@things-factory/worksheet-base 4.3.394 → 4.3.395

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

@@ -2,9 +2,13 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.activateBatchPicking = exports.activateBatchPickingResolver = void 0;
 const typeorm_1 = require("typeorm");
+const auth_base_1 = require("@things-factory/auth-base");
+const env_1 = require("@things-factory/env");
 const integration_marketplace_1 = require("@things-factory/integration-marketplace");
+const marketplace_base_1 = require("@things-factory/marketplace-base");
+const sales_base_1 = require("@things-factory/sales-base");
 const controllers_1 = require("../../../../controllers");
-const env_1 = require("@things-factory/env");
+const utils_1 = require("../../../../utils");
 exports.activateBatchPickingResolver = {
     async activateBatchPicking(_, { worksheetNo }, context) {
         const { tx, domain, user } = context.state;
@@ -12,11 +16,14 @@ exports.activateBatchPickingResolver = {
     }
 };
 async function activateBatchPicking(tx, domain, user, worksheetNo) {
+    var _a, _b;
     try {
         const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
+        const ecommerceCtrl = new controllers_1.EcommerceController(tx, domain, user);
         const worksheet = await worksheetController.activateBatchPicking(worksheetNo);
         const worksheetDetails = worksheet.worksheetDetails;
         const companyDomain = worksheet === null || worksheet === void 0 ? void 0 : worksheet.bizplace.company.domain;
+        let orderInventories = worksheetDetails.map(wsd => wsd.targetInventory);
         // find for any existing marketplace store connections
         const marketplaceStores = await tx.getRepository(integration_marketplace_1.MarketplaceStore).find({
             where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
@@ -37,6 +44,69 @@ async function activateBatchPicking(tx, domain, user, worksheetNo) {
         if ((marketplaceStores === null || marketplaceStores === void 0 ? void 0 : marketplaceStores.length) && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
             updateMarketplaceProductVariationStock(worksheetDetails, domain, user, marketplaceStores, companyDomain);
         }
+        try {
+            let releaseGoods = [];
+            let releaseGoodIds = orderInventories.reduce((data, orderInventory) => {
+                if (!data.find(x => x.id == orderInventory.releaseGood.id)) {
+                    data.push(orderInventory.releaseGood.id);
+                }
+                return data;
+            }, []);
+            releaseGoods = await tx.getRepository(sales_base_1.ReleaseGood).find({
+                where: { id: (0, typeorm_1.In)(releaseGoodIds) },
+                relations: [
+                    'domain',
+                    'lastMileDelivery',
+                    'bizplace',
+                    'bizplace.domain',
+                    'orderPackages',
+                    'orderPackages.orderPackageItems',
+                    'orderPackages.orderPackageItems.orderProduct',
+                    'orderPackages.orderPackageItems.orderProduct.product',
+                    'orderPackages.orderPackageItems.orderProduct.productDetail',
+                    'orderProducts',
+                    'orderProducts.productDetail',
+                    'orderProducts.product'
+                ]
+            });
+            if (releaseGoods === null || releaseGoods === void 0 ? void 0 : releaseGoods.length) {
+                for (const releaseGood of releaseGoods) {
+                    const orderSource = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.source;
+                    const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
+                        where: { orderNo: releaseGood.refNo, domain: companyDomain },
+                        relations: ['marketplaceStore']
+                    });
+                    switch (orderSource) {
+                        case auth_base_1.ApplicationType.MMS:
+                            if (marketplaceStores === null || marketplaceStores === void 0 ? void 0 : marketplaceStores.length) {
+                                if (marketplaceOrder) {
+                                    const marketplaceStore = marketplaceOrder.marketplaceStore;
+                                    await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, releaseGood);
+                                }
+                            }
+                            break;
+                        default:
+                            break;
+                    }
+                    if (((_a = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length) &&
+                        releaseGood.lmdOption &&
+                        releaseGood.lastMileDelivery &&
+                        ((_b = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _b === void 0 ? void 0 : _b.some(op => op.parcelId == null))) {
+                        await (0, utils_1.createLmdParcel)([releaseGood], tx, domain, user, marketplaceOrder);
+                        //where to trigger update parcel count
+                        let countParcel = (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.countParcel) ? releaseGood.countParcel : 0;
+                        const releaseGoodId = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.id;
+                        await tx.getRepository(sales_base_1.ReleaseGood).update({ id: releaseGoodId }, {
+                            countParcel: countParcel + 1,
+                            updater: user.id
+                        });
+                    }
+                }
+            }
+        }
+        catch (e) {
+            env_1.logger.error(e);
+        }
         return worksheet;
     }
     catch (error) {

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

@@ -1 +1 @@
-{"version":3,"file":"activate-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-batch-picking.ts"],"names":[],"mappings":";;;AAAA,qCAAsD;AAGtD,qFAA0E;AAG1E,yDAAyF;AAEzF,6CAA4C;AAE/B,QAAA,4BAA4B,GAAG;IAC1C,KAAK,CAAC,oBAAoB,CAAC,CAAM,EAAE,EAAE,WAAW,EAAE,EAAE,OAAY;QAC9D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,OAAO,MAAM,oBAAoB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;IAClE,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,oBAAoB,CACxC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,WAAmB;IAEnB,IAAI;QACF,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACxG,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,oBAAoB,CAAC,WAAW,CAAC,CAAA;QAC7E,MAAM,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAA;QACnD,MAAM,aAAa,GAAW,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAA;QAEhE,sDAAsD;QACtD,MAAM,iBAAiB,GAAuB,MAAM,EAAE,CAAC,aAAa,CAAC,0CAAgB,CAAC,CAAC,IAAI,CAAC;YAC1F,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE;YAC9E,SAAS,EAAE,CAAC,yBAAyB,CAAC;SACvC,CAAC,CAAA;QAEF,MAAM,sCAAsC,GAAG,KAAK,EAAE,gBAAgB,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,aAAa,EAAE,EAAE;YACxH,IAAI;gBACF,MAAM,IAAA,uBAAa,GAAE,CAAC,WAAW,CAAC,KAAK,EAAE,GAAkB,EAAE,EAAE;oBAC7D,IAAI,gBAAgB,GAAU,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;oBAC9E,MAAM,aAAa,GAAwB,IAAI,iCAAmB,CAAC,GAAG,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;oBACrF,MAAM,aAAa,CAAC,2BAA2B,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAA;gBACrG,CAAC,CAAC,CAAA;aACH;YAAC,OAAO,KAAK,EAAE;gBACd,YAAM,CAAC,KAAK,CAAC,iDAAiD,WAAW,GAAG,GAAG,GAAG,KAAK,EAAE,CAAC,CAAA;aAC3F;QACH,CAAC,CAAA;QAED,IAAI,CAAA,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,KAAI,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;YAC5F,sCAAsC,CAAC,gBAAgB,EAAE,MAAM,EAAE,IAAI,EAAE,iBAAiB,EAAE,aAAa,CAAC,CAAA;SACzG;QAED,OAAO,SAAS,CAAA;KAEjB;IAAC,OAAO,KAAK,EAAE;QACd,YAAM,CAAC,KAAK,CAAC,iDAAiD,WAAW,GAAG,GAAG,GAAG,KAAK,EAAE,CAAC,CAAA;QAC1F,MAAM,IAAI,KAAK,CAAC,+CAA+C,CAAC,CAAA;KACjE;AACH,CAAC;AAxCD,oDAwCC"}
+{"version":3,"file":"activate-batch-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-batch-picking.ts"],"names":[],"mappings":"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"}

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

@@ -7,6 +7,7 @@ const marketplace_base_1 = require("@things-factory/marketplace-base");
 const sales_base_1 = require("@things-factory/sales-base");
 const controllers_1 = require("../../../../controllers");
 const entities_1 = require("../../../../entities");
+const utils_1 = require("../../../../utils");
 exports.activatePickingResolver = {
     async activatePicking(_, { worksheetNo }, context) {
         const { tx, domain, user } = context.state;
@@ -14,12 +15,18 @@ exports.activatePickingResolver = {
     }
 };
 async function activatePicking(tx, domain, user, worksheetNo) {
+    var _a, _b;
     try {
         const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
+        const ecommerceCtrl = new controllers_1.EcommerceController(tx, domain, user);
         const worksheet = await worksheetController.activatePicking(worksheetNo);
         const companyDomain = worksheet === null || worksheet === void 0 ? void 0 : worksheet.bizplace.company.domain;
         let releaseGood = worksheet.releaseGood;
         const orderSource = releaseGood.source;
+        const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
+            where: { orderNo: releaseGood.refNo, domain: companyDomain },
+            relations: ['marketplaceStore']
+        });
         switch (orderSource) {
             case auth_base_1.ApplicationType.MMS:
                 // find for any existing marketplace store connections
@@ -34,46 +41,32 @@ async function activatePicking(tx, domain, user, worksheetNo) {
                         const ecommerceCtrl = new controllers_1.EcommerceController(tx, domain, user);
                         await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain);
                     }
-                    const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
-                        where: { orderNo: releaseGood.refNo, domain: companyDomain },
-                        relations: ['marketplaceStore']
-                    });
                     if (marketplaceOrder) {
                         const marketplaceStore = marketplaceOrder.marketplaceStore;
                         if (marketplaceStore.isAutoUpdateShipment) {
                             const ecommerceCtrl = new controllers_1.EcommerceController(tx, domain, user);
                             await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, sales_base_1.ORDER_STATUS.PICKING);
                         }
+                        await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, releaseGood);
                     }
                 }
                 break;
             default:
                 break;
         }
