RIA/ria
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

IGR live Issues Fixes

Browse Source
This commit is contained in:
VE10-Sanjeev 2025-05-15 13:56:50 +00:00
parent 7810f454a4
commit 06dd5af078
4 changed files with 31 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
app/Controllers/Inwardgateregister.php
View File

@ -812,7 +812,9 @@ function viewIGRDetails()
$DriverName = $this->request->getPost('driver'); $DriverName = $this->request->getPost('driver');
$DriverMobileNumber = $this->request->getPost('driver_mobile'); $DriverMobileNumber = $this->request->getPost('driver_mobile');
$IGRStatus = (int)$this->request->getPost('status') == 1 ? IGR_CREATED : IGR_DRAFT; $PreIGRStatus = (int)$this->request->getPost('status') == 1 ? IGR_CREATED : IGR_DRAFT;
$IsThisOpenOrderPO = $this->request->getPost('hiddenIsOpenOrder');
$IGRStatus = ((int)$IsThisOpenOrderPO == 1) ? IGR_DRAFT : $PreIGRStatus;
# Here decode the tableData for IGRLineitem # Here decode the tableData for IGRLineitem
$tableData = $this->request->getPost('tableData'); $tableData = $this->request->getPost('tableData');
@ -942,6 +944,7 @@ function viewIGRDetails()
# Step 4.3 : IGRlineitem affectedRow have value and MaterialCode have value means # Step 4.3 : IGRlineitem affectedRow have value and MaterialCode have value means
# : updated the polineitem Qty # : updated the polineitem Qty
if(!$IsThisOpenOrderPO){
$OldQuantityAsPerInvoice = $this->inwardgateregister_model->getOldIgrReceivedQty($IGRNo, $igrItemNo,$MaterialCode); $OldQuantityAsPerInvoice = $this->inwardgateregister_model->getOldIgrReceivedQty($IGRNo, $igrItemNo,$MaterialCode);
if ($MaterialCode != '' && ((int)$quantityAsPerInvoice != (int)$OldQuantityAsPerInvoice)) { if ($MaterialCode != '' && ((int)$quantityAsPerInvoice != (int)$OldQuantityAsPerInvoice)) {
@ -959,6 +962,8 @@ function viewIGRDetails()
$this->inwardgateregister_model->UpdatePOLineItem($POLineItem, $PONo, $MaterialCode); $this->inwardgateregister_model->UpdatePOLineItem($POLineItem, $PONo, $MaterialCode);
} }
}
# Step 4.3 : Updating IGRlineitem # Step 4.3 : Updating IGRlineitem
$updateigrlineitem = $this->inwardgateregister_model->updateIGRLineItem($igrline, $igrItemNo); $updateigrlineitem = $this->inwardgateregister_model->updateIGRLineItem($igrline, $igrItemNo);
log_message('error', "lineitem updated successfully: " . $updateigrlineitem); log_message('error', "lineitem updated successfully: " . $updateigrlineitem);

2
app/Models/Dashboard_model.php
View File

