diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 32115265..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,8 +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'); -$routes->get('deleteIncomingSilicaSandDetails', 'StockController::deleteIncomingSilicaSandDetails'); + +//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 a66bdda6..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,11 +142,23 @@ class StockController extends BaseController } } - + //incoming Silica Sand Details starts 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'; @@ -152,24 +166,99 @@ 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'] = []; } + $date = DateTime::createFromFormat('Y-m', $month); + + $formattedDate = $date->format('M-Y'); + + $data['month']=$formattedDate; + return $this->loadViews("incomingSilicaSandDetails", $this->global, $data, NULL); } 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(!empty($resultExists)){ + + $updated = $this->incomingSilicaSandDetails_model + ->where('igrNo_fk', $IGRNO) + ->where('materialCode', $materialCode) + ->set($dbData) + ->update(); + + }else{ + $inserted = $this->incomingSilicaSandDetails_model->insert($dbData); + } + + } + + echo "Data Saved Successfully"; } + // 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 @@ +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/CoatingMachineDetail.php b/app/Views/CoatingMachineDetail.php index c89ec637..eaaf54c8 100644 --- a/app/Views/CoatingMachineDetail.php +++ b/app/Views/CoatingMachineDetail.php @@ -161,17 +161,17 @@ - +     - -     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 @@
- 10 TON Drier Details + 10 TON Drier Details - Coating Machine Details + Coating Machine Details incoming silica sand Details + + Bag Stock Details
diff --git a/app/Views/incomingSilicaSandDetails.php b/app/Views/incomingSilicaSandDetails.php index f8f521b5..ec8a92c7 100644 --- a/app/Views/incomingSilicaSandDetails.php +++ b/app/Views/incomingSilicaSandDetails.php @@ -197,11 +197,12 @@
- " 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">
-
- +
+
@@ -210,7 +211,7 @@
- +
@@ -247,6 +248,7 @@ + @@ -272,12 +274,12 @@ - - - @@ -459,6 +461,11 @@ + + + @@ -503,33 +510,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); }
Sieve Loss Qty Salable Qty Remark + + - + - + + +