-        // if (releaseGood.type === 'b2c') {
-        //   const sellercraft: Sellercraft = await tx
-        //     .getRepository(Sellercraft)
-        //     .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
-        //   if (marketplaceStores?.length && !sellercraft) {
-        //     if (marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
-        //       const worksheetDetails = worksheet.worksheetDetails
-        //       let orderInventories: any[] = worksheetDetails.map(wsd => wsd.targetInventory)
-        //       const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-        //       await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain)
-        //     }
-        //     const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-        //       where: { orderNo: releaseGood.refNo, domain: companyDomain },
-        //       relations: ['marketplaceStore']
-        //     })
-        //     if (marketplaceOrder) {
-        //       const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
-        //       if (marketplaceStore.isAutoUpdateShipment) {
-        //         const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-        //         await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PICKING)
-        //       }
-        //     }
-        //   }
-        // }
+        if (((_a = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length) &&
+            releaseGood.lmdOption &&
+            releaseGood.lastMileDelivery &&
+            ((_b = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _b === void 0 ? void 0 : _b.some(op => op.parcelId == null))) {
+            await (0, utils_1.createLmdParcel)([releaseGood], tx, domain, user, marketplaceOrder);
+            //where to trigger update parcel count
+            let countParcel = (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.countParcel) ? releaseGood.countParcel : 0;
+            const releaseGoodId = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.id;
+            await tx.getRepository(sales_base_1.ReleaseGood).update({ id: releaseGoodId }, {
+                countParcel: countParcel + 1,
+                updater: user.id
+            });
+        }
         return worksheet;
     }
     catch (error) {

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

@@ -1 +1 @@
-{"version":3,"file":"activate-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-picking.ts"],"names":[],"mappings":";;;AAEA,yDAAiE;AACjE,qFAA0E;AAC1E,uEAAmE;AACnE,2DAAsE;AAGtE,yDAAyF;AACzF,mDAA4E;AAE/D,QAAA,uBAAuB,GAAG;IACrC,KAAK,CAAC,eAAe,CAAC,CAAM,EAAE,EAAE,WAAW,EAAE,EAAE,OAAY;QACzD,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,OAAO,MAAM,eAAe,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;IAC7D,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,eAAe,CACnC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,WAAmB;IAEnB,IAAI;QACF,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;QACxG,MAAM,SAAS,GAAG,MAAM,mBAAmB,CAAC,eAAe,CAAC,WAAW,CAAC,CAAA;QACxE,MAAM,aAAa,GAAW,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAA;QAEhE,IAAI,WAAW,GAAgB,SAAS,CAAC,WAAW,CAAA;QAEpD,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,CAAA;QAC9C,QAAQ,WAAW,EAAE;YACnB,KAAK,2BAAe,CAAC,GAAG;gBACtB,sDAAsD;gBACtD,MAAM,iBAAiB,GAAuB,MAAM,EAAE,CAAC,aAAa,CAAC,0CAAgB,CAAC,CAAC,IAAI,CAAC;oBAC1F,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE;oBAC9E,SAAS,EAAE,CAAC,yBAAyB,CAAC;iBACvC,CAAC,CAAA;gBAEF,IAAI,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,EAAE;oBAC7B,IAAI,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;wBAC/D,MAAM,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAA;wBACnD,IAAI,gBAAgB,GAAU,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;wBAC9E,MAAM,aAAa,GAAwB,IAAI,iCAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;wBACpF,MAAM,aAAa,CAAC,2BAA2B,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAA;qBACpG;oBAED,MAAM,gBAAgB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAgB,CAAC,CAAC,OAAO,CAAC;wBAC1F,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE;wBAC5D,SAAS,EAAE,CAAC,kBAAkB,CAAC;qBAChC,CAAC,CAAA;oBAEF,IAAI,gBAAgB,EAAE;wBACpB,MAAM,gBAAgB,GAAqB,gBAAgB,CAAC,gBAAgB,CAAA;wBAE5E,IAAI,gBAAgB,CAAC,oBAAoB,EAAE;4BACzC,MAAM,aAAa,GAAwB,IAAI,iCAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;4BACpF,MAAM,aAAa,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,yBAAY,CAAC,OAAO,CAAC,CAAA;yBACjG;qBACF;iBACF;gBACD,MAAK;YAEP;gBACE,MAAK;SACR;QAED,oCAAoC;QACpC,8CAA8C;QAC9C,kCAAkC;QAClC,wFAAwF;QAExF,qDAAqD;QACrD,yEAAyE;QACzE,4DAA4D;QAC5D,uFAAuF;QACvF,6FAA6F;QAC7F,4GAA4G;QAC5G,QAAQ;QAER,oGAAoG;QACpG,sEAAsE;QACtE,wCAAwC;QACxC,SAAS;QAET,8BAA8B;QAC9B,qFAAqF;QAErF,qDAAqD;QACrD,+FAA+F;QAC/F,2GAA2G;QAC3G,UAAU;QACV,QAAQ;QACR,MAAM;QACN,IAAI;QACJ,OAAO,SAAS,CAAA;KACjB;IAAC,OAAO,KAAK,EAAE;QACd,MAAM,KAAK,CAAA;KACZ;YAAS;QACR,qCAA0B,CAAC,WAAW,EAAE,CAAA;KACzC;AAEH,CAAC;AArFD,0CAqFC"}
+{"version":3,"file":"activate-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/activate-picking.ts"],"names":[],"mappings":"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"}

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

