@things-factory/worksheet-base 4.0.0-y.0 → 4.0.4

package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.completeBatchPicking = exports.completeBatchPickingResolver = void 0;
 const biz_base_1 = require("@things-factory/biz-base");
+const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
 const controllers_1 = require("../../../../controllers/");
 const worksheet_controller_1 = require("../../../../controllers/worksheet-controller");
 exports.completeBatchPickingResolver = {
@@ -23,6 +24,24 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
     const worksheet = await pickingWSCtrl.completeBatchPicking(taskNo);
     const worksheetDetails = worksheet.worksheetDetails;
     const targetInventories = worksheetDetails.map((wsd) => wsd.targetInventory);
+    const sellercraft = await tx
+        .getRepository(integration_sellercraft_1.Sellercraft)
+        .findOne({ domain: worksheet.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
+    if (sellercraft) {
+        const releaseGoods = worksheetDetails.map(worksheetDetail => worksheetDetail.targetInventory && worksheetDetail.targetInventory.releaseGood);
+        const uniqueReleaseGoods = [];
+        const map = new Map();
+        for (const releaseGood of releaseGoods) {
+            if (!map.has(releaseGood.id)) {
+                map.set(releaseGood.id, true);
+                uniqueReleaseGoods.push(Object.assign({}, releaseGood));
+            }
+        }
+        await Promise.all(uniqueReleaseGoods.map(async (releaseGood) => {
+            const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
+            await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood);
+        }));
+    }
     const pickPackTargetInventories = targetInventories
         .filter(targetInventory => targetInventory.releaseGood.packingOption)
         .map((pickPackTargetInventory) => {

package/dist-server/graphql/resolvers/worksheet/picking/complete-batch-picking.js.map

@@ -1 +1 @@
-{"version":3,"file":"complete-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"complete-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts"],"names":[],"mappings":";;;AAGA,uDAAkE;AAClE,qFAAwF;AAIxF,0DAKiC;AACjC,uFAAkF;AAGrE,QAAA,4BAA4B,GAAG;IAC1C,KAAK,CAAC,oBAAoB,CAAC,CAAM,EAAE,EAAE,MAAM,EAAE,EAAE,OAAY;QACzD,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,MAAM,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,CAAA;QAEpD,MAAM,QAAQ,GAAa,MAAM,IAAA,wBAAa,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAC5D,MAAM,mBAAmB,GAAwB,IAAI,0CAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC1F,MAAM,mBAAmB,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YACnD,KAAK,EAAE,+BAA+B,QAAQ,CAAC,IAAI,KAAK,MAAM,GAAG;YACjE,IAAI,EAAE,iCAAiC;YACvC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO;YAC3B,IAAI,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE;SACtC,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,oBAAoB,CACxC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,MAAc;IAEd,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAClG,MAAM,SAAS,GAAG,MAAM,aAAa,CAAC,oBAAoB,CAAC,MAAM,CAAC,CAAA;IAElE,MAAM,gBAAgB,GAAsB,SAAS,CAAC,gBAAgB,CAAA;IACtE,MAAM,iBAAiB,GAAqB,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IAE/G,MAAM,WAAW,GAAgB,MAAM,EAAE;SACtC,aAAa,CAAC,qCAAW,CAAC;SAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,SAAS,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;IAEnF,IAAI,WAAW,EAAE;QACf,MAAM,YAAY,GAAkB,gBAAgB,CAAC,GAAG,CACtD,eAAe,CAAC,EAAE,CAAC,eAAe,CAAC,eAAe,IAAI,eAAe,CAAC,eAAe,CAAC,WAAW,CAClG,CAAA;QACD,MAAM,kBAAkB,GAAkB,EAAE,CAAA;QAC5C,MAAM,GAAG,GAAG,IAAI,GAAG,EAAE,CAAA;QACrB,KAAK,MAAM,WAAW,IAAI,YAAY,EAAE;YACtC,IAAI,CAAC,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,CAAC,EAAE;gBAC5B,GAAG,CAAC,GAAG,CAAC,WAAW,CAAC,EAAE,EAAE,IAAI,CAAC,CAAA;gBAC7B,kBAAkB,CAAC,IAAI,mBAAM,WAAW,EAAG,CAAA;aAC5C;SACF;QAED,MAAM,OAAO,CAAC,GAAG,CACf,kBAAkB,CAAC,GAAG,CAAC,KAAK,EAAC,WAAW,EAAC,EAAE;YACzC,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAC1F,MAAM,eAAe,CAAC,qBAAqB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;QACvE,CAAC,CAAC,CACH,CAAA;KACF;IAED,MAAM,yBAAyB,GAAqB,iBAAiB;SAClE,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,eAAe,CAAC,WAAW,CAAC,aAAa,CAAC;SACpE,GAAG,CAAC,CAAC,uBAAuC,EAAE,EAAE;QAC/C,OAAO,uBAAuB,CAAA;IAChC,CAAC,CAAC,CAAA;IAEJ,MAAM,yBAAyB,GAAqB,iBAAiB;SAClE,MAAM,CAAC,eAAe,CAAC,EAAE,CAAC,CAAC,eAAe,CAAC,WAAW,CAAC,aAAa,CAAC;SACrE,GAAG,CAAC,CAAC,uBAAuC,EAAE,EAAE;QAC/C,OAAO,uBAAuB,CAAA;IAChC,CAAC,CAAC,CAAA;IAEJ,IAAI,yBAAyB,aAAzB,yBAAyB,uBAAzB,yBAAyB,CAAE,MAAM,EAAE;QACrC,yBAAyB;QACzB,MAAM,QAAQ,GAAa,yBAAyB,CAAC,GAAG,CAAC,CAAC,EAAkB,EAAE,EAAE,CAAC,EAAE,CAAC,WAAW,CAAC,IAAI,CAAC,CAAA;QACrG,IAAI,UAAU,GAAa,EAAE,CAAA;QAC7B,QAAQ,CAAC,OAAO,CAAC,IAAI,CAAC,EAAE;YACtB,IAAI,CAAC,UAAU,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE;gBAC9B,UAAU,CAAC,IAAI,CAAC,IAAI,CAAC,CAAA;aACtB;QACH,CAAC,CAAC,CAAA;QAEF,qCAAqC;QACrC,KAAK,IAAI,CAAC,GAAW,CAAC,EAAE,CAAC,GAAG,UAAU,CAAC,MAAM,EAAE,CAAC,EAAE,EAAE;YAClD,MAAM,aAAa,GAAW,UAAU,CAAC,CAAC,CAAC,CAAA;YAC3C,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAClG,MAAM,aAAa,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAA;SAC5D;KACF;IAED,IAAI,yBAAyB,aAAzB,yBAAyB,uBAAzB,yBAAyB,CAAE,MAAM,EAAE;QACrC,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAClG,MAAM,gBAAgB,GAAc,MAAM,aAAa,CAAC,wBAAwB,CAC9E,SAAS,EACT,yBAAyB,CAC1B,CAAA;QAED,MAAM,aAAa,CAAC,eAAe,CAAC,gBAAgB,CAAC,IAAI,EAAE,gBAAgB,CAAC,gBAAgB,CAAC,CAAA;KAC9F;AACH,CAAC;AA5ED,oDA4EC"}

package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js

@@ -2,42 +2,20 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.completePicking = exports.completePickingResolver = void 0;
 const biz_base_1 = require("@things-factory/biz-base");
+const integration_lmd_1 = require("@things-factory/integration-lmd");
+const integration_marketplace_1 = require("@things-factory/integration-marketplace");
+const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
+const marketplace_base_1 = require("@things-factory/marketplace-base");
 const sales_base_1 = require("@things-factory/sales-base");
 const constants_1 = require("../../../../constants");
 const controllers_1 = require("../../../../controllers/");
-const marketplace_base_1 = require("@things-factory/marketplace-base");
-const integration_marketplace_1 = require("@things-factory/integration-marketplace");
+const ecommerce_1 = require("../../../../controllers/ecommerce");
 const worksheet_controller_1 = require("../../../../controllers/worksheet-controller");
 const entities_1 = require("../../../../entities");
-const utils_1 = require("../../../../utils");
-const ecommerce_1 = require("../../../../controllers/ecommerce");
-const integration_lmd_1 = require("@things-factory/integration-lmd");
 exports.completePickingResolver = {
     async completePicking(_, { releaseGoodNo }, context) {
         const { tx, domain, user } = context.state;
         await completePicking(tx, domain, user, releaseGoodNo);
-        const releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
-            where: { domain, name: releaseGoodNo },
-            relations: [
-                'bizplace',
-                'bizplace.company',
-                'bizplace.company.domain',
-                'orderInventories',
-                'orderInventories.product'
-            ]
-        });
-        if (releaseGood.type === 'b2c') {
-            const companyDomain = releaseGood.bizplace.company.domain;
-            const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
-                where: { releaseOrderId: releaseGood.id, domain: companyDomain },
-                relations: ['marketplaceStore']
-            });
-            const marketplaceStore = marketplaceOrder.marketplaceStore;
-            if (marketplaceStore.isAutoUpdateShipment) {
-                const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
-                await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, sales_base_1.ORDER_STATUS.PACKING);
-            }
-        }
         const bizplace = await (0, biz_base_1.getMyBizplace)(domain, user);
         const worksheetController = new worksheet_controller_1.WorksheetController(tx, domain, user);
         await worksheetController.notifyToCustomer(bizplace, {
@@ -51,9 +29,16 @@ exports.completePickingResolver = {
 async function completePicking(tx, domain, user, releaseGoodNo) {
     var _a;
     const pickingWSCtrl = new controllers_1.PickingWorksheetController(tx, domain, user);
-    const releaseGood = await pickingWSCtrl.findRefOrder(sales_base_1.ReleaseGood, {
-        domain,
-        name: releaseGoodNo
+    const releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
+        where: { domain, name: releaseGoodNo },
+        relations: [
+            'bizplace',
+            'bizplace.domain',
+            'bizplace.company',
+            'bizplace.company.domain',
+            'orderInventories',
+            'orderInventories.product'
+        ]
     });
     const worksheet = await pickingWSCtrl.findWorksheetByRefOrder(releaseGood, constants_1.WORKSHEET_TYPE.PICKING, [
         'worksheetDetails',
@@ -67,143 +52,133 @@ async function completePicking(tx, domain, user, releaseGoodNo) {
     });
     const worksheetDetails = worksheet.worksheetDetails;
     const targetInventories = worksheetDetails.map((wsd) => wsd.targetInventory);
-    const pickedTargetInventories = targetInventories
-        .filter(targetInventory => targetInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.PICKED)
-        .map((pickedTargetInventory) => {
-        return pickedTargetInventory;
-    });
+    const pickedTargetInventories = targetInventories.filter(targetInventory => targetInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.PICKED);
     await pickingWSCtrl.completePicking(releaseGoodNo);
-    // Find Existing Loading Worksheet if any
-    let existLoadingWorksheet = await tx.getRepository(entities_1.Worksheet).findOne({
-        where: {
-            releaseGood,
-            type: constants_1.WORKSHEET_TYPE.LOADING,
-            status: constants_1.WORKSHEET_STATUS.DEACTIVATED
+    if (releaseGood.type == 'b2c') {
+        const sellercraft = await tx
+            .getRepository(integration_sellercraft_1.Sellercraft)
+            .findOne({ domain: releaseGood.bizplace.domain, status: integration_sellercraft_1.SellercraftStatus.ACTIVE });
+        if (sellercraft) {
+            const sellercraftCtrl = new controllers_1.SellercraftController(tx, domain, user);
+            await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood);
         }
-    });
-    if (releaseGood.packingOption) {
-        // find marketplace store to check if there is any eTrax true config
-        // access marketplaceOrderShipping from marketplaceOrderItems
-        let marketplaceOrder;
-        let eTraxOption;
-        if (releaseGood.type === 'b2c') {
+        else {
+            const companyDomain = releaseGood.bizplace.company.domain;
+            let marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
+                where: { orderNo: releaseGood.refNo, domain: companyDomain },
+                relations: ['marketplaceStore']
+            });
+            const marketplaceStore = marketplaceOrder.marketplaceStore;
+            let eTraxOption;
+            if (marketplaceStore.isAutoUpdateShipment) {
+                const ecommerceCtrl = new ecommerce_1.EcommerceController(tx, domain, user);
+                await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, sales_base_1.ORDER_STATUS.PACKING);
+            }
             marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
-                where: { releaseOrderId: releaseGood.id },
+                where: { orderNo: releaseGood.refNo },
                 relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceOrderShipping']
             });
             if (!marketplaceOrder)
                 throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue');
             eTraxOption = marketplaceOrder === null || marketplaceOrder === void 0 ? void 0 : marketplaceOrder.marketplaceStore.eTrax;
-        }
-        // if eTrax option is true
-        if (eTraxOption) {
-            const marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
-            // access every marketplaceOrderItems for shipping information you need
-            // trigger the controller from integration-lmd that trigger the API, build the parameters needed
-            // for etrax didn't support multi awb per order
-            const marketplaceOrderShipping = marketplaceOrderItems[0].marketplaceOrderShipping;
-            const lmd = await tx.getRepository(integration_lmd_1.LastMileDelivery).findOne({
-                where: {
-                    domain,
-                    platform: 'eTrax'
-                }
-            });
-            //Get which transporter to use
-            const marketplaceTransporter = await tx.getRepository(integration_marketplace_1.MarketplaceTransporter).findOne({
-                where: { marketplaceStore: marketplaceOrder.marketplaceStore },
-                relations: ['pickupTransporter', 'deliveryTransporter']
-            });
-            const resp = await integration_lmd_1.LastMileAPI.createShipmentRequest(lmd, {
-                orderNo: marketplaceOrder.orderNo,
-                clientId: lmd.clientId,
-                clientType: lmd.clientType,
-                clientName: lmd.clientName,
-                transporterId: marketplaceTransporter.pickupTransporter.transporterId,
-                pickupName: warehouseContactPoint.name,
-                pickupAddress1: warehouseContactPoint.address,
-                pickupAddress2: warehouseContactPoint.address2,
-                pickupPostcode: warehouseContactPoint.postCode,
-                pickupState: warehouseContactPoint.state,
-                pickupCity: warehouseContactPoint.city,
-                pickupPhone: warehouseContactPoint.phone,
-                pickupEmail: warehouseContactPoint.email,
-                name: marketplaceOrderShipping.attentionTo.trim(),
-                address1: marketplaceOrderShipping.address1.trim(),
-                address2: marketplaceOrderShipping.address2.trim(),
-                postCode: marketplaceOrderShipping.postCode.trim(),
-                city: marketplaceOrderShipping.city.trim(),
-                state: marketplaceOrderShipping.state.trim(),
-                phone: marketplaceOrderShipping.phone1 || '',
-                email: marketplaceOrderShipping.email || '',
-                attentionTo: marketplaceOrderShipping.attentionTo,
-                quantity: marketplaceOrderItems.length
-            });
-            const delay = (ms) => {
-                return new Promise(resolve => setTimeout(resolve, ms));
-            };
-            if (resp.Status === 'SUCCESS') {
-                //Success
-                let awbObtained = false;
-                let retry = 0;
-                while (!awbObtained) {
-                    const marketplaceOrder2 = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
-                        where: { releaseOrderId: releaseGood.id },
-                        relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceOrderShipping']
-                    });
-                    const orderShipping = marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShipping;
-                    if (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.airwayBill) {
-                        awbObtained = true;
+            // if eTrax option is true
+            if (eTraxOption) {
+                const marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems;
+                // access every marketplaceOrderItems for shipping information you need
+                // trigger the controller from integration-lmd that trigger the API, build the parameters needed
+                // for etrax didn't support multi awb per order
+                const marketplaceOrderShipping = marketplaceOrderItems[0].marketplaceOrderShipping;
+                const lmd = await tx.getRepository(integration_lmd_1.LastMileDelivery).findOne({
+                    where: {
+                        domain,
+                        platform: 'eTrax'
                     }
-                    await delay(5000);
-                    //Timeout after 15sec
-                    if (++retry > 3) {
-                        break;
+                });
+                //Get which transporter to use
+                const marketplaceTransporter = await tx.getRepository(integration_marketplace_1.MarketplaceTransporter).findOne({
+                    where: { marketplaceStore: marketplaceOrder.marketplaceStore },
+                    relations: ['pickupTransporter', 'deliveryTransporter']
+                });
+                const resp = await integration_lmd_1.LastMileAPI.createShipmentRequest(lmd, {
+                    orderNo: marketplaceOrder.orderNo,
+                    clientId: lmd.clientId,
+                    clientType: lmd.clientType,
+                    clientName: lmd.clientName,
+                    transporterId: marketplaceTransporter.pickupTransporter.transporterId,
+                    pickupName: warehouseContactPoint.name,
+                    pickupAddress1: warehouseContactPoint.address,
+                    pickupAddress2: warehouseContactPoint.address2,
+                    pickupPostcode: warehouseContactPoint.postCode,
+                    pickupState: warehouseContactPoint.state,
+                    pickupCity: warehouseContactPoint.city,
+                    pickupPhone: warehouseContactPoint.phone,
+                    pickupEmail: warehouseContactPoint.email,
+                    name: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.attentionTo) ? marketplaceOrderShipping.attentionTo.trim() : '',
+                    address1: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address1.trim() : '-',
+                    address2: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.address2.trim() : '-',
+                    postCode: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.postCode.trim() : '',
+                    city: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.city.trim() : '',
+                    state: (marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state) ? marketplaceOrderShipping === null || marketplaceOrderShipping === void 0 ? void 0 : marketplaceOrderShipping.state.trim() : '',
+                    phone: marketplaceOrderShipping.phone1 || '',
+                    email: marketplaceOrderShipping.email || '',
+                    attentionTo: marketplaceOrderShipping.attentionTo,
+                    quantity: marketplaceOrderItems.length
+                });
+                const delay = (ms) => {
+                    return new Promise(resolve => setTimeout(resolve, ms));
+                };
+                if (resp.Status === 'SUCCESS') {
+                    //Success
+                    let awbObtained = false;
+                    let retry = 0;
+                    while (!awbObtained) {
+                        const marketplaceOrder2 = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
+                            where: { releaseOrderId: releaseGood.id },
+                            relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceOrderShipping']
+                        });
+                        const orderShipping = marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShipping;
+                        if (orderShipping === null || orderShipping === void 0 ? void 0 : orderShipping.airwayBill) {
+                            awbObtained = true;
+                        }
+                        await delay(5000);
+                        //Timeout after 15sec
+                        if (++retry > 3) {
+                            break;
+                        }
                     }
                 }
-            }
-            else {
-                throw resp;
-                //Failed
+                else {
+                    throw resp;
+                    //Failed
+                }
             }
         }
+    }
+    if (releaseGood.packingOption) {
         const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
         await packingWSCtrl.generatePackingWorksheet(releaseGoodNo);
     }
-    if (existLoadingWorksheet && !releaseGood.packingOption) {
-        const bizplace = await (0, biz_base_1.getMyBizplace)(domain, user);
-        // 2) Create loading worksheet details
-        let loadingWorksheetDetails = await Promise.all(pickedTargetInventories.map(async (targetInventory) => {
-            let existingLoadingWorksheetDetail = await tx.getRepository(entities_1.WorksheetDetail).findOne({
-                where: {
-                    domain,
-                    worksheet: existLoadingWorksheet,
-                    targetInventory,
-                    type: constants_1.WORKSHEET_TYPE.LOADING
-                }
-            });
-            return existingLoadingWorksheetDetail
-                ? Object.assign(Object.assign({}, existingLoadingWorksheetDetail), { status: constants_1.WORKSHEET_STATUS.DEACTIVATED }) : {
-                domain,
-                bizplace: bizplace,
-                worksheet: existLoadingWorksheet,
-                name: utils_1.WorksheetNoGenerator.generateDetail(constants_1.WORKSHEET_TYPE.LOADING),
-                targetInventory,
+    else {
+        // Find Existing Loading Worksheet if any
+        const existLoadingWorksheet = await tx.getRepository(entities_1.Worksheet).findOne({
+            where: {
+                releaseGood,
                 type: constants_1.WORKSHEET_TYPE.LOADING,
-                status: constants_1.WORKSHEET_STATUS.DEACTIVATED,
-                creator: user,
-                updater: user
-            };
-        }));
-        loadingWorksheetDetails = await tx.getRepository(entities_1.WorksheetDetail).save(loadingWorksheetDetails);
-    }
-    else if (!existLoadingWorksheet && !releaseGood.courierOption && !releaseGood.packingOption) {
-        const loadingWSCtrl = new controllers_1.LoadingWorksheetController(tx, domain, user);
-        let loadingWorksheet = await loadingWSCtrl.generateLoadingWorksheet(releaseGoodNo, pickedTargetInventories);
-        if (!((_a = loadingWorksheet.worksheetDetails) === null || _a === void 0 ? void 0 : _a.length)) {
-            loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id);
+                status: constants_1.WORKSHEET_STATUS.DEACTIVATED
+            }
+        });
+        if (!existLoadingWorksheet && !releaseGood.courierOption && !releaseGood.packingOption) {
+            const loadingWSCtrl = new controllers_1.LoadingWorksheetController(tx, domain, user);
+            let loadingWorksheet = await loadingWSCtrl.generateLoadingWorksheet(releaseGoodNo, pickedTargetInventories);
+            if (!((_a = loadingWorksheet.worksheetDetails) === null || _a === void 0 ? void 0 : _a.length)) {
+                loadingWorksheet = await pickingWSCtrl.findWorksheetById(loadingWorksheet.id);
+            }
+            const loadingWorksheetDetails = loadingWorksheet.worksheetDetails;
+            await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails);
+        }
+        else {
+            throw new Error('Picking completion has been triggered twice, loading worksheet has been generated. Kindly proceed to loading.');
         }
-        const loadingWorksheetDetails = loadingWorksheet.worksheetDetails;
-        await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails);
     }
 }
 exports.completePicking = completePicking;

package/dist-server/graphql/resolvers/worksheet/picking/complete-picking.js.map

@@ -1 +1 @@
-{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"complete-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/complete-picking.ts"],"names":[],"mappings":";;;AAGA,uDAAgF;AAChF,qEAA+E;AAC/E,qFAAkG;AAClG,qFAAwF;AACxF,uEAAmH;AACnH,2DAA8G;AAG9G,qDAAwE;AACxE,0DAKiC;AACjC,iEAAuE;AACvE,uFAAkF;AAClF,mDAAiE;AAEpD,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,EAAE,OAAY;QAC3D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,MAAM,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,CAAC,CAAA;QAEtD,MAAM,QAAQ,GAAa,MAAM,IAAA,wBAAa,EAAC,MAAM,EAAE,IAAI,CAAC,CAAA;QAC5D,MAAM,mBAAmB,GAAwB,IAAI,0CAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAC1F,MAAM,mBAAmB,CAAC,gBAAgB,CAAC,QAAQ,EAAE;YACnD,KAAK,EAAE,+BAA+B,QAAQ,CAAC,IAAI,KAAK,aAAa,GAAG;YACxE,IAAI,EAAE,kCAAkC;YACxC,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO;YAC3B,IAAI,EAAE,EAAE,GAAG,EAAE,OAAO,CAAC,MAAM,CAAC,OAAO,EAAE;SACtC,CAAC,CAAA;IACJ,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,eAAe,CACnC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB;;IAErB,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IAClG,MAAM,WAAW,GAAgB,MAAM,EAAE,CAAC,aAAa,CAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;QAC3E,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE;QACtC,SAAS,EAAE;YACT,UAAU;YACV,iBAAiB;YACjB,kBAAkB;YAClB,yBAAyB;YACzB,kBAAkB;YAClB,0BAA0B;SAC3B;KACF,CAAC,CAAA;IAEF,MAAM,SAAS,GAAc,MAAM,aAAa,CAAC,uBAAuB,CAAC,WAAW,EAAE,0BAAc,CAAC,OAAO,EAAE;QAC5G,kBAAkB;QAClB,kCAAkC;KACnC,CAAC,CAAA;IAEF,MAAM,qBAAqB,GAAiB,MAAM,EAAE,CAAC,aAAa,CAAC,uBAAY,CAAC,CAAC,OAAO,CAAC;QACvF,KAAK,EAAE;YACL,MAAM;YACN,IAAI,EAAE,WAAW;SAClB;KACF,CAAC,CAAA;IAEF,MAAM,gBAAgB,GAAsB,SAAS,CAAC,gBAAgB,CAAA;IACtE,MAAM,iBAAiB,GAAqB,gBAAgB,CAAC,GAAG,CAAC,CAAC,GAAoB,EAAE,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;IAC/G,MAAM,uBAAuB,GAAqB,iBAAiB,CAAC,MAAM,CACxE,eAAe,CAAC,EAAE,CAAC,eAAe,CAAC,MAAM,KAAK,mCAAsB,CAAC,MAAM,CAC5E,CAAA;IAED,MAAM,aAAa,CAAC,eAAe,CAAC,aAAa,CAAC,CAAA;IAElD,IAAI,WAAW,CAAC,IAAI,IAAI,KAAK,EAAE;QAC7B,MAAM,WAAW,GAAgB,MAAM,EAAE;aACtC,aAAa,CAAC,qCAAW,CAAC;aAC1B,OAAO,CAAC,EAAE,MAAM,EAAE,WAAW,CAAC,QAAQ,CAAC,MAAM,EAAE,MAAM,EAAE,2CAAiB,CAAC,MAAM,EAAE,CAAC,CAAA;QAErF,IAAI,WAAW,EAAE;YACf,MAAM,eAAe,GAA0B,IAAI,mCAAqB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAC1F,MAAM,eAAe,CAAC,qBAAqB,CAAC,WAAW,EAAE,WAAW,CAAC,CAAA;SACtE;aAAM;YACL,MAAM,aAAa,GAAW,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAA;YACjE,IAAI,gBAAgB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAgB,CAAC,CAAC,OAAO,CAAC;gBACxF,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE;gBAC5D,SAAS,EAAE,CAAC,kBAAkB,CAAC;aAChC,CAAC,CAAA;YACF,MAAM,gBAAgB,GAAqB,gBAAgB,CAAC,gBAAgB,CAAA;YAC5E,IAAI,WAAoB,CAAA;YAExB,IAAI,gBAAgB,CAAC,oBAAoB,EAAE;gBACzC,MAAM,aAAa,GAAwB,IAAI,+BAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;gBACpF,MAAM,aAAa,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,yBAAY,CAAC,OAAO,CAAC,CAAA;aACjG;YAED,gBAAgB,GAAG,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAgB,CAAC,CAAC,OAAO,CAAC;gBAClE,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,KAAK,EAAE;gBACrC,SAAS,EAAE,CAAC,kBAAkB,EAAE,uBAAuB,EAAE,gDAAgD,CAAC;aAC3G,CAAC,CAAA;YAEF,IAAI,CAAC,gBAAgB;gBACnB,MAAM,IAAI,KAAK,CAAC,sFAAsF,CAAC,CAAA;YACzG,WAAW,GAAG,gBAAgB,aAAhB,gBAAgB,uBAAhB,gBAAgB,CAAE,gBAAgB,CAAC,KAAK,CAAA;YAEtD,0BAA0B;YAC1B,IAAI,WAAW,EAAE;gBACf,MAAM,qBAAqB,GAA2B,gBAAgB,CAAC,qBAAqB,CAAA;gBAE5F,uEAAuE;gBACvE,gGAAgG;gBAChG,+CAA+C;gBAC/C,MAAM,wBAAwB,GAA6B,qBAAqB,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAA;gBAC5G,MAAM,GAAG,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,kCAAgB,CAAC,CAAC,OAAO,CAAC;oBAC7E,KAAK,EAAE;wBACL,MAAM;wBACN,QAAQ,EAAE,OAAO;qBAClB;iBACF,CAAC,CAAA;gBAEF,8BAA8B;gBAC9B,MAAM,sBAAsB,GAA2B,MAAM,EAAE,CAAC,aAAa,CAAC,gDAAsB,CAAC,CAAC,OAAO,CAAC;oBAC5G,KAAK,EAAE,EAAE,gBAAgB,EAAE,gBAAgB,CAAC,gBAAgB,EAAE;oBAC9D,SAAS,EAAE,CAAC,mBAAmB,EAAE,qBAAqB,CAAC;iBACxD,CAAC,CAAA;gBAEF,MAAM,IAAI,GAAG,MAAM,6BAAW,CAAC,qBAAqB,CAAC,GAAG,EAAE;oBACxD,OAAO,EAAE,gBAAgB,CAAC,OAAO;oBACjC,QAAQ,EAAE,GAAG,CAAC,QAAQ;oBACtB,UAAU,EAAE,GAAG,CAAC,UAAU;oBAC1B,UAAU,EAAE,GAAG,CAAC,UAAU;oBAC1B,aAAa,EAAE,sBAAsB,CAAC,iBAAiB,CAAC,aAAa;oBACrE,UAAU,EAAE,qBAAqB,CAAC,IAAI;oBACtC,cAAc,EAAE,qBAAqB,CAAC,OAAO;oBAC7C,cAAc,EAAE,qBAAqB,CAAC,QAAQ;oBAC9C,cAAc,EAAE,qBAAqB,CAAC,QAAQ;oBAC9C,WAAW,EAAE,qBAAqB,CAAC,KAAK;oBACxC,UAAU,EAAE,qBAAqB,CAAC,IAAI;oBACtC,WAAW,EAAE,qBAAqB,CAAC,KAAK;oBACxC,WAAW,EAAE,qBAAqB,CAAC,KAAK;oBACxC,IAAI,EAAE,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,WAAW,EAAC,CAAC,CAAC,wBAAwB,CAAC,WAAW,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;oBAC9F,QAAQ,EAAE,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,QAAQ,EAAC,CAAC,CAAC,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG;oBAC9F,QAAQ,EAAE,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,QAAQ,EAAC,CAAC,CAAC,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,GAAG;oBAC9F,QAAQ,EAAE,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,QAAQ,EAAC,CAAC,CAAC,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;oBAC7F,IAAI,EAAE,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,IAAI,EAAC,CAAC,CAAC,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,IAAI,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;oBACjF,KAAK,EAAE,CAAA,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,KAAK,EAAC,CAAC,CAAC,wBAAwB,aAAxB,wBAAwB,uBAAxB,wBAAwB,CAAE,KAAK,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC,EAAE;oBACpF,KAAK,EAAE,wBAAwB,CAAC,MAAM,IAAI,EAAE;oBAC5C,KAAK,EAAE,wBAAwB,CAAC,KAAK,IAAI,EAAE;oBAC3C,WAAW,EAAE,wBAAwB,CAAC,WAAW;oBACjD,QAAQ,EAAE,qBAAqB,CAAC,MAAM;iBACvC,CAAC,CAAA;gBAEF,MAAM,KAAK,GAAG,CAAC,EAAU,EAAE,EAAE;oBAC3B,OAAO,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,CAAC,UAAU,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,CAAA;gBACxD,CAAC,CAAA;gBAED,IAAI,IAAI,CAAC,MAAM,KAAK,SAAS,EAAE;oBAC7B,SAAS;oBACT,IAAI,WAAW,GAAG,KAAK,CAAA;oBACvB,IAAI,KAAK,GAAG,CAAC,CAAA;oBACb,OAAO,CAAC,WAAW,EAAE;wBACnB,MAAM,iBAAiB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAgB,CAAC,CAAC,OAAO,CAAC;4BAC3F,KAAK,EAAE,EAAE,cAAc,EAAE,WAAW,CAAC,EAAE,EAAE;4BACzC,SAAS,EAAE,CAAC,kBAAkB,EAAE,uBAAuB,EAAE,gDAAgD,CAAC;yBAC3G,CAAC,CAAA;wBACF,MAAM,aAAa,GAAG,iBAAiB,CAAC,qBAAqB,CAAC,CAAC,CAAC,CAAC,wBAAwB,CAAA;wBACzF,IAAI,aAAa,aAAb,aAAa,uBAAb,aAAa,CAAE,UAAU,EAAE;4BAC7B,WAAW,GAAG,IAAI,CAAA;yBACnB;wBACD,MAAM,KAAK,CAAC,IAAI,CAAC,CAAA;wBACjB,qBAAqB;wBACrB,IAAI,EAAE,KAAK,GAAG,CAAC,EAAE;4BACf,MAAK;yBACN;qBACF;iBACF;qBAAM;oBACL,MAAM,IAAI,CAAA;oBACV,QAAQ;iBACT;aACF;SACF;KACF;IAED,IAAI,WAAW,CAAC,aAAa,EAAE;QAC7B,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QAClG,MAAM,aAAa,CAAC,wBAAwB,CAAC,aAAa,CAAC,CAAA;KAC5D;SAAM;QACL,yCAAyC;QACzC,MAAM,qBAAqB,GAAc,MAAM,EAAE,CAAC,aAAa,CAAC,oBAAS,CAAC,CAAC,OAAO,CAAC;YACjF,KAAK,EAAE;gBACL,WAAW;gBACX,IAAI,EAAE,0BAAc,CAAC,OAAO;gBAC5B,MAAM,EAAE,4BAAgB,CAAC,WAAW;aACrC;SACF,CAAC,CAAA;QAEF,IAAI,CAAC,qBAAqB,IAAI,CAAC,WAAW,CAAC,aAAa,IAAI,CAAC,WAAW,CAAC,aAAa,EAAE;YACtF,MAAM,aAAa,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;YAClG,IAAI,gBAAgB,GAAc,MAAM,aAAa,CAAC,wBAAwB,CAC5E,aAAa,EACb,uBAAuB,CACxB,CAAA;YAED,IAAI,CAAC,CAAA,MAAA,gBAAgB,CAAC,gBAAgB,0CAAE,MAAM,CAAA,EAAE;gBAC9C,gBAAgB,GAAG,MAAM,aAAa,CAAC,iBAAiB,CAAC,gBAAgB,CAAC,EAAE,CAAC,CAAA;aAC9E;YAED,MAAM,uBAAuB,GAAsB,gBAAgB,CAAC,gBAAgB,CAAA;YACpF,MAAM,aAAa,CAAC,eAAe,CAAC,gBAAgB,CAAC,IAAI,EAAE,uBAAuB,CAAC,CAAA;SACpF;aAAM;YACL,MAAM,IAAI,KAAK,CACb,+GAA+G,CAChH,CAAA;SACF;KACF;AACH,CAAC;AApLD,0CAoLC"}

