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

production issue ogr

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-04-13 11:07:33 +05:30
parent fbbda5bb78
commit 2eb2a523ca
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
application/controllers/inwardgateregister.php
View File

@ -495,7 +495,7 @@ class inwardgateregister extends BaseController
$totalReceivedqty = $ReceivedQuantity - $Outwardtotal; $totalReceivedqty = $ReceivedQuantity - $Outwardtotal;
$POMStatus=OGR_CREATED; $POMStatus=OGR_CREATED;
$POLineItem = array('ReceivedQuantity'=>$totalReceivedqty,'OGR_Status'=>$POMStatus); $POLineItem = array('ReceivedQuantity'=>$totalReceivedqty);
$this->inwardgateregister_model->UpdatePOLineItem($POLineItem,$pono,$MaterialCode); $this->inwardgateregister_model->UpdatePOLineItem($POLineItem,$pono,$MaterialCode);

16
application/models/inwardgateregister_model.php
View File

@ -34,17 +34,17 @@ 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,POM.status,OGR_Status'); $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->join('T_OGR_Master OGM ', 'POM.PONO = OGM.PONO_INV','left'); $this->db->join('T_OGR_Master OGM ', 'POM.PONO = OGM.PONO_INV','left');
$this->db->where('POM.Status',PO_RELEASED); $this->db->where('POM.Status',PO_RELEASED);
$this->db->where('POM.POType !=',SERVICE); $this->db->where('POM.POType !=',SERVICE);
$this->db->or_where('POM.Status',IGR_CREATED); $this->db->or_where('POM.Status',IGR_CREATED);
$this->db->or_where('POM.Status',MRIR_CREATED); $this->db->or_where('POM.Status',MRIR_CREATED);
$this->db->or_where('POM.Status',MRIR_APPROVED); $this->db->or_where('POM.Status',MRIR_APPROVED);
$this->db->or_where('POM.Status',OGR_COMPLETE); $this->db->or_where('POM.Status',OGR_COMPLETE);
$query = $this->db->get(); $query = $this->db->get();
$result = $query->result(); $result = $query->result();

2
application/views/inwardgateregister.php
View File

@ -493,7 +493,7 @@ $('<input>').attr({
}); });
if((status == '<?php echo IGR_CREATED ?>' || status == '<?php echo MRIR_CREATED ?>' || status == '<?php echo MRIR_APPROVED ?>') && ostatus != '<?php echo OGR_CREATED; ?>' ) if((status == '<?php echo IGR_CREATED ?>' || status == '<?php echo MRIR_CREATED ?>' || status == '<?php echo MRIR_APPROVED ?>'))
{ {
alert('The Order is completed!!'); alert('The Order is completed!!');
$("#IGRLink").hide(); $("#IGRLink").hide();