diff --git a/application/models/mrir_model.php b/application/models/mrir_model.php index 031f06c1..7eeae2f7 100755 --- a/application/models/mrir_model.php +++ b/application/models/mrir_model.php @@ -214,15 +214,15 @@ function ViewDistributionList() /* This function is used to get the value for modal in view MRIR page */ function get_MRIRs($mrir) { - $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMD.*,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRD.*,SUPP.SupplierName,SUPP.Address,POMR.DeliveryDate,POMR.ServiceDescription,MM.MaterialCode,MM.UOM,MM.MaterialName,POLT.Quantity,POLT.ReceivedQuantity'); + $this->db->select('TMM.MRIRNO,TMM.PONO,TMM.IGRNO,TMD.*,IGRM.DeliveryChellanOrInvoiceNo,IGRM.DeliveryChellanDate,IGRM.VehicleNo,IGRD.*,SUPP.SupplierName,SUPP.Address,POMR.DeliveryDate,POMR.ServiceDescription,MM.MaterialCode,MM.UOM,MM.MaterialName,POLT.Quantity,POLT.ReceivedQuantity'); $this->db->from ('T_MRIR_Master TMM'); - $this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO','left'); - $this->db->join ('T_MaterialMaster MM','TMD.MaterialCode = MM.MaterialCode','left'); - $this->db->join ('T_IGR_Master IGRM', 'IGRM.IGRNO=TMM.IGRNO','left'); - $this->db->join ('T_PurchaseOrder_Master POMR ','IGRM.PONO=POMR.PONO','left'); - $this->db->join ('T_PurchaseOrder_LineItem POLT','IGRM.PONO=POLT.PONO','left'); - $this->db->join ('T_IGR_Details IGRD','IGRD.IGRNO= IGRM.IGRNO','left'); - $this->db->join ('T_SupplierDetailsN SUPP','POMR.SupplierID=SUPP.SupplierID','left'); + $this->db->join ('T_MRIR_Details TMD','TMM.MRIRNO = TMD.MRIRNO'); + $this->db->join ('T_MaterialMaster MM','TMD.MaterialCode = MM.MaterialCode'); + $this->db->join ('T_IGR_Master IGRM', 'IGRM.IGRNO=TMM.IGRNO'); + $this->db->join ('T_PurchaseOrder_Master POMR ','IGRM.PONO=POMR.PONO'); + $this->db->join ('T_PurchaseOrder_LineItem POLT','IGRM.PONO=POLT.PONO and POLT.MaterialCode=TMD.MaterialCode'); + $this->db->join ('T_IGR_Details IGRD','IGRD.IGRNO= IGRM.IGRNO and IGRD.MaterialCode=TMD.MaterialCode'); + $this->db->join ('T_SupplierDetailsN SUPP','POMR.SupplierID=SUPP.SupplierID'); $this->db->where('TMD.MRIRNO',$mrir); //$this->db->order_by('TMD.MRIRNO','asc'); diff --git a/application/models/requistion_model.php b/application/models/requistion_model.php index 9abc05d4..5bd97dd0 100755 --- a/application/models/requistion_model.php +++ b/application/models/requistion_model.php @@ -428,7 +428,7 @@ class requistion_model extends CI_Model function UpdateRequistionLineItem($Requist, $ReqNo,$MaterialCode) { $this->db->where('ReqNo', $ReqNo); - $this->db->where('MaterialCode', $MaterialCode); + //$this->db->where('MaterialCode', $MaterialCode); $this->db->update('T_Requestion_Details',$Requist); return TRUE;