package/dist-server/graphql/resolvers/worksheet/picking/undo-picking-assignment.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.undoPickingAssigment = exports.undoPickingAssigmentResolver = void 0;
 const controllers_1 = require("../../../../controllers");
 exports.undoPickingAssigmentResolver = {
-    async undoPickingAssigment(_, { worksheetNo, batchId, productId, packingType }, context) {
+    async undoPickingAssigment(_, { worksheetNo, batchId, productId, packingType, packingSize }, context) {
         const { tx, domain, user } = context.state;
-        await undoPickingAssigment(tx, domain, user, worksheetNo, batchId, productId, packingType);
+        await undoPickingAssigment(tx, domain, user, worksheetNo, batchId, productId, packingType, packingSize);
     }
 };
-async function undoPickingAssigment(tx, domain, user, worksheetNo, batchId, productId, packingType) {
+async function undoPickingAssigment(tx, domain, user, worksheetNo, batchId, productId, packingType, packingSize) {
     const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
-    await worksheetController.undoPickingAssigment(worksheetNo, batchId, productId, packingType);
+    await worksheetController.undoPickingAssigment(worksheetNo, batchId, productId, packingType, packingSize);
 }
 exports.undoPickingAssigment = undoPickingAssigment;
 //# sourceMappingURL=undo-picking-assignment.js.map

package/dist-server/graphql/resolvers/worksheet/picking/undo-picking-assignment.js.map

@@ -1 +1 @@
-{"version":3,"file":"undo-picking-assignment.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/undo-picking-assignment.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,4BAA4B,GAAG;IAC1C,KAAK,CAAC,oBAAoB,CAAC,CAAM,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,EAAE,OAAY;QAC/F,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,CAAC,CAAA;IAC5F,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,oBAAoB,CACxC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,WAAmB,EACnB,OAAe,EACf,SAAiB,EACjB,WAAmB;IAEnB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,oBAAoB,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,CAAC,CAAA;AAC9F,CAAC;AAXD,oDAWC"}
+{"version":3,"file":"undo-picking-assignment.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/undo-picking-assignment.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,4BAA4B,GAAG;IAC1C,KAAK,CAAC,oBAAoB,CAAC,CAAM,EAAE,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,EAAE,EAAE,OAAY;QAC5G,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;IACzG,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,oBAAoB,CACxC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,WAAmB,EACnB,OAAe,EACf,SAAiB,EACjB,WAAmB,EACnB,WAAmB;IAEnB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,oBAAoB,CAAC,WAAW,EAAE,OAAO,EAAE,SAAS,EAAE,WAAW,EAAE,WAAW,CAAC,CAAA;AAC3G,CAAC;AAZD,oDAYC"}

package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js

@@ -2,10 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.pickingWorksheetResolver = void 0;
 const typeorm_1 = require("typeorm");
-const utils_1 = require("../../../utils");
 const sales_base_1 = require("@things-factory/sales-base");
 const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
+const utils_1 = require("../../../utils");
 exports.pickingWorksheetResolver = {
     async pickingWorksheet(_, { releaseGoodNo, locationSortingRules }, context) {
         var _a;
@@ -38,6 +38,7 @@ exports.pickingWorksheetResolver = {
                 partnerDomainId: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id,
                 startedAt: worksheet.startedAt,
                 refNo: releaseGood.refNo,
+                refNo2: releaseGood.refNo2,
                 releaseGood
             },
             worksheetDetailInfos: worksheetDetails.map(async (pickingWSD) => {

package/dist-server/graphql/resolvers/worksheet/picking-worksheet.js.map

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

package/dist-server/graphql/resolvers/worksheet/recommend-putway-location.js

@@ -33,7 +33,7 @@ exports.recommendPutawayLocationResolver = {
         const sortingLevelSetting = await (0, typeorm_1.getRepository)(setting_base_1.Setting).findOne({
             where: { domain, name: 'location-recommendation-level' }
         });
-        const sortingLevel = sortingLevelSetting.value;
+        const sortingLevel = sortingLevelSetting === null || sortingLevelSetting === void 0 ? void 0 : sortingLevelSetting.value;
         switch (sortingLevel) {
             case 'level 1':
                 return recommendLocationLevel1(domain, targetWarehouse, optCnt);

package/dist-server/graphql/resolvers/worksheet/recommend-putway-location.js.map

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

package/dist-server/graphql/resolvers/worksheet/replace-picking-pallets.js

@@ -17,11 +17,13 @@ exports.replacePickingPalletsResolver = {
                 'worksheet',
                 'targetInventory',
                 'targetInventory.releaseGood',
-                'targetInventory.inventory'
+                'targetInventory.inventory',
+                'targetInventory.inventory.product'
             ]
         });
         const prevOrderInv = prevWSD.targetInventory;
         const prevInv = prevOrderInv.inventory;
+        const product = prevInv.product;
         const batchId = prevOrderInv.batchId;
         const productName = prevOrderInv.productName;
         const packingType = prevOrderInv.packingType;
@@ -29,13 +31,13 @@ exports.replacePickingPalletsResolver = {
         const releaseGood = prevWSD.targetInventory.releaseGood;
         const customerBizplace = prevWSD.bizplace;
         // remove locked qty and locked uomValue
-        await tx.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, prevInv), { lockedQty: 0, lockedWeight: 0, lockedUomValue: 0, updater: user }));
+        await tx.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, prevInv), { lockedQty: prevInv.lockedQty - prevOrderInv.releaseQty, lockedUomValue: prevInv.lockedUomValue - prevOrderInv.releaseUomValue, updater: user }));
         // 2. update status of previous order Inventory
         await tx.getRepository(sales_base_1.OrderInventory).save(Object.assign(Object.assign({}, prevOrderInv), { status: sales_base_1.ORDER_INVENTORY_STATUS.REPLACED, updater: user }));
         // 3. update status of prev worksheet detail
         await tx.getRepository(entities_1.WorksheetDetail).save(Object.assign(Object.assign({}, prevWSD), { status: constants_1.WORKSHEET_STATUS.REPLACED, updater: user }));
         await Promise.all(inventories.map(async (inventory) => {
-            const foundInv = await tx.getRepository(warehouse_base_1.Inventory).findOne({
+            let foundInv = await tx.getRepository(warehouse_base_1.Inventory).findOne({
                 where: {
                     domain,
                     palletId: inventory.palletId
@@ -52,11 +54,13 @@ exports.replacePickingPalletsResolver = {
                 releaseQty: inventory.qty,
                 releaseUomValue: unitUomValue * inventory.qty,
                 inventory: foundInv,
+                product,
                 batchId,
                 type: sales_base_1.ORDER_TYPES.RELEASE_OF_GOODS,
                 status: sales_base_1.ORDER_INVENTORY_STATUS.PICKING,
                 productName,
                 packingType,
+                packingSize: inventory.packingSize,
                 creator: user,
                 updater: user
             });
@@ -74,8 +78,13 @@ exports.replacePickingPalletsResolver = {
                 creator: user,
                 updater: user
             });
+            foundInv.lockedQty = foundInv.lockedQty ? foundInv.lockedQty + inventory.qty : inventory.qty;
+            foundInv.lockedUomValue = foundInv.lockedUomValue
+                ? foundInv.lockedUomValue + unitUomValue * inventory.qty
+                : unitUomValue * inventory.qty;
+            foundInv = await tx.getRepository(warehouse_base_1.Inventory).save(foundInv);
             // 6. execute picking transaction
-            await (0, picking_1.picking)(tx, domain, user, wsd.name, worksheetType, inventory.palletId, returnLocation, inventory.qty);
+            await (0, picking_1.picking)(tx, domain, user, wsd.name, worksheetType, foundInv.palletId, returnLocation, inventory.qty);
         }));
     }
 };

package/dist-server/graphql/resolvers/worksheet/replace-picking-pallets.js.map

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