diff --git a/application/models/purchaseorder_model.php b/application/models/purchaseorder_model.php index 48449893..7324c63e 100644 --- a/application/models/purchaseorder_model.php +++ b/application/models/purchaseorder_model.php @@ -898,7 +898,7 @@ function GetCurrencytype() } function UpdateRequistionStatus() { - $result = $this->db-> query("CALL P_UPDATE_REQUISTIONSTATUS()") or die(mysql_error()); + $result = $this->db-> query("CALL P_UPDATE_REQUISTIONSTATUS_New()") or die(mysql_error()); $result ->next_result(); diff --git a/application/models/requistion_model.php b/application/models/requistion_model.php index 5c994255..5e4ef7e5 100644 --- a/application/models/requistion_model.php +++ b/application/models/requistion_model.php @@ -52,7 +52,7 @@ class requistion_model extends CI_Model */ $subQuery ='select distinct Req.ReqNo, Mat.MaterialCode,Mat.MaterialName,Mat.UOM, Req.Quantity,if (Po.Quantity is null,0,Po.Quantity) as POQTY,sta.StatusName from T_MaterialMaster Mat join T_Requestion_Details Req on Req.MaterialCode = Mat.MaterialCode - left join T_PurchaseOrder_LineItem Po on Po.ReqNo = Req.ReqNo + left join T_PurchaseOrder_LineItem Po on Po.ReqNo = Req.ReqNo and Po.MaterialCode = Req.MaterialCode left join T_Status sta on sta.StatusCode = Req.Status where Req.ReqNo = ?'; @@ -321,10 +321,10 @@ class requistion_model extends CI_Model function getRequistItemList($ReqID,$NoArray='') { - $subQuery = 'select distinct Req.ReqNo, Mat.MaterialCode,Mat.MaterialName,Mat.UOM, Req.Quantity,Po.Quantity as POQTY,sta.StatusName from T_MaterialMaster Mat + $subQuery = 'select distinct Req.ReqNo, Mat.MaterialCode,Mat.MaterialName,Mat.UOM, Req.Quantity,sum(Po.Quantity) as POQTY,sta.StatusName from T_MaterialMaster Mat left join T_Requestion_Details Req on Req.MaterialCode = Mat.MaterialCode left join T_PurchaseOrder_LineItem Po on Po.ReqNo = Req.ReqNo and Po.MaterialCode = Req.MaterialCode - left join T_Status sta on sta.StatusCode = Req.Status where Req.ReqNo=?'; + left join T_Status sta on sta.StatusCode = Req.Status where Req.ReqNo=? group by Po.ReqNo,Req.MaterialCode'; $query = $this->db->query($subQuery, array($ReqID));