diff --git a/app/Models/TrpProductionModel.php b/app/Models/TrpProductionModel.php index 4da363f4..c79eefdd 100644 --- a/app/Models/TrpProductionModel.php +++ b/app/Models/TrpProductionModel.php @@ -164,7 +164,9 @@ class TrpProductionModel extends Model LEFT JOIN ip_clients clients ON clients.client_id = inv.client_id 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 <= '$endDate' GROUP BY @@ -188,8 +190,8 @@ class TrpProductionModel extends Model LEFT JOIN t_supplierdetailsn ts ON tpom.SupplierID = ts.SupplierID WHERE tigrd.MaterialCode IN ($materialCodesString) - AND tigrd.CreatedDate >= '$startDate' - AND tigrd.CreatedDate <= '$endDate' + AND Date(tigrd.CreatedDate) >= '$startDate' + AND Date(tigrd.CreatedDate) <= '$endDate' GROUP BY Date(tigrd.CreatedDate) ) tigrdot ON DATE(tigrdot.CreatedDate) = tpmd.date