latest commit 20-05-2025

This commit is contained in:
vadivelJ96 2025-05-21 16:10:48 +05:30
parent 815914982c
commit 2ad54ee7d7
3 changed files with 36 additions and 36 deletions

View File

@ -945,23 +945,21 @@ 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){ if(!$IsThisOpenOrderPO && $PreIGRStatus){
$OldQuantityAsPerInvoice = $this->inwardgateregister_model->getOldIgrReceivedQty($IGRNo, $igrItemNo,$MaterialCode);
if ($MaterialCode != '' && ((int)$quantityAsPerInvoice != (int)$OldQuantityAsPerInvoice)) { $quantitiesReceived = $this->inwardgateregister_model->getOldIgrReceivedQty($MaterialCode,$PONo);
$PolineitemQty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONo, $MaterialCode); $newQuantitiesReceived = $quantityAsPerInvoice;
$POReceivedQuantity = 0.00;
if (count($PolineitemQty) > 0) { $changeInQuantities = $newQuantitiesReceived - $quantitiesReceived;
foreach ($PolineitemQty as $key) {
$POReceivedQuantity = $key->ReceivedQuantity; $quantityToBeUpdated = $quantitiesReceived + $changeInQuantities;
}
} $totalReceivedqty = $quantityToBeUpdated;
$totalReceivedqty = ($POReceivedQuantity - $OldQuantityAsPerInvoice) + $quantityAsPerInvoice;
$POLineItem = array('ReceivedQuantity' => $totalReceivedqty); $POLineItem = array('ReceivedQuantity' => $totalReceivedqty);
$this->inwardgateregister_model->UpdatePOLineItem($POLineItem, $PONo, $MaterialCode); $this->inwardgateregister_model->UpdatePOLineItem($POLineItem, $PONo, $MaterialCode);
}
} }

View File

@ -2295,12 +2295,12 @@ where po.Status != 'ST030' and po.Status = 'ST026' and po.IsOpenOrder = 1";
pl.Quantity as quantity, pl.Quantity as quantity,
pl.ReceivedQuantity as received, pl.ReceivedQuantity as received,
(pl.Quantity - pl.ReceivedQuantity) as pending,po.PODate AS raw_date (pl.Quantity - pl.ReceivedQuantity) as pending,po.PODate AS raw_date
from t_purchaseorder_lineitem pl from t_purchaseorder_lineitem pl
join t_purchaseorder_master po on po.PONO = pl.PONO 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' and (po.IsOpenOrder IS NULL OR po.IsOpenOrder = 0) where po.Status != 'ST030' and po.Status = 'ST026' and (po.IsOpenOrder IS NULL OR po.IsOpenOrder = 0)
"; ";
if ($cname != '') { if ($cname != '') {

View File

@ -721,20 +721,22 @@ class Inwardgateregister_model extends Model
return $result; return $result;
} }
function getOldIgrReceivedQty($IGRitemNo,$IGR,$MaterialCode){ function getOldIgrReceivedQty( $MaterialCode, $PONO) {
$builder = $this->db->table('t_igr_details')
->select('QuantityAsPerInvoice') $builder = $this->db->table('t_igr_details tigrd')
->where('IGRItemNo', $IGRitemNo) ->selectSum('tigrd.QuantityAsPerInvoice')
->where('MaterialCode', $MaterialCode) ->join('t_igr_master tigrm','tigrm.IGRNO = tigrd.IGRNO AND tigrm.PONO = ' . $this->db->escape($PONO),'inner')
->where('IGRNO', $IGR); ->where('tigrm.IGRStatus', 'ST027')
->where('tigrd.MaterialCode', $MaterialCode)
->groupBy('tigrd.MaterialCode');
$query = $builder->get()->getRow(); $query = $builder->get()->getRow();
$QuantityAsPerInvoice = $query ? $query->QuantityAsPerInvoice : 0; return $query ? $query->QuantityAsPerInvoice : 0;
return $QuantityAsPerInvoice;
} }
function GetMRIROutQty($MRIRNO, $MaterialCode) function GetMRIROutQty($MRIRNO, $MaterialCode)
{ {