@things-factory/operato-pms 4.3.591 → 4.3.601

package/server/utils/transaction-util.ts

@@ -80,7 +80,7 @@ export async function updateTransactionHistory(
 
       await transactionRepo.update(
         { id: existingTransactionRecord.id },
-        { fieldBunches: totalBunches, updater: user, updatedAt: new Date() }
+        { fieldBunches: totalBunches, transactionDate, block, updater: user, updatedAt: new Date() }
       )
   }
 
@@ -104,70 +104,50 @@ export async function generateRampBlockHistories(
   dailyDispatch?: DailyDispatch,
   trxMgr?: EntityManager
 ): Promise<RampBlockHistory> {
-  console.log(block, domain, ramp, user)
   const rampBlockHistoryRepo: Repository<RampBlockHistory> =
     trxMgr?.getRepository(RampBlockHistory) || getRepository(RampBlockHistory)
 
   if (!ramp?.id) throw new Error(`Can't find a matching ramp.`)
 
+  // Fetch the last ramp block history for the given block, ramp, and domain
   const lastRampBlockHistory: RampBlockHistory = await rampBlockHistoryRepo.findOne({
     where: { domain, ramp, block },
-    order: { seq: 'DESC' }
+    order: { createdAt: 'DESC' }
   })
 
-  let res: any
-
-  if (!lastRampBlockHistory) {
-    res = await rampBlockHistoryRepo
-      .createQueryBuilder()
-      .insert()
-      .into(RampBlockHistory)
-      .values([
-        {
-          transactionDate,
-          transactionType,
-          seq: 0,
-          domain,
-          block,
-          ramp,
-          weight: rampWeight,
-          previousWeight: 0,
-          currentWeight: rampWeight,
-          dailyDispatch,
-          deletedAt: deletedAt ? deletedAt : null,
-          creator: user,
-          updater: user
-        }
-      ])
-      .returning('*')
-      .execute()
-  } else {
-    const previousWeight: number = lastRampBlockHistory.currentWeight
-
-    res = await rampBlockHistoryRepo
-      .createQueryBuilder()
-      .insert()
-      .into(RampBlockHistory)
-      .values([
-        {
-          domain,
-          block,
-          ramp,
-          transactionType,
-          transactionDate,
-          weight: rampWeight,
-          previousWeight,
-          currentWeight: parseFloat((previousWeight + rampWeight).toFixed(4)),
-          creator: user,
-          updater: user,
-          seq: () =>
-            `(select seq from ramp_block_histories where ramp_id = '${ramp.id}' and block_id = '${block.id}' and domain_id = '${domain.id}' order by seq desc limit 1) + 1`
-        }
-      ])
-      .returning('*')
-      .execute()
-  }
-
+  // if (!lastRampBlockHistory) {
+  //   throw new Error(
+  //     `No opening quantity defined for block ${block.id} in ramp ${ramp.id}. Please set an opening quantity before creating dispatch records to avoid negative calculation in report.`
+  //   )
+  // }
+
+  const previousWeight: number = lastRampBlockHistory.currentWeight
+
+  const res: any = await rampBlockHistoryRepo
+    .createQueryBuilder()
+    .insert()
+    .into(RampBlockHistory)
+    .values([
+      {
+        domain,
+        block,
+        ramp,
+        transactionType,
+        transactionDate,
+        weight: rampWeight,
+        previousWeight,
+        currentWeight: parseFloat((previousWeight + rampWeight).toFixed(4)),
+        dailyDispatch, // Include dailyDispatch object
+        creator: user,
+        updater: user,
+        seq: () =>
+          `(select seq from ramp_block_histories where ramp_id = '${ramp.id}' and block_id = '${block.id}' and domain_id = '${domain.id}' order by seq desc limit 1) + 1`
+      }
+    ])
+    .returning('*')
+    .execute()
+
+  // Extract the newly created ramp block history
   let newRampBlockHistory: RampBlockHistory = res.generatedMaps[0]
 
   return newRampBlockHistory

package/translations/en.json

@@ -200,7 +200,7 @@
   "text.there_is_no_selected_items": "there is no selected items",
   "text.total_bunch_weight_should_be_positive": "total bunch weight should be positive",
   "text.total_bunches_loaded_should_be_positive": "total bunches loaded should be positive",
-  "text.total_no_of_bunches_should_be_positive": "total no of bunches should be positive",
+  "text.total_no_of_bunches_should_be_positive_and_whole_number": "total no of bunches should be positive and whole number",
   "text.total_tonnage_harvested_should_be_positive": "total tonnage harvested should be positive",
   "text.tracked_inventory_setting": "tracked inventory setting",
   "text.truck_is_not_selected": "truck not selected",

package/translations/ja.json

@@ -69,7 +69,7 @@
   "text.there_is_duplicated_staff_in_record": "there is duplicated staff in this record",
   "text.total_bunch_weight_should_be_positive": "total bunch weight should be positive",
   "text.total_bunches_loaded_should_be_positive": "total bunches loaded should be positive",
-  "text.total_no_of_bunches_should_be_positive": "total no of bunches should be positive",
+  "text.total_no_of_bunches_should_be_positive_and_whole_number": "total no of bunches should be positive and whole number",
   "text.total_tonnage_harvested_should_be_positive": "total tonnage harvested should be positive",
   "text.tracked_inventory_setting": "tracked inventory setting",
   "text.x_has_invalid_value": "{x} has invalid value",

package/translations/ko.json

@@ -69,7 +69,7 @@
   "text.there_is_duplicated_staff_in_record": "there is duplicated staff in this record",
   "text.total_bunch_weight_should_be_positive": "total bunch weight should be positive",
   "text.total_bunches_loaded_should_be_positive": "total bunches loaded should be positive",
-  "text.total_no_of_bunches_should_be_positive": "total no of bunches should be positive",
+  "text.total_no_of_bunches_should_be_positive_and_whole_number": "total no of bunches should be positive and whole number",
   "text.total_tonnage_harvested_should_be_positive": "total tonnage harvested should be positive",
   "text.tracked_inventory_setting": "tracked inventory setting",
   "text.x_has_invalid_value": "{x} has invalid value",

package/translations/ms.json

@@ -69,7 +69,7 @@
   "text.there_is_duplicated_staff_in_record": "there is duplicated staff in this record",
   "text.total_bunch_weight_should_be_positive": "total bunch weight should be positive",
   "text.total_bunches_loaded_should_be_positive": "total bunches loaded should be positive",
-  "text.total_no_of_bunches_should_be_positive": "total no of bunches should be positive",
+  "text.total_no_of_bunches_should_be_positive_and_whole_number": "total no of bunches should be positive and whole number",
   "text.total_tonnage_harvested_should_be_positive": "total tonnage harvested should be positive",
   "text.tracked_inventory_setting": "tracked inventory setting",
   "text.x_has_invalid_value": "{x} has invalid value",

package/translations/zh.json

@@ -69,7 +69,7 @@
   "text.there_is_duplicated_staff_in_record": "there is duplicated staff in this record",
   "text.total_bunch_weight_should_be_positive": "total bunch weight should be positive",
   "text.total_bunches_loaded_should_be_positive": "total bunches loaded should be positive",
-  "text.total_no_of_bunches_should_be_positive": "total no of bunches should be positive",
+  "text.total_no_of_bunches_should_be_positive_and_whole_number": "total no of bunches should be positive and whole number",
   "text.total_tonnage_harvested_should_be_positive": "total tonnage harvested should be positive",
   "text.tracked_inventory_setting": "tracked inventory setting",
   "text.x_has_invalid_value": "{x} has invalid value",