@@ -6,6 +6,7 @@ const integration_marketplace_1 = require("@things-factory/integration-marketpla
 const marketplace_base_1 = require("@things-factory/marketplace-base");
 const sales_base_1 = require("@things-factory/sales-base");
 const controllers_1 = require("../../../../controllers");
+const utils_1 = require("../../../../utils");
 exports.activateBulkPickingResolver = {
     async activateBulkPicking(_, { worksheetNo }, context) {
         const { tx, domain, user } = context.state;
@@ -13,12 +14,18 @@ exports.activateBulkPickingResolver = {
     }
 };
 async function activateBulkPicking(tx, domain, user, worksheetNo) {
+    var _a, _b;
     const worksheetController = new controllers_1.PickingWorksheetController(tx, domain, user);
+    const ecommerceCtrl = new controllers_1.EcommerceController(tx, domain, user);
     const worksheets = await worksheetController.activateBulkPicking(worksheetNo);
     for (const worksheet of worksheets) {
         const companyDomain = worksheet === null || worksheet === void 0 ? void 0 : worksheet.bizplace.company.domain;
         let releaseGood = worksheet.releaseGood;
         const orderSource = releaseGood.source;
+        const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
+            where: { orderNo: releaseGood.refNo, domain: companyDomain },
+            relations: ['marketplaceStore']
+        });
         switch (orderSource) {
             case auth_base_1.ApplicationType.MMS:
                 // find for any existing marketplace store connections
@@ -33,22 +40,32 @@ async function activateBulkPicking(tx, domain, user, worksheetNo) {
                         const ecommerceCtrl = new controllers_1.EcommerceController(tx, domain, user);
                         await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain);
                     }
-                    const marketplaceOrder = await tx.getRepository(marketplace_base_1.MarketplaceOrder).findOne({
-                        where: { orderNo: releaseGood.refNo, domain: companyDomain },
-                        relations: ['marketplaceStore']
-                    });
                     if (marketplaceOrder) {
                         const marketplaceStore = marketplaceOrder.marketplaceStore;
                         if (marketplaceStore.isAutoUpdateShipment) {
                             const ecommerceCtrl = new controllers_1.EcommerceController(tx, domain, user);
                             await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, sales_base_1.ORDER_STATUS.PICKING);
                         }
+                        await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, releaseGood);
                     }
                 }
                 break;
             default:
                 break;
         }