@ -2234,7 +2234,7 @@ join t_purchaseorder_master po on po.PONO = pl.PONO
join t_supplierdetailsn sup on sup.SupplierID=po.SupplierID join t_supplierdetailsn sup on sup.SupplierID=po.SupplierID
join t_materialmaster mm on mm.MaterialCode=pl.MaterialCode join t_materialmaster mm on mm.MaterialCode=pl.MaterialCode
join t_configdetails cd on cd.key = mm.Category join t_configdetails cd on cd.key = mm.Category
where po.Status != 'ST030' and po.Status = 'ST026' where po.Status != 'ST030' and po.Status = 'ST026 and po.IsOpenOrder != '1'
"; ";
if ($cname != '') { if ($cname != '') {

13
app/Views/inwardgateregister.php
View File

@ -479,8 +479,6 @@
isOpenOrder = parseInt(obj.IsOpenOrder ? obj.IsOpenOrder : "0", 2); isOpenOrder = parseInt(obj.IsOpenOrder ? obj.IsOpenOrder : "0", 2);
var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "" : "Open"; var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "" : "Open";
$('.help-block').text(formatted_IsOpenOrder); $('.help-block').text(formatted_IsOpenOrder);
var button_text_for_IGRDraftLink = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "Save as Draft IGR" : "Save as Open IGR";
$('#IGRDraftLink').text(button_text_for_IGRDraftLink);
//$("#Add").val(obj.Address); //$("#Add").val(obj.Address);
$("#del").val(obj.DeliveryDate); $("#del").val(obj.DeliveryDate);
//$("#ser").val(obj.ServiceDescription); //$("#ser").val(obj.ServiceDescription);
@ -683,7 +681,16 @@
// InvoiceQty // InvoiceQty
return true; return true;
} }
} else if(formatted_IsOpenOrder == 1){
// alert("Here Handling Open Order");
console.log(InvoiceQty + "Here Handling Open Order");
$('#PendingQuantity' + Rowid).text(0.00);
$('#txtPendingQty' + Rowid).val(0.00);
$("#ReceivedQuantity" + Rowid).val(InvoiceQty);
$("#txtQuantityAsPerInvoice" + Rowid).val((InvoiceQty));
return true;
} else{ } else{
// alert("None Of the Above");
console.log(InvoiceQty + RecQty); console.log(InvoiceQty + RecQty);
$('#PendingQuantity' + Rowid).text(0.00); $('#PendingQuantity' + Rowid).text(0.00);
$('#txtPendingQty' + Rowid).val(0.00); $('#txtPendingQty' + Rowid).val(0.00);
@ -913,8 +920,6 @@
isOpenOrder = parseInt(obj.IsOpenOrder ? obj.IsOpenOrder : "0", 2); isOpenOrder = parseInt(obj.IsOpenOrder ? obj.IsOpenOrder : "0", 2);
var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "" : "Open"; var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "" : "Open";
$('.help-block').text(formatted_IsOpenOrder); $('.help-block').text(formatted_IsOpenOrder);
var button_text_for_IGRDraftLink = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "Save as Draft IGR" : "Save as Draft IGR";
$('#IGRDraftLink').text(button_text_for_IGRDraftLink);
//$("#Add").val(obj.Address); //$("#Add").val(obj.Address);
$("#del").val(obj.DeliveryDate); $("#del").val(obj.DeliveryDate);
//$("#ser").val(obj.ServiceDescription); //$("#ser").val(obj.ServiceDescription);

4
app/Views/viewinwardgateregister.php
View File

@ -1208,8 +1208,6 @@
console.log(isOpenOrder); console.log(isOpenOrder);
var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "" : "Open"; var formatted_IsOpenOrder = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "" : "Open";
$('.help-block').text(formatted_IsOpenOrder); $('.help-block').text(formatted_IsOpenOrder);
var button_text_for_IGRDraft = (isOpenOrder === 0 || isNaN(isOpenOrder)) ? "Save as Draft IGR" : "Save as Open IGR";
$('#draftIGR').text(button_text_for_IGRDraft);
$("#hiddenIsOpenOrder").val(isOpenOrder); $("#hiddenIsOpenOrder").val(isOpenOrder);
$("#Vehicle_No").val(item.VehicleNo); $("#Vehicle_No").val(item.VehicleNo);
$("#Transporter_Id").val(item.TransporterId); $("#Transporter_Id").val(item.TransporterId);
@ -1548,7 +1546,7 @@
var igrno = $("#IGRNO1").val(); var igrno = $("#IGRNO1").val();
var pono = $("#PONO1").val(); var pono = $("#PONO1").val();
var status = 1; var status = 1; // Some Handle This 1 - Generate IGR
var tableData = []; var tableData = [];
$('#tbleIGRAppend tr').each(function(index) { $('#tbleIGRAppend tr').each(function(index) {
var row = $(this); var row = $(this);