From e09955acdb176e0389c2c31e54550bb2ba1b1adc Mon Sep 17 00:00:00 2001 From: Gowtham M Date: Wed, 29 Jan 2025 09:02:29 +0530 Subject: [PATCH 1/5] igr tax value : GWM --- app/Models/Inwardgateregister_model.php | 46 +++++++++++++++++++------ 1 file changed, 36 insertions(+), 10 deletions(-) diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index ef94a74d..245000a8 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -372,18 +372,42 @@ class Inwardgateregister_model extends Model function ViewigrListing($fromDate,$toDate) { - $subQuery = $this->db->table('t_igr_remarkes') - ->select('COUNT(id)') - ->where('igr_no = igr.IGRNo') - ->getCompiledSelect(); + $subQuery1 = $this->db->table('t_igr_remarkes') + ->select('COUNT(id)') + ->where('igr_no = igr.IGRNo') + ->getCompiledSelect(); + + // Build subQuery2 dynamically for rate and tax based on POType + $subQuery2 = "(CASE + WHEN PO.POType = 'revenue' THEN ( + SELECT JSON_OBJECT('total_rate', SUM(POL.Rate), 'total_tax', AVG(tax.CGST + tax.SGST + tax.IGST)) + FROM t_igr_details IGRD + LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode + LEFT JOIN t_revenue_tax tax ON tax.LineItemNo = POL.LineItemNo + WHERE IGRD.IGRNO = igr.IGRNO + ) + WHEN PO.POType = 'service' THEN ( + SELECT JSON_OBJECT('total_rate', SUM(POL.Rate), 'total_tax', AVG(tax.CGST + tax.SGST + tax.IGST)) + FROM t_igr_details IGRD + LEFT JOIN t_purchaseorder_lineitem POL ON PONO = POL.PONO AND IGRD.MaterialCode = POL.MaterialCode + LEFT JOIN t_service_tax tax ON tax.LineItemNo = POL.LineItemNo + WHERE IGRD.IGRNO = igr.IGRNO + ) + ELSE NULL + END)"; + + + // Main query $builder = $this->db->table('t_igr_master igr') ->select("igr.*, PO.IsOpenOrder, PO.DeliveryDate, sup.SupplierName, PO.POType, trans.name as TransporterName, SUM(IGRD.QuantityAsPerInvoice) as ReceivedQuantity, SUM(IGRD.NetWeight) as NetWeight, COUNT(IGRD.IGRNo) as itemCount, - COALESCE(($subQuery), 0) as remark_count") // COALESCE to handle no matches + COALESCE(($subQuery1), 0) as remark_count, + JSON_EXTRACT(($subQuery2), '$.total_rate') as total_rate, + JSON_EXTRACT(($subQuery2), '$.total_tax') as total_tax") ->join('t_purchaseorder_master PO', 'igr.PONO = PO.PONO') ->join('t_supplierdetailsn sup', 'PO.SupplierID = sup.SupplierID') ->join('t_transporter trans', 'igr.TransporterId = trans.id', 'left') @@ -391,13 +415,15 @@ class Inwardgateregister_model extends Model ->where('igr.IGRStatus !=', MRIR_CREATED) ->where('Date(igr.CreatedDate) >=', "$fromDate") ->where('Date(igr.CreatedDate) <=', "$toDate") - // ->where('igr.IGRNo', "IGRNO-1627") ->groupBy('IGRD.IGRNo') ->orderBy('igr.CreatedDate', 'desc'); - - $query = $builder->get(); - $result = $query->getResult(); - + + $query = $builder->get(); + $result = $query->getResult(); + + + // echo $this->db->getLastQuery()->getQuery();die; + // dd($result); // old - issue in t_igr_remarkes join From 88800e186caec1d137da9cd6911206fada691c6e Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Wed, 29 Jan 2025 09:30:07 +0530 Subject: [PATCH 2/5] stock module latest today vadivel J 29-01-2025 --- app/Views/dieselStockDetails.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Views/dieselStockDetails.php b/app/Views/dieselStockDetails.php index c7f0ba3d..f766835c 100644 --- a/app/Views/dieselStockDetails.php +++ b/app/Views/dieselStockDetails.php @@ -444,9 +444,9 @@ foreach ($period as $day) { $summary['balanceStock'] = 0 ; } - $summary['totalPurchaseDiesel'] += $totalDiesel[$groupedDieselMachineStockDetailsIndex]['purchase_diesel'] == '-' ? 0 : $totalDiesel[$groupedDieselMachineStockDetailsIndex]['purchase_diesel'] ; - $summary['totalFillingDiesel'] += $totalDiesel[$groupedDieselMachineStockDetailsIndex]['total_filling_diesel'] == '-' ? 0 : $totalDiesel[$groupedDieselMachineStockDetailsIndex]['total_filling_diesel'] ; - $summary['balanceStock'] = $totalDiesel[$groupedDieselMachineStockDetailsIndex]['balance_stock'] == '-' ? 0 : $totalDiesel[$groupedDieselMachineStockDetailsIndex]['balance_stock'] ; + $summary['totalPurchaseDiesel'] += is_numeric($totalDiesel[$groupedDieselMachineStockDetailsIndex]['purchase_diesel'] ) ? $totalDiesel[$groupedDieselMachineStockDetailsIndex]['purchase_diesel'] : 0 ; + $summary['totalFillingDiesel'] += is_numeric($totalDiesel[$groupedDieselMachineStockDetailsIndex]['total_filling_diesel']) ? $totalDiesel[$groupedDieselMachineStockDetailsIndex]['total_filling_diesel'] : 0 ; + $summary['balanceStock'] = is_numeric($totalDiesel[$groupedDieselMachineStockDetailsIndex]['balance_stock']) ? $totalDiesel[$groupedDieselMachineStockDetailsIndex]['balance_stock'] : 0 ; ?> From b8a1490d7653824240cd63e0ff6e1bb5085c44b5 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Wed, 29 Jan 2025 10:28:30 +0530 Subject: [PATCH 3/5] stock module latest today vadivel J 29-01-2025 --- app/Controllers/StockController.php | 2 +- app/Views/trpProductionStockDetails.php | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 79451166..21843367 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -1383,7 +1383,7 @@ class StockController extends BaseController } else { // $month = new DateTime('2024-10-01'); - // $month = $month->format('Y-m'); + // $month = $month->format('Y-m'); $month = date('Y-m'); diff --git a/app/Views/trpProductionStockDetails.php b/app/Views/trpProductionStockDetails.php index 24a6fe5c..a825e64c 100644 --- a/app/Views/trpProductionStockDetails.php +++ b/app/Views/trpProductionStockDetails.php @@ -1051,7 +1051,7 @@ //table to json function - var updateResinStockDetails = tableToJson(); + var updateTrpProductionDetails = tableToJson(); alert('Updation may take a while, And we appreciate your patience..!!'); @@ -1062,7 +1062,7 @@ updateResinStockDetails }, type: "POST", - url: "updateResinStockDetails", + url: "updateTrpProductionDetails", success: function (data) { if (data) { From 2406b0fa71866d0256868c6f910bb4e0e611bc9c Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Wed, 29 Jan 2025 11:23:20 +0530 Subject: [PATCH 4/5] stock module latest today vadivel J 29-01-2025 --- app/Controllers/StockController.php | 366 ++++++++++++++-------------- 1 file changed, 188 insertions(+), 178 deletions(-) diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 21843367..76cabd29 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -1409,7 +1409,9 @@ class StockController extends BaseController $inserts = $this->generateDummyData($startDate, $endDate); - $data['trpProductionMaintenanceData'] = $this->updateTrpProductionDetails($inserts); + $freshEntry = true ; + + $data['trpProductionMaintenanceData'] = $this->updateTrpProductionDetails($inserts ,$freshEntry); } @@ -1443,147 +1445,155 @@ class StockController extends BaseController - public function updateTrpProductionDetails($inserts) { - - $postData = $this->request->getPost(); - - if(empty($postData['updateTrpProductionDetails'])){ - if(empty($inserts)){ - return $this->response->setJSON(['error' => 'No data found to update']); - }else{ - $postData['updateTrpProductionDetails'] = $inserts; - } - } - - - $updateTrpProductionDetails = $postData['updateTrpProductionDetails']; - - $updateProduction = []; - $updateMaintanence = []; - $updateWaste = []; - - $insertProduction = []; - $insertMaintanence = []; - $insertWaste = []; - - foreach ($updateTrpProductionDetails as $data) { - - $data['date'] = $this->convertToDateWithFlexibleFormats($data['Date'], ["d-m-Y", "Y-m-d", "m/d/Y", "m-d-Y"], "Y-m-d"); - - $date = $data['date']; - - $dbDataTrpMaintenance = [ - 'date' => $data['date'], - 'openingTime' => $data['openingTime'], - 'closingTime' => $data['closingTime'], - 'totalHours' => $data['totalHours'], - 'coldStart' => $data['coldStart'], - 'breakdownHours' => $data['breakdownHours'], - 'burnerFiringHours' => $data['burnerFiringHours'], - 'sandFeedingHours' => $data['sandFeedingHours'], - 'workingPersonEngineers' => $data['workingPersonEngineers'], - 'workingPersonSupervisiors' => $data['workingPersonSupervisiors'], - 'workingPersonOperators' => $data['workingPersonOperators'], - 'rollerDrivers' => $data['rollerDrivers'], - 'natureOfMaintenance' => $data['natureOfMaintenance'], - 'location' => $data['location'], - 'description' => $data['description'] - ]; - - $dbDataTrpProduction = [ - 'date' => $data['date'], - 'gasReceiptBg' => $data['gasReceiptBg'], - 'gasReceiptPg' => $data['gasReceiptPg'], - 'physicalGasConsumption'=> $data['physicalGasConsumption'], - 'trpPlusDrierGasConsumption'=> $data['trpPlusDrierGasConsumption'], - 'trpPhysicalGasPerTon' => $data['trpPhysicalGasPerTon'], - 'panelGasConsumption' => $data['panelGasConsumption'], - 'panelGasPerTon' => $data['panelGasPerTon'], - 'edRunningHours' => $data['edRunningHours'], - 'edProduction' => $data['edProduction'], - 'edUsage' => $data['edUsage'], - 'trpProduction' => $data['trpProduction'], - 'trpProductionPerHour' => $data['trpProductionPerHour'], - 'waterReceipt' => $data['waterReceipt'], - 'waterConsumption' => $data['waterConsumption'], - 'ebReading' => $data['ebReading'], - 'ebReadingPerUnitTon' => $data['ebReadingPerUnitTon'], - ]; - - $dbDataTrpWaste = [ - 'date' => $data['date'], - 'msSeperation' => $data['msSeperation'], - 'edWaste' => $data['edWaste'], - 'coolerBags' => $data['coolerBags'], - 'edPlus20Waste' => $data['edPlus20Waste'], - 'cycloneWaste' => $data['cycloneWaste'], - ]; - - $trpMaintenanceResultExists = $this->TrpProductionMaintenance_model - ->where('date', $date) - ->first(); - - $trpProductionResultExists = $this->TrpProduction_model - ->where('date', $date) - ->first(); - - $trpWasteResultExists = $this->TrpProductionWaste_model - ->where('date', $date) - ->first(); - - if (empty($trpMaintenanceResultExists)) { - $insertMaintanence[] = $dbDataTrpMaintenance; - $insertProduction[] = $dbDataTrpProduction; - $insertWaste[] = $dbDataTrpWaste; - } else { - $dbDataTrpMaintenance['id'] = $trpMaintenanceResultExists['id']; - $dbDataTrpProduction['id'] = $trpProductionResultExists['id']; - $dbDataTrpWaste['id'] = $trpWasteResultExists['id']; - - $updateMaintanence[] = $dbDataTrpMaintenance; - $updateProduction[] = $dbDataTrpProduction; - $updateWaste[] = $dbDataTrpWaste; - } - } - - // Start the transaction - $this->db->transBegin(); - - try { - if (!empty($insertMaintanence)) { - $this->TrpProductionMaintenance_model->insertBatch($insertMaintanence); - } - - if (!empty($insertProduction)) { - $this->TrpProduction_model->insertBatch($insertProduction); - } - - if (!empty($insertWaste)) { - $this->TrpProductionWaste_model->insertBatch($insertWaste); - } - - if (!empty($updateMaintanence)) { - $this->TrpProductionMaintenance_model->updateBatch($updateMaintanence, 'id'); - } - - if (!empty($updateProduction)) { - $this->TrpProduction_model->updateBatch($updateProduction, 'id'); - } - - if (!empty($updateWaste)) { - $this->TrpProductionWaste_model->updateBatch($updateWaste, 'id'); - } - - // Commit the transaction if all operations are successful - $this->db->transCommit(); - echo "Data Saved Successfully"; - - } catch (\Exception $error) { - // Rollback the transaction in case of any errors - $this->db->transRollback(); - echo "An error occurred: " . $error->getMessage(); - } - } + public function updateTrpProductionDetails($inserts, $freshEntry = false) + { + $postData = $this->request->getPost(); + + if (empty($postData['updateTrpProductionDetails'])) { + if (empty($inserts)) { + return $this->response->setJSON(['error' => 'No data found to update']); + } else { + $postData['updateTrpProductionDetails'] = $inserts; + } + } + + $updateTrpProductionDetails = $postData['updateTrpProductionDetails']; + + // Extract all dates from input data + $dates = array_column($updateTrpProductionDetails, 'Date'); + $formattedDates = array_map(fn($date) => $this->convertToDateWithFlexibleFormats($date, ["d-m-Y", "Y-m-d", "m/d/Y", "m-d-Y"], "Y-m-d"), $dates); + + // Fetch all existing records in a single query per table + $existingMaintenance = $this->TrpProductionMaintenance_model->whereIn('date', $formattedDates)->findAll(); + $existingProduction = $this->TrpProduction_model->whereIn('date', $formattedDates)->findAll(); + $existingWaste = $this->TrpProductionWaste_model->whereIn('date', $formattedDates)->findAll(); + + // Map existing records by date for quick lookup + $existingMaintenanceMap = array_column($existingMaintenance, null, 'date'); + $existingProductionMap = array_column($existingProduction, null, 'date'); + $existingWasteMap = array_column($existingWaste, null, 'date'); + + $insertMaintenance = []; + $updateMaintenance = []; + $insertProduction = []; + $updateProduction = []; + $insertWaste = []; + $updateWaste = []; + + foreach ($updateTrpProductionDetails as $data) { + $date = $this->convertToDateWithFlexibleFormats($data['Date'], ["d-m-Y", "Y-m-d", "m/d/Y", "m-d-Y"], "Y-m-d"); + + // Data arrays + $dbDataTrpMaintenance = [ + 'date' => $date, + 'openingTime' => $data['openingTime'], + 'closingTime' => $data['closingTime'], + 'totalHours' => $data['totalHours'], + 'coldStart' => $data['coldStart'], + 'breakdownHours' => $data['breakdownHours'], + 'burnerFiringHours' => $data['burnerFiringHours'], + 'sandFeedingHours' => $data['sandFeedingHours'], + 'workingPersonEngineers' => $data['workingPersonEngineers'], + 'workingPersonSupervisiors' => $data['workingPersonSupervisiors'], + 'workingPersonOperators' => $data['workingPersonOperators'], + 'rollerDrivers' => $data['rollerDrivers'], + 'natureOfMaintenance' => $data['natureOfMaintenance'], + 'location' => $data['location'], + 'description' => $data['description'] + ]; + + $dbDataTrpProduction = [ + 'date' => $date, + 'gasReceiptBg' => $data['gasReceiptBg'], + 'gasReceiptPg' => $data['gasReceiptPg'], + 'physicalGasConsumption' => $data['physicalGasConsumption'], + 'trpPlusDrierGasConsumption' => $data['trpPlusDrierGasConsumption'], + 'trpPhysicalGasPerTon' => $data['trpPhysicalGasPerTon'], + 'panelGasConsumption' => $data['panelGasConsumption'], + 'panelGasPerTon' => $data['panelGasPerTon'], + 'edRunningHours' => $data['edRunningHours'], + 'edProduction' => $data['edProduction'], + 'edUsage' => $data['edUsage'], + 'trpProduction' => $data['trpProduction'], + 'trpProductionPerHour' => $data['trpProductionPerHour'], + 'waterReceipt' => $data['waterReceipt'], + 'waterConsumption' => $data['waterConsumption'], + 'ebReading' => $data['ebReading'], + 'ebReadingPerUnitTon' => $data['ebReadingPerUnitTon'], + ]; + + $dbDataTrpWaste = [ + 'date' => $date, + 'msSeperation' => $data['msSeperation'], + 'edWaste' => $data['edWaste'], + 'coolerBags' => $data['coolerBags'], + 'edPlus20Waste' => $data['edPlus20Waste'], + 'cycloneWaste' => $data['cycloneWaste'], + ]; + + // Check if data already exists + if (isset($existingMaintenanceMap[$date])) { + $dbDataTrpMaintenance['id'] = $existingMaintenanceMap[$date]['id']; + $updateMaintenance[] = $dbDataTrpMaintenance; + } else { + $insertMaintenance[] = $dbDataTrpMaintenance; + } + + if (isset($existingProductionMap[$date])) { + $dbDataTrpProduction['id'] = $existingProductionMap[$date]['id']; + $updateProduction[] = $dbDataTrpProduction; + } else { + $insertProduction[] = $dbDataTrpProduction; + } + + if (isset($existingWasteMap[$date])) { + $dbDataTrpWaste['id'] = $existingWasteMap[$date]['id']; + $updateWaste[] = $dbDataTrpWaste; + } else { + $insertWaste[] = $dbDataTrpWaste; + } + } + + // Start transaction + $this->db->transBegin(); + + try { + // Insert new records in batch + if (!empty($insertMaintenance)) { + $this->TrpProductionMaintenance_model->insertBatch($insertMaintenance); + } + if (!empty($insertProduction)) { + $this->TrpProduction_model->insertBatch($insertProduction); + } + if (!empty($insertWaste)) { + $this->TrpProductionWaste_model->insertBatch($insertWaste); + } + + // Update existing records in batch + if (!empty($updateMaintenance)) { + $this->TrpProductionMaintenance_model->updateBatch($updateMaintenance, 'id'); + } + if (!empty($updateProduction)) { + $this->TrpProduction_model->updateBatch($updateProduction, 'id'); + } + if (!empty($updateWaste)) { + $this->TrpProductionWaste_model->updateBatch($updateWaste, 'id'); + } + + // Commit transaction if successful + $this->db->transCommit(); + + if (!$freshEntry) { + echo "Data Saved Successfully"; + } + } catch (\Exception $error) { + // Rollback transaction on error + $this->db->transRollback(); + echo "An error occurred: " . $error->getMessage(); + } + } + + @@ -1592,10 +1602,10 @@ class StockController extends BaseController $datesInMonth = []; $inserts = []; - $period = new DatePeriod( - new DateTime($startDate), - new DateInterval('P1D'), - (new DateTime($endDate))->modify('+1 day') + $period = new DatePeriod( + new DateTime($startDate), + new DateInterval('P1D'), + (new DateTime($endDate))->modify('+1 day') ); foreach ($period as $day) { @@ -1606,41 +1616,41 @@ class StockController extends BaseController $inserts[] = [ 'Date' => $dateInMonth, - 'openingTime' => '00:00', - 'closingTime' => '00:00', - 'totalHours' => '00:00', - 'coldStart' => '00:00', - 'breakdownHours' => '00:00', - 'burnerFiringHours' => '00:00', - 'sandFeedingHours' => '00:00', - 'workingPersonEngineers' => 0, - 'workingPersonSupervisiors' => 0, - 'workingPersonOperators' => 0, - 'rollerDrivers' => 0, + 'openingTime' => " ", + 'closingTime' => " ", + 'totalHours' => " ", + 'coldStart' => " ", + 'breakdownHours' => " ", + 'burnerFiringHours' => " ", + 'sandFeedingHours' => " ", + 'workingPersonEngineers' => " ", + 'workingPersonSupervisiors' => " ", + 'workingPersonOperators' => " ", + 'rollerDrivers' => " ", 'natureOfMaintenance' => '', 'location' => '', 'description' => '', - 'gasReceiptBg' => 0, - 'gasReceiptPg' => 0, - 'physicalGasConsumption' => 0, - 'trpPlusDrierGasConsumption' => 0, - 'trpPhysicalGasPerTon' => 0, - 'panelGasConsumption' => 0, - 'panelGasPerTon' => 0, - 'edRunningHours' => 0, - 'edProduction' => 0, - 'edUsage' => 0, - 'trpProduction' => 0, - 'trpProductionPerHour' => 0, - 'waterReceipt' => 0, - 'waterConsumption' => 0, - 'ebReading' => 0, - 'ebReadingPerUnitTon' => 0, - 'msSeperation' => 0, - 'edWaste' => 0, - 'coolerBags' => 0, - 'edPlus20Waste' => 0, - 'cycloneWaste' => 0 + 'gasReceiptBg' => " ", + 'gasReceiptPg' => " ", + 'physicalGasConsumption' => " ", + 'trpPlusDrierGasConsumption' => " ", + 'trpPhysicalGasPerTon' => " ", + 'panelGasConsumption' => " ", + 'panelGasPerTon' => " ", + 'edRunningHours' => " ", + 'edProduction' => " ", + 'edUsage' => " ", + 'trpProduction' => " ", + 'trpProductionPerHour' => " ", + 'waterReceipt' => " ", + 'waterConsumption' => " ", + 'ebReading' =>" ", + 'ebReadingPerUnitTon' =>" ", + 'msSeperation' => " ", + 'edWaste' => " ", + 'coolerBags' =>" ", + 'edPlus20Waste' => " ", + 'cycloneWaste' => " " ]; } From 20a73ed18b2db14af2a497c6b464dbf3d312bdd0 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Wed, 29 Jan 2025 14:17:40 +0530 Subject: [PATCH 5/5] stock module latest today vadivel J 29-01-2025 --- api_test.http | 2 +- app/Controllers/StockController.php | 2 +- app/Models/TrpProductionModel.php | 8 +++--- app/Views/trpProductionStockDetails.php | 33 +++++++++++++------------ 4 files changed, 24 insertions(+), 21 deletions(-) diff --git a/api_test.http b/api_test.http index bf824419..88ea6b3f 100644 --- a/api_test.http +++ b/api_test.http @@ -6,7 +6,7 @@ // $routes->match(['GET', 'POST'], 'trpProductionDetails', 'StockController::trpProductionDetails'); - # GET http://localhost/ci4/ria/trpProductionDetails + GET http://localhost/ci4/ria/trpProductionDetails diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 76cabd29..df0de8f7 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -496,7 +496,7 @@ class StockController extends BaseController } else { $updated = $this->incomingSilicaSandDetails_model ->insert($dbData); - } + } if ($updated) { diff --git a/app/Models/TrpProductionModel.php b/app/Models/TrpProductionModel.php index e0ead6c2..0496178b 100644 --- a/app/Models/TrpProductionModel.php +++ b/app/Models/TrpProductionModel.php @@ -68,6 +68,8 @@ class TrpProductionModel extends Model // Convert the array of material codes to a comma-separated string $materialCodesString = "'" . implode("','", $materialCodes) . "'"; + + // dd($materialCodes); $sql = "SELECT @@ -190,9 +192,9 @@ class TrpProductionModel extends Model tigrd.CreatedDate , - SUM(CASE WHEN ts.SupplierName = 'ASHOK LEYLAND LIMITED FOUNDRY DIVN - SPU' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS + SUM(CASE WHEN ts.SupplierName = 'Ashok leyland limited foundry divn-SPU' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS `ALs_wcs`, - SUM(CASE WHEN ts.SupplierName = 'ASHOK LEYLAND LIMITED FOUNDRY DIVN - ENU' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS + SUM(CASE WHEN ts.SupplierName = 'Ashok leyland limited foundry divn-ENU' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS `ALe_wcs`, SUM(CASE WHEN ts.SupplierName = 'MADRAS ENGINEERING INDUSTRIES PRIVATE LIMITED' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS `ME_wcs`, @@ -202,7 +204,7 @@ class TrpProductionModel extends Model `caparo_wcs`, SUM(CASE WHEN ts.SupplierName = 'NEMAK ALUMINIUM CASTING INDIA PVT LTD' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS `Nemak_wcs`, - SUM(CASE WHEN ts.SupplierName = 'DR AXION INDIA PRIVATE LIMITED' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS + SUM(CASE WHEN ts.SupplierName = 'DR Axion India Private Limited' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS `DR_wcs` from t_igr_details tigrd diff --git a/app/Views/trpProductionStockDetails.php b/app/Views/trpProductionStockDetails.php index a825e64c..37504006 100644 --- a/app/Views/trpProductionStockDetails.php +++ b/app/Views/trpProductionStockDetails.php @@ -570,7 +570,7 @@ - + @@ -612,18 +612,19 @@ + - + - + @@ -631,21 +632,21 @@ - + - + - + @@ -653,14 +654,14 @@ - + - + @@ -668,7 +669,7 @@ - + @@ -709,42 +710,42 @@ - + - + - + - + - + - + @@ -752,7 +753,7 @@ - +