SIA/CI3_siddharth_application
6
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Amendment issue

Browse Source
This commit is contained in:
gandhimathi Bharathirajan 2017-07-13 11:24:41 +05:30
parent ca3fede901
commit c94e68388d
2 changed files with 35 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
application/models/inwardgateregister_model.php
View File

@ -34,13 +34,13 @@ class inwardgateregister_model extends CI_Model
function getpurchaseorder() function getpurchaseorder()
{ {
$this->db->distinct(); $this->db->distinct();
$this->db->select('POM.PONO,POM.ServiceDescription,POM.DeliveryDate,sup.SupplierName,sup.Address'); $this->db->select('POM.PONO,POM.ServiceDescription,POM.DeliveryDate,sup.SupplierName,sup.Address,POM.status');
$this->db->from('T_PurchaseOrder_Master POM'); $this->db->from('T_PurchaseOrder_Master POM');
$this->db->join('T_PurchaseOrder_LineItem POL', 'POL.PONO = POM.PONO'); $this->db->join('T_PurchaseOrder_LineItem POL', 'POL.PONO = POM.PONO');
$this->db->join('T_SupplierDetailsN sup', 'POM.SupplierID = sup.SupplierID'); $this->db->join('T_SupplierDetailsN sup', 'POM.SupplierID = sup.SupplierID');
$this->db->where('POM.Status',PO_RELEASED); $this->db->where('POM.Status',PO_RELEASED);
$this->db->where('POL.Status !=',IGR_CREATED); $this->db->or_where('POM.Status',IGR_CREATED);
$this->db->where('POL.Status !=',MRIR_CREATED); $this->db->or_where('POM.Status',MRIR_CREATED);
$query = $this->db->get(); $query = $this->db->get();
@ -53,17 +53,15 @@ class inwardgateregister_model extends CI_Model
function viewpurchaseorder($PO) function viewpurchaseorder($PO)
{ {
$subQuery ='SELECT distinct POM.PONO,POL.MaterialCode,(CASE WHEN (POL.Quantity > igr.QuantityAsPerInvoice ) $subQuery ='SELECT distinct POM.PONO,POL.MaterialCode,POL.Quantity,POL.ReceivedQuantity,(POL.Quantity -POL.ReceivedQuantity ) as PendingQty,POL.PONO,MM.MaterialName,MM.UOM
THEN ( POL.Quantity - igr.QuantityAsPerInvoice) ELSE POL.Quantity
END) as Quantity,POL.PONO,MM.MaterialName,MM.UOM
from T_PurchaseOrder_Master POM from T_PurchaseOrder_Master POM
left join T_PurchaseOrder_LineItem POL on POL.PONO = POM.PONO left join T_PurchaseOrder_LineItem POL on POL.PONO = POM.PONO
left join T_IGR_Master IGM on IGM.PONO =POL.PONO left join T_IGR_Master IGM on IGM.PONO =POL.PONO
left join T_IGR_Details igr on igr.MaterialCode = POL.MaterialCode and IGM.PONO =POL.PONO left join T_IGR_Details igr on igr.MaterialCode = POL.MaterialCode and IGM.PONO =POL.PONO
left join T_MaterialMaster MM left join T_MaterialMaster MM
on MM.MaterialCode = POL.MaterialCode where POM.PONO=? and POL.Status not in(?,?) '; on MM.MaterialCode = POL.MaterialCode where POM.PONO=? ';// and POM.Status not in(?) ';
$query = $this->db->query($subQuery, array($PO,IGR_CREATED,MRIR_CREATED)); $query = $this->db->query($subQuery, array($PO,IGR_CREATED));
// print_r($this->db->last_query()); // print_r($this->db->last_query());
return $query->result(); return $query->result();
@ -145,4 +143,21 @@ class inwardgateregister_model extends CI_Model
return TRUE; return TRUE;
} }
function UpdatePOMaster($PONO,$updatedBy)
{
$this->db->select('Count(*) as cnt');
$this->db->from('T_PurchaseOrder_LineItem');
$this->db->where('PONO',$PONO);
$this->db->where('Status !=',IGR_CREATED);
$query = $this->db->get();
//print_r($this->db->last_query());
if ($query->num_rows == 0) {
$this->db->where('PONO', $PONO);
$POStatus = array('status'=>IGR_CREATED,'UpdateBY'=>$updatedBy);
$this->db->update('T_PurchaseOrder_Master', $POStatus);
}
}
} }

11
application/models/purchaseorder_model.php
View File

@ -1249,4 +1249,15 @@ join T_MaterialMaster Mat on Mat.MaterialCode = LineItem.MaterialCode
$RequistionDetails = $ResultArray; $RequistionDetails = $ResultArray;
return $RequistionDetails; return $RequistionDetails;
} }
function GetLineItemReceivedQty($ParentPO,$MaterialCode)
{
$this->db->select('ReceivedQuantity');
$this->db->from('T_PurchaseOrder_LineItem');
$this->db->where('PONO',$ParentPO);
$this->db->where('MaterialCode',$MaterialCode);
$result=$this->db->get();
return $result->result_array();
}
} }