From 335f043b391eb626f52b48039fefcbcd2ae2dfde Mon Sep 17 00:00:00 2001 From: "venbatechnologies@gmail.com" Date: Wed, 9 Aug 2017 11:51:14 +0530 Subject: [PATCH] status --- application/controllers/MRIRcontroller.php | 40 ++++++++++++++++++---- application/controllers/storestatus.php | 2 ++ application/models/mrir_model.php | 3 ++ application/models/requistion_model.php | 19 ++++++++++ application/models/store_model.php | 22 ++++++++++-- application/views/MaterialIssueList.php | 20 +++++++++-- application/views/storestatus.php | 2 +- 7 files changed, 96 insertions(+), 12 deletions(-) diff --git a/application/controllers/MRIRcontroller.php b/application/controllers/MRIRcontroller.php index e3286b4a..fd675c06 100755 --- a/application/controllers/MRIRcontroller.php +++ b/application/controllers/MRIRcontroller.php @@ -322,14 +322,42 @@ public function viewmMaterialDistributionList() $MaterialCode = trim($Values[1]); $ReqNumber = trim($Values[2]); $Remarks = trim($Values[3]); - + $ReqQuantity=trim($Values[4]); + $UpdatedBy = $this->session->userdata ( 'userId' ); - $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); - $updatedDt = $dt->format('Y-m-d H:i:s'); - - $ReqDetails = array('Status'=>$StatusCode,'remarks'=>$Remarks,'UpdatedBy'=>$UpdatedBy,'UpdatedOn'=>$updatedDt); + $dt = new DateTime('now', new DateTimeZone('Asia/Kolkata')); + $updatedDt = $dt->format('Y-m-d H:i:s'); + + $getAvailableqty = $this->mrir_model->getItemQuantityFromStock($MaterialCode); + //print_r($getAvailableqty); + + $avlQty = 0; + + if(count($getAvailableqty)>0) + { + $avlQty = $getAvailableqty[0]['Quantity']; + } + + + $BalanceQty=0; + $BalanceQty=$avlQty-$ReqQuantity; + + //echo $avlQty; + //die(); + + $ReqDetails = array('Status'=>$StatusCode,'remarks'=>$Remarks,'UpdatedBy'=>$UpdatedBy,'UpdatedOn'=>$updatedDt,'DeliveredQuantity'=>$ReqQuantity); //print_r($ReqDetails); - $this->requistion_model->UpdateRequistionLineItem($ReqDetails,$ReqNumber,$MaterialCode); + //die(); + $this->requistion_model->UpdateRequistionLineItem($ReqDetails,$ReqNumber,$MaterialCode); + + $Remark=array('Remarks'=>$Remarks); + $this->requistion_model->UpdateStoreRemark($Remark,$MaterialCode); + + $BalanceQuantity=array('Quantity'=>$BalanceQty); + + $this->requistion_model->UpdateAvlQty($BalanceQuantity,$MaterialCode); + + echo "Successfully Updated the Requistion No: ".$ReqNumber; } diff --git a/application/controllers/storestatus.php b/application/controllers/storestatus.php index e0ba7545..11f29e53 100755 --- a/application/controllers/storestatus.php +++ b/application/controllers/storestatus.php @@ -47,6 +47,8 @@ class storestatus extends BaseController $this->global['pageTitle'] = 'Siddharth Industries : Store Status'; //viewStock $data['Stock'] = $this->store_model->viewStock(); + + // print_r($data['Stock']); $data['MaterialList'] = $this->store_model->GetAllMaterialList(); $data['StockStatus'] = $this->store_model->GetConfigValue('C021'); $this->loadViews("storestatus", $this->global, $data,null); diff --git a/application/models/mrir_model.php b/application/models/mrir_model.php index 935d2caf..3bbc89b6 100755 --- a/application/models/mrir_model.php +++ b/application/models/mrir_model.php @@ -273,6 +273,9 @@ TMD.QuantityRejected,ST.StatusName,TMD.Remarks,AdvanceAmount '); function getItemQuantityFromStock($MaterialCode) { + + // echo $MaterialCode; + // die(); $subQuery = 'select Quantity from T_Store_Stockdetails where MaterialCode=?'; $query = $this->db->query($subQuery,array($MaterialCode)); return $query->result_array(); diff --git a/application/models/requistion_model.php b/application/models/requistion_model.php index 9abc05d4..3143218a 100755 --- a/application/models/requistion_model.php +++ b/application/models/requistion_model.php @@ -433,6 +433,25 @@ class requistion_model extends CI_Model return TRUE; } + + function UpdateStoreRemark($Remark,$MaterialCode) + { + // echo 'fsd'; + // die(); + $this->db->where('MaterialCode',$MaterialCode); + $this->db->update('T_Store_Stockdetails',$Remark); + return TRUE; + + } + + + + function UpdateAvlQty($BalanceQuantity,$MaterialCode) + { + $this->db->where('MaterialCode',$MaterialCode); + $this->db->update('T_Store_Stockdetails',$BalanceQuantity); + return TRUE; + } /** * This function is used to update the details into Database diff --git a/application/models/store_model.php b/application/models/store_model.php index 1e0b3f3f..aac30ac6 100755 --- a/application/models/store_model.php +++ b/application/models/store_model.php @@ -2,8 +2,8 @@ class store_model extends CI_Model { - - function viewStock() + + function viewStock() { $this->db->select('st.*,st.Remarks as storeremarks,MM.*'); @@ -12,10 +12,26 @@ class store_model extends CI_Model $query = $this->db->get(); - + //print_r($this->db->last_query()); + $result = $query->result(); return $result; } + + // function viewStock() + // { + // $this->db->distinct(); + // $this->db->select('st.*,st.Remarks as storeremarks,MM.*,RDet.DeliveredQuantity'); + // $this->db->from('T_Store_Stockdetails st '); + // $this->db->join('T_MaterialMaster MM','st.MaterialCode=MM.MaterialCode'); + // $this->db->join('T_Requestion_Details RDet','st.MaterialCode=RDet.MaterialCode and MM.MaterialCode=RDet.MaterialCode'); + + // $query = $this->db->get(); + + // $result = $query->result(); + // //print_r($this->db->last_query()); + // return $result; + // } function GetAllMaterialList() { diff --git a/application/views/MaterialIssueList.php b/application/views/MaterialIssueList.php index f2a0a224..12ba2a4c 100755 --- a/application/views/MaterialIssueList.php +++ b/application/views/MaterialIssueList.php @@ -157,15 +157,31 @@ var id = $('#Remarks'+Index).val(); var StatusCode = $('#status'+Index).val(); - - var Remarks = $('#Remarks'+Index).val(); + var Remarks = $('#Remarks'+Index).val(); + var AcceptedQty=cellval[10].innerHTML; + var RequestedQty=cellval[8].innerHTML; var MaterialCode = cellval[5].innerHTML; var ReqNo = cellval[1].innerHTML; + if(StatusCode=='ST050' &&(RequestedQty>AcceptedQty)) + { + var ReqQuantity=cellval[10].innerHTML; + } + + if(StatusCode=='ST050' &&(RequestedQty MaterialCode ?> MaterialName ; ?> UOM ; ?> - Quantity ; ?> + Quantity; ?>