latest commit 20-05-2025
This commit is contained in:
parent
3de16bc920
commit
7195d6d56f
@ -614,17 +614,17 @@ class Inwardgateregister extends BaseController
|
|||||||
|
|
||||||
if(!$IsThisOpenOrderPO && $PreIGRStatus == "ST027"){
|
if(!$IsThisOpenOrderPO && $PreIGRStatus == "ST027"){
|
||||||
|
|
||||||
// $quantitiesReceived = $this->inwardgateregister_model->getOldIgrReceivedQty($MaterialCode,$PONO_array);
|
$currentPoRecievedQuantity = $this->inwardgateregister_model->getCurrentPOreceivedQty($MaterialCode,$PONO);
|
||||||
|
|
||||||
$oldQuantityReceived = 0 ;
|
$currentIgrPreviousQty = 0 ;
|
||||||
|
|
||||||
$newQuantitiesReceived = $QuantityAsPerInvoice;
|
$currentIgrCurrentQty = $QuantityAsPerInvoice;
|
||||||
|
|
||||||
$changeInQuantities = $newQuantitiesReceived - $oldQuantityReceived;
|
$changeInQty = $currentIgrCurrentQty - $currentIgrPreviousQty;
|
||||||
|
|
||||||
$quantityToBeUpdated = $changeInQuantities;
|
$quantityToBeUpdated = $changeInQty;
|
||||||
|
|
||||||
$totalReceivedqty = $oldQuantityReceived + $quantityToBeUpdated;
|
$totalReceivedqty = $currentPoRecievedQuantity + $quantityToBeUpdated;
|
||||||
|
|
||||||
$POLineItem = array('ReceivedQuantity' => $totalReceivedqty, 'Status' => $ItemStatus, 'UpdateBY' => $CreatedBy, 'UpdatedOn' => $createddt);
|
$POLineItem = array('ReceivedQuantity' => $totalReceivedqty, 'Status' => $ItemStatus, 'UpdateBY' => $CreatedBy, 'UpdatedOn' => $createddt);
|
||||||
|
|
||||||
@ -975,18 +975,17 @@ function viewIGRDetails()
|
|||||||
# : updated the polineitem Qty
|
# : updated the polineitem Qty
|
||||||
if(!$IsThisOpenOrderPO && $PreIGRStatus == "ST027"){
|
if(!$IsThisOpenOrderPO && $PreIGRStatus == "ST027"){
|
||||||
|
|
||||||
|
$currentPoRecievedQuantity = $this->inwardgateregister_model->getCurrentPOreceivedQty($MaterialCode,$PONo);
|
||||||
|
|
||||||
// $quantitiesReceived = $this->inwardgateregister_model->getOldIgrReceivedQty($MaterialCode,$PONO_array);d
|
$currentIgrPreviousQty = $this->inwardgateregister_model->currentIgrPreviousQty($IGRNo , $MaterialCode);
|
||||||
|
|
||||||
$oldQuantityReceived = $this->inwardgateregister_model->getOldIgrReceivedIndividualQty($IGRNo , $MaterialCode );
|
$currentIgrCurrentQty = $quantityAsPerInvoice;
|
||||||
|
|
||||||
$newQuantitiesReceived = $quantityAsPerInvoice;
|
$changeInQty = $currentIgrCurrentQty - $currentIgrPreviousQty;
|
||||||
|
|
||||||
$changeInQuantities = $newQuantitiesReceived - $oldQuantityReceived;
|
$quantityToBeUpdated = $changeInQty;
|
||||||
|
|
||||||
$quantityToBeUpdated = $oldQuantityReceived + $changeInQuantities;
|
$totalReceivedqty = $currentPoRecievedQuantity + $quantityToBeUpdated;
|
||||||
|
|
||||||
$totalReceivedqty = $quantityToBeUpdated;
|
|
||||||
|
|
||||||
$POLineItem = array('ReceivedQuantity' => $totalReceivedqty);
|
$POLineItem = array('ReceivedQuantity' => $totalReceivedqty);
|
||||||
|
|
||||||
@ -1220,19 +1219,22 @@ function viewIGRDetails()
|
|||||||
|
|
||||||
if ($MaterialCode != '') {
|
if ($MaterialCode != '') {
|
||||||
|
|
||||||
$PolineitemQty = $this->inwardgateregister_model->getPOLineItemReceivedQty($PONo, $MaterialCode);
|
$currentPoRecievedQuantity = $this->inwardgateregister_model->getCurrentPOreceivedQty($MaterialCode,$PONo);
|
||||||
$ReceivedQuantity = 0.00;
|
|
||||||
if (count($PolineitemQty) > 0) {
|
$currentIgrPreviousQty = $this->inwardgateregister_model->currentIgrPreviousQty($IGRNo , $MaterialCode);
|
||||||
foreach ($PolineitemQty as $key) {
|
|
||||||
$ReceivedQuantity = $key->ReceivedQuantity;
|
$currentIgrCurrentQty = 0 ;
|
||||||
}
|
|
||||||
}
|
$changeInQty = $currentIgrCurrentQty - $currentIgrPreviousQty;
|
||||||
|
|
||||||
|
$quantityToBeUpdated = $changeInQty;
|
||||||
|
|
||||||
|
$totalReceivedqty = $currentPoRecievedQuantity + $quantityToBeUpdated;
|
||||||
|
|
||||||
|
$POLineItem = array('ReceivedQuantity' => $totalReceivedqty );
|
||||||
|
|
||||||
$totalReceivedqty = ($ReceivedQuantity-$quantityAsPerInvoice);
|
|
||||||
$POLineItem = array('ReceivedQuantity' => ($totalReceivedqty > 0) ? $totalReceivedqty : 0 );
|
|
||||||
$this->inwardgateregister_model->UpdatePOLineItem($POLineItem, $PONo, $MaterialCode);
|
$this->inwardgateregister_model->UpdatePOLineItem($POLineItem, $PONo, $MaterialCode);
|
||||||
$POMasterStatus = array('Status' => PO_RELEASED);
|
|
||||||
$this->inwardgateregister_model->UpdatePOMasterStatus($PONo, $POMasterStatus);
|
|
||||||
}
|
}
|
||||||
|
|
||||||
# Step 5.3 : Updating IGRlineitem
|
# Step 5.3 : Updating IGRlineitem
|
||||||
|
|||||||
@ -754,26 +754,24 @@ class Inwardgateregister_model extends Model
|
|||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
function getOldIgrReceivedQty( $MaterialCode, $PONO_array) {
|
function getCurrentPOreceivedQty( $MaterialCode, $PONO) {
|
||||||
|
|
||||||
|
|
||||||
$builder = $this->db->table('t_igr_details tigrd')
|
$builder = $this->db->table('t_purchaseorder_lineitem tpol')
|
||||||
->selectSum('tigrd.QuantityAsPerInvoice')
|
->selectSum('tpol.ReceivedQuantity')
|
||||||
->join('t_igr_master tigrm', 'tigrm.IGRNO = tigrd.IGRNO', 'inner')
|
->where('tpol.PONO',$PONO)
|
||||||
->whereIn('tigrm.PONO', $PONO_array)
|
->where('tpol.MaterialCode', $MaterialCode)
|
||||||
->where('tigrm.IGRStatus', 'ST027')
|
->groupBy('PONO,MaterialCode');
|
||||||
->where('tigrd.MaterialCode', $MaterialCode)
|
|
||||||
->groupBy('tigrd.MaterialCode');
|
|
||||||
|
|
||||||
$result = $builder->get()->getRow();
|
$result = $builder->get()->getRow();
|
||||||
|
|
||||||
log_message('info', 'getOldIgrReceivedQty Second Query: ' . $this->db->getLastQuery()->getQuery());
|
log_message('info', 'getCurrentPOreceivedQty Query: ' . $this->db->getLastQuery()->getQuery());
|
||||||
|
|
||||||
// Return the sum or 0 if no result from the second query
|
// Return the sum or 0 if no result from the second query
|
||||||
return $result ? $result->QuantityAsPerInvoice : 0;
|
return $result ? $result->ReceivedQuantity : 0;
|
||||||
}
|
}
|
||||||
|
|
||||||
function getOldIgrReceivedIndividualQty($IGRNo , $MaterialCode){
|
function currentIgrPreviousQty($IGRNo , $MaterialCode){
|
||||||
|
|
||||||
$builder = $this->db->table('t_igr_details tigrd')
|
$builder = $this->db->table('t_igr_details tigrd')
|
||||||
->selectSum('tigrd.QuantityAsPerInvoice')
|
->selectSum('tigrd.QuantityAsPerInvoice')
|
||||||
@ -784,7 +782,7 @@ class Inwardgateregister_model extends Model
|
|||||||
|
|
||||||
$result = $builder->get()->getRow();
|
$result = $builder->get()->getRow();
|
||||||
|
|
||||||
log_message('info', 'getOldIgrReceivedIndividualQty Query: ' . $this->db->getLastQuery()->getQuery());
|
log_message('info', 'currentIgrPreviousQty Query: ' . $this->db->getLastQuery()->getQuery());
|
||||||
|
|
||||||
// Return the sum or 0 if no result from the second query
|
// Return the sum or 0 if no result from the second query
|
||||||
return $result ? $result->QuantityAsPerInvoice : 0;
|
return $result ? $result->QuantityAsPerInvoice : 0;
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user