diff --git a/app/Models/TrpProductionModel.php b/app/Models/TrpProductionModel.php index e9d85b5d..8cf96e23 100644 --- a/app/Models/TrpProductionModel.php +++ b/app/Models/TrpProductionModel.php @@ -151,6 +151,8 @@ class TrpProductionModel extends Model $builder->join("({$subquery2}) tdmd", 'tdmd.date = tpmd.date', 'left'); + + // Subquery: Core Sand Reclaimed by Clients $crsClientList = $this->db->table('ip_clients clients') @@ -164,7 +166,7 @@ class TrpProductionModel extends Model ->get() ->getResultArray(); - if(!empty($crsClientList)){ + $crsClientList = array_column($crsClientList, 'client_name'); // Initialize an empty array for dynamic SQL conditions @@ -202,11 +204,13 @@ class TrpProductionModel extends Model $builder->join("({$subquery3}) invItems", 'invItems.item_date_added = tpmd.date', 'left'); - } + + + - - $materialCodes = ! empty($materialCodes) ? $materialCodes : [''] ; + $materialCodes = ! empty($materialCodes) ? $materialCodes : ['600374','600422','600434']; + // Subquery: Waste Core Sand Suppliers $subquery4 = $this->db->table('t_igr_details tigrd') diff --git a/app/Views/stock/trpProductionStockDetails.php b/app/Views/stock/trpProductionStockDetails.php index 31f5cc6f..9c863f62 100644 --- a/app/Views/stock/trpProductionStockDetails.php +++ b/app/Views/stock/trpProductionStockDetails.php @@ -485,7 +485,7 @@ $timeOtions[] = "12:00 AM";