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

stock module latest today vadivel J 10-02-2025

Browse Source
This commit is contained in:
vadivelJ96 2025-02-10 17:16:14 +05:30
parent 21cd2aa633
commit 228d2d0cc1
2 changed files with 138 additions and 178 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

148
app/Models/TrpProductionModel.php
View File

@ -90,8 +90,6 @@ class TrpProductionModel extends Model
tpmd.location, tpmd.location,
tpmd.description, tpmd.description,
tpd.gasReceiptBg, tpd.gasReceiptBg,
tpd.gasReceiptPg, tpd.gasReceiptPg,
tpd.physicalGasConsumption, tpd.physicalGasConsumption,
@ -109,58 +107,56 @@ class TrpProductionModel extends Model
tpd.ebReading, tpd.ebReading,
tpd.ebReadingPerUnitTon, tpd.ebReadingPerUnitTon,
tpwd.msSeperation, tpwd.msSeperation,
tpwd.edWaste, tpwd.edWaste,
tpwd.coolerBags, tpwd.coolerBags,
tpwd.edPlus20Waste, tpwd.edPlus20Waste,
tpwd.cycloneWaste, tpwd.cycloneWaste,
-- Aggregated totalGasConsumption for Coating Machine
IFNULL(tcmd.totalGasConsumption, 0) AS coatingGasConsumption,
tcmd.totalGasConsumption as coatingGasConsumption, -- Aggregated totalGasConsumption for Drier Machine
IFNULL(tdmd.totalGasConsumption, 0) AS drierGasConsumption,
tdmd.total_gas_consumption as drierGasConsumption, tsu.total_kgs AS coating,
tsu.total_kgs as coating,
invItems.*, invItems.*,
tigrdot.* tigrdot.*
FROM FROM
t_trpProductionMaintenanceDetails tpmd t_trpProductionMaintenanceDetails tpmd
JOIN JOIN
t_trpProductionDetails tpd ON tpd.date = tpmd.date t_trpProductionDetails tpd ON tpd.date = tpmd.date
JOIN JOIN
t_trpProductionWasteDetails tpwd ON tpwd.date = tpmd.date t_trpProductionWasteDetails tpwd ON tpwd.date = tpmd.date
LEFT JOIN
t_coatingMachineDetails tcmd ON tcmd.date = tpmd.date
LEFT JOIN
t_drierMachineDetails tdmd ON tdmd.date = tpmd.date
LEFT JOIN LEFT JOIN
t_trp_sand_use tsu ON tsu.date = tpmd.date t_trp_sand_use tsu ON tsu.date = tpmd.date
-- Aggregated Coating Machine Gas Consumption
LEFT JOIN (
SELECT date, SUM(totalGasConsumption) AS totalGasConsumption
FROM t_coatingMachineDetails
GROUP BY date
) tcmd ON tcmd.date = tpmd.date
-- Aggregated Drier Machine Gas Consumption
LEFT JOIN (
SELECT date, SUM(total_gas_consumption) AS totalGasConsumption
FROM t_drierMachineDetails
GROUP BY date
) tdmd ON tdmd.date = tpmd.date
LEFT JOIN -- Aggregating Core Sand Reclaimed by Client
( LEFT JOIN (
SELECT SELECT
invItems.item_date_added, invItems.item_date_added,
SUM(CASE WHEN clients.client_name = 'ASHOK LEYLAND LIMITED (FOUNDRY DIVISION-SRIPERUMBUDUR)' THEN invItems.item_quantity ELSE 0 END) AS SUM(CASE WHEN clients.client_name = 'ASHOK LEYLAND LIMITED (FOUNDRY DIVISION-SRIPERUMBUDUR)' THEN invItems.item_quantity ELSE 0 END) AS `ALs_crs`,
`ALs_crs`, SUM(CASE WHEN clients.client_name = 'NEMAK ALUMINIUM CASTING INDIA PVT LTD' THEN invItems.item_quantity ELSE 0 END) AS `Nemak_crs`,
SUM(CASE WHEN clients.client_name = 'NEMAK ALUMINIUM CASTING INDIA PVT LTD' THEN invItems.item_quantity ELSE 0 END) AS SUM(CASE WHEN clients.client_name = 'MADRAS ENGINEERING INDUSTRIES PRIVATE LIMITED' THEN invItems.item_quantity ELSE 0 END) AS `ME_crs`,
`Nemak_crs`, SUM(CASE WHEN clients.client_name = 'BRAKES INDIA PRIVATE LIMITED' THEN invItems.item_quantity ELSE 0 END) AS `BI_crs`,
SUM(CASE WHEN clients.client_name = 'MADRAS ENGINEERING INDUSTRIES PRIVATE LIMITED' THEN invItems.item_quantity ELSE 0 END) AS SUM(CASE WHEN clients.client_name = 'KARMEN INTERNATIONAL PVT LTD' THEN invItems.item_quantity ELSE 0 END) AS `Karmen_crs`
`ME_crs`,
SUM(CASE WHEN clients.client_name = 'BRAKES INDIA PRIVATE LIMITED' THEN invItems.item_quantity ELSE 0 END) AS
`BI_crs`,
SUM(CASE WHEN clients.client_name = 'KARMEN INTERNATIONAL PVT LTD' THEN invItems.item_quantity ELSE 0 END) AS
`Karmen_crs`
FROM FROM
ip_invoice_items invItems ip_invoice_items invItems
LEFT JOIN LEFT JOIN
@ -169,84 +165,37 @@ class TrpProductionModel extends Model
ip_clients clients ON clients.client_id = inv.client_id ip_clients clients ON clients.client_id = inv.client_id
WHERE WHERE
invItems.item_name = 'Core Sand Reclaimed' invItems.item_name = 'Core Sand Reclaimed'
AND invItems.item_date_added >= '$startDate'
AND AND invItems.item_date_added <= '$endDate'
invItems.item_date_added >= '$startDate'
AND
invItems.item_date_added <= '$endDate'
GROUP BY GROUP BY
invItems.item_date_added invItems.item_date_added
) invItems ON invItems.item_date_added = tpmd.date
-- Aggregating Waste Core Sand Suppliers
) invItems LEFT JOIN (
ON invItems.item_date_added = tpmd.date SELECT
LEFT JOIN
(
Select
tigrd.CreatedDate, tigrd.CreatedDate,
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-SPU' 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`,
`ALs_wcs`, SUM(CASE WHEN ts.SupplierName = 'MADRAS ENGINEERING INDUSTRIES PRIVATE LIMITED' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS `ME_wcs`,
SUM(CASE WHEN ts.SupplierName = 'Ashok leyland limited foundry divn-ENU' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS SUM(CASE WHEN ts.SupplierName = 'SIDDHARTH INDUSTRIES' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS `SI_wcs`,
`ALe_wcs`, SUM(CASE WHEN ts.SupplierName = 'Caparo Engineering India Limited' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS `caparo_wcs`,
SUM(CASE WHEN ts.SupplierName = 'MADRAS ENGINEERING INDUSTRIES PRIVATE LIMITED' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS SUM(CASE WHEN ts.SupplierName = 'NEMAK ALUMINIUM CASTING INDIA PVT LTD' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS `Nemak_wcs`,
`ME_wcs`, SUM(CASE WHEN ts.SupplierName = 'DR Axion India Private Limited' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS `DR_wcs`
SUM(CASE WHEN ts.SupplierName = 'SIDDHARTH INDUSTRIES' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS FROM t_igr_details tigrd
`SI_wcs`, LEFT JOIN t_igr_master tigm ON tigm.IGRNo = tigrd.IGRNo
SUM(CASE WHEN ts.SupplierName = 'Caparo Engineering India Limited' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS LEFT JOIN t_purchaseorder_master tpom ON tpom.PONO = tigm.PONO
`caparo_wcs`, LEFT JOIN t_supplierdetailsn ts ON tpom.SupplierID = ts.SupplierID
SUM(CASE WHEN ts.SupplierName = 'NEMAK ALUMINIUM CASTING INDIA PVT LTD' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS WHERE
`Nemak_wcs`,
SUM(CASE WHEN ts.SupplierName = 'DR Axion India Private Limited' THEN tigrd.QuantityAsPerInvoice ELSE 0 END) AS
`DR_wcs`
from t_igr_details tigrd
-- All joins to get supplier name thats it
LEFT JOIN
t_igr_master tigm
ON tigm.IGRNo = tigrd.IGRNo
LEFT JOIN
t_purchaseorder_master tpom
ON tpom.PONO = tigm.PONO
LEFT JOIN
t_supplierdetailsn ts
ON tpom.SupplierID = ts.SupplierID
-- getting waste core sands using three distinct material codes
Where
tigrd.MaterialCode IN ($materialCodesString) tigrd.MaterialCode IN ($materialCodesString)
AND tigrd.CreatedDate >= '$startDate'
AND AND tigrd.CreatedDate <= '$endDate'
tigrd.CreatedDate >= '$startDate' GROUP BY Date(tigrd.CreatedDate)
) tigrdot ON DATE(tigrdot.CreatedDate) = tpmd.date
AND
tigrd.CreatedDate <= '$endDate'
-- grouping supplier who provides waste core on a particular date with 1 or more IGRS
Group By Date(tigrd.CreatedDate)
) tigrdot
ON DATE(tigrdot.CreatedDate) = tpmd.date
WHERE WHERE
tpmd.date >= ? tpmd.date >= ?
AND AND tpmd.date <= ?
tpmd.date <= ?
ORDER BY ORDER BY
tpmd.date ASC"; tpmd.date ASC";
@ -257,6 +206,7 @@ class TrpProductionModel extends Model
// Execute the query // Execute the query
$query = $this->db->query($sql, [ $startDate, $endDate]); $query = $this->db->query($sql, [ $startDate, $endDate]);

12
app/Views/stock/dieselStockDetails.php
View File

@ -549,7 +549,17 @@ foreach ($period as $day) {
$summary["machineId_$machineId"]['filling_diesel'] += is_numeric($dieselStock['filling_diesel']) ? $dieselStock['filling_diesel'] : 0 ; $summary["machineId_$machineId"]['filling_diesel'] += is_numeric($dieselStock['filling_diesel']) ? $dieselStock['filling_diesel'] : 0 ;
$summary["machineId_$machineId"]['consumption'] += is_numeric($dieselStock['consumption']) ? $dieselStock['consumption'] : 0 ; $summary["machineId_$machineId"]['consumption'] += is_numeric($dieselStock['consumption']) ? $dieselStock['consumption'] : 0 ;
$summary["machineId_$machineId"]['running_hours'] += is_numeric($dieselStock['running_hours']) ? $dieselStock['running_hours'] : 0 ; $summary["machineId_$machineId"]['running_hours'] += is_numeric($dieselStock['running_hours']) ? $dieselStock['running_hours'] : 0 ;
$summary["machineId_$machineId"]['mileage'] += is_numeric($dieselStock['mileage']) ? $dieselStock['mileage'] : 0 ;
if($summary["machineId_$machineId"]['running_hours'] > 0){
$dieselMileage = round(
$summary["machineId_$machineId"]['consumption'] / $summary["machineId_$machineId"]['running_hours'],
2
);
}else{
$dieselMileage = 0 ;
}
$summary["machineId_$machineId"]['mileage'] = is_numeric( $dieselMileage) ? $dieselMileage : 0 ;