From 28cf1f49e6322476fdfc2a5e4ef506b0e62853e6 Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Sat, 21 Dec 2024 17:46:11 +0530 Subject: [PATCH 1/2] stock module-3 vadivel J 21-12-2024 --- app/Views/drierMachineDetails.php | 2 +- app/Views/incomingSilicaSandDetails.php | 126 +++++++++++++++--------- 2 files changed, 81 insertions(+), 47 deletions(-) diff --git a/app/Views/drierMachineDetails.php b/app/Views/drierMachineDetails.php index 96d7adc9..6ad5fcca 100644 --- a/app/Views/drierMachineDetails.php +++ b/app/Views/drierMachineDetails.php @@ -408,7 +408,7 @@ $datefordropdown = format_date($datefordropdown, 0, 'M-Y');

No Drier machine details present for this month..!!

- + diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php index 1070b34b..b044a124 100644 --- a/app/Views/incomingSilicaSandDetails.php +++ b/app/Views/incomingSilicaSandDetails.php @@ -370,7 +370,7 @@ - + @@ -455,13 +455,14 @@ - + - @@ -683,8 +684,15 @@ Moisture % 10 + id="dwnldMoistureActualId">10 + + Moisture Spec % + 10 + + + @@ -811,7 +819,7 @@    TOTAL - +   AFS @@ -871,22 +879,22 @@ - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + @@ -908,8 +916,6 @@ @@ -1040,12 +1045,14 @@ let _300Mm = row.find('td:eq(19)').text().trim(); let pan = row.find('td:eq(20)').text().trim(); let total = row.find('td:eq(21)').text().trim(); + + let moistureSpec = row.find('td:eq(26)').text().trim(); + let moistureActual = row.find('td:eq(27)').text().trim(); let moistureLoss = row.find('td:eq(28)').text().trim(); let remark = row.find('.sand-status').val(); let materialCode = row.find('td:eq(33)').text().trim(); - // Fill the modal fields with the values @@ -1125,11 +1132,12 @@ $('#dwnldWeighOfSand').text(total); - $('#dwnldMoistureId').text(moistureLoss); + $('#dwnldMoistureActualId').text(moistureActual); + $('#dwnldMoistureSpecId').text(moistureSpec); $('#dwnldAcceptedId').text(""); $('#dwnldAcceptedUnderDeviationId').text(""); $('#dwnldRejectedId').text(""); - $('#dwnldTotalId').text(fTotal); + $('#dwnldFtotalId').text(fTotal); $('#dwnldAfsId').text(dwnldAfsId); if(remark == "accepted"){ @@ -1175,8 +1183,8 @@ let _140Mm = parseFloat($('#140Mm').val().trim()); let _200Mm = parseFloat($('#200Mm').val().trim()); let _300Mm = parseFloat($('#300Mm').val().trim()); - let pan = parseFloat($('#pan').val().trim()); - let total = parseFloat($('#total').val().trim()); + let pan = parseFloat($('#pan').val().trim()); + let total = parseFloat($('#total').val().trim()); let plus20Loss = parseFloat($('#plus20Loss').val().trim()); let plus30Loss = parseFloat($('#plus30Loss').val().trim()); let moistureSpec = parseFloat($('#moistureSpec').val().trim()); @@ -1245,7 +1253,6 @@ let row = incomingSilicaSandDetailsData[index]; - // Get the selected values from dropdowns row['Remark'] = $(this).find('.sand-status').val(); row['Grade Condition'] = $(this).find('.grade-condition').val() @@ -1305,12 +1312,14 @@ function calculateRow(value){ var tr = $(value).closest('tr'); var weighOfSand = tr.find('td:eq(3)').text(); var factor = tr.find('td:eq(4)').text(); - tr.find('td:eq(5)').text(weighOfSand * factor); + tr.find('td:eq(5)').text(parseFloat((weighOfSand * factor).toFixed(2))); let result = table.tableToJSON(); - let qty = $('#totalSandQty').val(); + let qty = parseFloat($('#dwnldQtyId').text()); + let moistureSpec = $('#dwnldMoistureSpecId').text(); + let moistureActual = $('#dwnldMoistureActualId').text(); let totalWeighOfSand = 0; let totalFactoredValue = 0; let afs = 0 ; @@ -1328,7 +1337,7 @@ function calculateRow(value){ newPlus30Loss += Number(result[i]['WEIGH OF SAND']) ; - newSieveLossQty = Math.floor((parseFloat(qty) * newPlus30Loss) / 100) ; + newSieveLossQty = (parseFloat(qty) * newPlus30Loss) / 100 ; } @@ -1336,33 +1345,58 @@ function calculateRow(value){ totalFactoredValue += Number(result[i]['TOTAL']) ; afs = (Number(totalFactoredValue) / Number(totalWeighOfSand)).toFixed(2) ; - $('#dwnldWeighOfSand').text(totalWeighOfSand); - $('#dwnldTotalId').text(totalFactoredValue); + + + $('#dwnldWeighOfSand').text((totalWeighOfSand.toFixed(2))); + $('#dwnldFtotalId').text((totalFactoredValue).toFixed(2)); $('#dwnldAfsId').text(afs); - - } - let newMoistureLoss = parseFloat(moistureActual) - parseFloat(moistureSpec) ; + let newMoistureLoss = parseFloat(moistureActual) - parseFloat(moistureSpec) ; - let newMoistureLossQty = Math.round((parseFloat(qty) * newMoistureLoss) / 100 ) ; + let newMoistureLossQty = ((parseFloat(qty) * newMoistureLoss) / 100 ).toFixed(2) ; - let newSalableQty = Math.floor(parseFloat(qty) - newMoistureLossQty - newSieveLossQty) ; + let newSalableQty = (parseFloat(qty) - newMoistureLossQty - newSieveLossQty).toFixed(2) ; + + newSieveLossQty = (newSieveLossQty).toFixed(2); console.log(totalWeighOfSand); //total console.log(totalFactoredValue); console.log(afs); + console.log(newMoistureLoss); + console.log("qty"); + console.log(qty); + console.log(newMoistureLossQty); + console.log(newSieveLossQty); + console.log(newSalableQty); + + $('#10Mm').val(result[0]['WEIGH OF SAND']); + $('#20Mm').val(result[1]['WEIGH OF SAND']); + $('#30Mm').val(result[2]['WEIGH OF SAND']); + $('#40Mm').val(result[3]['WEIGH OF SAND']); + $('#50Mm').val(result[4]['WEIGH OF SAND']); + $('#70Mm').val(result[5]['WEIGH OF SAND']); + $('#100Mm').val(result[6]['WEIGH OF SAND']); + $('#140Mm').val(result[7]['WEIGH OF SAND']); + $('#200Mm').val(result[8]['WEIGH OF SAND']); + $('#300Mm').val(result[9]['WEIGH OF SAND']); + $('#pan') .val(result[10]['WEIGH OF SAND']); + $('#total').val(totalWeighOfSand); + $('#plus20Loss').val(newPlus20Loss); + $('#plus30Loss').val(newPlus30Loss); + $('#moistureSpec').val(moistureSpec); + $('#moistureActual').val(moistureActual); + $('#moistureLoss').val(newMoistureLoss); + $('#moistureLossQty').val(newMoistureLossQty); + $('#sieveLossQty').val(newSieveLossQty); + $('#salableQty').val(newSalableQty); + return; - - - - - } From 45c0abcfd0d5b5e92525e34e7ebc8a11dbdbdaca Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Mon, 23 Dec 2024 18:16:24 +0530 Subject: [PATCH 2/2] stock module-1 vadivel J 23-12-2024 --- app/Controllers/StockController.php | 11 +- app/Views/incomingSilicaSandDetails.php | 568 +++++++++--------------- 2 files changed, 216 insertions(+), 363 deletions(-) diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index aa61707d..cb31f1e9 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -415,7 +415,7 @@ class StockController extends BaseController '_300' => $postData['300Mm'], 'pan' => $postData['pan'], 'total' => $postData['total'], - 'plus20loss' => $postData['plus20Loss'], + 'plus20Loss' => $postData['plus20Loss'], 'plus30Loss' => $postData['plus30Loss'], 'moistureSpec' => $postData['moistureSpec'], 'moistureActual' => $postData['moistureActual'], @@ -753,8 +753,6 @@ class StockController extends BaseController ->findAll(); - - $startDate = "$month-01"; $endDate = date("Y-m-t", strtotime($startDate)); $data['resinStockDetails'] = $this->resinStockDetails_model @@ -789,7 +787,7 @@ class StockController extends BaseController - if (!empty($data['groupedBagStockDetails'])) { + if (!empty($data['groupedResinStockDetails'])) { $result = $this->resinStockDetails_model ->select('materialCode') // Specify the column you want to select @@ -802,9 +800,10 @@ class StockController extends BaseController } $resinMaterials = $this->rawmaterialdetails_model->getSelectedResinMaterialCode($distinctMaterialCodes); } else { + $resinMaterials = $this->rawmaterialdetails_model->getAllResinMaterialCode(); - } + } foreach ($resinMaterials as $key => $resinMaterial) { $materialCode = $resinMaterial['MaterialCode']; @@ -819,7 +818,7 @@ class StockController extends BaseController $resinMaterialCount = count($resinMaterials); $data['resinMaterialCount'] = $resinMaterialCount; - $data['resinMaterials'] = $resinMaterials; + $data['resinMaterials'] = $resinMaterials; $date = DateTime::createFromFormat('Y-m', $month); diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php index b044a124..6583336c 100644 --- a/app/Views/incomingSilicaSandDetails.php +++ b/app/Views/incomingSilicaSandDetails.php @@ -15,6 +15,10 @@ padding:0 8px; } + .table td{ + vertical-align: 0; + } + .fht-table td { text-align: center; } @@ -272,6 +276,7 @@ ___300___ PAN Total + Lab Report AFS Spec AFS Actual Plus 20 loss% @@ -284,9 +289,8 @@ Salable Qty Remark MaterialCode - Update Lab Report id - Download Report + @@ -367,7 +371,6 @@ - @@ -434,62 +437,67 @@ + + + + + + + - + - + - + - - + + - - - - - - - + + - + - + + + + + + - +