diff --git a/application/controllers/requisitionform.php b/application/controllers/requisitionform.php
index ccbc51ad..07eb7b89 100755
--- a/application/controllers/requisitionform.php
+++ b/application/controllers/requisitionform.php
@@ -104,7 +104,7 @@ class requisitionform extends BaseController
}
- $data['LineItem'] = $this->requistion_model->getRequistItemList($ReqNo,'Yes');
+ $data['LineItem'] = $this->requistion_model->getEditRequistItemList($ReqNo,'Yes');
$data['CostCenter'] = $this->requistion_model->getCostCenterUserID($userID);
$data['MaterialCode'] = $this->requistion_model->EditMaterialCode($ReqNo, $ReqType);
@@ -476,6 +476,9 @@ class requisitionform extends BaseController
$MaterialName = $result[$i]['MaterialName'];
$UOM = $result[$i]['UOM'];
$Quantity = $result[$i]['Quantity'];
+ $Quantity = $result[$i]['Quantity'];
+ $POQTY = $result[$i]['POQTY'];
+ $StatusName= $result[$i]['StatusName'];
$HTML.="
| ".$SNo." |
". $MaterialCode." |
@@ -483,7 +486,9 @@ class requisitionform extends BaseController
".$MaterialName." |
".$UOM." |
- ".$Quantity." |
+ ".$Quantity." |
+ ".$POQTY." |
+ ".$StatusName." |
";
//$index = $index + 1;
diff --git a/application/logs/log-2017-06-14.php b/application/logs/log-2017-06-14.php
old mode 100644
new mode 100755
diff --git a/application/logs/log-2017-06-15.php b/application/logs/log-2017-06-15.php
old mode 100644
new mode 100755
diff --git a/application/models/requistion_model.php b/application/models/requistion_model.php
index 46f26058..ea1729f3 100755
--- a/application/models/requistion_model.php
+++ b/application/models/requistion_model.php
@@ -28,6 +28,30 @@ class requistion_model extends CI_Model
$query = $this->db->get();
return $query->result();
+ }
+ /* This function is used to getEditRequistItemList view the information
+ * @return array $result : This is result of the query
+ */
+ function getEditRequistItemList($ReqNo)
+ {
+
+ $result = $this->db-> query("CALL P_GET_REQUISTITEMLIST('".$ReqNo."')") or die(mysql_error());
+
+
+ //echo 'REQUISTITEMLIST Line item view successfully';
+
+
+
+ $result ->next_result();
+
+ if($result->num_rows > 0)
+ {
+
+ return $result->result();
+ }
+
+
+
}
/**
@@ -288,9 +312,11 @@ class requistion_model extends CI_Model
function getRequistItemList($ReqID,$NoArray='')
{
- $subQuery = 'select ReqNo,Mat.MaterialCode,Mat.MaterialName,Mat.UOM,Quantity from
- T_Requestion_Details Req join T_MaterialMaster Mat on
- Req.MaterialCode = Mat.MaterialCode where ReqNo=?';
+ $subQuery = 'select distinct Req.ReqNo, Mat.MaterialCode,Mat.MaterialName,Mat.UOM, Req.Quantity,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=?';
+
$query = $this->db->query($subQuery, array($ReqID));
if($NoArray == '')
diff --git a/application/views/createPOfromRequistion.php b/application/views/createPOfromRequistion.php
index a87a7510..b9575cb1 100755
--- a/application/views/createPOfromRequistion.php
+++ b/application/views/createPOfromRequistion.php
@@ -196,7 +196,11 @@
Item Code |
Item Description |
UOM |
- Quantity |
+ Requested Quantity |
+ PO Quantity |
+
+ Status |
+
diff --git a/application/views/editrequisitionform.php b/application/views/editrequisitionform.php
index 59e660a9..83d606df 100755
--- a/application/views/editrequisitionform.php
+++ b/application/views/editrequisitionform.php
@@ -292,7 +292,10 @@ if(!empty($ReqDetails))
Material Code |
Material Name |
Uom |
- Quantity |
+
+RequestedQuantity |
+ PoQuantity |
+ Status |
Action |
@@ -316,8 +319,8 @@ if(!empty($ReqDetails))
UOM ; ?> |
Quantity ; ?> |
-
-
+ POQTY ; ?> |
+ StatusName ;?> |
|