+        if (((_a = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length) &&
+            releaseGood.lmdOption &&
+            releaseGood.lastMileDelivery &&
+            ((_b = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.orderPackages) === null || _b === void 0 ? void 0 : _b.some(op => op.parcelId == null))) {
+            await (0, utils_1.createLmdParcel)([releaseGood], tx, domain, user, marketplaceOrder);
+            //where to trigger update parcel count
+            let countParcel = (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.countParcel) ? releaseGood.countParcel : 0;
+            const releaseGoodId = releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.id;
+            await tx.getRepository(sales_base_1.ReleaseGood).update({ id: releaseGoodId }, {
+                countParcel: countParcel + 1,
+                updater: user.id
+            });
+        }
     }
     return worksheets;
 }

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

@@ -1 +1 @@
-{"version":3,"file":"bulk-activate-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/bulk-activate-picking.ts"],"names":[],"mappings":";;;AAEA,yDAGkC;AAClC,qFAA0E;AAC1E,uEAAmE;AACnE,2DAGmC;AAGnC,yDAGgC;AAGnB,QAAA,2BAA2B,GAAG;IACzC,KAAK,CAAC,mBAAmB,CAAC,CAAM,EAAE,EAAE,WAAW,EAAE,EAAE,OAAY;QAC7D,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAE7F,OAAO,MAAM,mBAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,WAAW,CAAC,CAAA;IACjE,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,mBAAmB,CACvC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,WAAqB;IAErB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,UAAU,GAAG,MAAM,mBAAmB,CAAC,mBAAmB,CAAC,WAAW,CAAC,CAAA;IAE7E,KAAK,MAAM,SAAS,IAAI,UAAU,EAAE;QAClC,MAAM,aAAa,GAAW,SAAS,aAAT,SAAS,uBAAT,SAAS,CAAE,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAA;QAChE,IAAI,WAAW,GAAgB,SAAS,CAAC,WAAW,CAAA;QACpD,MAAM,WAAW,GAAW,WAAW,CAAC,MAAM,CAAA;QAE9C,QAAQ,WAAW,EAAE;YACnB,KAAK,2BAAe,CAAC,GAAG;gBACtB,sDAAsD;gBACtD,MAAM,iBAAiB,GAAuB,MAAM,EAAE,CAAC,aAAa,CAAC,0CAAgB,CAAC,CAAC,IAAI,CAAC;oBAC1F,KAAK,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,MAAM,EAAE,QAAQ,EAAE,oBAAoB,EAAE,IAAI,EAAE;oBAC9E,SAAS,EAAE,CAAC,yBAAyB,CAAC;iBACvC,CAAC,CAAA;gBAEF,IAAI,iBAAiB,aAAjB,iBAAiB,uBAAjB,iBAAiB,CAAE,MAAM,EAAE;oBAC7B,IAAI,iBAAiB,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,KAAK,CAAC,oBAAoB,CAAC,EAAE;wBAC/D,MAAM,gBAAgB,GAAG,SAAS,CAAC,gBAAgB,CAAA;wBACnD,IAAI,gBAAgB,GAAU,gBAAgB,CAAC,GAAG,CAAC,GAAG,CAAC,EAAE,CAAC,GAAG,CAAC,eAAe,CAAC,CAAA;wBAC9E,MAAM,aAAa,GAAwB,IAAI,iCAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;wBACpF,MAAM,aAAa,CAAC,2BAA2B,CAAC,iBAAiB,EAAE,gBAAgB,EAAE,aAAa,CAAC,CAAA;qBACpG;oBAED,MAAM,gBAAgB,GAAqB,MAAM,EAAE,CAAC,aAAa,CAAC,mCAAgB,CAAC,CAAC,OAAO,CAAC;wBAC1F,KAAK,EAAE,EAAE,OAAO,EAAE,WAAW,CAAC,KAAK,EAAE,MAAM,EAAE,aAAa,EAAE;wBAC5D,SAAS,EAAE,CAAC,kBAAkB,CAAC;qBAChC,CAAC,CAAA;oBAEF,IAAI,gBAAgB,EAAE;wBACpB,MAAM,gBAAgB,GAAqB,gBAAgB,CAAC,gBAAgB,CAAA;wBAE5E,IAAI,gBAAgB,CAAC,oBAAoB,EAAE;4BACzC,MAAM,aAAa,GAAwB,IAAI,iCAAmB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;4BACpF,MAAM,aAAa,CAAC,kBAAkB,CAAC,gBAAgB,EAAE,gBAAgB,EAAE,yBAAY,CAAC,OAAO,CAAC,CAAA;yBACjG;qBACF;iBACF;gBACD,MAAK;YACP;gBACE,MAAK;SACR;KACF;IACD,OAAO,UAAU,CAAA;AACnB,CAAC;AAlDD,kDAkDC"}
+{"version":3,"file":"bulk-activate-picking.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/picking/bulk-activate-picking.ts"],"names":[],"mappings":"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"}

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

