@things-factory/operato-pms 4.3.591 → 4.3.601

package/dist-server/utils/transaction-util.js

@@ -38,7 +38,7 @@ async function updateTransactionHistory(block, domain, ramp, refActionID, refRec
             });
             if (!existingTransactionRecord)
                 throw new Error('Oops! Could not find current harvest record');
-            await transactionRepo.update({ id: existingTransactionRecord.id }, { fieldBunches: totalBunches, updater: user, updatedAt: new Date() });
+            await transactionRepo.update({ id: existingTransactionRecord.id }, { fieldBunches: totalBunches, transactionDate, block, updater: user, updatedAt: new Date() });
     }
     return true;
 }
@@ -48,64 +48,43 @@ exports.updateTransactionHistory = updateTransactionHistory;
  * seq will be calculated based on number of records for one specific plantation inventory
  */
 async function generateRampBlockHistories(block, domain, ramp, transactionType, transactionDate, rampWeight, user, deletedAt, dailyDispatch, trxMgr) {
-    console.log(block, domain, ramp, user);
     const rampBlockHistoryRepo = (trxMgr === null || trxMgr === void 0 ? void 0 : trxMgr.getRepository(entities_1.RampBlockHistory)) || (0, typeorm_1.getRepository)(entities_1.RampBlockHistory);
     if (!(ramp === null || ramp === void 0 ? void 0 : 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 = await rampBlockHistoryRepo.findOne({
         where: { domain, ramp, block },
-        order: { seq: 'DESC' }
+        order: { createdAt: 'DESC' }
     });
-    let res;
-    if (!lastRampBlockHistory) {
-        res = await rampBlockHistoryRepo
-            .createQueryBuilder()
-            .insert()
-            .into(entities_1.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 = lastRampBlockHistory.currentWeight;
-        res = await rampBlockHistoryRepo
-            .createQueryBuilder()
-            .insert()
-            .into(entities_1.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 = lastRampBlockHistory.currentWeight;
+    const res = await rampBlockHistoryRepo
+        .createQueryBuilder()
+        .insert()
+        .into(entities_1.RampBlockHistory)
+        .values([
+        {
+            domain,
+            block,
+            ramp,
+            transactionType,
+            transactionDate,
+            weight: rampWeight,
+            previousWeight,
+            currentWeight: parseFloat((previousWeight + rampWeight).toFixed(4)),
+            dailyDispatch,
+            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 = res.generatedMaps[0];
     return newRampBlockHistory;
 }

package/dist-server/utils/transaction-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"transaction-util.js","sourceRoot":"","sources":["../../server/utils/transaction-util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"transaction-util.js","sourceRoot":"","sources":["../../server/utils/transaction-util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/operato-pms",
-  "version": "4.3.591",
+  "version": "4.3.601",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -55,7 +55,7 @@
     "@operato/scene-wheel-sorter": "^0.1.8",
     "@things-factory/apptool-ui": "^4.3.591",
     "@things-factory/auth-ui": "^4.3.591",
-    "@things-factory/biz-base": "^4.3.591",
+    "@things-factory/biz-base": "^4.3.595",
     "@things-factory/board-service": "^4.3.591",
     "@things-factory/board-ui": "^4.3.591",
     "@things-factory/code-ui": "^4.3.591",
@@ -95,5 +95,5 @@
   "devDependencies": {
     "@things-factory/builder": "^4.3.591"
   },
-  "gitHead": "b8528f316a234ad95d0f285d5ade988b44f1195f"
+  "gitHead": "d7949f19d5fb44db88037b9e4a4167d49121954d"
 }

package/server/entities/daily-dispatch.ts

@@ -55,8 +55,8 @@ export class DailyDispatch {
   @ManyToOne(type => Organization, { nullable: true })
   dispatchTo: Organization
 
-  @Column({ nullable: true })
-  dispatchAt: Date
+  @Column({ type: 'timestamp', nullable: true })
+  dispatchAt: Date | string
 
   @Column({ nullable: true })
   dispatchDate: string

package/server/entities/ramp-block-history.ts

@@ -4,11 +4,7 @@ import { Column, CreateDateColumn, Entity, Index, ManyToOne, PrimaryGeneratedCol
 import { Block, Ramp, PlantationInventory, DailyDispatch } from '../entities'
 
 @Entity()
-@Index(
-  'ix_ramp_block_history_0',
-  (rampBlockHistory: RampBlockHistory) => [rampBlockHistory.id],
-  { unique: true }
-)
+@Index('ix_ramp_block_history_0', (rampBlockHistory: RampBlockHistory) => [rampBlockHistory.id], { unique: true })
 export class RampBlockHistory {
   @PrimaryGeneratedColumn('uuid')
   id: string
@@ -41,6 +37,7 @@ export class RampBlockHistory {
    * transactionType
    * LOADING
    * DISPATCH
+   * REVERSE_DISPATCH
    */
   @Column()
   transactionType: string

package/server/graphql/resolvers/daily-dispatch/delete-daily-dispatch.ts

@@ -1,14 +1,18 @@
 import { Domain } from '@things-factory/shell'
+import { User } from '@things-factory/auth-base'
 import { EntityManager, IsNull } from 'typeorm'
-import { DailyDispatch, DailyDispatchDetail } from '../../../entities'
+import { DailyDispatch, DailyDispatchDetail, RecordTransaction, RampBlockHistory } from '../../../entities'
 
 export const deleteDailyDispatch = {
   async deleteDailyDispatch(_: any, { name }, context: any) {
-    const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state
+    const { user, domain, tx }: { user: User; domain: Domain; tx: EntityManager } = context.state
+
+    // Step 1: Fetch the daily dispatch record
     const dailyDispatch = await tx
       .getRepository(DailyDispatch)
       .findOneOrFail({ where: { name, deletedAt: IsNull() }, relations: ['dailyDispatchDetails'] })
 
+    // Step 2: Soft delete the daily dispatch record
     await tx.getRepository(DailyDispatch).update(
       {
         domain,
@@ -19,6 +23,7 @@ export const deleteDailyDispatch = {
       }
     )
 
+    // Step 3: Soft delete related daily dispatch details
     await tx.getRepository(DailyDispatchDetail).update(
       {
         domain,
@@ -28,5 +33,67 @@ export const deleteDailyDispatch = {
         deletedAt: new Date()
       }
     )
+
+    // Step 4: Soft delete related record transactions
+    await tx.getRepository(RecordTransaction).update(
+      {
+        domain,
+        refActionID: dailyDispatch.id
+      },
+      {
+        deletedAt: new Date()
+      }
+    )
+
+    // Step 5: Reverse the effects of the dispatch in ramp_block_histories
+    await reverseRampBlockHistories(domain, user, dailyDispatch, tx)
+  }
+}
+
+// Helper function to reverse ramp block histories
+async function reverseRampBlockHistories(
+  domain: Domain,
+  user: User,
+  dailyDispatch: DailyDispatch,
+  tx?: EntityManager
+): Promise<void> {
+  const rampBlockHistoryRepo = tx.getRepository(RampBlockHistory)
+
+  // Fetch all ramp block histories related to this dispatch
+  const rampBlockHistories = await rampBlockHistoryRepo.find({
+    where: {
+      domain,
+      dailyDispatch: dailyDispatch.id,
+      transactionType: 'DISPATCH'
+    },
+    relations: ['ramp', 'block', 'domain']
+  })
+
+  // Reverse the effects of each ramp block history record
+  for (const history of rampBlockHistories) {
+    // Create a new ramp block history record to reverse the dispatch
+    await rampBlockHistoryRepo.save({
+      weight: -history.weight, // Reverse the weight (e.g., if dispatch was -100, reversal will be +100)
+      previousWeight: history.previousWeight,
+      currentWeight: parseFloat((history.previousWeight + -history.weight).toFixed(4)),
+      transactionType: 'REVERSE_DISPATCH', // Use a new transaction type for reversals
+      transactionDate: dailyDispatch.dispatchDate, // Use the current date for the reversal
+      domain: history.domain,
+      block: history.block,
+      ramp: history.ramp,
+      dailyDispatch,
+      creator: user,
+      updater: user
+    })
+
+    // Soft delete the original ramp block history record
+    await rampBlockHistoryRepo.update(
+      {
+        id: history.id
+      },
+      {
+        deletedAt: new Date()
+      }
+    )
   }
 }