diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index acd084c3..8b282ad0 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -1327,19 +1327,7 @@ class StockController extends BaseController tsu.*, ip_invoice_items.*, tigrd.* , - ( - SELECT ts.SupplierName - FROM t_supplierdetailsn ts - WHERE ts.SupplierID = ( - SELECT tpom.SupplierID - FROM t_purchaseorder_master tpom - WHERE tpom.PONO = ( - SELECT tigm.PONO - FROM t_igr_master tigm - WHERE tigm.IGRNo = tigrd.IGRNo - ) - ) - ) AS SupplierName + ts.SupplierName FROM t_trpProductionMaintenanceDetails tpmd JOIN @@ -1356,6 +1344,13 @@ class StockController extends BaseController ip_invoice_items ON ip_invoice_items.item_date_added = tpmd.date AND ip_invoice_items.item_name = 'Core Sand Reclaimed' + + + LEFT JOIN + t_igr_details tigrd + ON DATE(tigrd.CreatedDate) = tpmd.date + AND tigrd.MaterialCode IN ($materialCodesString) + LEFT JOIN t_igr_master tigm ON tigm.IGRNo = tigrd.IGRNo @@ -1366,38 +1361,29 @@ class StockController extends BaseController LEFT JOIN t_supplierdetailsn ts - ON ts.SupplierID = tpom.SupplierID - - - - LEFT JOIN ( - SELECT - DATE(CreatedDate) AS GroupedDate, - IGRNo, - SUM(QuantityAsPerInvoice) AS GroupedQuantity - FROM - t_igr_details - WHERE - MaterialCode IN ($materialCodesString) - GROUP BY - IGRNo - ) tigrd ON tigrd.GroupedDate = tpmd.date - + ON tpom.SupplierID = ts.SupplierID + WHERE tpmd.date >= ? AND tpmd.date <= ? + + Group BY + ts.SupplierName , tpmd.date , tigrd.MaterialCode + + + ORDER BY tpmd.date ASC"; // Execute the query - $query = $this->db->query($sql, [$startDate, $endDate]); + $query = $this->db->query($sql, [ $startDate, $endDate]); $data['trpProductionDetails'] = $query->getResultArray(); - dd($data['trpProductionDetails']); + $date = DateTime::createFromFormat('Y-m', $month); $formattedDate = $date->format('M-Y');