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

stock module - 19-03-2025

Browse Source
This commit is contained in:
vadivelJ96 2025-03-20 15:06:48 +05:30
parent 4afebb851f
commit 71fce65d0f
1 changed files with 6 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
app/Models/TrpProductionModel.php
View File

@ -125,11 +125,7 @@ class TrpProductionModel extends Model
tpwd.edWaste, tpwd.edWaste,
tpwd.coolerBags, tpwd.coolerBags,
tpwd.edPlus20Waste, tpwd.edPlus20Waste,
tpwd.cycloneWaste, tpwd.cycloneWaste'
'
); );
@ -165,8 +161,7 @@ class TrpProductionModel extends Model
->join('ip_invoices inv', 'inv.client_id = clients.client_id') ->join('ip_invoices inv', 'inv.client_id = clients.client_id')
->join('ip_invoice_items invItems', 'inv.invoice_id = invItems.invoice_id') ->join('ip_invoice_items invItems', 'inv.invoice_id = invItems.invoice_id')
->whereIn('invItems.item_product_id', [81, 93]) ->whereIn('invItems.item_product_id', [81, 93])
->where('invItems.item_date_added >=', $startDate) ->where("invItems.item_date_added BETWEEN '$startDate' AND '$endDate'", null, false) // Use BETWEEN for date filtering
->where('invItems.item_date_added <=', $endDate)
->get() ->get()
->getResultArray(); ->getResultArray();
@ -199,8 +194,7 @@ class TrpProductionModel extends Model
->join('ip_invoices inv', 'inv.invoice_id = invItems.invoice_id', 'left') ->join('ip_invoices inv', 'inv.invoice_id = invItems.invoice_id', 'left')
->join('ip_clients clients', 'clients.client_id = inv.client_id', 'left') ->join('ip_clients clients', 'clients.client_id = inv.client_id', 'left')
->whereIn('invItems.item_product_id', [81, 93]) ->whereIn('invItems.item_product_id', [81, 93])
->where('invItems.item_date_added >=', $startDate) ->where("invItems.item_date_added BETWEEN '$startDate' AND '$endDate'", null, false) // Use BETWEEN for date filtering
->where('invItems.item_date_added <=', $endDate)
->groupBy('invItems.item_date_added') ->groupBy('invItems.item_date_added')
->getCompiledSelect(false); // Convert Query Builder to raw SQL; ->getCompiledSelect(false); // Convert Query Builder to raw SQL;
@ -223,10 +217,8 @@ class TrpProductionModel extends Model
->join('t_igr_master tigm', 'tigm.IGRNo = tigrd.IGRNo', 'left') ->join('t_igr_master tigm', 'tigm.IGRNo = tigrd.IGRNo', 'left')
->join('t_purchaseorder_master tpom', 'tpom.PONO = tigm.PONO', 'left') ->join('t_purchaseorder_master tpom', 'tpom.PONO = tigm.PONO', 'left')
->join('t_supplierdetailsn ts', 'tpom.SupplierID = ts.SupplierID', 'left') ->join('t_supplierdetailsn ts', 'tpom.SupplierID = ts.SupplierID', 'left')
->whereIn('tigrd.MaterialCode', $materialCodes) ->whereIn('tigrd.MaterialCode', $materialCodes)
->where('tigrd.CreatedDate >=', $startDate) ->where("DATE(tigrd.CreatedDate) BETWEEN '$startDate' AND '$endDate'", null, false) // Use BETWEEN for date filtering
->where('tigrd.CreatedDate <=', $endDate)
->groupBy('DATE(tigrd.CreatedDate)')
->get() ->get()
->getResultArray(); ->getResultArray();
@ -260,8 +252,7 @@ class TrpProductionModel extends Model
->join('t_purchaseorder_master tpom', 'tpom.PONO = tigm.PONO', 'left') ->join('t_purchaseorder_master tpom', 'tpom.PONO = tigm.PONO', 'left')
->join('t_supplierdetailsn ts', 'tpom.SupplierID = ts.SupplierID', 'left') ->join('t_supplierdetailsn ts', 'tpom.SupplierID = ts.SupplierID', 'left')
->whereIn('tigrd.MaterialCode', $materialCodes) ->whereIn('tigrd.MaterialCode', $materialCodes)
->where('tigrd.CreatedDate >=', $startDate) ->where("DATE(tigrd.CreatedDate) BETWEEN '$startDate' AND '$endDate'", null, false) // Use BETWEEN for date filtering
->where('tigrd.CreatedDate <=', $endDate)
->groupBy('DATE(tigm.CreatedDate)') ->groupBy('DATE(tigm.CreatedDate)')
->getCompiledSelect(false); // Convert Query Builder to raw SQL ->getCompiledSelect(false); // Convert Query Builder to raw SQL