@@ -15,7 +15,6 @@ const warehouse_base_1 = require("@things-factory/warehouse-base");
 const controllers_1 = require("../../../../controllers/");
 const ecommerce_1 = require("../../../../controllers/ecommerce");
 const entities_1 = require("../../../../entities");
-const utils_1 = require("../../../../utils");
 exports.completeBatchPickingResolver = {
     async completeBatchPicking(_, { taskNo }, context) {
         const { tx, domain, user } = context.state;
@@ -35,7 +34,7 @@ exports.completeBatchPickingResolver = {
     }
 };
 async function completeBatchPicking(tx, domain, user, taskNo) {
-    var _a, _b;
+    var _a, _b, _c;
     try {
         console.time(`complete-batch-picking[completeBatchPicking]: {domain:${domain.id}, taskNo:${taskNo}}`);
         const pickingWSCtrl = new controllers_1.PickingWorksheetController(tx, domain, user);
@@ -154,143 +153,110 @@ async function completeBatchPicking(tx, domain, user, taskNo) {
                         foundReleaseGood = await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, foundReleaseGood);
                         break;
                     default:
-                        let orderPackage = {
-                            name: sales_base_1.OrderNoGenerator.orderPackage(),
-                            packageId: null,
-                            trackingNo: null,
-                            transporter: null,
-                            airwayBill: null,
-                            status: sales_base_1.ORDER_STATUS.PROCESSING,
-                            releaseGood: foundReleaseGood,
-                            domain: foundReleaseGood.domain,
-                            bizplace: foundReleaseGood.bizplace,
-                            creator: foundReleaseGood.creator,
-                            updater: foundReleaseGood.updater
-                        };
-                        let savedOrderPackage = await tx.getRepository(sales_base_1.OrderPackage).save(orderPackage);
-                        const orderPackageItems = foundReleaseGood.orderProducts.map(op => {
-                            if (op.product) {
-                                return {
-                                    name: sales_base_1.OrderNoGenerator.orderPackageItem(),
-                                    orderProduct: op,
-                                    status: sales_base_1.ORDER_STATUS.PROCESSING,
-                                    releaseQty: op.releaseQty,
-                                    orderPackage: savedOrderPackage,
-                                    domain: foundReleaseGood.domain,
-                                    bizplace: foundReleaseGood.bizplace,
-                                    creator: foundReleaseGood.creator,
-                                    updater: foundReleaseGood.updater,
-                                    productDetail: op.productDetail
-                                };
-                            }
-                            else {
-                                let productBundle = op.productBundle;
-                                return productBundle.productBundleSettings.map(pbs => ({
-                                    name: sales_base_1.OrderNoGenerator.orderPackageItem(),
-                                    orderProduct: op,
-                                    status: sales_base_1.ORDER_STATUS.PROCESSING,
-                                    releaseQty: op.releaseQty * pbs.bundleQty,
-                                    orderPackage: savedOrderPackage,
-                                    domain: foundReleaseGood.domain,
-                                    bizplace: foundReleaseGood.bizplace,
-                                    creator: foundReleaseGood.creator,
-                                    updater: foundReleaseGood.updater,
-                                    productDetail: pbs.productDetail
-                                }));
+                        if (!((_a = foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length)) {
+                            let orderPackage = {
+                                name: sales_base_1.OrderNoGenerator.orderPackage(),
+                                packageId: null,
+                                trackingNo: null,
+                                transporter: null,
+                                airwayBill: null,
+                                status: sales_base_1.ORDER_STATUS.PROCESSING,
+                                releaseGood: foundReleaseGood,
+                                domain: foundReleaseGood.domain,
+                                bizplace: foundReleaseGood.bizplace,
+                                creator: foundReleaseGood.creator,
+                                updater: foundReleaseGood.updater
+                            };
+                            await (0, controllers_1.createOrderPackageAndItems)(tx, foundReleaseGood, orderPackage);
+                            break;
+                        }
+                        const account = await tx
+                            .getRepository(integration_accounting_1.Account)
+                            .findOne({ where: { domain: foundReleaseGood.bizplace.domain, status: 'active' }, relations: ['domain'] });
+                        // Xilnex Create Sales Order and Post Sales Order to Sales Invoice
+                        const createSalesOrder = async (account, releaseGood, tx) => {
+                            if (account) {
+                                if (account.platform == 'xilnex') {
+                                    try {
+                                        delete releaseGood.orderPackages;
+                                        delete releaseGood.creator;
+                                        delete releaseGood.updater;
+                                        const body = {
+                                            accessToken: account.accessToken,
+                                            appId: account.accountId,
+                                            accountInfo: account.accountInfo,
+                                            req: JSON.stringify({
+                                                releaseGood,
+                                                orderProducts: releaseGood.orderProducts
+                                            })
+                                        };
+                                        await (0, integration_base_1.sqsSendMessage)({
+                                            body,
+                                            deduplicationId: releaseGood.refNo,
+                                            groupId: releaseGood.refNo,
+                                            queueName: 'prototypeQueue.fifo'
+                                        });
+                                    }
+                                    catch (e) {
+                                        throw new Error(e);
+                                    }
+                                }
                             }
-                        }).flat();
-                        await tx.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItems);
-                        orderPackage.orderPackageItems = orderPackageItems;
-                        foundReleaseGood.orderPackages = [orderPackage];
-                        break;
-                }
-                const account = await tx
-                    .getRepository(integration_accounting_1.Account)
-                    .findOne({ where: { domain: foundReleaseGood.bizplace.domain, status: 'active' }, relations: ['domain'] });
-                // Xilnex Create Sales Order and Post Sales Order to Sales Invoice
-                const createSalesOrder = async (account, releaseGood, tx) => {
-                    if (account) {
-                        if (account.platform == 'xilnex') {
+                        };
+                        if (foundReleaseGood.type == 'b2c') {
+                            createSalesOrder(account, foundReleaseGood, tx);
+                        }
+                        // trigger LMD API to create parcel
+                        if (((_b = foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.orderPackages) === null || _b === void 0 ? void 0 : _b.length) &&
+                            foundReleaseGood.lmdOption &&
+                            foundReleaseGood.lastMileDelivery &&
+                            ((_c = foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.orderPackages) === null || _c === void 0 ? void 0 : _c.some(op => op.parcelId == null))) {
+                            // trigger RTS
                             try {
-                                delete releaseGood.orderPackages;
-                                delete releaseGood.creator;
-                                delete releaseGood.updater;
-                                const body = {
-                                    accessToken: account.accessToken,
-                                    appId: account.accountId,
-                                    accountInfo: account.accountInfo,
-                                    req: JSON.stringify({
-                                        releaseGood,
-                                        orderProducts: releaseGood.orderProducts
-                                    })
-                                };
-                                await (0, integration_base_1.sqsSendMessage)({
-                                    body,
-                                    deduplicationId: releaseGood.refNo,
-                                    groupId: releaseGood.refNo,
-                                    queueName: 'prototypeQueue.fifo'
-                                });
+                                const orderSource = foundReleaseGood.source;
+                                if (orderSource == auth_base_1.ApplicationType.SELLERCRAFT) {
+                                    const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
+                                        domain: foundReleaseGood.bizplace.domain,
+                                        status: integration_sellercraft_1.SellercraftStatus.ACTIVE
+                                    });
+                                    if (sellercraft) {
+                                        const sellercraftCtrl = new controllers_1.SellercraftController(tx, null, null);
+                                        const rtsTriggerLevel = await tx.getRepository(setting_base_1.Setting).findOne({
+                                            where: { domain: foundReleaseGood.domain, category: 'id-rule', name: 'rts-trigger-level' }
+                                        });
+                                        if (rtsTriggerLevel && parseInt((rtsTriggerLevel === null || rtsTriggerLevel === void 0 ? void 0 : rtsTriggerLevel.value) || 0) == 1) {
+                                            sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood);
+                                        }
+                                    }
+                                }
                             }
                             catch (e) {
-                                throw new Error(e);
-                            }
-                        }
-                    }
-                };
-                if (foundReleaseGood.type == 'b2c') {
-                    createSalesOrder(account, foundReleaseGood, tx);
-                }
-                // trigger LMD API to create parcel
-                if (((_a = foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.orderPackages) === null || _a === void 0 ? void 0 : _a.length) &&
-                    foundReleaseGood.lmdOption &&
-                    foundReleaseGood.lastMileDelivery &&
-                    ((_b = foundReleaseGood === null || foundReleaseGood === void 0 ? void 0 : foundReleaseGood.orderPackages) === null || _b === void 0 ? void 0 : _b.some(op => op.parcelId == null))) {
-                    await (0, utils_1.createLmdParcel)([foundReleaseGood], tx, domain, user, marketplaceOrder);
-                    // trigger RTS
-                    try {
-                        const orderSource = foundReleaseGood.source;
-                        if (orderSource == auth_base_1.ApplicationType.SELLERCRAFT) {
-                            const sellercraft = await tx.getRepository(integration_sellercraft_1.Sellercraft).findOne({
-                                domain: foundReleaseGood.bizplace.domain,
-                                status: integration_sellercraft_1.SellercraftStatus.ACTIVE
-                            });
-                            if (sellercraft) {
-                                const sellercraftCtrl = new controllers_1.SellercraftController(tx, null, null);
-                                const rtsTriggerLevel = await tx.getRepository(setting_base_1.Setting).findOne({
-                                    where: { domain: foundReleaseGood.domain, category: 'id-rule', name: 'rts-trigger-level' }
-                                });
-                                if (rtsTriggerLevel && parseInt((rtsTriggerLevel === null || rtsTriggerLevel === void 0 ? void 0 : rtsTriggerLevel.value) || 0) == 1) {
-                                    sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood);
-                                }
+                                env_1.logger.error(`[get-lmd-awb-sof-trigger]: ${e}`);
                             }
+                            //
                         }
-                    }
-                    catch (e) {
-                        env_1.logger.error(`[get-lmd-awb-sof-trigger]: ${e}`);
-                    }
                     //
                 }
