SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ogr bug fix

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-04-10 10:17:05 +05:30
parent c251d4b0b3
commit 7e336808ea
4 changed files with 130 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
application/controllers/inwardgateregister.php
View File

@ -482,14 +482,14 @@ class inwardgateregister extends BaseController
// if($OutwardQty==$allowed) if($OutwardQty==$allowed)
// { {
$Status='ST063'; $Status='ST063';
// } }
// else else
// { {
// $Status='ST064'; $Status='ST064';
// } }
@ -507,9 +507,13 @@ class inwardgateregister extends BaseController
,'PONO_INV'=>$pono,'VehicleNo'=>$vehicle,'Status'=>$Status); ,'PONO_INV'=>$pono,'VehicleNo'=>$vehicle,'Status'=>$Status);
$updateogrmaster= $this->inwardgateregister_model->UpdateOGR($updateogrmaster,$OGRNO); $updateogrmaster= $this->inwardgateregister_model->UpdateOGR($updateogrmaster,$OGRNO);
$postatus=array('Status'=>$Status); $postatus=array('Status'=>OGR_COMPLETE);
$this->inwardgateregister_model->UpdatePOMasterOGR($postatus,$pono);
//$this->inwardgateregister_model->UpdatePOLineItem($POLineItem,$PONO,$MaterialCode);
$this->inwardgateregister_model->UpdatePOMasterOGR($postatus,$pono);
} }
@ -517,6 +521,9 @@ class inwardgateregister extends BaseController
} }
//$this->inwardgateregister_model->UpdatePOMaster($PONO,$CreatedBy);
//$this->inwardgateregister_model->updateogrpomaster($pono);
if((count($addogrmaster)>0)&&(count($addOgrline)>0) && (count($updateogrmaster)>0)) if((count($addogrmaster)>0)&&(count($addOgrline)>0) && (count($updateogrmaster)>0))
{ {
echo "Saved Successfully OGR No is OGR".$OGRNO; echo "Saved Successfully OGR No is OGR".$OGRNO;
@ -554,7 +561,7 @@ class inwardgateregister extends BaseController
$name= $this->input->post('name'); $name= $this->input->post('name');
$pooutward= $this->input->post('pooutward'); $pooutward= $this->input->post('pooutward');
$destination= $this->input->post('destination'); $destination= $this->input->post('destination');
$Ogrline= array('OGRNO'=>$OGRNO,'MaterialCode'=>$material,'OutwardQty'=>$pooutward,'Destination'=>$destination,'Status'=>$Status); $Ogrline= array('OGRNO'=>$OGRNO,'MaterialCode'=>$material,'OutwardQty'=>$pooutward,'Destination'=>$destination,'Status'=>$Status,'Material_Name'=>$name);
$addOgrline = $this->inwardgateregister_model->AddOgrLine($Ogrline); $addOgrline = $this->inwardgateregister_model->AddOgrLine($Ogrline);

38
application/models/inwardgateregister_model.php
View File

@ -183,6 +183,28 @@ class inwardgateregister_model extends CI_Model
} }
} }
function updateogrpomaster($pono)
{
$this->db->select('*');
$this->db->from('T_PurchaseOrder_LineItem');
$this->db->where('PONO',$pono);
$this->db->where('OGR_Status !=','ST064');
$query = $this->db->get();
if ($query->num_rows == 0) {
$this->db->where('PONO',$pono);
$POStatus = array('status'=>'ST063');
$this->db->update('T_PurchaseOrder_Master', $POStatus);
}
}
function getPOLineItemReceivedQty($PONO,$MaterialCode) function getPOLineItemReceivedQty($PONO,$MaterialCode)
{ {
$this->db->select('ReceivedQuantity'); $this->db->select('ReceivedQuantity');
@ -305,13 +327,15 @@ class inwardgateregister_model extends CI_Model
$subQuery='select T_PurchaseOrder_Master.PONO from T_PurchaseOrder_Master // $subQuery='select T_PurchaseOrder_Master.PONO from T_PurchaseOrder_Master
join T_MRIR_Master on T_MRIR_Master.PONO= T_PurchaseOrder_Master.PONO // join T_MRIR_Master on T_MRIR_Master.PONO= T_PurchaseOrder_Master.PONO
where T_PurchaseOrder_Master.SupplierID=? and T_MRIR_Master.MRIRStatus=? and T_PurchaseOrder_Master.PONO not in(select PONO_INV from T_OGR_Master where OgrType=?) group by T_PurchaseOrder_Master.PONO'; // where T_PurchaseOrder_Master.SupplierID=? and T_MRIR_Master.MRIRStatus=? and T_PurchaseOrder_Master.PONO not in(select PONO_INV from T_OGR_Master where OgrType=?) group by T_PurchaseOrder_Master.PONO';
// $subQuery='select T_PurchaseOrder_Master.PONO from T_PurchaseOrder_Master $subQuery='select T_PurchaseOrder_Master.PONO from T_PurchaseOrder_Master
// join T_MRIR_Master on T_MRIR_Master.PONO= T_PurchaseOrder_Master.PONO join T_MRIR_Master on T_MRIR_Master.PONO= T_PurchaseOrder_Master.PONO
// where T_PurchaseOrder_Master.SupplierID=? and T_MRIR_Master.MRIRStatus=? group by T_PurchaseOrder_Master.PONO'; where T_PurchaseOrder_Master.SupplierID=? and T_PurchaseOrder_Master.Status=? and T_PurchaseOrder_Master.PONO not in(select PONO_INV from T_OGR_Master where OgrType=?) group by T_PurchaseOrder_Master.PONO';
//$query= $this->db->query($subQuery, array($supplierId,ST044,PO,ST063)); //$query= $this->db->query($subQuery, array($supplierId,ST044,PO,ST063));
$query= $this->db->query($subQuery, array($supplierId,ST044,PO)); $query= $this->db->query($subQuery, array($supplierId,ST044,PO));
@ -346,7 +370,7 @@ where T_PurchaseOrder_Master.PONO=?';
function getPOmaterialDetails($PONO,$materialcode) function getPOmaterialDetails($PONO,$materialcode)
{ {
$subQuery='select distinct T_PurchaseOrder_LineItem.MaterialCode,MaterialName,T_PurchaseOrder_LineItem.Quantity as Oqty,T_MRIR_Details.ActualQuantityReceived,T_MRIR_Details.QuantityRejected,balance_Qty $subQuery='select distinct T_PurchaseOrder_LineItem.MaterialCode,MaterialName,T_PurchaseOrder_LineItem.Quantity as Oqty,sum( T_MRIR_Details.ActualQuantityReceived) as ActualQuantityReceived,sum( T_MRIR_Details.QuantityRejected) as QuantityRejected,balance_Qty
from T_PurchaseOrder_Master from T_PurchaseOrder_Master
join T_PurchaseOrder_LineItem on T_PurchaseOrder_LineItem.PONO = T_PurchaseOrder_Master.PONO join T_PurchaseOrder_LineItem on T_PurchaseOrder_LineItem.PONO = T_PurchaseOrder_Master.PONO
join T_MRIR_Master on T_MRIR_Master.PONO = T_PurchaseOrder_Master.PONO join T_MRIR_Master on T_MRIR_Master.PONO = T_PurchaseOrder_Master.PONO

31
application/views/editogr.php
View File

@ -42,6 +42,7 @@ if(!empty($OGR_Data))
$driver=$dt->Driver; $driver=$dt->Driver;
$PONO=$dt->PONO_INV; $PONO=$dt->PONO_INV;
$MaterialCode=$dt->MaterialCode; $MaterialCode=$dt->MaterialCode;
$MaterialName=$dt->Material_Name;
//$name=$dt->; //$name=$dt->;
$outqty=$dt->OutwardQty; $outqty=$dt->OutwardQty;
} }
@ -175,18 +176,32 @@ if(!empty($OGR_Data))
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3"> <div class="col-md-3">
<div class="col-md-12">
<label>OGR Type</label>
<?php
$data = array('name' => 'type','value' => set_value('type',$type),'id'=>'type', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
echo form_input($data);
?>
</div>
<div class="col-md-12"> <div class="col-md-12">
<label>Supplier/Customer</label> <label>Supplier/Customer</label>
<?php <?php
$data = array('name' => 'supplier','value' => set_value('supplier',$sup),'id'=>'supplier', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;'); $data = array('name' => 'supplier','value' => set_value('supplier',$sup),'id'=>'supplier', 'class' => 'form-control' ,'required' => 'true', 'onkeypress'=>'return false;');
echo form_input($data); echo form_input($data);
?> ?>
</div>
</div>
</div> </div>
<div class="col-md-9" style="padding: 0px;"> <div class="col-md-9" style="padding: 0px;">
<div class="col-md-12" style="padding: 0px;"> <div class="col-md-12" style="padding: 0px;">
@ -248,6 +263,8 @@ if(!empty($OGR_Data))
</div> </div>
</div> </div>
</div> </div>
</div> </div>
@ -405,12 +422,12 @@ if(!empty($OGR_Data))
</div> </div>
<div class="col-md-3" style="display: none"> <div class="col-md-3">
<label>Name</label> <label>Name</label>
<div class="form-group"> <div class="form-group">
<?php <?php
$data = array('name' => 'name','value' => set_value('name'),'id'=>'name', 'class' => 'form-control'); $data = array('name' => 'name','value' => set_value('name',$MaterialName),'id'=>'name', 'class' => 'form-control');
echo form_input($data); echo form_input($data);
?> ?>
</div> </div>

66
application/views/ogr.php
View File

@ -70,6 +70,7 @@ $Value="&#8377;";
$('#saveinv').hide(); $('#saveinv').hide();
$('#savepo').hide(); $('#savepo').hide();
$('#saveservice').hide(); $('#saveservice').hide();
$('#supplierselect').hide();
$("#date").datepicker({ $("#date").datepicker({
@ -141,7 +142,7 @@ $Value="&#8377;";
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3"> <div class="col-md-3">
<div class="col-md-12"> <!-- <div class="col-md-12">
<label>Supplier/Customer</label> <label>Supplier/Customer</label>
<?php <?php
@ -155,7 +156,23 @@ $Value="&#8377;";
</div> </div>
-->
<div class="col-md-12">
<div class="form-group">
<label>OGR TYPE</label>
<select id="ogrtype" >
<option value="0">select option</option>
<option value="2">PO</option>
<option value="3">Service</option>
</select>
</div>
</div>
</div> </div>
<div class="col-md-9" style="padding: 0px;"> <div class="col-md-9" style="padding: 0px;">
<div class="col-md-12" style="padding: 0px;"> <div class="col-md-12" style="padding: 0px;">
@ -225,21 +242,39 @@ $Value="&#8377;";
<!--mv/po/ser starting--> <!--mv/po/ser starting-->
<div class="row"> <div class="row">
<div class="col-md-12"> <div class="col-md-12">
<div class="col-md-3"> <div class="col-md-3" id="supplierselect">
<div class="col-md-12"> <!-- <div class="col-md-12">
<div class="form-group"> <div class="form-group">
<label>OGR TYPE</label> <label>OGR TYPE</label>
<select id="ogrtype" > <select id="ogrtype" >
<option value="0">select option</option> <option value="0">select option</option>
<!-- <option value="1">INVOICE</option> -->
<option value="2">PO</option> <option value="2">PO</option>
<option value="3">Service</option> <option value="3">Service</option>
</select> </select>
</div> </div>
</div> </div> -->
<div class="col-md-12">
<label>Supplier/Customer</label>
<?php
$options = array("0"=>'Select');
//print_r( $options);
echo form_dropdown('sup', $options,set_value('sup'),'id="sup"' ,'required="true"' ,'class="form-control select2');
?>
</div>
</div> </div>
<div id="mv"> <div id="mv">
<div class="col-md-9" style="padding: 0px;"> <div class="col-md-9" style="padding: 0px;">
@ -559,6 +594,8 @@ $("#ogrtype").change(function()
$('#saveinv').hide(); $('#saveinv').hide();
$('#savepo').show(); $('#savepo').show();
$('#saveservice').hide(); $('#saveservice').hide();
$('#supplierselect').show();
// alert("po") // alert("po")
// document.getElementById("sup").options.length = 0; // document.getElementById("sup").options.length = 0;
$('#sup').find('option:not(:first)').remove(); $('#sup').find('option:not(:first)').remove();
@ -581,6 +618,8 @@ $("#ogrtype").change(function()
$('#potable').hide(); $('#potable').hide();
$('#saveservice').show(); $('#saveservice').show();
$('#savepo').hide(); $('#savepo').hide();
$('#supplierselect').hide();
} }
@ -981,8 +1020,16 @@ function QtyCheck(row)
if(outwardqty>allowed) if(outwardqty>allowed)
{ {
alert("Exceeding allowed amount"); alert("Exceeding allowed amount");
$('#outward'+row).val('');
return false; return false;
} }
else if((outwardqty == ''))
{
alert("Please Enter Valid Quantity");
$('#outward'+row).val('');
return false;
}
else else
{ {
@ -1069,7 +1116,7 @@ function validateOutward()
{ {
if($('#outward'+j).val()=='') if($('#outward'+j).val()=='')
{ {
alert("enter"); alert("Please Enter Values");
che =1; che =1;
break; break;
@ -1139,9 +1186,12 @@ function Save(type)
{ {
//alert() //alert()
if(validatepo() && validateOutward()) if(validatepo() && validateOutward() && QtyCheck())
{ {
// alert('if');
// die();
$('#content').loader('show'); $('#content').loader('show');
var date= $('#date').val(); var date= $('#date').val();
var newdate = date.split("-").reverse().join("-"); var newdate = date.split("-").reverse().join("-");