This commit is contained in:
venbatechnologies@gmail.com 2017-08-04 12:26:17 +05:30
parent 8094987c82
commit b934101656
3 changed files with 10 additions and 6 deletions

View File

@ -198,6 +198,9 @@ public function viewmMaterialDistributionList()
//this array to store the value in child table..
$mrirdetailvalues = array('MRIRNO'=>$MRIRNO,'MaterialCode'=>$MaterialCode,'ActualQuantityReceived'=>$ActualQuantityReceived,'StoreInchargeID'=>$StoreIncharge,'Remarks'=>$Remarked);
//print_r($mrirdetailvalues);
//die();
$mrirdetails = $this->mrir_model->detail_mrir($mrirdetailvalues);
}
@ -223,7 +226,7 @@ public function viewmMaterialDistributionList()
//this array to store the updated value in master table..
$updatemastervalues = array('MRIRStatus'=>$Status,'UpdateBY'=>$UPdateby,'UpdatedOn'=>$UPdateon);
$updatemaster = $this->mrir_model->update_mrirmaster($updatemastervalues,$mrir_no);
$updatemaster = $this->mrir_model->update_mrirmaster($updatemastervalues,$mrir_no);
$strStatus = '';
//echo "outside for loop";
for ($i = 1; $i <= $RowCount; $i++)
@ -249,7 +252,7 @@ public function viewmMaterialDistributionList()
//echo 'Stock added for'.$mrir_no;
$updatStock = array('Quantity'=>($acceptquantity+$avlQty),'Status'=>'0','UpdatedOn'=>$UPdateon,'UpdatedBy'=>$UPdateby,'Remarks'=>'Stock added for '. $this->input->post('MRIRNO'));
$this->mrir_model->UpdateStock($updatStock,trim($MaterialCode));
$this->mrir_model->UpdateStock($updatStock,trim($MaterialCode));
}
elseif(strlen($acceptquantity)==0 && strlen($rejectquantity)>0)
@ -259,7 +262,7 @@ public function viewmMaterialDistributionList()
$remark=$this->input->post('Remarks1'.$i);
$remark=$this->input->post('Remark'.$i);
//echo $remark;
//die();
$updateby=$this->session->userdata('userId');
@ -275,6 +278,7 @@ public function viewmMaterialDistributionList()
$updatedetailvalues = array('UpdateBy'=>$updateby,'UpdatedOn'=>$updateon,'QuantityAccepted'=>$acceptquantity,'QuantityRejected'=>$rejectquantity,'Remarks'=>$remark,'MRIRStatus'=>$strStatus);
//print_r($updatedetailvalues);
//die();
$updatedetails = $this->mrir_model->update_mrirdetail($updatedetailvalues,$Lineitm);

View File

@ -129,7 +129,7 @@ function ViewDistributionList()
function edit_mrir($MrirNo)
{
$this->db->distinct();
$this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMM.Createdon as MRIRCreatedon,TMD.MRIRItemNo,TMD.ActualQuantityReceived,TMD.QuantityAccepted,TMD.QuantityRejected,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,IGRM.CreatedDate as IGRCreated,IGRD.QuantityAsPerInvoice,SUPP.SupplierName,SUPP.Address,POMR.PODate,POMR.DeliveryDate,POMR.ServiceDescription,TMD.MaterialCode,MM.MaterialName,MM.UOM,POLT.Quantity,POLT.ReceivedQuantity,ED.FirstName as PORasiedbyName,ED1.FirstName as MRIRRasiedbyName, ED2.FirstName as IGRRasiedbyName,TMM.MRIRStatus,POLT.CostCenterCode,COST.CostCenterName,IGRD.Remarks');
$this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMM.Createdon as MRIRCreatedon,TMD.MRIRItemNo,TMD.ActualQuantityReceived,TMD.QuantityAccepted,TMD.QuantityRejected,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRM.CourierNo,IGRM.CreatedDate as IGRCreated,IGRD.QuantityAsPerInvoice,SUPP.SupplierName,SUPP.Address,POMR.PODate,POMR.DeliveryDate,POMR.ServiceDescription,TMD.MaterialCode,MM.MaterialName,MM.UOM,POLT.Quantity,POLT.ReceivedQuantity,ED.FirstName as PORasiedbyName,ED1.FirstName as MRIRRasiedbyName, ED2.FirstName as IGRRasiedbyName,TMM.MRIRStatus,POLT.CostCenterCode,COST.CostCenterName,TMD.Remarks');
$this->db->from ('T_MRIR_Master TMM');
$this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO');//to get IGRNO,PONO,MRIRNO,mrirdate,
$this->db->join ('T_IGR_Master IGRM', 'IGRM.IGRNO = TMM.IGRNO');//to get actualquantity,deliverydate,Invoicedate,vechileno,courierno,igrdate,

View File

@ -24,12 +24,12 @@ if(!empty($MRIRDetails))
foreach ($MRIRDetails as $MRIR)
{
$MRIRNO = $MRIR->MRIRNO;
$MRIRDate=$MRIR->CreatedDate;
$MRIRDate=$MRIR->MRIRCreatedon;
$mrir_date = strtotime( $MRIRDate );
$mrirdate = date( 'd/m/Y', $mrir_date );
$MRIRRasiedbyName=$MRIR->MRIRRasiedbyName;
$IGRNO = $MRIR->IGRNO;
$IGRDate = $MRIR->Createdon;
$IGRDate = $MRIR->IGRCreated;
$igr_date = strtotime( $IGRDate );
$igrdate = date( 'd/m/Y', $igr_date );
$IGRRasiedbyName=$MRIR->IGRRasiedbyName;