@things-factory/operato-pms 4.3.595 → 4.3.609

package/client/pages/harvesting/harvesting-create-record.js

@@ -232,8 +232,11 @@ class HarvestingCreateRecord extends localize(i18next)(PageView) {
       const changedColumn = event.detail.column.name
       let { totalBunchHarvested, totalTonnageHarvested } = changeRecord
 
-      if (changedColumn === 'totalBunchHarvested' && (!totalBunchHarvested || totalBunchHarvested < 0)) {
-        throw new Error(i18next.t('text.total_no_of_bunches_should_be_positive'))
+      if (changedColumn === 'totalBunchHarvested') {
+        // Check if the value is a positive integer
+        if (!totalBunchHarvested || totalBunchHarvested < 0 || !Number.isInteger(totalBunchHarvested)) {
+          throw new Error(i18next.t('text.total_no_of_bunches_should_be_positive_and_whole_number'))
+        }
       }
 
       if (changedColumn === 'totalTonnageHarvested' && totalTonnageHarvested < 0) {

package/client/pages/loading/edit-loading-record.js

@@ -370,6 +370,8 @@ class EditLoadingRecord extends localize(i18next)(PageView) {
         ramp: { id: record.ramp.id, name: record.ramp.name },
         totalBunchLoaded: Number(record?.totalBunchLoaded || 0),
         totalBunchWeight: Number(record.totalBunchWeight),
+        prevTotalBunchLoaded: Number(record.__origin__.totalBunchLoaded),
+        prevTotalBunchWeight: Number(record.__origin__.totalBunchWeight),
         remark: record?.remark ? record.remark : null
       }
 

package/client/pages/report/report-daily-ffb-dispatch-and-production.js

@@ -225,19 +225,19 @@ class ReportDailyFfbDispatchAndProduction extends connect(store)(localize(i18nex
             width: 130
           }
         }),
-        {
-          type: 'string',
-          name: 'unknown',
-          header: 'UNKNOWN',
-          record: { editable: false, align: 'center' },
-          imex: {
-            header: 'UNKNOWN',
-            key: 'unknown',
-            width: 30,
-            type: 'string'
-          },
-          width: 130
-        },
+        // {
+        //   type: 'string',
+        //   name: 'unknown',
+        //   header: 'UNKNOWN',
+        //   record: { editable: false, align: 'center' },
+        //   imex: {
+        //     header: 'UNKNOWN',
+        //     key: 'unknown',
+        //     width: 30,
+        //     type: 'string'
+        //   },
+        //   width: 130
+        // },
         {
           type: 'string',
           name: 'today',
@@ -314,15 +314,11 @@ class ReportDailyFfbDispatchAndProduction extends connect(store)(localize(i18nex
 
     const response = await client.query({
       query: gql`
-        query ramps($filters: [Filter], $pagination: Pagination) {
-          ramps(filters: $filters, pagination: $pagination) {
+        query blocks($filters: [Filter], $pagination: Pagination) {
+          blocks(filters: $filters, pagination: $pagination) {
             items {
               id
               name
-              block {
-                id
-                name
-              }
             }
           }
         }
@@ -331,11 +327,11 @@ class ReportDailyFfbDispatchAndProduction extends connect(store)(localize(i18nex
     })
 
     if (!response.errors) {
-      return response.data.ramps.items.reduce((acc, ramp) => {
-        if (!acc.find(itm => itm.id == ramp.block.id) && !ramp.block.deletedAt)
+      return response.data.blocks.items.reduce((acc, block) => {
+        if (!acc.find(itm => itm.id == block.id) && !block.deletedAt)
           acc.push({
-            id: ramp.block.id,
-            name: ramp.block.name
+            id: block.id,
+            name: block.name
           })
 
         return acc

package/dist-server/entities/daily-dispatch.js

@@ -66,8 +66,8 @@ __decorate([
     __metadata("design:type", entities_1.Organization)
 ], DailyDispatch.prototype, "dispatchTo", void 0);
 __decorate([
-    (0, typeorm_1.Column)({ nullable: true }),
-    __metadata("design:type", Date)
+    (0, typeorm_1.Column)({ type: 'timestamp', nullable: true }),
+    __metadata("design:type", Object)
 ], DailyDispatch.prototype, "dispatchAt", void 0);
 __decorate([
     (0, typeorm_1.Column)({ nullable: true }),

package/dist-server/entities/daily-dispatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"daily-dispatch.js","sourceRoot":"","sources":["../../server/entities/daily-dispatch.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,iDAA8C;AAE9C,0CAAyF;AAMlF,IAAM,aAAa,GAAnB,MAAM,aAAa;CAwEzB,CAAA;AAvEC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;yCACrB;AAEV;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;6CAAA;AAEd;IAAC,IAAA,gBAAM,GAAE;;2CACG;AAEZ;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACR;AAEnB;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,4BAAiB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACjD,4BAAiB;6CAAA;AAEzB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACL;AAEtB;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAClC,gBAAK;gDAAA;AAEhB;IAAC,IAAA,gBAAM,GAAE;;kDACU;AAEnB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DACC;AAE5B;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;0DACX;AAE3B;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,8BAAmB,EAAE,mBAAmB,CAAC,EAAE,CAAC,mBAAmB,CAAC,aAAa,CAAC;;2DACtD;AAE3C;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,uBAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACxC,uBAAY;iDAAA;AAExB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACf,IAAI;iDAAA;AAEhB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACP;AAGpB;IAAC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;;6CACV;AAGd;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACpC;AAElB;IAAC,IAAA,gBAAM,GAAE;;6CACK;AAEd;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChB,IAAI;gDAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;gDAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;gDAAA;AAEf;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;8CAAA;AAEb;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;8CAAA;AAvEF,aAAa;IAJzB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,qBAAqB,EAAE,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,EAAE;QACxG,MAAM,EAAE,IAAI;KACb,CAAC;GACW,aAAa,CAwEzB;AAxEY,sCAAa"}
+{"version":3,"file":"daily-dispatch.js","sourceRoot":"","sources":["../../server/entities/daily-dispatch.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,qCASgB;AAEhB,yDAAgD;AAChD,iDAA8C;AAE9C,0CAAyF;AAMlF,IAAM,aAAa,GAAnB,MAAM,aAAa;CAwEzB,CAAA;AAvEC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;yCACrB;AAEV;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;6CAAA;AAEd;IAAC,IAAA,gBAAM,GAAE;;2CACG;AAEZ;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;kDACR;AAEnB;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,4BAAiB,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACjD,4BAAiB;6CAAA;AAEzB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;qDACL;AAEtB;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAClC,gBAAK;gDAAA;AAEhB;IAAC,IAAA,gBAAM,GAAE;;kDACU;AAEnB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;2DACC;AAE5B;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;0DACX;AAE3B;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,8BAAmB,EAAE,mBAAmB,CAAC,EAAE,CAAC,mBAAmB,CAAC,aAAa,CAAC;;2DACtD;AAE3C;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,uBAAY,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACxC,uBAAY;iDAAA;AAExB;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,WAAW,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACrB;AAEzB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;mDACP;AAGpB;IAAC,IAAA,gBAAM,EAAC,EAAE,OAAO,EAAE,EAAE,EAAE,CAAC;;6CACV;AAGd;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;iDACpC;AAElB;IAAC,IAAA,gBAAM,GAAE;;6CACK;AAEd;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChB,IAAI;gDAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;gDAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;gDAAA;AAEf;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;8CAAA;AAEb;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;8CAAA;AAvEF,aAAa;IAJzB,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,qBAAqB,EAAE,CAAC,aAA4B,EAAE,EAAE,CAAC,CAAC,aAAa,CAAC,MAAM,EAAE,aAAa,CAAC,EAAE,CAAC,EAAE;QACxG,MAAM,EAAE,IAAI;KACb,CAAC;GACW,aAAa,CAwEzB;AAxEY,sCAAa"}

package/dist-server/entities/ramp-block-history.js.map

@@ -1 +1 @@
-{"version":3,"file":"ramp-block-history.js","sourceRoot":"","sources":["../../server/entities/ramp-block-history.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yDAAgD;AAChD,iDAA8C;AAC9C,qCAAsH;AACtH,0CAA6E;AAQtE,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CAyD5B,CAAA;AAxDC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;4CACrB;AAEV;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CAChB;AAEX;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;gDAAA;AAEd;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACtC,gBAAK;+CAAA;AAEZ;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,eAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACtC,eAAI;8CAAA;AAEV;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAa,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACtC,wBAAa;uDAAA;AAE5B;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;gDACxB;AAEd;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;wDAChB;AAEtB;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;uDACjB;AAOrB;IAAC,IAAA,gBAAM,GAAE;;yDACc;AAEvB;IAAC,IAAA,gBAAM,GAAE;;yDACc;AAEvB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChB,IAAI;mDAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;mDAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;mDAAA;AAEf;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;iDAAA;AAEb;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;iDAAA;AAxDF,gBAAgB;IAN5B,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EACJ,yBAAyB,EACzB,CAAC,gBAAkC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,EAAE,CAAC,EAC7D,EAAE,MAAM,EAAE,IAAI,EAAE,CACjB;GACY,gBAAgB,CAyD5B;AAzDY,4CAAgB"}
+{"version":3,"file":"ramp-block-history.js","sourceRoot":"","sources":["../../server/entities/ramp-block-history.ts"],"names":[],"mappings":";;;;;;;;;;;;;AAAA,yDAAgD;AAChD,iDAA8C;AAC9C,qCAAsH;AACtH,0CAA6E;AAItE,IAAM,gBAAgB,GAAtB,MAAM,gBAAgB;CA0D5B,CAAA;AAzDC;IAAC,IAAA,gCAAsB,EAAC,MAAM,CAAC;;4CACrB;AAEV;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;;6CAChB;AAEX;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,cAAM,CAAC;kDAClB,cAAM,oBAAN,cAAM;gDAAA;AAEd;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAK,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACtC,gBAAK;+CAAA;AAEZ;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,eAAI,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACtC,eAAI;8CAAA;AAEV;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,wBAAa,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BACtC,wBAAa;uDAAA;AAE5B;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;gDACxB;AAEd;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;wDAChB;AAEtB;IAAC,IAAA,gBAAM,EAAC,EAAE,IAAI,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC;;uDACjB;AAQrB;IAAC,IAAA,gBAAM,GAAE;;yDACc;AAEvB;IAAC,IAAA,gBAAM,GAAE;;yDACc;AAEvB;IAAC,IAAA,gBAAM,EAAC,EAAE,QAAQ,EAAE,IAAI,EAAE,CAAC;8BAChB,IAAI;mDAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;mDAAA;AAEf;IAAC,IAAA,0BAAgB,GAAE;8BACR,IAAI;mDAAA;AAEf;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;iDAAA;AAEb;IAAC,IAAA,mBAAS,EAAC,IAAI,CAAC,EAAE,CAAC,gBAAI,EAAE;QACvB,QAAQ,EAAE,IAAI;KACf,CAAC;kDACO,gBAAI,oBAAJ,gBAAI;iDAAA;AAzDF,gBAAgB;IAF5B,IAAA,gBAAM,GAAE;IACR,IAAA,eAAK,EAAC,yBAAyB,EAAE,CAAC,gBAAkC,EAAE,EAAE,CAAC,CAAC,gBAAgB,CAAC,EAAE,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,CAAC;GACrG,gBAAgB,CA0D5B;AA1DY,4CAAgB"}

package/dist-server/graphql/resolvers/daily-dispatch/delete-daily-dispatch.js

@@ -5,22 +5,70 @@ const typeorm_1 = require("typeorm");
 const entities_1 = require("../../../entities");
 exports.deleteDailyDispatch = {
     async deleteDailyDispatch(_, { name }, context) {
-        const { domain, tx } = context.state;
+        const { user, domain, tx } = context.state;
+        // Step 1: Fetch the daily dispatch record
         const dailyDispatch = await tx
             .getRepository(entities_1.DailyDispatch)
             .findOneOrFail({ where: { name, deletedAt: (0, typeorm_1.IsNull)() }, relations: ['dailyDispatchDetails'] });
+        // Step 2: Soft delete the daily dispatch record
         await tx.getRepository(entities_1.DailyDispatch).update({
             domain,
             name
         }, {
             deletedAt: new Date()
         });
+        // Step 3: Soft delete related daily dispatch details
         await tx.getRepository(entities_1.DailyDispatchDetail).update({
             domain,
             dailyDispatch: dailyDispatch
         }, {
             deletedAt: new Date()
         });
+        // Step 4: Soft delete related record transactions
+        await tx.getRepository(entities_1.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, user, dailyDispatch, tx) {
+    const rampBlockHistoryRepo = tx.getRepository(entities_1.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,
+            previousWeight: history.previousWeight,
+            currentWeight: parseFloat((history.previousWeight + -history.weight).toFixed(4)),
+            transactionType: 'REVERSE_DISPATCH',
+            transactionDate: dailyDispatch.dispatchDate,
+            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()
+        });
+    }
+}
 //# sourceMappingURL=delete-daily-dispatch.js.map

package/dist-server/graphql/resolvers/daily-dispatch/delete-daily-dispatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"delete-daily-dispatch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/delete-daily-dispatch.ts"],"names":[],"mappings":";;;AACA,qCAA+C;AAC/C,gDAAsE;AAEzD,QAAA,mBAAmB,GAAG;IACjC,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QACtD,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,GAA0C,OAAO,CAAC,KAAK,CAAA;QAC3E,MAAM,aAAa,GAAG,MAAM,EAAE;aAC3B,aAAa,CAAC,wBAAa,CAAC;aAC5B,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE,EAAE,SAAS,EAAE,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAA;QAE/F,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAa,CAAC,CAAC,MAAM,CAC1C;YACE,MAAM;YACN,IAAI;SACL,EACD;YACE,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,CACF,CAAA;QAED,MAAM,EAAE,CAAC,aAAa,CAAC,8BAAmB,CAAC,CAAC,MAAM,CAChD;YACE,MAAM;YACN,aAAa,EAAE,aAAa;SAC7B,EACD;YACE,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,CACF,CAAA;IACH,CAAC;CACF,CAAA"}
+{"version":3,"file":"delete-daily-dispatch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/delete-daily-dispatch.ts"],"names":[],"mappings":";;;AAEA,qCAA+C;AAC/C,gDAA2G;AAE9F,QAAA,mBAAmB,GAAG;IACjC,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,EAAE,OAAY;QACtD,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,EAAE,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,0CAA0C;QAC1C,MAAM,aAAa,GAAG,MAAM,EAAE;aAC3B,aAAa,CAAC,wBAAa,CAAC;aAC5B,aAAa,CAAC,EAAE,KAAK,EAAE,EAAE,IAAI,EAAE,SAAS,EAAE,IAAA,gBAAM,GAAE,EAAE,EAAE,SAAS,EAAE,CAAC,sBAAsB,CAAC,EAAE,CAAC,CAAA;QAE/F,gDAAgD;QAChD,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAa,CAAC,CAAC,MAAM,CAC1C;YACE,MAAM;YACN,IAAI;SACL,EACD;YACE,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,CACF,CAAA;QAED,qDAAqD;QACrD,MAAM,EAAE,CAAC,aAAa,CAAC,8BAAmB,CAAC,CAAC,MAAM,CAChD;YACE,MAAM;YACN,aAAa,EAAE,aAAa;SAC7B,EACD;YACE,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,CACF,CAAA;QAED,kDAAkD;QAClD,MAAM,EAAE,CAAC,aAAa,CAAC,4BAAiB,CAAC,CAAC,MAAM,CAC9C;YACE,MAAM;YACN,WAAW,EAAE,aAAa,CAAC,EAAE;SAC9B,EACD;YACE,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,CACF,CAAA;QAED,sEAAsE;QACtE,MAAM,yBAAyB,CAAC,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,EAAE,CAAC,CAAA;IAClE,CAAC;CACF,CAAA;AAED,kDAAkD;AAClD,KAAK,UAAU,yBAAyB,CACtC,MAAc,EACd,IAAU,EACV,aAA4B,EAC5B,EAAkB;IAElB,MAAM,oBAAoB,GAAG,EAAE,CAAC,aAAa,CAAC,2BAAgB,CAAC,CAAA;IAE/D,0DAA0D;IAC1D,MAAM,kBAAkB,GAAG,MAAM,oBAAoB,CAAC,IAAI,CAAC;QACzD,KAAK,EAAE;YACL,MAAM;YACN,aAAa,EAAE,aAAa,CAAC,EAAE;YAC/B,eAAe,EAAE,UAAU;SAC5B;QACD,SAAS,EAAE,CAAC,MAAM,EAAE,OAAO,EAAE,QAAQ,CAAC;KACvC,CAAC,CAAA;IAEF,wDAAwD;IACxD,KAAK,MAAM,OAAO,IAAI,kBAAkB,EAAE;QACxC,iEAAiE;QACjE,MAAM,oBAAoB,CAAC,IAAI,CAAC;YAC9B,MAAM,EAAE,CAAC,OAAO,CAAC,MAAM;YACvB,cAAc,EAAE,OAAO,CAAC,cAAc;YACtC,aAAa,EAAE,UAAU,CAAC,CAAC,OAAO,CAAC,cAAc,GAAG,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC;YAChF,eAAe,EAAE,kBAAkB;YACnC,eAAe,EAAE,aAAa,CAAC,YAAY;YAC3C,MAAM,EAAE,OAAO,CAAC,MAAM;YACtB,KAAK,EAAE,OAAO,CAAC,KAAK;YACpB,IAAI,EAAE,OAAO,CAAC,IAAI;YAClB,aAAa;YACb,OAAO,EAAE,IAAI;YACb,OAAO,EAAE,IAAI;SACd,CAAC,CAAA;QAEF,qDAAqD;QACrD,MAAM,oBAAoB,CAAC,MAAM,CAC/B;YACE,EAAE,EAAE,OAAO,CAAC,EAAE;SACf,EACD;YACE,SAAS,EAAE,IAAI,IAAI,EAAE;SACtB,CACF,CAAA;KACF;AACH,CAAC"}

package/dist-server/graphql/resolvers/daily-dispatch/generate-daily-dispatch.js

@@ -1,132 +1,144 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.generateDispatchTransaction = exports.addDailyDispatchDetail = exports.generateDailyDispatch = void 0;
-const typeorm_1 = require("typeorm");
+exports.generateDailyDispatch = void 0;
 const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
 const utils_1 = require("../../../utils");
 exports.generateDailyDispatch = {
     async generateDailyDispatch(_, { dailyDispatch }, context) {
         const { domain, user, tx } = context.state;
-        let dailyDispatchDetails = dailyDispatch.dailyDispatchDetails;
-        let driver;
-        let transport;
-        let dispatchTo;
-        if (dailyDispatch === null || dailyDispatch === void 0 ? void 0 : dailyDispatch.driver) {
-            driver = await tx.getRepository(entities_1.OrganizationStaff).findOne({
-                where: { id: dailyDispatch.driver.id }
+        try {
+            const { dailyDispatchDetails, driver, transport, dispatchTo, dispatchAt, chitNo, percentage } = dailyDispatch;
+            // Validate input data
+            if (!dailyDispatchDetails || dailyDispatchDetails.length === 0) {
+                throw new Error('Daily dispatch details are required.');
+            }
+            // Fetch related entities
+            const driverEntity = driver ? await fetchEntity(tx.getRepository(entities_1.OrganizationStaff), driver.id) : null;
+            const transportEntity = transport ? await fetchEntity(tx.getRepository(entities_1.Truck), transport.id) : null;
+            const dispatchToEntity = dispatchTo ? await fetchEntity(tx.getRepository(entities_1.Organization), dispatchTo.id) : null;
+            // Calculate total tonnage released
+            const totalTonnageRelease = dailyDispatchDetails.reduce((sum, detail) => sum + detail.collectedRampWeight, 0);
+            // Create daily dispatch record
+            const newDailyDispatch = await createDailyDispatch({
+                domain,
+                transport: transportEntity,
+                driver: driverEntity,
+                dispatchTo: dispatchToEntity,
+                totalTonnageRelease,
+                chitNo,
+                percentage,
+                dispatchAt,
+                user,
+                tx
             });
+            // Create daily dispatch details
+            const createdDetails = await addDailyDispatchDetail(domain, newDailyDispatch, dailyDispatchDetails, user, tx);
+            // Generate transaction history and ramp block histories
+            await generateDispatchTransaction(domain, newDailyDispatch, createdDetails, user, tx);
+            return newDailyDispatch;
         }
-        if (dailyDispatch === null || dailyDispatch === void 0 ? void 0 : dailyDispatch.transport) {
-            transport = await tx.getRepository(entities_1.Truck).findOne({
-                where: { id: dailyDispatch.transport.id }
-            });
-        }
-        if (dailyDispatch === null || dailyDispatch === void 0 ? void 0 : dailyDispatch.dispatchTo) {
-            dispatchTo = await tx.getRepository(entities_1.Organization).findOne({
-                where: { id: dailyDispatch.dispatchTo.id }
-            });
+        catch (error) {
+            console.error('Error generating daily dispatch:', error);
+            throw new Error('Failed to generate daily dispatch.');
         }
-        const totalTonnageRelease = dailyDispatchDetails.reduce(function (prev, cur) {
-            return prev + cur.collectedRampWeight;
-        }, 0);
-        // 1. Create daily dispatchment
-        let newDailyDispatch = new entities_1.DailyDispatch();
-        newDailyDispatch.name = utils_1.NoGenerator.dailyDispatch();
-        newDailyDispatch.domain = domain;
-        newDailyDispatch.transport = transport;
-        newDailyDispatch.transportNo = transport.name;
-        newDailyDispatch.driver = driver;
-        newDailyDispatch.driverIdentification = (driver === null || driver === void 0 ? void 0 : driver.idNumber) ? driver.idNumber : null;
-        newDailyDispatch.externalDriver = (driver === null || driver === void 0 ? void 0 : driver.name) ? driver === null || driver === void 0 ? void 0 : driver.name : null;
-        newDailyDispatch.totalTonnageRelease = totalTonnageRelease;
-        newDailyDispatch.chitNo = dailyDispatch === null || dailyDispatch === void 0 ? void 0 : dailyDispatch.chitNo;
-        newDailyDispatch.percentage = dailyDispatch === null || dailyDispatch === void 0 ? void 0 : dailyDispatch.percentage;
-        newDailyDispatch.dispatchTo = dispatchTo;
-        newDailyDispatch.dispatchDate = dailyDispatch.dispatchAt.split('T')[0];
-        newDailyDispatch.dispatchAt = dailyDispatch.dispatchAt;
-        newDailyDispatch.status = constants_1.RECORD_STATUS.STORED;
-        newDailyDispatch.creator = user;
-        newDailyDispatch = await tx.getRepository(entities_1.DailyDispatch).save(newDailyDispatch);
-        // 2. Create daily dispatch detail
-        dailyDispatchDetails = await addDailyDispatchDetail(domain, newDailyDispatch, dailyDispatchDetails.map((record) => {
-            return Object.assign({}, record);
-        }), user, tx);
-        await generateDispatchTransaction(domain, newDailyDispatch, dailyDispatchDetails, user, tx);
-        return newDailyDispatch;
     }
 };
-async function addDailyDispatchDetail(domain, newDailyDispatch, dailyDispatchDetails, user, tx) {
-    const rampRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.Ramp)) || (0, typeorm_1.getRepository)(entities_1.Ramp);
-    const dailyDispatchDetailRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.DailyDispatchDetail)) || (0, typeorm_1.getRepository)(entities_1.DailyDispatchDetail);
-    dailyDispatchDetails = await Promise.all(dailyDispatchDetails.map(async (dailyDispatchDetail) => {
-        return Object.assign(Object.assign({}, dailyDispatchDetail), { domain, name: utils_1.NoGenerator.dailyDispatchDetail(), ramp: await rampRepo.findOne({ id: dailyDispatchDetail.ramp.id }), dailyDispatch: newDailyDispatch, creator: user, updater: user });
+// Helper function to fetch an entity by ID
+async function fetchEntity(repository, id) {
+    const entity = await repository.findOne({ where: { id } });
+    if (!entity) {
+        throw new Error(`Entity with ID ${id} not found.`);
+    }
+    return entity;
+}
+// Helper function to create a daily dispatch record
+async function createDailyDispatch({ domain, transport, driver, dispatchTo, totalTonnageRelease, chitNo, percentage, dispatchAt, user, tx }) {
+    const dailyDispatchRepo = tx.getRepository(entities_1.DailyDispatch);
+    // Convert dispatchAt to a string if it's a Date object
+    const dispatchDate = typeof dispatchAt === 'string' ? dispatchAt.split('T')[0] : dispatchAt.toISOString().split('T')[0];
+    const newDailyDispatch = dailyDispatchRepo.create({
+        name: utils_1.NoGenerator.dailyDispatch(),
+        domain,
+        transport,
+        transportNo: (transport === null || transport === void 0 ? void 0 : transport.name) || null,
+        driver,
+        driverIdentification: (driver === null || driver === void 0 ? void 0 : driver.idNumber) || null,
+        externalDriver: (driver === null || driver === void 0 ? void 0 : driver.name) || null,
+        totalTonnageRelease,
+        chitNo,
+        percentage,
+        dispatchTo,
+        dispatchDate,
+        dispatchAt: typeof dispatchAt === 'string' ? dispatchAt : dispatchAt.toISOString(),
+        status: constants_1.RECORD_STATUS.STORED,
+        creator: user
+    });
+    return await dailyDispatchRepo.save(newDailyDispatch);
+}
+// Helper function to add daily dispatch details
+async function addDailyDispatchDetail(domain, dailyDispatch, details, user, tx) {
+    const rampRepo = tx.getRepository(entities_1.Ramp);
+    const detailRepo = tx.getRepository(entities_1.DailyDispatchDetail);
+    // Extract unique ramp IDs from details
+    // const uniqueRampIds = new Set(details.map(detail => detail.ramp.id))
+    // Validate opening quantities for all unique ramps
+    // for (const rampId of uniqueRampIds) {
+    //   const ramp = await fetchEntity(rampRepo, rampId)
+    //   await validateOpeningQuantities(domain, ramp, tx)
+    // }
+    // Create and save daily dispatch details
+    const createdDetails = await Promise.all(details.map(async (detail) => {
+        const ramp = await fetchEntity(rampRepo, detail.ramp.id);
+        return detailRepo.create(Object.assign(Object.assign({}, detail), { domain, name: utils_1.NoGenerator.dailyDispatchDetail(), ramp,
+            dailyDispatch, creator: user, updater: user }));
     }));
-    return await dailyDispatchDetailRepo.save(dailyDispatchDetails);
+    return await detailRepo.save(createdDetails);
 }
-exports.addDailyDispatchDetail = addDailyDispatchDetail;
-async function generateDispatchTransaction(domain, newDailyDispatch, dailyDispatchDetails, user, tx) {
-    const blockRepo = (tx === null || tx === void 0 ? void 0 : tx.getRepository(entities_1.Block)) || (0, typeorm_1.getRepository)(entities_1.Block);
-    for (let dailyDispatch of dailyDispatchDetails) {
-        const dispatchedTonnage = dailyDispatch.collectedRampWeight;
-        const dispatchDate = newDailyDispatch.dispatchAt.toString().split('T')[0];
-        const ramp = dailyDispatch.ramp;
-        await (0, utils_1.generateTransactionHistory)(null, domain, dailyDispatch.ramp, newDailyDispatch.id, newDailyDispatch.name, constants_1.TRANSACTION_TYPE.DISPATCHMENT, dispatchDate, 0, -dispatchedTonnage, user, tx);
-        let rampBlockHistory = await tx.query(`
-        SELECT * FROM (
-          SELECT *, ROW_NUMBER () OVER (PARTITION BY ramp_id, block_id ORDER BY transaction_date desc, transaction_type) AS rn FROM ramp_block_histories 
-          WHERE ramp_id =$1 AND transaction_date <= $2
-        ) foo WHERE rn = 1
+async function generateDispatchTransaction(domain, dailyDispatch, // Ensure this is passed correctly
+details, user, tx) {
+    const blockRepo = tx.getRepository(entities_1.Block);
+    for (const detail of details) {
+        const dispatchedTonnage = detail.collectedRampWeight;
+        const dispatchDate = typeof dailyDispatch.dispatchAt === 'string'
+            ? dailyDispatch.dispatchAt.split('T')[0]
+            : dailyDispatch.dispatchAt.toISOString().split('T')[0];
+        const ramp = detail.ramp;
+        // Generate transaction history
+        await (0, utils_1.generateTransactionHistory)(null, domain, ramp, dailyDispatch.id, dailyDispatch.name, constants_1.TRANSACTION_TYPE.DISPATCHMENT, dispatchDate, 0, -dispatchedTonnage, user, tx);
+        // Fetch the latest ramp block histories
+        const rampBlockHistories = await tx.query(`
+      SELECT * FROM (
+        SELECT *, ROW_NUMBER () OVER (PARTITION BY ramp_id, block_id ORDER BY transaction_date DESC, transaction_type) AS rn
+        FROM ramp_block_histories
+        WHERE ramp_id = $1 AND transaction_date <= $2
+      ) foo WHERE rn = 1
       `, [ramp.id, dispatchDate]);
-        let totalRampWeight = rampBlockHistory.reduce((total, currentValue) => {
-            total += currentValue.previous_weight + currentValue.weight;
-            return total;
-        }, 0);
-        for (let index = 0; index < rampBlockHistory.length; index++) {
-            const dt2 = rampBlockHistory[index];
-            const block = await blockRepo.findOne({ id: dt2.block_id });
-            let currentRampBlockWeight = dt2.previous_weight + dt2.weight;
-            let percentage = parseFloat((currentRampBlockWeight / totalRampWeight).toFixed(4));
-            let weight = (-dispatchedTonnage * percentage).toFixed(4);
-            //   // insert into ramp_block_histories (id,transaction_type, creator_id, updater_id, transaction_date, created_at, updated_at, weight, domain_id, block_id, ramp_id)
-            //   let processedData = await tx.query(
-            //     `
-            //     insert into ramp_block_histories (id, seq, transaction_type, creator_id, updater_id, transaction_date, created_at, updated_at, domain_id, ramp_id, weight, previous_weight, current_weight, block_id, daily_dispatch_id)
-            //     SELECT uuid_generate_v4() AS id, (select seq from ramp_block_histories where ramp_id = '${ramp.id}' and domain_id = '${domain.id}' order by seq desc limit 1) + 1,'DISPATCH' AS transaction_type,
-            //     '0933baea-e099-494b-9791-3dfe805731f0' AS creator_id, '0933baea-e099-494b-9791-3dfe805731f0' AS updater_id,
-            //     $1 AS transaction_date, $2 AS created_at, $3 AS updated_at,
-            //     $4 AS domain_id, $5 AS ramp_id,
-            //     $6 AS weight,
-            //     $7 AS previous_weight,
-            //     $8 AS current_weight,
-            //     $9 AS block_id,
-            //     $10 AS daily_dispatch_id
-            // `,
-            //     [
-            //       dispatchDate,
-            //       dt2.created_at,
-            //       dt2.updated_at,
-            //       domain.id,
-            //       ramp.id,
-            //       parseFloat(weight),
-            //       parseFloat(currentRampBlockWeight),
-            //       parseFloat(currentRampBlockWeight) + parseFloat(weight),
-            //       dt2.block_id,
-            //       newDailyDispatch.id
-            //     ]
-            //   )
-            await (0, utils_1.generateRampBlockHistories)(block, domain, ramp, 'DISPATCH', dispatchDate, parseFloat(weight), user, null, newDailyDispatch, tx);
-            // await txMgr.query(`
-            //   SELECT * FROM (
-            //     SELECT *, ROW_NUMBER () OVER (PARTITION BY ramp_id, block_id ORDER BY transaction_date desc) AS rn FROM ramp_block_histories
-            //     WHERE ramp_id =$1 AND transaction_date <= $2
-            //   ) foo WHERE rn = 1
-            // `, [dt.ramp_id, dt.transaction_date]
-            // )
-            let x = dt2;
+        // Calculate total ramp weight
+        const totalRampWeight = rampBlockHistories.reduce((total, history) => total + history.previous_weight + history.weight, 0);
+        // Distribute dispatched tonnage across blocks
+        for (const history of rampBlockHistories) {
+            const block = await fetchEntity(blockRepo, history.block_id);
+            const currentRampBlockWeight = history.previous_weight + history.weight;
+            const percentage = parseFloat((currentRampBlockWeight / totalRampWeight).toFixed(4));
+            const weight = parseFloat((-dispatchedTonnage * percentage).toFixed(4));
+            await (0, utils_1.generateRampBlockHistories)(block, domain, ramp, 'DISPATCH', dispatchDate, weight, user, null, dailyDispatch, // Pass dailyDispatch object
+            tx);
         }
-        let x = rampBlockHistory;
     }
 }
-exports.generateDispatchTransaction = generateDispatchTransaction;
+// async function validateOpeningQuantities(domain: Domain, ramp: Ramp, tx: EntityManager): Promise<void> {
+//   const rampBlockHistoryRepo = tx.getRepository(RampBlockHistory)
+//   const blocks = await tx.getRepository(Block).find({ where: { ramp } })
+//   for (const block of blocks) {
+//     const history = await rampBlockHistoryRepo.findOne({
+//       where: { domain, ramp, block, transactionType: 'OPENING_QUANTITY' }
+//     })
+//     if (!history) {
+//       throw new Error(
+//         `No opening quantity defined for block ${block.id} in ramp ${ramp.id}. Please set an opening quantity before creating dispatch records.`
+//       )
+//     }
+//   }
+// }
 //# sourceMappingURL=generate-daily-dispatch.js.map

package/dist-server/graphql/resolvers/daily-dispatch/generate-daily-dispatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"generate-daily-dispatch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/generate-daily-dispatch.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"generate-daily-dispatch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/generate-daily-dispatch.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/daily-dispatch/update-daily-dispatch.js

@@ -8,16 +8,65 @@ exports.updateDailyDispatch = {
         const repository = tx.getRepository(entities_1.DailyDispatch);
         const dailyDispatch = await repository.findOne({
             where: { domain, name },
-            relations: ['dailyDispatchDetails']
+            relations: ['dailyDispatchDetails', 'dailyDispatchDetails.ramp']
         });
+        if (!dailyDispatch) {
+            throw new Error('Daily dispatch record not found.');
+        }
+        // Step 1: Update daily dispatch details
         let foundDailyDispatchDetails = dailyDispatch.dailyDispatchDetails;
         foundDailyDispatchDetails = foundDailyDispatchDetails.map(record => {
             const matchedDispatchDetail = dailyDispatchDetails.find(dispatchDetail => dispatchDetail.name === record.name);
             return Object.assign(Object.assign(Object.assign({}, record), matchedDispatchDetail), { updater: user });
         });
         await tx.getRepository(entities_1.DailyDispatchDetail).save(foundDailyDispatchDetails);
-        return await repository.save(Object.assign(Object.assign({}, dailyDispatch), { chitNo,
+        // Step 2: Update daily dispatch record
+        const updatedDailyDispatch = await repository.save(Object.assign(Object.assign({}, dailyDispatch), { chitNo,
             percentage, updater: user }));
+        // Step 3: Handle tonnage variance for ramp block histories
+        await handleTonnageVariance(domain, dailyDispatch, foundDailyDispatchDetails, user, tx);
+        return updatedDailyDispatch;
     }
 };
+// Helper function to handle tonnage variance
+async function handleTonnageVariance(domain, dailyDispatch, dailyDispatchDetails, user, tx) {
+    const rampBlockHistoryRepo = tx.getRepository(entities_1.RampBlockHistory);
+    for (const detail of dailyDispatchDetails) {
+        const { collectedRampWeight, adjustedWeight } = detail;
+        // Calculate the variance
+        const variance = adjustedWeight - collectedRampWeight;
+        if (variance === 0) {
+            continue; // No variance, skip adjustment
+        }
+        // Fetch the original ramp block histories for this dispatch detail
+        const rampBlockHistories = await rampBlockHistoryRepo.find({
+            where: {
+                domain,
+                dailyDispatch: dailyDispatch.id,
+                ramp: detail.ramp,
+                transactionType: 'DISPATCH'
+            },
+            relations: ['ramp', 'block']
+        });
+        // Adjust the ramp block histories based on the variance
+        for (const history of rampBlockHistories) {
+            // Calculate the proportional adjustment for this block
+            const blockAdjustment = parseFloat((variance * (history.weight / collectedRampWeight)).toFixed(4));
+            // Create a new ramp block history record to reflect the adjustment
+            await rampBlockHistoryRepo.save({
+                domain,
+                block: history.block,
+                ramp: history.ramp,
+                transactionType: 'TONNAGE_VARIANCE',
+                transactionDate: dailyDispatch.dispatchDate,
+                weight: blockAdjustment,
+                previousWeight: history.previousWeight,
+                currentWeight: parseFloat((history.previousWeight + blockAdjustment).toFixed(4)),
+                dailyDispatch,
+                creator: user,
+                updater: user
+            });
+        }
+    }
+}
 //# sourceMappingURL=update-daily-dispatch.js.map

package/dist-server/graphql/resolvers/daily-dispatch/update-daily-dispatch.js.map

@@ -1 +1 @@
-{"version":3,"file":"update-daily-dispatch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/update-daily-dispatch.ts"],"names":[],"mappings":";;;AAKA,gDAAsE;AAEzD,QAAA,mBAAmB,GAAG;IACjC,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,EAAE,IAAI,EAAE,MAAM,EAAE,UAAU,EAAE,oBAAoB,EAAE,EAAE,OAAY;QAChG,MAAM,EAAE,MAAM,EAAE,EAAE,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,MAAM,UAAU,GAAG,EAAE,CAAC,aAAa,CAAC,wBAAa,CAAC,CAAA;QAClD,MAAM,aAAa,GAAG,MAAM,UAAU,CAAC,OAAO,CAAC;YAC7C,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE;YACvB,SAAS,EAAE,CAAC,sBAAsB,CAAC;SACpC,CAAC,CAAA;QAEF,IAAI,yBAAyB,GAA0B,aAAa,CAAC,oBAAoB,CAAA;QAEzF,yBAAyB,GAAG,yBAAyB,CAAC,GAAG,CAAC,MAAM,CAAC,EAAE;YACjE,MAAM,qBAAqB,GAAQ,oBAAoB,CAAC,IAAI,CAC1D,cAAc,CAAC,EAAE,CAAC,cAAc,CAAC,IAAI,KAAK,MAAM,CAAC,IAAI,CACtD,CAAA;YAED,qDACK,MAAM,GACN,qBAAqB,KACxB,OAAO,EAAE,IAAI,IACd;QACH,CAAC,CAAC,CAAA;QAEF,MAAM,EAAE,CAAC,aAAa,CAAC,8BAAmB,CAAC,CAAC,IAAI,CAAC,yBAAyB,CAAC,CAAA;QAE3E,OAAO,MAAM,UAAU,CAAC,IAAI,iCACvB,aAAa,KAChB,MAAM;YACN,UAAU,EACV,OAAO,EAAE,IAAI,IACb,CAAA;IACJ,CAAC;CACF,CAAA"}
+{"version":3,"file":"update-daily-dispatch.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/daily-dispatch/update-daily-dispatch.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/daily-harvest/delete-daily-harvest.js

@@ -2,9 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.deleteDailyHarvest = void 0;
 const typeorm_1 = require("typeorm");
-const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
-const utils_1 = require("../../../utils");
 exports.deleteDailyHarvest = {
     async deleteDailyHarvest(_, { name }, context) {
         try {
@@ -24,12 +22,12 @@ exports.deleteDailyHarvest = {
             }, {
                 deletedAt: new Date()
             });
-            const foundPlantationInv = await tx.getRepository(entities_1.PlantationInventory).findOne({
-                where: { domain, block: dailyHarvest.block, type: constants_1.INVENTORY_TYPE.FIELD_BUNCHES },
-                relations: ['domain', 'block']
+            await tx.getRepository(entities_1.RecordTransaction).update({
+                domain,
+                refActionID: dailyHarvest.id
+            }, {
+                deletedAt: new Date()
             });
-            await tx.getRepository(entities_1.PlantationInventory).save(Object.assign(Object.assign({}, foundPlantationInv), { totalBunches: foundPlantationInv.totalBunches - dailyHarvest.totalBunchHarvested, updater: user }));
-            await (0, utils_1.generateTransactionHistory)(dailyHarvest.block, domain, null, dailyHarvest.id, dailyHarvest.name, constants_1.TRANSACTION_TYPE.HARVEST, dailyHarvest.harvestDate, -dailyHarvest.totalBunchHarvested, 0, user, tx);
             return true;
         }
         catch (error) {