From 090f91ebf3050d33a04025c3b248e808b834bbc9 Mon Sep 17 00:00:00 2001 From: vadivel J Date: Tue, 22 Oct 2024 12:40:15 +0530 Subject: [PATCH 1/4] stock module changes -vadivel J --- app/Config/Routes.php | 2 +- app/Controllers/StockController.php | 67 ++++++++++++++++++- app/Models/IncomingSilicaSandDetailsModel.php | 6 +- app/Models/Inwardgateregister_model.php | 4 +- app/Views/incomingSilicaSandDetails.php | 29 ++++---- 5 files changed, 82 insertions(+), 26 deletions(-) diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 1811b97e..7ca3546c 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -434,4 +434,4 @@ $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addOrEditdrierMachineDetails', //incomingSilicaSandDetaails $routes->match(['GET','POST'],'incomingSilicaSandDetails', 'StockController::loadView_incomingSilicaSandDetails'); $routes->post('updateIncomingSilicaSandDetails', 'StockController::updateIncomingSilicaSandDetails'); -$routes->get('deleteIncomingSilicaSandDetails', 'StockController::deleteIncomingSilicaSandDetails'); + diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 974027ac..21b5750e 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -143,7 +143,7 @@ class StockController extends BaseController $materialCodes = $this->rawmaterialdetails_model->getAllSilicaRawMaterialCode(); if (!empty($materialCodes)) { - $data['igrDetails'] = $this->inwardGateRegister_model->findIgrForSilicaSand($materialCodes,$month); + $data['igrDetails'] = $this->inwardGateRegister_model->findIgrDetailsForIncomingSilicaSand($materialCodes,$month); } else { $data['igrDetails'] = []; @@ -155,11 +155,72 @@ class StockController extends BaseController public function updateIncomingSilicaSandDetails(){ - } + $postData = $this->request->getPost(); - public function deleteIncomingSilicaSandDetails(){ + $incomingSilicaSandDetailsData = json_decode($postData['incomingSilicaSandDetailsData'], true); + + + foreach($incomingSilicaSandDetailsData as $data){ + + $IGRNO=$data['IGR No']; + $materialCode=$data['MaterialCode']; + + + $dbData=[ + 'igrNo_fk'=>$data['IGR No'], + 'materialCode'=>$data['MaterialCode'], + 'grade'=>$data['Grade'], + 'gradeCondition'=>$data['Grade Condition'], + '_10'=>$data['___10___'], + '_20'=>$data['___20___'], + '_30'=>$data['___30___'], + '_40'=>$data['___40___'], + '_50'=>$data['___50___'], + '_70'=>$data['___70___'], + '_100'=>$data['___100___'], + '_140'=>$data['___140___'], + '_200'=>$data['___200___'], + '_300'=>$data['___300___'], + 'pan'=>$data['PAN'], + 'total'=>$data['Total'], + 'afsSpec'=>$data['AFS Spec'], + 'afsActual'=>$data['AFS Actual'], + 'plus20loss'=>$data['Plus 20 loss%'], + 'plus30Loss'=>$data['Plus 30 Loss %'], + 'moistureSpec'=>$data['Moisture % Spec'], + 'moistureActual'=>$data['Moisture Actual'], + 'moistureLoss'=>$data['Moisture Loss'], + 'moistureLossQty'=>$data['Moisture loss Qty'], + 'sieveLossQty'=>$data['Sieve Loss Qty'], + 'salableQty'=>$data['Salable Qty'], + 'remark'=>$data['Remark'] + + + ]; + + $resultExists=$this->incomingSilicaSandDetails_model + ->where('igrNo_fk',$IGRNO) + ->where('materialCode',$materialCode) + ->first(); + + if($resultExists){ + + $this->incomingSilicaSandDetails_model + ->where('igrNo_fk', $IGRNO) + ->where('materialCode', $materialCode) + ->update($dbData); + + }else{ + $this->incomingSilicaSandDetails_model->insert($dbData); + } + + } + + echo "Data Saved Successfully"; } + + diff --git a/app/Models/IncomingSilicaSandDetailsModel.php b/app/Models/IncomingSilicaSandDetailsModel.php index 90df8f2b..2411244d 100644 --- a/app/Models/IncomingSilicaSandDetailsModel.php +++ b/app/Models/IncomingSilicaSandDetailsModel.php @@ -12,14 +12,14 @@ class IncomingSilicaSandDetailsModel extends Model protected $returnType = 'array'; protected $useSoftDeletes = false; protected $protectFields = true; - protected $allowedFields = ['igrNo_fk','grade','gradeCondition', + protected $allowedFields = ['igrNo_fk','materialCode','grade','gradeCondition', '_10' ,'_20','_30','_40','_50','_70','_100', '_140','_200','_300', 'pan' , 'total' , 'afsSpec' ,'afsActual','plus20Loss','plus30Loss','moistureSpec','moistureActual', 'moistureLoss', 'moistureLossQty','sieveLossQty','salableQty', 'remark', 'is_active','created_at','updated_at']; - protected bool $allowEmptyInserts = false; - protected bool $updateOnlyChanged = true; + protected bool $allowEmptyInserts = true; + protected bool $updateOnlyChanged = false; protected array $casts = []; protected array $castHandlers = []; diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index 43901fae..03cc1bde 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -1031,7 +1031,7 @@ class Inwardgateregister_model extends Model return $result; } - public function findIgrForSilicaSand($materialCodes, $month) + public function findIgrDetailsForIncomingSilicaSand($materialCodes, $month) { $builder = $this->db->table('t_igr_details') ->select( @@ -1043,7 +1043,7 @@ class Inwardgateregister_model extends Model igrMast.MaterialRcvdDate as materialRecievedDate, igrMast.VehicleNo, supplierDetails.SupplierName, - SUM(t_igr_details.QuantityAsPerInvoice) as Qty, + t_igr_details.QuantityAsPerInvoice as Qty, issd.* ') ->whereIn('t_igr_details.MaterialCode', $materialCodes) ->like('t_igr_details.CreatedDate', $month, 'after') diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php index f8f521b5..5262fb9f 100644 --- a/app/Views/incomingSilicaSandDetails.php +++ b/app/Views/incomingSilicaSandDetails.php @@ -210,7 +210,7 @@
- +
@@ -247,6 +247,7 @@ + @@ -459,6 +460,11 @@ + + + @@ -503,33 +509,22 @@ $('#save').click(function() { - var alldata = $("#drierTable").tableToJSON(); + var incomingSilicaSandDetailsData = $("#incomingSilicaSandDetailsTable").tableToJSON(); - $('#drierTable tbody tr').each(function (index) { - - let row = alldata[index]; - - // Get the selected values from dropdowns - row['Drier On Time'] = $(this).find('.drier_on_time').val(); - row['Drier Off Time'] = $(this).find('.drier_off_time').val(); - }); - - - - alldata = JSON.stringify(alldata); + incomingSilicaSandDetailsData = JSON.stringify(incomingSilicaSandDetailsData); $('#loader').show(); $.ajax({ data: { - drierData: alldata, + incomingSilicaSandDetailsData }, type: "POST", - url: "addOrEditdrierMachineDetails", + url: "updateIncomingSilicaSandDetails", success: function(data) { if (data) { - $('#loader').hide(); + alert(data); } From b61401974739a6241d8eaa0a2ca47f6abfb25046 Mon Sep 17 00:00:00 2001 From: vadivel J Date: Tue, 22 Oct 2024 14:14:03 +0530 Subject: [PATCH 2/4] stock module changes 3 -vadivel J --- app/Controllers/StockController.php | 13 ++++++++----- app/Models/IncomingSilicaSandDetailsModel.php | 4 ++-- 2 files changed, 10 insertions(+), 7 deletions(-) diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 4168d9cc..55d4e785 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -212,15 +212,18 @@ class StockController extends BaseController ->where('materialCode',$materialCode) ->first(); - if($resultExists){ + + + if(!empty($resultExists)){ - $this->incomingSilicaSandDetails_model + $updated = $this->incomingSilicaSandDetails_model ->where('igrNo_fk', $IGRNO) ->where('materialCode', $materialCode) - ->update($dbData); - + ->set($dbData) + ->update(); + }else{ - $this->incomingSilicaSandDetails_model->insert($dbData); + $inserted = $this->incomingSilicaSandDetails_model->insert($dbData); } } diff --git a/app/Models/IncomingSilicaSandDetailsModel.php b/app/Models/IncomingSilicaSandDetailsModel.php index 2411244d..3c2198de 100644 --- a/app/Models/IncomingSilicaSandDetailsModel.php +++ b/app/Models/IncomingSilicaSandDetailsModel.php @@ -18,8 +18,8 @@ class IncomingSilicaSandDetailsModel extends Model 'moistureLoss', 'moistureLossQty','sieveLossQty','salableQty', 'remark', 'is_active','created_at','updated_at']; - protected bool $allowEmptyInserts = true; - protected bool $updateOnlyChanged = false; + protected bool $allowEmptyInserts = false; + protected bool $updateOnlyChanged = true; protected array $casts = []; protected array $castHandlers = []; From 2e309f4343d9d8f7e27eac6b1634cd37354f904d Mon Sep 17 00:00:00 2001 From: vadivel J Date: Tue, 22 Oct 2024 14:26:34 +0530 Subject: [PATCH 3/4] finished incoming silica module --- app/Controllers/StockController.php | 20 +++++++++++++++++++- app/Views/incomingSilicaSandDetails.php | 14 +++++++------- 2 files changed, 26 insertions(+), 8 deletions(-) diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index 55d4e785..c24bda22 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -144,7 +144,19 @@ class StockController extends BaseController public function loadView_incomingSilicaSandDetails(){ - $month='2024-09'; + if ($this->request->getMethod() === 'POST'){ + $month = $this->request->getPost('month'); + + $date = DateTime::createFromFormat('M-Y', $month); + + $formattedDate = $date->format('Y-m'); + + $month=$formattedDate; + } + else{ + $month = date('Y-m'); + } + $data['month']=$month; $this->global['pageTitle']='Incoming Silica Sand Details'; @@ -158,6 +170,12 @@ class StockController extends BaseController $data['igrDetails'] = []; } + $date = DateTime::createFromFormat('Y-m', $month); + + $formattedDate = $date->format('M-Y'); + + $data['month']=$formattedDate; + return $this->loadViews("incomingSilicaSandDetails", $this->global, $data, NULL); } diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php index 5262fb9f..01449351 100644 --- a/app/Views/incomingSilicaSandDetails.php +++ b/app/Views/incomingSilicaSandDetails.php @@ -200,8 +200,8 @@ " class="form-control" data-provide="datepicker" data-date-format="M-yyyy" data-date-min-view-mode="1"> -
- +
+
@@ -273,12 +273,12 @@ - - - From 877db92512de81fac51b546792f4e89e64da6c6a Mon Sep 17 00:00:00 2001 From: vadivel J Date: Tue, 22 Oct 2024 17:34:34 +0530 Subject: [PATCH 4/4] started bag stock sub module --- app/Config/Routes.php | 8 +++-- app/Controllers/StockController.php | 9 ++++- app/Models/BagStockDetailsModel.php | 46 +++++++++++++++++++++++++ app/Views/CoatingMachineDetail.php | 8 ++--- app/Views/bagStockDetails.php | 0 app/Views/includes/new_header.php | 23 +++++++------ app/Views/incomingSilicaSandDetails.php | 3 +- 7 files changed, 79 insertions(+), 18 deletions(-) create mode 100644 app/Models/BagStockDetailsModel.php create mode 100644 app/Views/bagStockDetails.php diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 0ab28311..35ced9e1 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -427,7 +427,7 @@ $routes->post('updateCoatingMachineDetails','StockController::updateCoatingMachi $routes->get('deleteCoatingMachineDetails' , 'StockController::deleteCoatingMachineDetails'); - +//drier machine details $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'drierMachineDetails', 'StockController::drierMachineDetails'); $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addOrEditdrierMachineDetails', 'StockController::addOrEditdrierMachineDetails'); @@ -435,7 +435,11 @@ $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'factoryVehicleDieselDetails', ' $routes->match(['GET', 'POST', 'PUT', 'DELETE'],'addOrEditfactoryVehicleDieselDetails', 'StockController::addOrEditfactoryVehicleDieselDetails'); -//incomingSilicaSandDetaails +//incoming Silica Sand Detaails $routes->match(['GET','POST'],'incomingSilicaSandDetails', 'StockController::loadView_incomingSilicaSandDetails'); $routes->post('updateIncomingSilicaSandDetails', 'StockController::updateIncomingSilicaSandDetails'); + +//Bag stock details +$routes->match(['GET','POST'],'bagStockDetails', 'StockController::loadView_bagStockDetails'); +$routes->post('updateBagStockDetails', 'StockController::updateBagStockDetails'); \ No newline at end of file diff --git a/app/Controllers/StockController.php b/app/Controllers/StockController.php index c24bda22..2d1b7e7a 100644 --- a/app/Controllers/StockController.php +++ b/app/Controllers/StockController.php @@ -53,6 +53,8 @@ class StockController extends BaseController // } + //Coating Machine Details starts + public function loadView_coatingMachineDetails(){ if ($this->request->getMethod() === 'POST'){ @@ -140,7 +142,7 @@ class StockController extends BaseController } } - + //incoming Silica Sand Details starts public function loadView_incomingSilicaSandDetails(){ @@ -250,6 +252,11 @@ class StockController extends BaseController } + // Bag Stock details starts + + public function loadView_bagStockDetails(){} + + public function updateBagStockDetails(){} diff --git a/app/Models/BagStockDetailsModel.php b/app/Models/BagStockDetailsModel.php new file mode 100644 index 00000000..fa7aa260 --- /dev/null +++ b/app/Models/BagStockDetailsModel.php @@ -0,0 +1,46 @@ + - +     - -     diff --git a/app/Views/bagStockDetails.php b/app/Views/bagStockDetails.php new file mode 100644 index 00000000..e69de29b diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php index 75b91194..728e400a 100755 --- a/app/Views/includes/new_header.php +++ b/app/Views/includes/new_header.php @@ -743,15 +743,16 @@
- Transporter Details - Cost Details - Asset Details - Business Settings - Config Details - Department Details + + Transporter Details + Cost Details + Asset Details + Business Settings + Config Details + Department Details - Users - Factory Machines Details + Users + Factory Machines Details
@@ -764,11 +765,13 @@
diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php index 01449351..ec8a92c7 100644 --- a/app/Views/incomingSilicaSandDetails.php +++ b/app/Views/incomingSilicaSandDetails.php @@ -197,7 +197,8 @@
- " class="form-control" data-provide="datepicker" data-date-format="M-yyyy" data-date-min-view-mode="1"> + + " class="form-control mt-2" data-provide="datepicker" data-date-format="M-yyyy" data-date-min-view-mode="1">
Sieve Loss Qty Salable Qty Remark + +
+ + - + - +