-                //
-            }
-            // generate packing worksheet based on orders WITH packing option
-            const pickPackOrders = uniqueReleaseGoods.filter(rg => rg.packingOption);
-            if (pickPackOrders === null || pickPackOrders === void 0 ? void 0 : pickPackOrders.length) {
-                const roNoList = pickPackOrders.map((rg) => rg.name);
-                const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
-                await packingWSCtrl.generatePackingWorksheetByBulk(roNoList);
-            }
-            // generate packing worksheet with orderInventory based on orders WITHOUT packing option
-            const pickSortTargetInventories = targetInventories
-                .filter(targetInventory => !targetInventory.releaseGood.packingOption)
-                .map((pickSortTargetInventory) => {
-                return pickSortTargetInventory;
-            });
-            // loop to generate sorting worksheet
-            if (pickSortTargetInventories === null || pickSortTargetInventories === void 0 ? void 0 : pickSortTargetInventories.length) {
-                const sortingWSCtrl = new controllers_1.SortingWorksheetController(tx, domain, user);
-                await sortingWSCtrl.generateSortingWorksheet(worksheet, pickSortTargetInventories);
+                // generate packing worksheet based on orders WITH packing option
+                const pickPackOrders = uniqueReleaseGoods.filter(rg => rg.packingOption);
+                if (pickPackOrders === null || pickPackOrders === void 0 ? void 0 : pickPackOrders.length) {
+                    const roNoList = pickPackOrders.map((rg) => rg.name);
+                    const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
+                    await packingWSCtrl.generatePackingWorksheetByBulk(roNoList);
+                }
+                // generate packing worksheet with orderInventory based on orders WITHOUT packing option
+                const pickSortTargetInventories = targetInventories
+                    .filter(targetInventory => !targetInventory.releaseGood.packingOption)
+                    .map((pickSortTargetInventory) => {
+                    return pickSortTargetInventory;
+                });
+                // loop to generate sorting worksheet
+                if (pickSortTargetInventories === null || pickSortTargetInventories === void 0 ? void 0 : pickSortTargetInventories.length) {
+                    const sortingWSCtrl = new controllers_1.SortingWorksheetController(tx, domain, user);
+                    await sortingWSCtrl.generateSortingWorksheet(worksheet, pickSortTargetInventories);
+                }
+                return false;
             }
-            return false;
         }
         else {
             let foundObsoleteInventories = worksheet;