diff --git a/application/models/mrir_model.php b/application/models/mrir_model.php index e7ba2431..36b867ac 100755 --- a/application/models/mrir_model.php +++ b/application/models/mrir_model.php @@ -60,17 +60,20 @@ class mrir_model extends CI_Model } function ViewDistributionList() { - $subQuery = 'select distinct ReqLine.MaterialCode, MR.PONO,REQ.ReqNo,MM.MaterialName,MM.UOM, + $subQuery = 'Select distinct ReqLine.MaterialCode, MR.PONO, REQ.ReqNo,MM.MaterialName,MM.UOM, EMP.FirstName,DD.DEPCode,DD.DepartmentName,ReqLine.Quantity as RequestedQty,POL.Quantity - as OrderedQuantity ,sum(MD.ActualQuantityReceived) as ActualReceivedqty,sum(MD.QuantityAccepted) as - AcceptedQty,REQ.ReqDate,ReqLine.Status as ReqStatus,st.StatusName,ReqLine.Remarks - from T_PurchaseOrder_LineItem POL join T_Requestion_Details ReqLine on ReqLine.ReqNo = POL.ReqNo + as OrderedQuantity ,(MD.ActualQuantityReceived) as ActualReceivedqty,(MD.QuantityAccepted) as + AcceptedQty,REQ.ReqDate, ReqLine.Status as ReqStatus, + st.StatusCode as ReqStatus,st.StatusName, + ReqLine.Remarks + from T_Requestion_Details ReqLine join T_PurchaseOrder_LineItem POL on ReqLine.ReqNo = POL.ReqNo join T_Requestion_Master REQ on REQ.ReqNo = ReqLine.ReqNo + join T_Status st on ReqLine.Status = st.StatusCode join T_MRIR_Master MR on MR.PONO = POL.PONO join T_MRIR_Details MD - on MD.MRIRNO = MR.MRIRNO and POL.MaterialCode = MD.MaterialCode join T_MaterialMaster MM on - MM.MaterialCode = POL.MaterialCode join - T_Employee_Details EMP on EMP.EmpID = REQ.Requestedby join T_Status st on - st.StatusCode = ReqLine.Status join T_DepartmentDetails DD on DD.DEPCode = EMP.Departmentcode where + on MD.MRIRNO = MR.MRIRNO and ReqLine.MaterialCode = MD.MaterialCode join T_MaterialMaster MM on + MM.MaterialCode = ReqLine.MaterialCode join + T_Employee_Details EMP on EMP.EmpID = REQ.Requestedby join + T_DepartmentDetails DD on DD.DEPCode = EMP.Departmentcode where POL.status in (?,?) and ReqLine.Status not in(?) group by ReqLine.MaterialCode ,POL.PONO'; $query = $this->db->query($subQuery,array(MRIR_APPROVED,PARTIAL_MRIRAPPROVED,REQITEM_NEW)); //print_r($this->db->last_query());