ogr
This commit is contained in:
parent
2eb2a523ca
commit
00666a78e4
@ -495,7 +495,7 @@ class inwardgateregister extends BaseController
|
|||||||
$totalReceivedqty = $ReceivedQuantity - $Outwardtotal;
|
$totalReceivedqty = $ReceivedQuantity - $Outwardtotal;
|
||||||
$POMStatus=OGR_CREATED;
|
$POMStatus=OGR_CREATED;
|
||||||
|
|
||||||
$POLineItem = array('ReceivedQuantity'=>$totalReceivedqty);
|
$POLineItem = array('ReceivedQuantity'=>$totalReceivedqty,'OGR_Status'=>$POMStatus);
|
||||||
|
|
||||||
$this->inwardgateregister_model->UpdatePOLineItem($POLineItem,$pono,$MaterialCode);
|
$this->inwardgateregister_model->UpdatePOLineItem($POLineItem,$pono,$MaterialCode);
|
||||||
|
|
||||||
|
|||||||
@ -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');
|
$this->db->select('POM.PONO,POM.ServiceDescription,POM.DeliveryDate,sup.SupplierName,sup.Address,POM.status,OGR_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();
|
||||||
|
|||||||
@ -142,7 +142,7 @@ Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
|
|||||||
<div class="col-md-12">
|
<div class="col-md-12">
|
||||||
<div class="col-md-offset-4">
|
<div class="col-md-offset-4">
|
||||||
<div class="box-header">
|
<div class="box-header">
|
||||||
<input type="file" accept=".png,.jpg,.pdf" onchange="filealert();" id="myfile" name="myfile" />
|
<input type="file" accept=".png,.jpg,.pdf" id="myfile" name="myfile" />
|
||||||
|
|
||||||
|
|
||||||
<label for="photo">Select File to upload<br/></label>
|
<label for="photo">Select File to upload<br/></label>
|
||||||
@ -574,6 +574,7 @@ function isNumberKey(evt)
|
|||||||
|
|
||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
function Save()
|
function Save()
|
||||||
{
|
{
|
||||||
//alert("save function worked ");
|
//alert("save function worked ");
|
||||||
@ -614,30 +615,35 @@ function Save()
|
|||||||
$('#IGR').submit();
|
$('#IGR').submit();
|
||||||
}//validate if closed
|
}//validate if closed
|
||||||
}//save function closed
|
}//save function closed
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
function filecheck()
|
function filecheck()
|
||||||
{
|
{
|
||||||
var myfile = $('#myfile').val();
|
var myfile = $('#myfile').val();
|
||||||
if(myfile=='')
|
if(myfile=='')
|
||||||
{
|
{
|
||||||
alert('File not Found');
|
alert('File not Found');
|
||||||
Save();
|
Save();
|
||||||
}
|
}
|
||||||
|
|
||||||
}
|
|
||||||
function filealert()
|
|
||||||
{
|
|
||||||
var sizef = document.getElementById('myfile').files[0].size;
|
|
||||||
var myfile = $('#myfile').val();
|
|
||||||
if(myfile!='' && sizef < 2100000)
|
|
||||||
{
|
|
||||||
alert('Your file added successfully');
|
|
||||||
}
|
|
||||||
|
|
||||||
else
|
else
|
||||||
{
|
{
|
||||||
alert('Sorry Your File is Large To 2MB');
|
var sizef = document.getElementById('myfile').files[0].size;
|
||||||
$('#myfile').val('');
|
var myfile = $('#myfile').val();
|
||||||
|
if(myfile!='' && sizef < 2100000)
|
||||||
|
{
|
||||||
|
alert('Your file added successfully');
|
||||||
|
Save();
|
||||||
|
}
|
||||||
|
else
|
||||||
|
{
|
||||||
|
alert('Sorry Your File is Large To 2MB');
|
||||||
|
$('#myfile').val('');
|
||||||
|
}
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
</script>
|
</script>
|
||||||
Loading…
Reference in New Issue
Block a user