diff --git a/app/Models/BagStockDetailsModel.php b/app/Models/BagStockDetailsModel.php index fa7aa260..4a4e9993 100644 --- a/app/Models/BagStockDetailsModel.php +++ b/app/Models/BagStockDetailsModel.php @@ -7,25 +7,19 @@ use CodeIgniter\Model; class BagStockDetailsModel extends Model { protected $table = 't_bagStockDetails'; - protected $primaryKey = 'id'; - protected $useAutoIncrement = true; protected $returnType = 'array'; protected $useSoftDeletes = false; protected $protectFields = true; - protected $allowedFields = []; + protected $allowedFields = [ + 'date', 'materialCode', 'customer', 'opening', 'receipt', 'used', 'balanceStock' + ]; protected bool $allowEmptyInserts = false; protected bool $updateOnlyChanged = true; - protected array $casts = []; - protected array $castHandlers = []; - // Dates protected $useTimestamps = false; protected $dateFormat = 'datetime'; - protected $createdField = 'created_at'; - protected $updatedField = 'updated_at'; - protected $deletedField = 'deleted_at'; // Validation protected $validationRules = []; @@ -33,14 +27,35 @@ class BagStockDetailsModel extends Model protected $skipValidation = false; protected $cleanValidationRules = true; - // Callbacks - protected $allowCallbacks = true; - protected $beforeInsert = []; - protected $afterInsert = []; - protected $beforeUpdate = []; - protected $afterUpdate = []; - protected $beforeFind = []; - protected $afterFind = []; - protected $beforeDelete = []; - protected $afterDelete = []; + /** + * Custom method to handle composite key updates. + * @param array $data Array of records to be updated in bulk. + * @return bool + */ + public function updateBatchWithCompositeKey(array $data) + { + $db = \Config\Database::connect(); + $db->transBegin(); + + foreach ($data as $record) { + $db->table($this->table) + ->where('date', $record['date']) + ->where('materialCode', $record['materialCode']) + ->update([ + 'customer' => $record['customer'], + 'opening' => $record['opening'], + 'receipt' => $record['receipt'], + 'used' => $record['used'], + 'balanceStock' => $record['balanceStock'] + ]); + } + + if ($db->transStatus() === FALSE) { + $db->transRollback(); + return false; + } else { + $db->transCommit(); + return true; + } + } } diff --git a/app/Models/Inwardgateregister_model.php b/app/Models/Inwardgateregister_model.php index 03cc1bde..ee992195 100755 --- a/app/Models/Inwardgateregister_model.php +++ b/app/Models/Inwardgateregister_model.php @@ -378,12 +378,12 @@ class Inwardgateregister_model extends Model ->join('t_transporter trans', 'igr.TransporterId = trans.id' , 'left') ->join('t_igr_details IGRD', 'igr.IGRNo = IGRD.IGRNo') ->where('igr.IGRStatus !=', MRIR_CREATED) - ->where('igr.CreatedDate >=',"$fromDate") - ->where('igr.CreatedDate <=', "$toDate") + ->where('Date(igr.CreatedDate) >=',"$fromDate") + ->where('Date(igr.CreatedDate) <=', "$toDate") ->groupBy('igr.IGRNo') - ->orderBy('igr.CreatedDate', 'desc'); - $query = $builder->get(); - $result = $query->getResult(); + ->orderBy('igr.CreatedDate', 'desc'); + $query = $builder->get(); + $result = $query->getResult(); $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') diff --git a/app/Models/Purchaseorder_model.php b/app/Models/Purchaseorder_model.php index cea45580..5f33aeca 100755 --- a/app/Models/Purchaseorder_model.php +++ b/app/Models/Purchaseorder_model.php @@ -403,8 +403,8 @@ mstr.CourierNo,pom.Status,pom.POType') //,bill.BillNo,bill.FilePath, // $builder->orderBy('POMast.Status !=',PO_AMENDED); } - $builder->where('POMast.CreatedDate >=', $fromDate) - ->where('POMast.CreatedDate <=', $toDate); + $builder->where('Date(POMast.CreatedDate) >=', $fromDate) + ->where('Date(POMast.CreatedDate) <=', $toDate); $builder->orderBy('POMast.CreatedDate', 'desc'); diff --git a/app/Views/bagStockDetails.php b/app/Views/bagStockDetails.php index 943e0b8e..cfde7953 100644 --- a/app/Views/bagStockDetails.php +++ b/app/Views/bagStockDetails.php @@ -208,85 +208,108 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- Material

Customer

Date -
- customers -
info1info2info3info4
23-10-2024472-472472-472
- -
- + style="font-size: small;"> + + + - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + +
S.NO IGR No material material 1material 2
Customer + + + +
Date Date material customerOpeningReceiptUsedBalance StockDate material customerOpeningReceiptUsedBalance Stock
1 - data 2 -
23-10-202423-10-2024 material 1 customer 147211212-47223-10-2024 material 2 customer 247211212-472
24-10-202424-10-2024 material 1 customer 147211212-47224-10-2024 material 2 customer 247211212-472
- - -
+
@@ -322,9 +345,7 @@ //table to json function - var updateBagStockDetails = $("#bagStockDetailsTableId").tableToJSON(); - - updateBagStockDetails = JSON.stringify(incomingSilicaSandDetailsData); + var updateBagStockDetails = tableToJSON(); $('#loader').show(); $.ajax({ @@ -349,8 +370,42 @@ }); - - }); + + + \ No newline at end of file