From 725c96a12373862deb97f9dc6b02e78f34a6d32b Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Fri, 7 Mar 2025 12:01:30 +0530 Subject: [PATCH] changes in stock module 07-03-2025 --- app/Models/TrpProductionModel.php | 4 +- app/Views/stock/CoatingMachineDetail.php | 65 +- app/Views/stock/bagStockDetails.php | 64 +- app/Views/stock/dieselStockDetails.php | 84 +-- app/Views/stock/drierMachineDetails.php | 77 +-- app/Views/stock/dustAndRoughStockDetails.php | 28 +- app/Views/stock/gasStockDetails.php | 57 +- app/Views/stock/incomingSilicaSandDetails.php | 50 +- app/Views/stock/powerConsumptionDetails.php | 90 +-- app/Views/stock/resinStockDetails.php | 47 +- app/Views/stock/trpProductionStockDetails.php | 583 +++++++----------- app/Views/stock/trpSandUseStockDetails.php | 39 +- 12 files changed, 435 insertions(+), 753 deletions(-) diff --git a/app/Models/TrpProductionModel.php b/app/Models/TrpProductionModel.php index 55277d90..de14aba0 100644 --- a/app/Models/TrpProductionModel.php +++ b/app/Models/TrpProductionModel.php @@ -146,7 +146,7 @@ class TrpProductionModel extends Model $builder->join('t_trp_sand_use tsu', 'tsu.date = tpmd.date', 'left'); // Subquery: Coating Machine Gas Consumption - $subquery1 = $this->db->table('t_coatingMachineDetails') + $subquery1 = $this->db->table('t_coatingmachinedetails') ->select('date, SUM(totalGasConsumption) AS totalGasConsumption') ->groupBy('date') ->getCompiledSelect(false); // Convert Query Builder to raw SQL; @@ -154,7 +154,7 @@ class TrpProductionModel extends Model $builder->join("({$subquery1}) tcmd", 'tcmd.date = tpmd.date', 'left'); // Subquery: Drier Machine Gas Consumption - $subquery2 = $this->db->table('t_drierMachineDetails') + $subquery2 = $this->db->table('t_driermachinedetails') ->select('date, SUM(total_gas_consumption) AS totalGasConsumption') ->groupBy('date') ->getCompiledSelect(false); // Convert Query Builder to raw SQL; diff --git a/app/Views/stock/CoatingMachineDetail.php b/app/Views/stock/CoatingMachineDetail.php index 2e69cd0c..a0ecdce6 100644 --- a/app/Views/stock/CoatingMachineDetail.php +++ b/app/Views/stock/CoatingMachineDetail.php @@ -235,6 +235,10 @@ z-index: 5!important; } + tfoot tr { + background-color:rgb(235, 236, 203); + } +
@@ -456,49 +460,26 @@ } ?> - + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
+ Total + - - - - - (avg) (avg)
Date ShiftMachine On TimeMachine Off TimeMachine Running(hr)Customer Name GradeTotal CoatingTotal Coating Sand(kg)Total Gas ConsumptionHour GasHour QTY(kg)
- Total - - - - - - (avg) (avg)
diff --git a/app/Views/stock/bagStockDetails.php b/app/Views/stock/bagStockDetails.php index a5adbade..9820c631 100644 --- a/app/Views/stock/bagStockDetails.php +++ b/app/Views/stock/bagStockDetails.php @@ -235,6 +235,9 @@ } */ + tfoot tr { + background-color:rgb(235, 236, 203); + } @@ -419,7 +422,7 @@ - " + " class="form-control mt-2" data-provide="datepicker" data-date-format="M-yyyy" data-date-min-view-mode="1"> @@ -585,45 +588,27 @@ + + -
- + - - - - - - - - - - - + - + + + + + - - - - - - - - - - - + - + - -
+ Total +
Total SumOpening StockReceiptUsedBalance Stock
- Total -
-
@@ -1282,4 +1267,17 @@ }; }); + + + \ No newline at end of file diff --git a/app/Views/stock/dieselStockDetails.php b/app/Views/stock/dieselStockDetails.php index c9df9250..4e46e21c 100644 --- a/app/Views/stock/dieselStockDetails.php +++ b/app/Views/stock/dieselStockDetails.php @@ -226,8 +226,9 @@ max-width: 100px; } - - + tfoot tr{ + background-color:rgb(235, 236, 203); + } @@ -683,67 +684,40 @@ foreach ($period as $day) { } ?> -
- + + - - - - - - - - - - - - - - - - - - - - - - - - + - - - - + + + + - + - - - - - - + + + + + + + + + + + - - - - -
Total Sum Opening Purchase Diesel Filling Diesel Balance StockOpening ReadingClosing ReadingFilling DieselConsumptionRunning HoursMileage
- Total - + Total +
-
diff --git a/app/Views/stock/drierMachineDetails.php b/app/Views/stock/drierMachineDetails.php index 3cf051d8..4244ad46 100644 --- a/app/Views/stock/drierMachineDetails.php +++ b/app/Views/stock/drierMachineDetails.php @@ -238,6 +238,10 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); z-index: 5!important; } + tfoot tr { + background-color:rgb(235, 236, 203); + } +
@@ -503,62 +507,29 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y'); - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - - - - - - - - - - - - - - - -
Date valueDrier On Time Drier Off TimeRunning HrsSupplier Name input Sand Qty (Metric Ton)inputp Sand Moisture(%)Sand Dried Qty (Metric Ton)Total Gas ConsumptionGas Per TonQty Per Hrs (Metric Ton)Moisture Loss Qty (Metric Ton)Dust Qty (Metric Ton)
- Total - ----
- - + + Total + + - + - + + - + + - + + + + + + + + + +

