IGR issue fixed
This commit is contained in:
gandhimathi Bharathirajan
parent
8bf6602964
commit
309762b0bc
@ -1,6 +1,5 @@
|
||||
|
||||
|
||||
|
||||
<script src="https://cdnjs.cloudflare.com/ajax/libs/jquery.inputmask/3.3.4/jquery.inputmask.bundle.min.js"></script>
|
||||
<script>
|
||||
|
||||
$(document).ready(function(){
|
||||
@ -15,9 +14,12 @@
|
||||
});
|
||||
|
||||
});
|
||||
|
||||
//jquery for vechicle masking
|
||||
$(document).ready(function(){
|
||||
Inputmask("A{2,3} 9{1,2} A{1,2} 9{4}").mask($("#VehicleNo"));
|
||||
});
|
||||
</script>
|
||||
|
||||
|
||||
<style>
|
||||
.modal {
|
||||
text-align: center;
|
||||
@ -48,7 +50,7 @@
|
||||
}
|
||||
</style>
|
||||
|
||||
<div class="content-wrapper">
|
||||
<div class="content-wrapper" style="min-height:537px;">
|
||||
<!-- Content Header (Page header) -->
|
||||
<section class="content-header">
|
||||
<h1>
|
||||
@ -59,13 +61,13 @@
|
||||
<div class="row" style="padding-bottom:1%">
|
||||
<div id="content" > </div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<?php
|
||||
<div class="col-md-2">
|
||||
<?php
|
||||
$attributes = array('class' => 'form-label-left IGR ','name' => 'IGR','id' => 'IGR');
|
||||
|
||||
echo form_open($this->config->base_url().'/inwardgateregister/addNewigr/',$attributes); ?>
|
||||
<label>Select Purchase Order NO </label>
|
||||
<div>
|
||||
|
||||
<?php
|
||||
$options = array("-1"=>'Purchase Order No');
|
||||
|
||||
@ -83,13 +85,11 @@
|
||||
}
|
||||
|
||||
echo form_dropdown('PONO', $options,set_value('PONO'),'id="PONO"' ,'class="form-control select2"' , 'required="true"');
|
||||
|
||||
?>
|
||||
|
||||
</div>
|
||||
?>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="col-md-6">
|
||||
<div class="col-md-2">
|
||||
<label>Supplier Name </label>
|
||||
<div class="form-group">
|
||||
<?php
|
||||
@ -99,36 +99,35 @@
|
||||
</div>
|
||||
</div>
|
||||
|
||||
<div class="col-md-3">
|
||||
|
||||
</div>
|
||||
</div>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<label>Delivery Challan / Invoice NO</label>
|
||||
|
||||
|
||||
|
||||
<div class="col-md-2">
|
||||
<label>Delivery Challan/Invoice NO</label>
|
||||
<?php
|
||||
$data = array('name' => 'InvoiceNo','value' => set_value('InvoiceNo'),'id'=>'InvoiceNo', 'class' => 'form-control', 'required=>"true"' );
|
||||
|
||||
echo form_input($data);
|
||||
?>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<label>Delivery Challan / Invoice Date</label>
|
||||
<div class="col-md-2">
|
||||
<label>Delivery Challan/Invoice Date</label>
|
||||
<?php
|
||||
$data = array('name' => 'InvoiceDate','value' => set_value('InvoiceDate'),'id'=>'InvoiceDate', 'class' => 'form-control num', 'required'=>'true' );
|
||||
echo form_input($data);
|
||||
?>
|
||||
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
|
||||
<div class="col-md-2">
|
||||
<label>Vechicle NO</label>
|
||||
<?php
|
||||
$data = array('name' => 'VehicleNo','value' => set_value('VehicleNo'),'pattern=>"^[A-Z]{2}\s[0-9]{2}\s[A-Z]{2}\s[0-9]{4}$"','id'=>'VehicleNo', 'class' => 'form-control', 'onchange'=>'validate_Vechicle();');
|
||||
$data = array('name' => 'VehicleNo','value' => set_value('VehicleNo'), 'id'=>'VehicleNo', 'class' => 'form-control', );
|
||||
echo form_input($data);
|
||||
?>
|
||||
<span pattern="" required="true"></span>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<div class="col-md-2">
|
||||
<label>Courier NO</label>
|
||||
<?php
|
||||
$data = array('name' => 'CourierNo','value' => set_value('CourierNo'),'id'=>'CourierNo', 'class' => 'form-control' );
|
||||
@ -136,7 +135,7 @@
|
||||
?>
|
||||
</div>
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
<div class="row">
|
||||
<div class="col-md-12">
|
||||
@ -209,11 +208,7 @@
|
||||
|
||||
<!-- new modal ended-->
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
|
||||
|
||||
@ -256,12 +251,13 @@ function validate()
|
||||
var isExceed = 0;
|
||||
for(k=1;k<=rowcount ; k++)
|
||||
{
|
||||
var AdvisedQty = parseFloat( $('#QuantityAsPerInvoice'+k).val() == '' ? '0.00' : $('#QuantityAsPerInvoice'+k).val());
|
||||
var AdvisedQty = parseFloat( $('#QuantityAsPerInvoice'+k).val() == '' ? '0.00' : $('#QuantityAsPerInvoice'+k).val());
|
||||
var RecQty = parseFloat( $('#txtReceivedQuantity'+k).val() == '' ? '0.00' : $('#txtReceivedQuantity'+k).val());
|
||||
var OrderedQty =parseFloat($('#Quantity_1'+k).text());
|
||||
if(AdvisedQty != '0.00')
|
||||
{
|
||||
|
||||
if(OrderedQty < AdvisedQty)
|
||||
if(OrderedQty < (AdvisedQty+RecQty))
|
||||
{
|
||||
isExceed = 1;
|
||||
return false;
|
||||
@ -361,6 +357,9 @@ function validate()
|
||||
url:"<?php echo base_url() ?>inwardgateregister/IGRITEM",
|
||||
|
||||
success:function(data) {
|
||||
|
||||
//alert(data);
|
||||
|
||||
$('#content').loader('hide');
|
||||
//alert(data);
|
||||
var trHTML = '';
|
||||
@ -376,7 +375,7 @@ function validate()
|
||||
'<td name="Quantity1'+i+'" id="Quantity_1'+i+'">' + item.Quantity + '</td>' +
|
||||
'<td name="ReceivedQuantity'+i+'" id="ReceivedQuantity'+i+'">'+ item.ReceivedQuantity +'</td>'+
|
||||
'<td name="PendingQuantity'+i+'" id="PendingQuantity'+i+'">'+ item.PendingQty +'</td>'+
|
||||
'<td data-name="sel" ><input type="text" onchange="validateReceivedQuantity('+i+')"id="QuantityAsPerInvoice'+ i +'" name="QuantityAsPerInvoice'+ i +'" class="form required" value="" onkeypress="return isNumberKey(event);"></td>' +
|
||||
'<td data-name="sel" ><input type="text" onchange="validateReceivedQuantity('+i+')"id="QuantityAsPerInvoice'+ i +'" name="QuantityAsPerInvoice'+ i +'" value="" onkeypress="return isNumberKey(event);"></td>' +
|
||||
|
||||
'<td><input type="text" id="Remark'+ i +'" name="Remark'+ i +'" class="form" onchange="SetRemarks('+i+')"> </td>' +
|
||||
'</tr>';
|
||||
@ -388,6 +387,11 @@ function validate()
|
||||
value:item.MaterialCode,
|
||||
name: 'MaterialCode'+i
|
||||
}).appendTo('form');
|
||||
$('<input>').attr({
|
||||
type: 'hidden',
|
||||
id: 'txtQuantityAsPerInvoice'+i,
|
||||
name: 'txtQuantityAsPerInvoice'+i
|
||||
}).appendTo('form');
|
||||
$('<input>').attr({
|
||||
type: 'hidden',
|
||||
id: 'OrderedQuantity'+i,
|
||||
@ -399,8 +403,9 @@ $('<input>').attr({
|
||||
|
||||
$('<input>').attr({
|
||||
type: 'hidden',
|
||||
id: 'ReceivedQuantity'+i,
|
||||
name: 'ReceivedQuantity'+i,
|
||||
id: 'txtReceivedQuantity'+i,
|
||||
name: 'txtReceivedQuantity'+i,
|
||||
value:item.ReceivedQuantity
|
||||
}).appendTo('form');
|
||||
|
||||
$('<input>').attr({
|
||||
@ -408,6 +413,20 @@ $('<input>').attr({
|
||||
id: 'txtRemarks'+i,
|
||||
name: 'txtRemarks'+i
|
||||
}).appendTo('form');
|
||||
|
||||
$('<input>').attr({
|
||||
type: 'hidden',
|
||||
id: 'txtPendingQty'+i,
|
||||
name: 'txtPendingQty'+i,
|
||||
value:item.PendingQty
|
||||
}).appendTo('form');
|
||||
//alert(item.PendingQty);
|
||||
if(item.PendingQty == 0.00)
|
||||
{
|
||||
//alert('inside if');
|
||||
$('#QuantityAsPerInvoice'+i).attr('readonly', 'true');
|
||||
// $('#txtEditFreight').attr('readonly', 'true');
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
@ -420,7 +439,7 @@ $('<input>').attr({
|
||||
|
||||
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
});
|
||||
|
||||
@ -429,6 +448,10 @@ $('<input>').attr({
|
||||
{
|
||||
alert('The Order is completed!!');
|
||||
$("#IGRLink").hide();
|
||||
}
|
||||
else
|
||||
{
|
||||
$("#IGRLink").show();
|
||||
}
|
||||
|
||||
}
|
||||
@ -451,24 +474,25 @@ function validateReceivedQuantity(Rowid){
|
||||
|
||||
var InvoiceQty = parseFloat( $('#QuantityAsPerInvoice'+Rowid).val() == '' ? '0.00' : $('#QuantityAsPerInvoice'+Rowid).val());
|
||||
|
||||
var PendingQty = parseFloat( $('#PendingQuantity'+Rowid).text() == '' ? '0.00' : $('#PendingQuantity'+Rowid).text());
|
||||
//alert(PendingQty);
|
||||
var r =$("#Remark"+Rowid).val();
|
||||
var PendingQty = parseFloat( $('#PendingQuantity'+Rowid).text() == '' ? '0.00' : $('#PendingQuantity'+Rowid).text());
|
||||
|
||||
var RecQty = parseFloat( $('#txtReceivedQuantity'+Rowid).val() == '' ? '0.00' : $('#txtReceivedQuantity'+Rowid).val());
|
||||
|
||||
var OrderedQty =parseFloat($("#Quantity_1"+Rowid).text());
|
||||
|
||||
|
||||
|
||||
var r =$("#Remark"+Rowid).val();
|
||||
|
||||
|
||||
if(InvoiceQty > OrderedQty){
|
||||
if((InvoiceQty+RecQty) > OrderedQty){
|
||||
|
||||
alert("Advised Quantity is exceeding the Ordered Quantity.Please Contact Purchase Team for further Process ")
|
||||
$("#QuantityAsPerInvoice"+Rowid).focus();
|
||||
$("#QuantityAsPerInvoice"+Rowid).val('');
|
||||
return false;
|
||||
|
||||
|
||||
}
|
||||
else if(PendingQty == '0.00'){
|
||||
else if(((InvoiceQty+RecQty) - OrderedQty) > 0.00){
|
||||
alert("Order is completed.")
|
||||
$("#QuantityAsPerInvoice"+Rowid).focus();
|
||||
$('#QuantityAsPerInvoice'+Rowid).val('');
|
||||
@ -476,9 +500,12 @@ function validateReceivedQuantity(Rowid){
|
||||
}
|
||||
|
||||
else {
|
||||
$('#PendingQuantity'+Rowid).text(OrderedQty - InvoiceQty );
|
||||
$("#ReceivedQuantity"+Rowid).val(InvoiceQty);
|
||||
|
||||
// alert(RecQty);
|
||||
$('#PendingQuantity'+Rowid).text((OrderedQty - (InvoiceQty+RecQty)).toFixed(2));
|
||||
$('#txtPendingQty'+Rowid).val(OrderedQty - (InvoiceQty+RecQty));
|
||||
$("#ReceivedQuantity"+Rowid).val(InvoiceQty+RecQty);
|
||||
$("#txtQuantityAsPerInvoice"+Rowid).val(InvoiceQty);
|
||||
// InvoiceQty
|
||||
return true;
|
||||
}
|
||||
|
||||
|
||||
@ -120,11 +120,14 @@
|
||||
<br/>
|
||||
<div class="col-md-12">
|
||||
<div class="col-md-3">
|
||||
<label>Supplier Name:</label>
|
||||
<label>Supplier and Address :</label>
|
||||
</div>
|
||||
<div class="col-md-3">
|
||||
<input type="text" id="Supplier" readonly>
|
||||
</div>
|
||||
|
||||
|
||||
</div>
|
||||
|
||||
</div>
|
||||
<!-- Table to show the line item of po -->
|
||||
<div id="content" > </div>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user