From 968b02f11c3da7dca984ca2a4c3a214d0772d8e8 Mon Sep 17 00:00:00 2001 From: gandhimathi Bharathirajan Date: Fri, 18 Aug 2017 12:54:09 +0530 Subject: [PATCH] History detatails added --- application/models/mrir_model.php | 4 ++-- application/models/store_model.php | 11 +++++++++++ 2 files changed, 13 insertions(+), 2 deletions(-) diff --git a/application/models/mrir_model.php b/application/models/mrir_model.php index 62e6003e..e7ba2431 100755 --- a/application/models/mrir_model.php +++ b/application/models/mrir_model.php @@ -60,7 +60,7 @@ class mrir_model extends CI_Model } function ViewDistributionList() { - $subQuery = 'select distinct POL.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 @@ -71,7 +71,7 @@ function ViewDistributionList() 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 - POL.status in (?,?) and ReqLine.Status not in(?) group by POL.MaterialCode ,POL.PONO'; + 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()); return $query->result(); diff --git a/application/models/store_model.php b/application/models/store_model.php index aac30ac6..a45b09bb 100755 --- a/application/models/store_model.php +++ b/application/models/store_model.php @@ -65,6 +65,17 @@ class store_model extends CI_Model } + function GetStockHisory($MaterialCode) + { + $this->db->select('Quantity,ActualQuantity,Remarks,updatedOn'); + $this->db->from('T_Store_Stockdetails_History'); + $this->db->where('MaterialCode',$MaterialCode); + $query = $this->db->get(); + + $result = $query; + return $result->result_array(); + } + } \ No newline at end of file