From 06bc75aa2f566898c5ac12ed45352b2b09979407 Mon Sep 17 00:00:00 2001 From: vadivel J Date: Mon, 28 Oct 2024 18:17:40 +0530 Subject: [PATCH 1/3] bag stock module table to json conversion done --- app/Views/bagStockDetails.php | 193 ++++++++++++++++++++++------------ 1 file changed, 125 insertions(+), 68 deletions(-) diff --git a/app/Views/bagStockDetails.php b/app/Views/bagStockDetails.php index 943e0b8e..f312d388 100644 --- a/app/Views/bagStockDetails.php +++ b/app/Views/bagStockDetails.php @@ -208,85 +208,105 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - -
- 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
23-10-2024Date material 1 customer 147211212-472Date material 1 customer 147211212-472
- - -
+
@@ -349,8 +369,45 @@ }); - - }); + + + \ No newline at end of file From 1764388a1b849e0314e18e898b1e688d8bd9717c Mon Sep 17 00:00:00 2001 From: vadivelJ96 Date: Mon, 28 Oct 2024 23:43:17 +0530 Subject: [PATCH 2/3] 28/10/2024 vadivel J --- app/Models/BagStockDetailsModel.php | 53 ++++++++++++++++++----------- app/Views/bagStockDetails.php | 38 ++++++++++----------- 2 files changed, 52 insertions(+), 39 deletions(-) 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/Views/bagStockDetails.php b/app/Views/bagStockDetails.php index f312d388..cfde7953 100644 --- a/app/Views/bagStockDetails.php +++ b/app/Views/bagStockDetails.php @@ -218,6 +218,7 @@ material + material 1 material 2 @@ -226,6 +227,7 @@ Customer + @@ -239,6 +241,7 @@ Date + Date material customer @@ -267,38 +270,38 @@ 23-10-2024 material 1 customer 1 - 472 - 11212 - - 472 + 11212 + - + 472 23-10-2024 material 2 customer 2 472 11212 - - + - 472 - 23-10-2024 - Date + 24-10-2024 + 24-10-2024 material 1 customer 1 472 11212 - - + - 472 - Date - material 1 - customer 1 + 24-10-2024 + material 2 + customer 2 472 11212 - - + - 472 @@ -342,9 +345,7 @@ //table to json function - var updateBagStockDetails = $("#bagStockDetailsTableId").tableToJSON(); - - updateBagStockDetails = JSON.stringify(incomingSilicaSandDetailsData); + var updateBagStockDetails = tableToJSON(); $('#loader').show(); $.ajax({ @@ -391,8 +392,8 @@ material: rowCells.eq(i+1).text().trim(), customer: rowCells.eq(i+2).text().trim(), opening: rowCells.eq(i+3).text().trim(), - receipt: rowCells.eq(i + 4).text().trim(), - used: rowCells.eq(i + 5).text().trim(), + receipt: rowCells.eq(i+4).text().trim(), + used: rowCells.eq(i+5).text().trim(), balanceStock: rowCells.eq(i + 6).text().trim() }; @@ -406,8 +407,5 @@ console.log(tableToJson()); - $('#saveId').on('click', function() { - const jsonResult = tableToJson(); - console.log(jsonResult); - }); + \ No newline at end of file From 71fdcd85120b020fb49c31f736da42b6324d46f4 Mon Sep 17 00:00:00 2001 From: vadivel J Date: Tue, 29 Oct 2024 09:48:06 +0530 Subject: [PATCH 3/3] changes in listing order in igr listing, purchase order listing -j vadivel --- app/Models/Inwardgateregister_model.php | 10 +++++----- app/Models/Purchaseorder_model.php | 4 ++-- 2 files changed, 7 insertions(+), 7 deletions(-) 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');