diff --git a/app/Views/stock/dustAndRoughStockDetails.php b/app/Views/stock/dustAndRoughStockDetails.php index a9860050..405c77ff 100644 --- a/app/Views/stock/dustAndRoughStockDetails.php +++ b/app/Views/stock/dustAndRoughStockDetails.php @@ -228,6 +228,10 @@ max-width: 150px; } + tfoot tr { + background-color:rgb(235, 236, 203); + } + @@ -273,10 +277,9 @@ data-date-format="M-yyyy" data-date-min-view-mode="1" readonly>
-
+
-
Total - - - + + + @@ -680,3 +683,18 @@ + + + diff --git a/app/Views/stock/gasStockDetails.php b/app/Views/stock/gasStockDetails.php index 672242db..23dc0fa8 100644 --- a/app/Views/stock/gasStockDetails.php +++ b/app/Views/stock/gasStockDetails.php @@ -217,6 +217,9 @@ max-width: 100px; } + tfoot tr { + background-color:rgb(235, 236, 203); + } @@ -501,50 +504,8 @@ } ?> -
- - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - - - -
RIPL Gas Stock FBD 10 Ton DryerSand DriedCoating MachineSand CoatedTRP Sand TRPRotary Drier
Date Opening StockPurchase(Bharath)Purchase(Indian)TotalConsumption Balance StockConsumption ton Consumptionton Panel ConsumptionPhysical Consumptionton Consumption
Total @@ -568,12 +529,8 @@ -
-
+ + diff --git a/app/Views/stock/incomingSilicaSandDetails.php b/app/Views/stock/incomingSilicaSandDetails.php index c5f9cd4c..ecedf7c4 100644 --- a/app/Views/stock/incomingSilicaSandDetails.php +++ b/app/Views/stock/incomingSilicaSandDetails.php @@ -226,6 +226,9 @@ z-index: 5!important; } + tfoot tr { + background-color:rgb(235, 236, 203); + } @@ -669,48 +672,14 @@ } ?> - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + - @@ -718,6 +687,7 @@ + @@ -732,13 +702,11 @@ - - - - + +
S.NO IGR No Invoice NoInvoice DateReceived DateSupplier NameGrade Grade ConditionVehicle NoQtyLab ReportAFS SpecAFS ActualPlus 20 loss%Plus 30 Loss %Moisture % SpecMoisture ActualMoisture LossMoisture loss QtySieve Loss QtySalable Qty
-
Total
- - - - - - -

