RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'new_theme' of bitbucket.org:venbainformationtechnology/ria into new_theme

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-02-13 11:51:21 +00:00
commit 2a878fae9e
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
app/Models/TrpProductionModel.php
View File

@ -164,7 +164,9 @@ class TrpProductionModel extends Model
LEFT JOIN LEFT JOIN
ip_clients clients ON clients.client_id = inv.client_id ip_clients clients ON clients.client_id = inv.client_id
WHERE WHERE
invItems.item_name = 'Core Sand Reclaimed' invItems.item_name = 'Core Sand Reclaimed'
OR invItems.item_name = 'Core Sand Reclaimed - Code No: 1203838'
OR invItems.item_name = 'Nemak Reclaimed Silica Sand 39-43'
AND invItems.item_date_added >= '$startDate' AND invItems.item_date_added >= '$startDate'
AND invItems.item_date_added <= '$endDate' AND invItems.item_date_added <= '$endDate'
GROUP BY GROUP BY
@ -188,8 +190,8 @@ class TrpProductionModel extends Model
LEFT JOIN t_supplierdetailsn ts ON tpom.SupplierID = ts.SupplierID LEFT JOIN t_supplierdetailsn ts ON tpom.SupplierID = ts.SupplierID
WHERE WHERE
tigrd.MaterialCode IN ($materialCodesString) tigrd.MaterialCode IN ($materialCodesString)
AND tigrd.CreatedDate >= '$startDate' AND Date(tigrd.CreatedDate) >= '$startDate'
AND tigrd.CreatedDate <= '$endDate' AND Date(tigrd.CreatedDate) <= '$endDate'
GROUP BY Date(tigrd.CreatedDate) GROUP BY Date(tigrd.CreatedDate)
) tigrdot ON DATE(tigrdot.CreatedDate) = tpmd.date ) tigrdot ON DATE(tigrdot.CreatedDate) = tpmd.date