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

changes in listing order in igr listing, purchase order listing -j vadivel

Browse Source
This commit is contained in:
vadivel J 2024-10-29 09:48:06 +05:30
parent 1764388a1b
commit 71fdcd8512
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
app/Models/Inwardgateregister_model.php
View File

@ -378,12 +378,12 @@ class Inwardgateregister_model extends Model
->join('t_transporter trans', 'igr.TransporterId = trans.id' , 'left') ->join('t_transporter trans', 'igr.TransporterId = trans.id' , 'left')
->join('t_igr_details IGRD', 'igr.IGRNo = IGRD.IGRNo') ->join('t_igr_details IGRD', 'igr.IGRNo = IGRD.IGRNo')
->where('igr.IGRStatus !=', MRIR_CREATED) ->where('igr.IGRStatus !=', MRIR_CREATED)
->where('igr.CreatedDate >=',"$fromDate") ->where('Date(igr.CreatedDate) >=',"$fromDate")
->where('igr.CreatedDate <=', "$toDate") ->where('Date(igr.CreatedDate) <=', "$toDate")
->groupBy('igr.IGRNo') ->groupBy('igr.IGRNo')
->orderBy('igr.CreatedDate', 'desc'); ->orderBy('igr.CreatedDate', 'desc');
$query = $builder->get(); $query = $builder->get();
$result = $query->getResult(); $result = $query->getResult();
$builder2 = $this->db->table('t_igr_details igr_details') $builder2 = $this->db->table('t_igr_details igr_details')
->select('igr.*,PO.IsOpenOrder,PO.DeliveryDate,sup.SupplierName,PO.POType,trans.name as TransporterName,item.MaterialName, igr_details.QuantityAsPerInvoice as ReceivedQuantity , igr_details.NetWeight as NetWeight') ->select('igr.*,PO.IsOpenOrder,PO.DeliveryDate,sup.SupplierName,PO.POType,trans.name as TransporterName,item.MaterialName, igr_details.QuantityAsPerInvoice as ReceivedQuantity , igr_details.NetWeight as NetWeight')

4
app/Models/Purchaseorder_model.php
View File

@ -403,8 +403,8 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath,
// $builder->orderBy('POMast.Status !=',PO_AMENDED); // $builder->orderBy('POMast.Status !=',PO_AMENDED);
} }
$builder->where('POMast.CreatedDate >=', $fromDate) $builder->where('Date(POMast.CreatedDate) >=', $fromDate)
->where('POMast.CreatedDate <=', $toDate); ->where('Date(POMast.CreatedDate) <=', $toDate);
$builder->orderBy('POMast.CreatedDate', 'desc'); $builder->orderBy('POMast.CreatedDate', 'desc');