diff --git a/app/Views/stock/powerConsumptionDetails.php b/app/Views/stock/powerConsumptionDetails.php index 29abfadf..d7712d73 100644 --- a/app/Views/stock/powerConsumptionDetails.php +++ b/app/Views/stock/powerConsumptionDetails.php @@ -235,6 +235,12 @@ min-width: 100px; max-width: 100px; } + + tfoot tr { + background-color:rgb(235, 236, 203); + } + + @@ -685,71 +691,37 @@ foreach ($period as $day) { } ?> -
- + + - + - - - - - - - - - - + + + + + + + + - - - - - - - - + - + + + - - - - - - - - - - - - - - - - - - - - - - - - + } + ?> - - - - -
+ Total +
Date Opening Reading Final ReadingTotal ReadingTotal Units Average PFPresent PFMD MF *60Opening UnitsFinal UnitsTotal Units
- Total -
-
+ + @@ -862,6 +834,8 @@ foreach ($period as $day) { data-id=" "> + + $previousMonthPowerConsumptionStockDetail) { diff --git a/app/Views/stock/resinStockDetails.php b/app/Views/stock/resinStockDetails.php index 216eac8d..69225d08 100644 --- a/app/Views/stock/resinStockDetails.php +++ b/app/Views/stock/resinStockDetails.php @@ -235,6 +235,10 @@ min-width: 100px; max-width: 100px; } + + tfoot tr { + background-color:rgb(235, 236, 203); + } @@ -569,44 +573,27 @@ foreach ($period as $day) { -
- + + - - - - - - - - - + - - - - - - - + - - - - + + + + - + - + + - -
Total SumOpening StockReceiptUsedBalance Stock
+ Total +
- Total -
-
- diff --git a/app/Views/stock/trpProductionStockDetails.php b/app/Views/stock/trpProductionStockDetails.php index 1317bcf7..3a6d6b0e 100644 --- a/app/Views/stock/trpProductionStockDetails.php +++ b/app/Views/stock/trpProductionStockDetails.php @@ -230,6 +230,10 @@ min-height: 200px; } + tfoot tr { + background-color:rgb(235, 236, 203); + } + @@ -1004,421 +1008,274 @@ $timeOtions[] = "12:00 AM"; - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - 0){?> - - - - - - - - - - - - - 0){?> - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + - - - + + + - - - + + + - - - + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - + + + - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - - - - - - - - - - - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - -
Date Opening Time Closing Time Total Hours Cold Start Break Down Hours Burner Firing Hours Sand Feeding Hours Gas Receipt Physical Gas Consumption Drier Gas Consumption Coating Gas Consumption TRP plus Drier Gas Consumption TRP Physical Gas Per Ton Panel Gas Consumption Panel Gas Per Ton Incoming Sand/ Lump details ED details TRP Sand Coating Usage Water EB Reading EB Unit Per Ton Working Persons Maintanence Details Description MS Seperation ED Waste Cooler Bags ED +20 Waste Cyclone Waste
BGPG Running Hours Production Usage Production Production Per Hour Receipt Consumption Engineers SupervisorsOperators Roller Drivers Nature Of Maintenance Location
- Total - + Total + - - + + + + + - - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - + + - - - - + + - - - - - - - - + + - - + + - - + + - - + + - - - - - - - - + + - - + + - - + + - - + + - - + + - - + + + + + + + + + + + + + + + +
+


diff --git a/app/Views/stock/trpSandUseStockDetails.php b/app/Views/stock/trpSandUseStockDetails.php index 9fe0ee10..24823027 100644 --- a/app/Views/stock/trpSandUseStockDetails.php +++ b/app/Views/stock/trpSandUseStockDetails.php @@ -222,6 +222,11 @@ min-width: 150px; max-width: 150px; } + + tfoot tr { + background-color:rgb(235, 236, 203); + } + @@ -378,35 +383,27 @@ } ?> -
+ - + - - - - - - - - + - + + + + + - - - - - - + + - -
Total Rough Kgs Fine Kgs Total Kgs
+ Total +
- Total -
+