@things-factory/worksheet-base 4.0.0-alpha.6 → 4.0.0-beta.0

package/dist-server/graphql/resolvers/worksheet/vas-transactions/relabeling/relabeling.js

@@ -9,11 +9,11 @@ exports.relabelingResolver = {
     async relabeling(_, { worksheetDetailName, fromPalletId, toPalletId, locationName }, context) {
         const { tx, domain, user } = context.state;
         // Find target worksheet detail & target order vas & bizplace
-        const wsd = await common_utils_1.getWorksheetDetailByName(tx, domain, worksheetDetailName);
+        const wsd = await (0, common_utils_1.getWorksheetDetailByName)(tx, domain, worksheetDetailName);
         let { bizplace, targetVas } = wsd;
         // Check whether to pallet id is duplicated or not.
         if (await tx.getRepository(warehouse_base_1.Inventory).count({
-            where: { domain, bizplace, palletId: toPalletId, status: typeorm_1.Not(typeorm_1.Equal(warehouse_base_1.INVENTORY_STATUS.TERMINATED)) }
+            where: { domain, bizplace, palletId: toPalletId, status: (0, typeorm_1.Not)((0, typeorm_1.Equal)(warehouse_base_1.INVENTORY_STATUS.TERMINATED)) }
         })) {
             throw new Error(`Pallet (${toPalletId}) is already exists`);
         }
@@ -25,7 +25,7 @@ exports.relabelingResolver = {
         // Assign inventory if specific inventory isn't assigned yet.
         // This case is occured when the VAS order comes with Arrival Notice or Release Good
         if (!targetVas.inventory) {
-            targetVas = await common_utils_1.assignInventory(tx, domain, bizplace, user, wsd, refOrder, targetVas, fromPalletId);
+            targetVas = await (0, common_utils_1.assignInventory)(tx, domain, bizplace, user, wsd, refOrder, targetVas, fromPalletId);
         }
         let originInv = targetVas.inventory;
         let operationGuide = JSON.parse(targetVas.operationGuide);
@@ -33,7 +33,7 @@ exports.relabelingResolver = {
         if (!operationGuideData.relabeledFrom)
             operationGuideData.relabeledFrom = [];
         const palletChanges = operationGuideData.relabeledFrom;
-        const { remainQty, remainUomValue } = await common_utils_1.getRemainInventoryAmount(tx, refOrder, domain, bizplace, originInv, palletChanges, fromPalletId);
+        const { remainQty, remainUomValue } = await (0, common_utils_1.getRemainInventoryAmount)(tx, refOrder, domain, bizplace, originInv, palletChanges, fromPalletId);
         const unitUomValue = remainUomValue / remainQty;
         let newPalletChange = {
             fromPalletId,
@@ -61,8 +61,8 @@ exports.relabelingResolver = {
         palletChanges.push(newPalletChange);
         operationGuide.data.relabeledFrom = palletChanges;
         // Update every order vas to share same operation guide
-        await common_utils_1.updateRelatedOrderVas(tx, domain, bizplace, wsd, targetVas, operationGuide, user);
-        await execute_vas_1.executeVas(tx, domain, user, wsd);
+        await (0, common_utils_1.updateRelatedOrderVas)(tx, domain, bizplace, wsd, targetVas, operationGuide, user);
+        await (0, execute_vas_1.executeVas)(tx, domain, user, wsd);
     }
 };
 //# sourceMappingURL=relabeling.js.map

package/dist-server/graphql/resolvers/worksheet/vas-transactions/relabeling/relabeling.js.map

@@ -1 +1 @@
-{"version":3,"file":"relabeling.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/relabeling/relabeling.ts"],"names":[],"mappings":";;;AAIA,mEAA4E;AAC5E,qCAAmD;AAEnD,uDAAkD;AAClD,kDAKwB;AAGX,QAAA,kBAAkB,GAAG;IAChC,KAAK,CAAC,UAAU,CACd,CAAM,EACN,EAAE,mBAAmB,EAAE,YAAY,EAAE,UAAU,EAAE,YAAY,EAAE,EAC/D,OAAY;QAEZ,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,6DAA6D;QAC7D,MAAM,GAAG,GAAoB,MAAM,uCAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,mBAAmB,CAAC,CAAA;QAC5F,IAAI,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAgD,GAAG,CAAA;QAE9E,mDAAmD;QACnD,IACE,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,KAAK,CAAC;YACtC,KAAK,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,QAAQ,EAAE,UAAU,EAAE,MAAM,EAAE,aAAG,CAAC,eAAK,CAAC,iCAAgB,CAAC,UAAU,CAAC,CAAC,EAAE;SACnG,CAAC,EACF;YACA,MAAM,IAAI,KAAK,CAAC,WAAW,UAAU,qBAAqB,CAAC,CAAA;SAC5D;QAED,gBAAgB;QAChB,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAoC,SAAS,CAAA;QAC3F,MAAM,QAAQ,GAAiB,aAAa,IAAI,WAAW,IAAI,QAAQ,IAAI,IAAI,CAAA;QAC/E,IAAI,CAAC,QAAQ;YAAE,MAAM,IAAI,KAAK,CAAC,sDAAsD,CAAC,CAAA;QAEtF,6DAA6D;QAC7D,oFAAoF;QACpF,IAAI,CAAC,SAAS,CAAC,SAAS,EAAE;YACxB,SAAS,GAAG,MAAM,8BAAe,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,EAAE,QAAQ,EAAE,SAAS,EAAE,YAAY,CAAC,CAAA;SACtG;QAED,IAAI,SAAS,GAAc,SAAS,CAAC,SAAS,CAAA;QAC9C,IAAI,cAAc,GAA6C,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;QACnG,IAAI,kBAAkB,GAAoB,cAAc,CAAC,IAAI,CAAA;QAC7D,IAAI,CAAC,kBAAkB,CAAC,aAAa;YAAE,kBAAkB,CAAC,aAAa,GAAG,EAAE,CAAA;QAC5E,MAAM,aAAa,GAA6B,kBAAkB,CAAC,aAAa,CAAA;QAChF,MAAM,EAAE,SAAS,EAAE,cAAc,EAAE,GAAG,MAAM,uCAAwB,CAClE,EAAE,EACF,QAAQ,EACR,MAAM,EACN,QAAQ,EACR,SAAS,EACT,aAAa,EACb,YAAY,CACb,CAAA;QAED,MAAM,YAAY,GAAW,cAAc,GAAG,SAAS,CAAA;QACvD,IAAI,eAAe,GAA2B;YAC5C,YAAY;YACZ,UAAU;YACV,UAAU,EAAE,CAAC;YACb,eAAe,EAAE,CAAC;SACnB,CAAA;QACD,IAAI,YAAY,EAAE;YAChB,eAAe,CAAC,YAAY,GAAG,YAAY,CAAA;SAC5C;aAAM;YACL,SAAS,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,0BAAS,CAAC,CAAC,OAAO,CAAC,SAAS,CAAC,EAAE,EAAE,EAAE,SAAS,EAAE,CAAC,UAAU,CAAC,EAAE,CAAC,CAAA;YAChG,eAAe,CAAC,YAAY,GAAG,SAAS,CAAC,QAAQ,CAAC,IAAI,CAAA;SACvD;QAED,IAAI,SAAS,GAAG,SAAS,CAAC,GAAG,EAAE;YAC7B,6BAA6B;YAC7B,eAAe,CAAC,UAAU,GAAG,SAAS,CAAA;YACtC,eAAe,CAAC,eAAe,GAAG,SAAS,GAAG,YAAY,CAAA;SAC3D;aAAM;YACL,6BAA6B;YAC7B,eAAe,CAAC,UAAU,GAAG,SAAS,CAAC,GAAG,CAAA;YAC1C,eAAe,CAAC,eAAe,GAAG,SAAS,CAAC,QAAQ,CAAA;SACrD;QAED,aAAa,CAAC,IAAI,CAAC,eAAe,CAAC,CAAA;QACnC,cAAc,CAAC,IAAI,CAAC,aAAa,GAAG,aAAa,CAAA;QAEjD,uDAAuD;QACvD,MAAM,oCAAqB,CAAkB,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,cAAc,EAAE,IAAI,CAAC,CAAA;QACxG,MAAM,wBAAU,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAG,CAAC,CAAA;IACzC,CAAC;CACF,CAAA"}
+{"version":3,"file":"relabeling.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/relabeling/relabeling.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/worksheet/vas-transactions/relabeling/undo-relabeling.js

@@ -7,7 +7,7 @@ exports.undoRelabelingResolver = {
     async undoRelabeling(_, { worksheetDetailName, toPalletId }, context) {
         /** Initialize required variables */
         const { tx, domain, user } = context.state;
-        const wsd = await common_utils_1.getWorksheetDetailByName(tx, domain, worksheetDetailName);
+        const wsd = await (0, common_utils_1.getWorksheetDetailByName)(tx, domain, worksheetDetailName);
         const { bizplace, targetVas } = wsd;
         if (!targetVas)
             throw new Error(`Couldn't find any related target vas, using current worksheet detail`);
@@ -19,10 +19,10 @@ exports.undoRelabelingResolver = {
         // Filter out pallets which has same id with undoPalletId
         operationGuide.data.relabeledFrom = operationGuideData.relabeledFrom.filter((pc) => pc.fromPalletId !== fromPalletId || (pc.fromPalletId === fromPalletId && pc.toPalletId !== toPalletId));
         if (!(refOrder instanceof sales_base_1.VasOrder)) {
-            await common_utils_1.dismissInventory(tx, wsd, targetVas, operationGuide.data.relabeledFrom, fromPalletId);
+            await (0, common_utils_1.dismissInventory)(tx, wsd, targetVas, operationGuide.data.relabeledFrom, fromPalletId);
         }
         // Update every related operation guide to share same data
-        await common_utils_1.updateRelatedOrderVas(tx, domain, bizplace, wsd, targetVas, operationGuide, user);
+        await (0, common_utils_1.updateRelatedOrderVas)(tx, domain, bizplace, wsd, targetVas, operationGuide, user);
     }
 };
 //# sourceMappingURL=undo-relabeling.js.map

package/dist-server/graphql/resolvers/worksheet/vas-transactions/relabeling/undo-relabeling.js.map

@@ -1 +1 @@
-{"version":3,"file":"undo-relabeling.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/relabeling/undo-relabeling.ts"],"names":[],"mappings":";;;AAEA,2DAA+D;AAI/D,kDAAmG;AAGtF,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,cAAc,CAClB,CAAM,EACN,EAAE,mBAAmB,EAAE,UAAU,EAA6E,EAC9G,OAAY;QAEZ,oCAAoC;QACpC,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,GAAG,GAAoB,MAAM,uCAAwB,CAAC,EAAE,EAAE,MAAM,EAAE,mBAAmB,CAAC,CAAA;QAC5F,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAgD,GAAG,CAAA;QAEhF,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAA;QACvG,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAA;QAC1D,MAAM,QAAQ,GAAiB,aAAa,IAAI,WAAW,IAAI,QAAQ,CAAA;QAEvE,IAAI,cAAc,GAA6C,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;QACnG,IAAI,kBAAkB,GAAoB,cAAc,CAAC,IAAI,CAAA;QAE7D,MAAM,YAAY,GAAW,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAA;QACzD,yDAAyD;QACzD,cAAc,CAAC,IAAI,CAAC,aAAa,GAAG,kBAAkB,CAAC,aAAa,CAAC,MAAM,CACzE,CAAC,EAA0B,EAAE,EAAE,CAC7B,EAAE,CAAC,YAAY,KAAK,YAAY,IAAI,CAAC,EAAE,CAAC,YAAY,KAAK,YAAY,IAAI,EAAE,CAAC,UAAU,KAAK,UAAU,CAAC,CACzG,CAAA;QAED,IAAI,CAAC,CAAC,QAAQ,YAAY,qBAAQ,CAAC,EAAE;YACnC,MAAM,+BAAgB,CAAC,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAA;SAC5F;QAED,0DAA0D;QAC1D,MAAM,oCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,cAAc,EAAE,IAAI,CAAC,CAAA;IACzF,CAAC;CACF,CAAA"}
+{"version":3,"file":"undo-relabeling.js","sourceRoot":"","sources":["../../../../../../server/graphql/resolvers/worksheet/vas-transactions/relabeling/undo-relabeling.ts"],"names":[],"mappings":";;;AAEA,2DAA+D;AAI/D,kDAAmG;AAGtF,QAAA,sBAAsB,GAAG;IACpC,KAAK,CAAC,cAAc,CAClB,CAAM,EACN,EAAE,mBAAmB,EAAE,UAAU,EAA6E,EAC9G,OAAY;QAEZ,oCAAoC;QACpC,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,GAAG,GAAoB,MAAM,IAAA,uCAAwB,EAAC,EAAE,EAAE,MAAM,EAAE,mBAAmB,CAAC,CAAA;QAC5F,MAAM,EAAE,QAAQ,EAAE,SAAS,EAAE,GAAgD,GAAG,CAAA;QAEhF,IAAI,CAAC,SAAS;YAAE,MAAM,IAAI,KAAK,CAAC,sEAAsE,CAAC,CAAA;QACvG,MAAM,EAAE,aAAa,EAAE,WAAW,EAAE,QAAQ,EAAE,GAAG,SAAS,CAAA;QAC1D,MAAM,QAAQ,GAAiB,aAAa,IAAI,WAAW,IAAI,QAAQ,CAAA;QAEvE,IAAI,cAAc,GAA6C,IAAI,CAAC,KAAK,CAAC,SAAS,CAAC,cAAc,CAAC,CAAA;QACnG,IAAI,kBAAkB,GAAoB,cAAc,CAAC,IAAI,CAAA;QAE7D,MAAM,YAAY,GAAW,SAAS,CAAC,SAAS,CAAC,QAAQ,CAAA;QACzD,yDAAyD;QACzD,cAAc,CAAC,IAAI,CAAC,aAAa,GAAG,kBAAkB,CAAC,aAAa,CAAC,MAAM,CACzE,CAAC,EAA0B,EAAE,EAAE,CAC7B,EAAE,CAAC,YAAY,KAAK,YAAY,IAAI,CAAC,EAAE,CAAC,YAAY,KAAK,YAAY,IAAI,EAAE,CAAC,UAAU,KAAK,UAAU,CAAC,CACzG,CAAA;QAED,IAAI,CAAC,CAAC,QAAQ,YAAY,qBAAQ,CAAC,EAAE;YACnC,MAAM,IAAA,+BAAgB,EAAC,EAAE,EAAE,GAAG,EAAE,SAAS,EAAE,cAAc,CAAC,IAAI,CAAC,aAAa,EAAE,YAAY,CAAC,CAAA;SAC5F;QAED,0DAA0D;QAC1D,MAAM,IAAA,oCAAqB,EAAC,EAAE,EAAE,MAAM,EAAE,QAAQ,EAAE,GAAG,EAAE,SAAS,EAAE,cAAc,EAAE,IAAI,CAAC,CAAA;IACzF,CAAC;CACF,CAAA"}

package/dist-server/graphql/resolvers/worksheet/vas-transactions/repackaging/complete-repackaging.js

@@ -1,17 +1,29 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.completeRepackaging = void 0;
+const product_base_1 = require("@things-factory/product-base");
 const sales_base_1 = require("@things-factory/sales-base");
 const warehouse_base_1 = require("@things-factory/warehouse-base");
 const common_utils_1 = require("../common-utils");
 const interfaces_1 = require("../interfaces");
 async function completeRepackaging(trxMgr, orderVas, user) {
     orderVas = await trxMgr.getRepository(sales_base_1.OrderVas).findOne(orderVas.id, {
-        relations: ['domain', 'bizplace', 'inventory', 'inventory.product', 'arrivalNotice', 'releaseGood', 'vasOrder']
+        relations: [
+            'domain',
+            'bizplace',
+            'inventory',
+            'inventory.product',
+            'inventory.productDetail',
+            'arrivalNotice',
+            'releaseGood',
+            'vasOrder',
+            'vas'
+        ]
     });
     const domain = orderVas.domain;
     const bizplace = orderVas.bizplace;
     let originInv = orderVas.inventory;
+    let transactionType = warehouse_base_1.INVENTORY_TRANSACTION_TYPE.REPACKAGING;
     const operationGuide = JSON.parse(orderVas.operationGuide);
     const operationGuideData = operationGuide.data;
     const packingUnit = operationGuideData.packingUnit;
@@ -19,42 +31,136 @@ async function completeRepackaging(trxMgr, orderVas, user) {
     const toPackingType = operationGuideData.toPackingType;
     const { arrivalNotice, releaseGood, vasOrder } = orderVas;
     const refOrder = arrivalNotice || releaseGood || vasOrder;
-    const repackedInvs = extractRepackedInvs(operationGuideData, originInv);
-    let originQty = 0;
-    let originUomValue = 0;
+    const repackedInvs = operationGuideData.repackedInvs;
+    const repackedFroms = extractRepackedFroms(operationGuideData, orderVas, packingUnit);
+    if (orderVas.vas && orderVas.vas.operationGuide === 'vas-repack-relabel') {
+        transactionType = warehouse_base_1.INVENTORY_TRANSACTION_TYPE.REPACKAGING_RELABELING;
+        const toProduct = operationGuideData.toProduct;
+        // please add domain filter as well
+        const foundProduct = await trxMgr.getRepository(product_base_1.Product).findOne({
+            where: {
+                id: toProduct.product.id,
+                sku: toProduct.product.sku,
+                name: toProduct.product.name
+            }
+        });
+        if (!foundProduct) {
+            throw new Error(`Cannot find product with SKU ${toProduct.product.sku}`);
+        }
+        originInv.product = foundProduct;
+        originInv.batchId = operationGuideData.toBatchId;
+        originInv.productDetail = toProduct.productDetailId;
+    }
     // create repacked inventories based on repackedInvs
     for (const ri of repackedInvs) {
         const repackedFromList = ri.repackedFrom.filter((rf) => rf.toPalletId === ri.palletId);
-        const { qty, uomValue } = common_utils_1.getCurrentAmount(repackedFromList, ri.palletId);
-        const repackedPkgQty = packingUnit === interfaces_1.PackingUnits.QTY ? qty / stdAmount : uomValue / stdAmount;
-        const changedInv = await common_utils_1.upsertInventory(trxMgr, domain, bizplace, user, originInv, refOrder, ri.palletId, ri.locationName, toPackingType, repackedPkgQty, uomValue, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.REPACKAGING);
-        // accumulate qty and uomValue to update originInv in one shot
-        originQty += qty;
-        originUomValue += uomValue;
-        // Create worksheet if it's related with Arrival Notice or Release Order
-        if (refOrder instanceof sales_base_1.ArrivalNotice) {
-            // await createPutawayWorksheet(trxMgr, domain, bizplace, refOrder, originInv, changedInv, user)
-            await common_utils_1.createPutawayWorksheet(trxMgr, domain, bizplace, user, refOrder, originInv, changedInv);
-        }
-        else if (refOrder instanceof sales_base_1.ReleaseGood) {
-            // await createLoadingWorksheet(trxMgr, domain, bizplace, refOrder, originInv, changedInv, user)
-            await common_utils_1.createLoadingWorksheet(trxMgr, domain, bizplace, user, refOrder, originInv, changedInv);
+        const { qty, uomValue } = (0, common_utils_1.temporaryGetCurrentAmount)(repackedFromList, ri.palletId, packingUnit, stdAmount);
+        /* const changedInv: Inventory =  */ await (0, common_utils_1.upsertInventory)(trxMgr, domain, bizplace, user, originInv, refOrder, ri.palletId, ri.locationName, toPackingType, packingUnit == interfaces_1.PackingUnits.QTY ? qty : ri.repackedPkgQty, uomValue, transactionType, stdAmount, packingUnit);
+    }
+    for (const rf of repackedFroms) {
+        let foundInventory = await trxMgr.getRepository(warehouse_base_1.Inventory).findOne({
+            where: {
+                domain,
+                bizplace,
+                palletId: rf.fromPalletId
+            }
+        });
+        if (foundInventory) {
+            let reducedQty;
+            let reducedUomValue;
+            if (packingUnit == interfaces_1.PackingUnits.QTY) {
+                reducedQty = rf.reducedUnitQty / rf.packingSize;
+                reducedUomValue = rf.reducedUomValue;
+            }
+            else if (packingUnit == interfaces_1.PackingUnits.UOM) {
+                // reducedQty will remain 0 if there is remaining uomValue
+                reducedQty = foundInventory.uomValue - rf.reducedUomValue == 0 ? 1 : 0;
+                reducedUomValue = rf.reducedUomValue;
+            }
+            foundInventory = await (0, common_utils_1.deductProductAmount)(trxMgr, domain, bizplace, user, refOrder, foundInventory, reducedQty, getRoundedAmount(reducedUomValue, 1000), transactionType, rf.originalQty, getRoundedAmount(rf.originalUomValue, 1000), rf.currentUnitQty, rf.currentUomValue);
         }
     }
-    // Deduct amount of product on original pallet or order inventory (Case for release order)
-    originInv = await common_utils_1.deductProductAmount(trxMgr, domain, bizplace, user, refOrder, originInv, originQty, originUomValue, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.REPACKAGING);
 }
 exports.completeRepackaging = completeRepackaging;
-function extractRepackedInvs(operationGuideData, originInv) {
-    return operationGuideData.repackedInvs
-        .filter((ri) => {
-        const isPalletIncluded = Boolean(ri.repackedFrom.find((rf) => rf.fromPalletId === originInv.palletId));
-        if (isPalletIncluded)
-            return ri;
-    })
-        .map((ri) => {
-        ri.repackedFrom = ri.repackedFrom.filter((rf) => rf.fromPalletId === originInv.palletId);
-        return ri;
-    });
+function extractRepackedFroms(operationGuideData, orderVas, packingUnit) {
+    return (operationGuideData.repackedInvs
+        .reduce((acc, ri) => {
+        acc = [...acc, ...ri.repackedFrom];
+        return acc;
+    }, [])
+        // .flat()
+        .reduce((acc, inv) => {
+        let foundInv = acc.find(a => a.fromPalletId == inv.fromPalletId);
+        if (foundInv) {
+            if (packingUnit == interfaces_1.PackingUnits.QTY) {
+                foundInv.reducedUnitQty += inv.reducedUnitQty;
+                foundInv.reducedUomValue += inv.reducedUomValue;
+            }
+            else if (packingUnit == interfaces_1.PackingUnits.UOM) {
+                foundInv.reducedQty += inv.reducedQty;
+                foundInv.reducedUomValue += inv.reducedUomValue;
+            }
+        }
+        else {
+            if (packingUnit == interfaces_1.PackingUnits.QTY) {
+                acc.push({
+                    fromPalletId: inv.fromPalletId,
+                    reducedUnitQty: inv.reducedUnitQty,
+                    reducedUomValue: inv.reducedUomValue,
+                    packingSize: inv.packingSize
+                });
+            }
+            else if (packingUnit == interfaces_1.PackingUnits.UOM) {
+                acc.push({
+                    fromPalletId: inv.fromPalletId,
+                    reducedQty: inv.reducedQty,
+                    reducedUomValue: inv.reducedUomValue,
+                    packingSize: inv.packingSize
+                });
+            }
+        }
+        return acc;
+    }, [])
+        .map((pc) => {
+        const featuredInvs = operationGuideData.featuredInvs || [];
+        const foundFeaturedInv = featuredInvs.find((inv) => inv.palletId === pc.fromPalletId);
+        let originalQty;
+        let originalUomValue;
+        if (foundFeaturedInv) {
+            originalQty = foundFeaturedInv.originalQty;
+            originalUomValue = foundFeaturedInv.originalUomValue;
+            if (packingUnit == interfaces_1.PackingUnits.QTY) {
+                pc.currentUnitQty = foundFeaturedInv.currentUnitQty;
+            }
+            else if (packingUnit == interfaces_1.PackingUnits.UOM) {
+                pc.currentUomValue = foundFeaturedInv.currentUomValue;
+            }
+        }
+        else {
+            originalQty =
+                packingUnit == interfaces_1.PackingUnits.UOM
+                    ? orderVas.qty
+                    : orderVas.qty -
+                        featuredInvs.reduce((qty, inv) => {
+                            return qty + inv.originalQty;
+                        }, 0);
+            originalUomValue =
+                orderVas.uomValue -
+                    featuredInvs.reduce((uomValue, inv) => {
+                        return uomValue + inv.originalUomValue;
+                    }, 0);
+            if (packingUnit == interfaces_1.PackingUnits.QTY) {
+                pc.currentUnitQty = originalQty - pc.reducedUnitQty / pc.packingSize;
+            }
+            else if (packingUnit == interfaces_1.PackingUnits.UOM) {
+                pc.currentUomValue = getRoundedAmount(originalUomValue - pc.reducedUomValue);
+            }
+        }
+        return Object.assign(Object.assign({}, pc), { originalQty,
+            originalUomValue });
+    }));
+}
+function getRoundedAmount(value, decimalPlace = 100) {
+    return Math.round((value + Number.EPSILON) * decimalPlace) / decimalPlace;
 }
 //# sourceMappingURL=complete-repackaging.js.map

package/dist-server/graphql/resolvers/worksheet/vas-transactions/repackaging/complete-repackaging.js.map

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

package/dist-server/graphql/resolvers/worksheet/vas-transactions/repackaging/index.js

@@ -7,7 +7,7 @@ var __createBinding = (this && this.__createBinding) || (Object.create ? (functi
     o[k2] = m[k];
 }));
 var __exportStar = (this && this.__exportStar) || function(m, exports) {
-    for (var p in m) if (p !== "default" && !exports.hasOwnProperty(p)) __createBinding(exports, m, p);
+    for (var p in m) if (p !== "default" && !Object.prototype.hasOwnProperty.call(exports, p)) __createBinding(exports, m, p);
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 __exportStar(require("./complete-repackaging"), exports);

package/dist-server/graphql/resolvers/worksheet/vas-transactions/repackaging/repackaging.js

@@ -20,16 +20,16 @@ exports.repackagingResolver = {
         if (!warehouse)
             throw new Error(`Location (name: ${locationName}) doesn't have any relation with warehouse`);
         // Find target worksheet detail & target order vas & bizplace
-        const wsd = await common_utils_1.getWorksheetDetailByName(tx, domain, worksheetDetailName);
+        const wsd = await (0, common_utils_1.getWorksheetDetailByName)(tx, domain, worksheetDetailName);
         let { bizplace, targetVas } = wsd;
         // Check whether from pallet has valid condition compared with customer's request
         // Batch ID, product and packing type
-        const { identicallity, errorMessage } = await utils_1.checkPalletIdenticallity(domain, bizplace, fromPalletId, targetVas.targetBatchId, targetVas.targetProduct, targetVas.packingType, tx);
+        const { identicallity, errorMessage } = await (0, utils_1.checkPalletIdenticallity)(domain, bizplace, fromPalletId, targetVas.targetBatchId, targetVas.targetProduct, targetVas.packingType, tx);
         if (!identicallity)
             throw new Error(errorMessage);
         // Check whether there's duplicated inventory in warehouse.
-        if (await utils_1.checkPalletDuplication(domain, bizplace, toPalletId, tx))
-            throw new Error(`The Pallet ID (${toPalletId}) is duplicated.`);
+        if (await (0, utils_1.checkPalletDuplication)(domain, bizplace, toPalletId, tx))
+            throw new Error(`The lot ID (${toPalletId}) is duplicated.`);
         // Init refOrder
         const { arrivalNotice, releaseGood, vasOrder } = targetVas;
         const refOrder = arrivalNotice || releaseGood || vasOrder || null;
@@ -38,64 +38,123 @@ exports.repackagingResolver = {
         // Assign inventory if specific inventory isn't assigned yet.
         // This case is occured when the VAS order comes with Arrival Notice or Release Good
         if (!targetVas.inventory) {
-            targetVas = await common_utils_1.assignInventory(tx, domain, bizplace, user, wsd, refOrder, targetVas, fromPalletId);
+            targetVas = await (0, common_utils_1.assignInventory)(tx, domain, bizplace, user, wsd, refOrder, targetVas, fromPalletId);
         }
         let originInv = targetVas.inventory;
         let operationGuide = JSON.parse(targetVas.operationGuide);
         let operationGuideData = operationGuide.data;
-        if (!operationGuideData.repackedInvs)
-            operationGuideData.repackedInvs = [];
-        // const palletChanges: PalletChangesInterface[] = operationGuideData.repackedInvs
-        //   .map((ri: RepackedInvInfo) => ri.repackedFrom)
-        //   .flat()
-        const palletChanges = [];
-        const { remainQty, remainUomValue } = await common_utils_1.getRemainInventoryAmount(tx, refOrder, domain, bizplace, originInv, palletChanges, fromPalletId);
-        const unitUomValue = remainUomValue / remainQty;
+        let featuredInvs = operationGuideData.featuredInvs;
         const packingUnit = operationGuideData.packingUnit;
         const stdAmount = operationGuideData.stdAmount;
+        let repackedInvs = operationGuideData.repackedInvs;
+        if ((repackedInvs === null || repackedInvs === void 0 ? void 0 : repackedInvs.length) && repackedInvs.some((inv) => inv.palletId == toPalletId))
+            throw new Error(`Unable to repack into the same lot ID ${toPalletId}`);
+        let palletChanges = [];
+        if (repackedInvs && repackedInvs.length) {
+            palletChanges = repackedInvs.reduce((acc, ri) => {
+                acc = [...acc, ...ri.repackedFrom];
+                return acc;
+            }, []);
+            // .map((ri: RepackedInvInfo) => ri.repackedFrom).flat()
+        }
+        else if (!repackedInvs) {
+            operationGuideData.repackedInvs = [];
+        }
+        // get remainUnitQty of originInv (from previous repackaging actions)
+        let remainOriginInv = {
+            remainUomValue: 0,
+            remainUnitQty: 0
+        };
+        let remainUomValue = 0;
+        let remainUnitQty = 0;
+        try {
+            remainOriginInv = await (0, common_utils_1.temporaryGetRemainInventoryAmount)(tx, refOrder, domain, bizplace, originInv, palletChanges, fromPalletId);
+            remainUomValue = remainOriginInv.remainUomValue;
+            remainUnitQty = remainOriginInv.remainUnitQty;
+        }
+        catch (err) { }
+        let repackedFroms = [];
         let repackedInv = getRepackedInv(operationGuideData, toPalletId, locationName);
-        let isCompleted = false; // Flag for calling executeVas function to change status of worksheet detail
+        let isCompleted = false;
+        const repackagingAmount = stdAmount * packageQty;
         if (packingUnit === interfaces_1.PackingUnits.QTY) {
-            const packingSize = originInv.packingSize;
-            const reducedQty = remainQty >= (stdAmount * packageQty) / packingSize ? (stdAmount * packageQty) / packingSize : remainQty;
-            const repackedFrom = {
-                fromPalletId,
-                toPalletId,
-                reducedQty,
-                reducedUomValue: reducedQty * unitUomValue
-            };
-            repackedInv.repackedFrom.push(repackedFrom);
-            const totalPackedQty = repackedInv.repackedFrom.reduce((qty, rf) => (qty += rf.reducedQty), 0);
-            repackedInv.repackedPkgQty = (totalPackedQty * packingSize) / stdAmount;
-            isCompleted = remainQty <= stdAmount * packageQty;
+            const singleUnitUomValue = originInv.uomValue / (originInv.qty * originInv.packingSize);
+            // const singleUnitUomValue: number = getRoundedAmount(
+            //   originInv.uomValue / (originInv.qty * originInv.packingSize),
+            //   10000
+            // )
+            if ((featuredInvs === null || featuredInvs === void 0 ? void 0 : featuredInvs.length) && repackagingAmount > remainUnitQty) {
+                const inventoriesChanges = deductedFeaturedInventories(featuredInvs, repackagingAmount, remainUnitQty, toPalletId, 'currentUnitQty');
+                operationGuideData.featuredInvs = inventoriesChanges.featuredInvs;
+                repackedFroms = [...repackedFroms, ...inventoriesChanges.repackedFroms];
+                if (remainUnitQty > 0) {
+                    repackedFroms.push({
+                        fromPalletId,
+                        toPalletId,
+                        reducedUnitQty: remainUnitQty,
+                        reducedUomValue: remainUnitQty * singleUnitUomValue,
+                        packingSize: originInv.packingSize
+                    });
+                }
+            }
+            else if (remainUnitQty >= repackagingAmount) {
+                repackedFroms.push({
+                    fromPalletId,
+                    toPalletId,
+                    reducedUnitQty: repackagingAmount,
+                    reducedUomValue: repackagingAmount * singleUnitUomValue,
+                    packingSize: originInv.packingSize
+                });
+            }
+            repackedInv.repackedFrom = repackedFroms;
+            const totalPackedQty = repackedInv.repackedFrom.reduce((qty, rf) => (qty += rf.reducedUnitQty), 0);
+            repackedInv.repackedPkgQty = totalPackedQty / stdAmount;
+            isCompleted = operationGuideData.requiredPackageQty == 0;
         }
         else if (packingUnit === interfaces_1.PackingUnits.UOM) {
-            // Case 1. When batchProcess is true => Reduce as much as remainUomValue to complete this repackaging task
-            // Case 2. When from pallet has more products than std amount => Reduce as much as stdAmount
-            // Case 3. When from pallet has less products than std amount => Reduce as much as remainUomValue
-            const reducedUomValue = remainUomValue >= stdAmount * packageQty ? stdAmount * packageQty : remainUomValue;
-            const repackedFrom = {
-                fromPalletId,
-                toPalletId,
-                reducedUomValue,
-                reducedQty: reducedUomValue / unitUomValue
-            };
-            repackedInv.repackedFrom.push(repackedFrom);
-            const totalPackedUomValue = repackedInv.repackedFrom.reduce((uomValue, rf) => (uomValue += rf.reducedUomValue), 0);
+            if ((featuredInvs === null || featuredInvs === void 0 ? void 0 : featuredInvs.length) && repackagingAmount > remainUomValue) {
+                const inventoriesChanges = deductedFeaturedInventories(featuredInvs, repackagingAmount, remainUomValue, toPalletId, 'currentUomValue');
+                operationGuideData.featuredInvs = inventoriesChanges.featuredInvs;
+                repackedFroms = [...repackedFroms, ...inventoriesChanges.repackedFroms];
+                if (remainUomValue > 0) {
+                    repackedFroms.push({
+                        fromPalletId,
+                        toPalletId,
+                        reducedQty: 0,
+                        reducedUomValue: remainUomValue,
+                        // reducedUomValue: getRoundedAmount(remainUomValue),
+                        packingSize: originInv.packingSize
+                    });
+                }
+            }
+            else if (remainUomValue >= repackagingAmount) {
+                repackedFroms.push({
+                    fromPalletId,
+                    toPalletId,
+                    reducedQty: 0,
+                    reducedUomValue: repackagingAmount,
+                    // reducedUomValue: getRoundedAmount(repackagingAmount),
+                    packingSize: originInv.packingSize
+                });
+            }
+            repackedInv.repackedFrom = repackedFroms;
+            const totalPackedUomValue = repackedInv.repackedFrom.reduce((qty, rf) => (qty += rf.reducedUomValue), 0);
             repackedInv.repackedPkgQty = totalPackedUomValue / stdAmount;
-            isCompleted = remainUomValue <= stdAmount * packageQty;
+            // repackedInv.repackedPkgQty = getRoundedAmount(totalPackedUomValue / stdAmount)
+            isCompleted = operationGuideData.requiredPackageQty == 0;
         }
         // Get total required package qty to complete this VAS Task
-        const requiredPackageQty = await getRequiredPackageQty(tx, domain, bizplace, wsd.worksheet, targetVas, packingUnit, stdAmount);
+        const requiredPackageQty = await getRequiredPackageQty(tx, domain, bizplace, wsd.worksheet, targetVas, packingUnit, stdAmount, (operationGuideData === null || operationGuideData === void 0 ? void 0 : operationGuideData.remainder) || 0);
         // Get total repacked package qty until this transaction
         const repackedPackageQty = getRepackedPackageQty(operationGuideData.repackedInvs);
-        const remainRequiredPackageQty = requiredPackageQty - repackedPackageQty;
-        operationGuide.data.requiredPackageQty = remainRequiredPackageQty;
-        operationGuide.data.repackedInvs = operationGuideData.repackedInvs;
+        const remainRequiredPackageQty = getRoundedAmount(requiredPackageQty - repackedPackageQty);
+        // const requiredPackageQty: number = operationGuideData.requiredPackageQty - repackedPackageQty
+        operationGuide.data = Object.assign(Object.assign({}, operationGuideData), { requiredPackageQty: remainRequiredPackageQty });
         // Update every order vas to share same operation guide
-        await common_utils_1.updateRelatedOrderVas(tx, domain, bizplace, wsd, targetVas, operationGuide, user);
+        await (0, common_utils_1.updateRelatedOrderVas)(tx, domain, bizplace, wsd, targetVas, operationGuide, user);
+        // #########################  KIV DULU YANG NI  #########################
         if (isCompleted || remainRequiredPackageQty === 0) {
-            await execute_vas_1.executeVas(tx, domain, user, wsd);
+            await (0, execute_vas_1.executeVas)(tx, domain, user, wsd);
         }
     }
 };
@@ -117,7 +176,7 @@ function getRepackedPackageQty(repackedInvs) {
  * @param {String} packingUnit
  * @param {Number} stdAmount
  */
-async function getRequiredPackageQty(tx, domain, bizplace, worksheet, currentOV, packingUnit, stdAmount) {
+async function getRequiredPackageQty(tx, domain, bizplace, worksheet, currentOV, packingUnit, stdAmount, remainder) {
     const relatedWSDs = await tx.getRepository(entities_1.WorksheetDetail).find({
         where: { domain, bizplace, worksheet },
         relations: ['targetVas', 'targetVas.vas', 'targetVas.inventory']
@@ -133,10 +192,10 @@ async function getRequiredPackageQty(tx, domain, bizplace, worksheet, currentOV,
         return total;
     }, { qty: 0, uomValue: 0 });
     if (packingUnit === interfaces_1.PackingUnits.QTY) {
-        return qty / stdAmount;
+        return (qty - remainder) / stdAmount;
     }
     else if (packingUnit === interfaces_1.PackingUnits.UOM) {
-        return uomValue / stdAmount;
+        return Math.floor(uomValue / stdAmount);
     }
 }
 /**
@@ -160,4 +219,60 @@ function getRepackedInv(operationGuideData, palletId, locationName) {
     }
     return repackedInv;
 }
+/**
+ * @description To transfer qty or uom value from featured inventories into origin inventory
+ * If and only if the origin inventory has insufficient amount
+ *
+ * @param {FeaturedInventoryInterface} featuredInvs
+ * @param {Number} repackagingAmount
+ * @param {Number} remainingAmount
+ * @param {String} packingUnit -- value is strictly for qty / uomValue
+ */
+function deductedFeaturedInventories(featuredInvs, repackagingAmount, remainingAmount, toPalletId, packingUnit) {
+    let requiredAmount = getRoundedAmount(repackagingAmount - remainingAmount);
+    const repackedFroms = [];
+    featuredInvs = featuredInvs.map(inv => {
+        if (requiredAmount > 0 && inv[packingUnit] > 0) {
+            let reducedAmount = requiredAmount;
+            if (inv[packingUnit] >= requiredAmount) {
+                inv[packingUnit] = inv[packingUnit] - requiredAmount;
+                // inv[packingUnit] = getRoundedAmount(inv[packingUnit] - requiredAmount)
+                requiredAmount = 0;
+            }
+            else {
+                requiredAmount = requiredAmount - inv[packingUnit];
+                // requiredAmount = getRoundedAmount(requiredAmount - inv[packingUnit])
+                reducedAmount = inv[packingUnit];
+                inv[packingUnit] = 0;
+            }
+            switch (packingUnit) {
+                case 'currentUnitQty':
+                    repackedFroms.push({
+                        fromPalletId: inv.palletId,
+                        toPalletId,
+                        reducedUnitQty: reducedAmount,
+                        reducedUomValue: reducedAmount * inv.uomValuePerQty,
+                        // reducedUomValue: getRoundedAmount(reducedAmount * inv.uomValuePerQty),
+                        packingSize: featuredInvs.find(inv => inv.palletId == inv.palletId).packingSize
+                    });
+                    break;
+                case 'currentUomValue':
+                    repackedFroms.push({
+                        fromPalletId: inv.palletId,
+                        toPalletId,
+                        reducedQty: 0,
+                        reducedUomValue: reducedAmount,
+                        // reducedUomValue: getRoundedAmount(reducedAmount),
+                        packingSize: featuredInvs.find(inv => inv.palletId == inv.palletId).packingSize
+                    });
+                    break;
+            }
+        }
+        return inv;
+    });
+    return { featuredInvs, repackedFroms };
+}
+function getRoundedAmount(value, decimalPlace = 100) {
+    return Math.round((value + Number.EPSILON) * decimalPlace) / decimalPlace;
+}
 //# sourceMappingURL=repackaging.js.map