@things-factory/worksheet-base 4.3.61 → 4.3.62

package/dist-server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.js

@@ -0,0 +1,81 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.regenerateReleaseGoodWorksheetDetails = exports.regenerateReleaseGoodWorksheetDetailsResolver = 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 constants_1 = require("../../../constants");
+const entities_1 = require("../../../entities");
+const utils_1 = require("../../../utils");
+exports.regenerateReleaseGoodWorksheetDetailsResolver = {
+    async regenerateReleaseGoodWorksheetDetails(_, { worksheetNo, batchId, productId, packingType, packingSize, orderProductId, worksheetDetails }, context) {
+        const { tx, domain, user } = context.state;
+        return await regenerateReleaseGoodWorksheetDetails(tx, domain, user, worksheetNo, batchId, productId, packingType, packingSize, orderProductId, worksheetDetails);
+    }
+};
+async function regenerateReleaseGoodWorksheetDetails(tx, domain, user, worksheetNo, batchId, productId, packingType, packingSize, orderProductId, worksheetDetails) {
+    // 1. Remove prev worksheet details if it's exists
+    const worksheet = await tx.getRepository(entities_1.Worksheet).findOne({
+        where: { name: worksheetNo, domain },
+        relations: [
+            'bizplace',
+            'releaseGood',
+            'worksheetDetails',
+            'worksheetDetails.targetInventory',
+            'worksheetDetails.targetInventory.inventory',
+            'worksheetDetails.targetInventory.product',
+            'worksheetDetails.targetInventory.releaseGood',
+            'worksheetDetails.targetInventory.orderProduct',
+            'worksheetDetails.targetInventory.bizplace'
+        ]
+    });
+    const prevWSDs = worksheet.worksheetDetails.filter((wsd) => {
+        const targetInv = wsd.targetInventory;
+        if (targetInv.orderProductId === orderProductId)
+            return wsd.id;
+    });
+    // TODO: Update prev inventory locked qty and delete order inventories
+    if (prevWSDs === null || prevWSDs === void 0 ? void 0 : prevWSDs.length) {
+        const wsdIds = prevWSDs.map((wsd) => wsd.id);
+        const prevOrderInvIds = prevWSDs.map((wsd) => wsd.targetInventory.id);
+        const prevOrderInventories = prevWSDs.map((wsd) => wsd.targetInventory);
+        await Promise.all(prevOrderInventories.map(async (prevOI) => {
+            if (prevOI === null || prevOI === void 0 ? void 0 : prevOI.inventory) {
+                await tx.getRepository(warehouse_base_1.Inventory).update({ id: prevOI.inventory.id }, {
+                    lockedQty: prevOI.inventory.lockedQty - prevOI.releaseQty,
+                    lockedUomValue: prevOI.inventory.lockedUomValue - prevOI.releaseUomValue
+                });
+            }
+        }));
+        await tx.getRepository(entities_1.WorksheetDetail).delete(wsdIds);
+        await tx.getRepository(sales_base_1.OrderInventory).delete(prevOrderInvIds);
+    }
+    await Promise.all(worksheetDetails.map(async (wsd) => {
+        // 2. Create order inventory
+        let targetInventory = wsd.targetInventory;
+        const inventory = await tx.getRepository(warehouse_base_1.Inventory).findOne(targetInventory.inventory.id);
+        let targetProduct = await tx
+            .getRepository(sales_base_1.OrderProduct)
+            .findOne({ where: { id: wsd.targetProduct.id }, relations: ['releaseGood'] });
+        targetInventory = await tx.getRepository(sales_base_1.OrderInventory).save(Object.assign(Object.assign({}, targetInventory), { domain, bizplace: worksheet.bizplace, name: sales_base_1.OrderNoGenerator.orderInventory(), releaseGood: worksheet.type == constants_1.WORKSHEET_TYPE.BATCH_PICKING ? targetProduct.releaseGood : worksheet.releaseGood, inventory, batchId: inventory.batchId, batchIdRef: inventory.batchIdRef, status: sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_PICK, product: await tx.getRepository(product_base_1.Product).findOne(productId), packingType,
+            packingSize, orderProduct: targetProduct, refWorksheetId: worksheet.type == constants_1.WORKSHEET_TYPE.BATCH_PICKING ? worksheet.id : null, creator: user, updater: user }));
+        const currentLockedQty = inventory.lockedQty;
+        const currentLockedUomValue = inventory.lockedUomValue;
+        await tx.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, targetInventory.inventory), { lockedQty: Boolean(currentLockedQty)
+                ? targetInventory.releaseQty + currentLockedQty
+                : targetInventory.releaseQty, lockedUomValue: Boolean(currentLockedUomValue)
+                ? targetInventory.releaseUomValue + currentLockedUomValue
+                : targetInventory.releaseUomValue, updater: user }));
+        // update order product status to ASSIGNED
+        await tx
+            .getRepository(sales_base_1.OrderProduct)
+            .update({ id: targetProduct.id }, { status: sales_base_1.ORDER_PRODUCT_STATUS.ASSIGNED, updater: user });
+        // 3. Create worksheet details
+        await tx.getRepository(entities_1.WorksheetDetail).save(Object.assign(Object.assign({}, wsd), { domain, bizplace: worksheet.bizplace, worksheet, name: worksheet.type == constants_1.WORKSHEET_TYPE.BATCH_PICKING
+                ? utils_1.WorksheetNoGenerator.batchPickingDetail()
+                : utils_1.WorksheetNoGenerator.pickingDetail(), targetProduct,
+            targetInventory, type: worksheet.type == constants_1.WORKSHEET_TYPE.BATCH_PICKING ? constants_1.WORKSHEET_TYPE.BATCH_PICKING : constants_1.WORKSHEET_TYPE.PICKING, status: constants_1.WORKSHEET_STATUS.DEACTIVATED, creator: user, updater: user }));
+    }));
+}
+exports.regenerateReleaseGoodWorksheetDetails = regenerateReleaseGoodWorksheetDetails;
+//# sourceMappingURL=regenerate-release-good-worksheet-details.js.map

package/dist-server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.js.map

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

package/dist-server/graphql/types/worksheet/batch-pick-worksheet-info.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.GenerateBatchPickInfo = void 0;
+const apollo_server_koa_1 = require("apollo-server-koa");
+exports.GenerateBatchPickInfo = (0, apollo_server_koa_1.gql) `
+  input GenerateBatchPickInfo {
+    releaseGoodNo: String
+    bizplaceId: String
+    bizplaceName: String
+  }
+`;
+//# sourceMappingURL=batch-pick-worksheet-info.js.map

package/dist-server/graphql/types/worksheet/batch-pick-worksheet-info.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"batch-pick-worksheet-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/batch-pick-worksheet-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,qBAAqB,GAAG,IAAA,uBAAG,EAAA;;;;;;CAMvC,CAAA"}

package/dist-server/graphql/types/worksheet/index.js

@@ -7,6 +7,7 @@ const contact_point_info_1 = require("./contact-point-info");
 const cycle_count_worksheet_1 = require("./cycle-count-worksheet");
 const delivery_info_1 = require("./delivery-info");
 const delivery_order_info_1 = require("./delivery-order-info");
+const delivery_order_ro_1 = require("./delivery-order-ro");
 const delivery_worksheet_1 = require("./delivery-worksheet");
 const executing_worksheet_1 = require("./executing-worksheet");
 const find_release_orders_by_task_no_1 = require("./find-release-orders-by-task-no");
@@ -26,7 +27,7 @@ const worksheet_info_1 = require("./worksheet-info");
 const worksheet_list_1 = require("./worksheet-list");
 const worksheet_patch_1 = require("./worksheet-patch");
 const worksheet_with_pagination_1 = require("./worksheet-with-pagination");
-const delivery_order_ro_1 = require("./delivery-order-ro");
+const batch_pick_worksheet_info_1 = require("./batch-pick-worksheet-info");
 exports.Mutation = `
   createWorksheet (
     worksheet: NewWorksheet!
@@ -82,8 +83,7 @@ exports.Mutation = `
   ): ReleaseGoodWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
   generateBatchPickingWorksheet (
-    releaseGoodNos: [String!]
-    partnerBizplaceId: String!
+    releaseGoodWithBiz: [[GenerateBatchPickInfo!]]
   ): Worksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
   generateCycleCountWorksheet (
@@ -333,6 +333,7 @@ exports.Mutation = `
     binLocation: String
     serialNumber: String
     toteNo: String
+    pickingQty: Int
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   sortingProduct (
@@ -380,6 +381,7 @@ exports.Mutation = `
     productBarcode: String!
     inventory: InventoryPatch!
     binLocationName: String
+    pickingQty: Int
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   crossDockPicking (
@@ -710,6 +712,8 @@ exports.Query = `
   
   recommendPutawayLocation(worksheetDetailName: String!, optCnt: Int): [Location] @privilege(category: "worksheet", privilege: "query")
 
+  findSortingReleaseOrdersByTaskNo(taskNo: String!): FindReleaseOrdersByTaskNo @privilege(category: "worksheet", privilege: "query") @transaction
+
   findReleaseOrdersByTaskNo(taskNo: String!): FindReleaseOrdersByTaskNo @privilege(category: "worksheet", privilege: "query") @transaction
 `;
 exports.Types = [
@@ -738,6 +742,7 @@ exports.Types = [
     picking_assignment_status_1.PickingAssignmentStatus,
     my_picking_assignment_status_1.MyPickingAssignmentStatus,
     find_release_orders_by_task_no_1.FindReleaseOrdersByTaskNo,
-    delivery_order_ro_1.DeliveryOrderRO
+    delivery_order_ro_1.DeliveryOrderRO,
+    batch_pick_worksheet_info_1.GenerateBatchPickInfo
 ];
 //# sourceMappingURL=index.js.map

package/dist-server/graphql/types/worksheet/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,yEAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AACrE,2DAAqD;AAExC,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6hBrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8IlC,CAAA;AAEY,QAAA,KAAK,GAAiB;IACjC,qBAAS;IACT,uBAAU;IACV,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;IACzB,mCAAe;CAChB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/index.ts"],"names":[],"mappings":";;;AAAA,6CAAyC;AACzC,yEAAmE;AACnE,6DAAuD;AACvD,mEAA6D;AAC7D,mDAA8C;AAC9C,+DAAyD;AACzD,2DAAqD;AACrD,6DAAwD;AACxD,+DAA0D;AAC1D,qFAA4E;AAC5E,+DAAyD;AACzD,2EAAqE;AACrE,uEAAiE;AACjE,iFAA0E;AAC1E,mDAA8C;AAC9C,2EAAqE;AACrE,yDAAoD;AACpD,qEAA+D;AAC/D,qEAA+D;AAC/D,+DAAyD;AACzD,2CAAuC;AACvC,mEAA6D;AAC7D,qDAAgD;AAChD,qDAAgD;AAChD,uDAAkD;AAClD,2EAAqE;AACrE,2EAAmE;AAEtD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA8hBrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAgJlC,CAAA;AAEY,QAAA,KAAK,GAAgB;IAChC,qBAAS;IACT,uBAAU;IACV,4BAAY;IACZ,gCAAc;IACd,8BAAa;IACb,iDAAsB;IACtB,6CAAoB;IACpB,2CAAmB;IACnB,6CAAoB;IACpB,mDAAuB;IACvB,uCAAiB;IACjB,uCAAiB;IACjB,qCAAgB;IAChB,uCAAiB;IACjB,8BAAa;IACb,4BAAY;IACZ,sCAAiB;IACjB,2CAAmB;IACnB,wCAAkB;IAClB,+CAAqB;IACrB,kCAAe;IACf,mDAAuB;IACvB,mDAAuB;IACvB,wDAAyB;IACzB,0DAAyB;IACzB,mCAAe;IACf,iDAAqB;CACtB,CAAA"}

package/dist-server/graphql/types/worksheet-detail/index.js

@@ -30,6 +30,16 @@ exports.Mutation = `
     worksheetDetails: [NewWorksheetDetail]
   ): Boolean @transaction
 
+  regenerateReleaseGoodWorksheetDetails (
+    worksheetNo: String!
+    batchId: String!
+    productId: String!
+    packingType: String!
+    packingSize: Float!
+    orderProductId: String!
+    worksheetDetails: [NewWorksheetDetail]
+  ): Boolean @transaction
+  
   generateBatchPickingWorksheetDetails (
     worksheetNo: String!
     batchId: String!

package/dist-server/graphql/types/worksheet-detail/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet-detail/index.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AACpD,iEAA2D;AAC3D,+CAA0C;AAC1C,yDAAoD;AACpD,mEAA6D;AAC7D,qEAA+D;AAElD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA6CrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;CAOlC,CAAA;AAEY,QAAA,KAAK,GAAG;IACnB,kCAAe;IACf,yCAAkB;IAClB,6CAAoB;IACpB,2CAAmB;IACnB,wBAAU;IACV,kCAAe;CAChB,CAAA"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet-detail/index.ts"],"names":[],"mappings":";;;AAAA,yDAAoD;AACpD,iEAA2D;AAC3D,+CAA0C;AAC1C,yDAAoD;AACpD,mEAA6D;AAC7D,qEAA+D;AAElD,QAAA,QAAQ,GAAiB;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAuDrC,CAAA;AAEY,QAAA,KAAK,GAAiB;;;;;;;CAOlC,CAAA;AAEY,QAAA,KAAK,GAAG;IACnB,kCAAe;IACf,yCAAkB;IAClB,6CAAoB;IACpB,2CAAmB;IACnB,wBAAU;IACV,kCAAe;CAChB,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.61",
+  "version": "4.3.62",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -27,18 +27,18 @@
     "@things-factory/auth-base": "^4.3.47",
     "@things-factory/biz-base": "^4.3.47",
     "@things-factory/document-template-base": "^4.3.47",
-    "@things-factory/id-rule-base": "^4.3.47",
-    "@things-factory/integration-lmd": "^4.3.59",
-    "@things-factory/integration-marketplace": "^4.3.61",
-    "@things-factory/integration-sellercraft": "^4.3.61",
-    "@things-factory/integration-sftp": "^4.3.61",
-    "@things-factory/marketplace-base": "^4.3.61",
-    "@things-factory/notification": "^4.3.47",
-    "@things-factory/sales-base": "^4.3.61",
-    "@things-factory/setting-base": "^4.3.47",
+    "@things-factory/id-rule-base": "^4.3.62",
+    "@things-factory/integration-lmd": "^4.3.62",
+    "@things-factory/integration-marketplace": "^4.3.62",
+    "@things-factory/integration-sellercraft": "^4.3.62",
+    "@things-factory/integration-sftp": "^4.3.62",
+    "@things-factory/marketplace-base": "^4.3.62",
+    "@things-factory/notification": "^4.3.62",
+    "@things-factory/sales-base": "^4.3.62",
+    "@things-factory/setting-base": "^4.3.62",
     "@things-factory/shell": "^4.3.47",
     "@things-factory/transport-base": "^4.3.47",
-    "@things-factory/warehouse-base": "^4.3.61"
+    "@things-factory/warehouse-base": "^4.3.62"
   },
-  "gitHead": "42f79d1b7f03a52a1c9b043b897fca7a7e386049"
+  "gitHead": "013096f8c0dd7bda146fd9370bf0de70da0e7bf2"
 }

package/server/controllers/outbound/picking-worksheet-controller.ts

@@ -16,7 +16,8 @@ import {
   OrderToteItem,
   OrderToteSeal,
   OrderVas,
-  ReleaseGood
+  ReleaseGood,
+  GenerateBatchPickInfo
 } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
 import {
@@ -82,108 +83,113 @@ export class PickingWorksheetController extends VasWorksheetController {
     return worksheet
   }
 
-  async generateBatchPickingWorksheet(releaseGoodNos: [string], partnerBizplaceId: string): Promise<Worksheet> {
-    let releaseGoods: ReleaseGood[] = await this.trxMgr.getRepository(ReleaseGood).find({
-      where: { domain: this.domain, name: In(releaseGoodNos), status: ORDER_STATUS.PENDING_WORKSHEET },
-      relations: [
-        'orderProducts',
-        'orderProducts.product',
-        'orderInventories',
-        'orderInventories.inventory',
-        'bizplace',
-        'bizplace.domain'
-      ]
-    })
+  async generateBatchPickingWorksheet(releaseGoodWithBiz: [GenerateBatchPickInfo[]]): Promise<Worksheet[]> {
+    let worksheets = []
+
+    for (let i = 0; i < releaseGoodWithBiz.length; i++) {
+      let releaseGoodNos = releaseGoodWithBiz[i].map(itm => itm.releaseGoodNo)
+
+      let releaseGoods: ReleaseGood[] = await this.trxMgr.getRepository(ReleaseGood).find({
+        where: { domain: this.domain, name: In(releaseGoodNos), status: ORDER_STATUS.PENDING_WORKSHEET },
+        relations: [
+          'orderProducts',
+          'orderProducts.product',
+          'orderInventories',
+          'orderInventories.inventory',
+          'bizplace',
+          'bizplace.domain'
+        ]
+      })
 
-    const partnerBizplace: Bizplace = await this.trxMgr.getRepository(Bizplace).findOne(partnerBizplaceId)
+      let orderInventories: OrderInventory[] = []
+      releaseGoods.map((releaseGood: ReleaseGood) => {
+        const foundOIs: OrderInventory[] = releaseGood.orderInventories
+        foundOIs.map((oi: OrderInventory) => {
+          orderInventories.push(oi)
+        })
+      })
 
-    let orderInventories: OrderInventory[] = []
-    releaseGoods.map((releaseGood: ReleaseGood) => {
-      const foundOIs: OrderInventory[] = releaseGood.orderInventories
-      foundOIs.map((oi: OrderInventory) => {
-        orderInventories.push(oi)
+      const worksheetSetting: Setting = await this.trxMgr.getRepository(Setting).findOne({
+        where: {
+          domain: this.domain,
+          name: TASK_NUMBER_SETTING_KEY.TASK_NO_RULE
+        }
       })
-    })
+      if (!worksheetSetting) throw new Error(this.ERROR_MSG.FIND.NO_RESULT('task number rule'))
 
-    const worksheetSetting: Setting = await this.trxMgr.getRepository(Setting).findOne({
-      where: {
+      let worksheet: Worksheet = new Worksheet()
+      worksheet.name = WorksheetNoGenerator.generate(WORKSHEET_TYPE.BATCH_PICKING)
+      worksheet.type = WORKSHEET_TYPE.BATCH_PICKING
+      worksheet.taskNo = await generateId({
         domain: this.domain,
-        name: TASK_NUMBER_SETTING_KEY.TASK_NO_RULE
-      }
-    })
-    if (!worksheetSetting) throw new Error(this.ERROR_MSG.FIND.NO_RESULT('task number rule'))
-
-    let worksheet: Worksheet = new Worksheet()
-    worksheet.name = WorksheetNoGenerator.generate(WORKSHEET_TYPE.BATCH_PICKING)
-    worksheet.type = WORKSHEET_TYPE.BATCH_PICKING
-    worksheet.taskNo = await generateId({
-      domain: this.domain,
-      type: TASK_NUMBER_RULE_TYPE.TASK_NO,
-      seed: {}
-    })
-    worksheet.status = WORKSHEET_STATUS.DEACTIVATED
-    worksheet.bizplace = partnerBizplace
-    worksheet.domain = this.domain
-    worksheet.creator = this.user
-    worksheet.updater = this.user
-    worksheet = await this.trxMgr.getRepository(Worksheet).save(worksheet)
-
-    if (orderInventories.some((oi: OrderInventory) => oi.inventory?.id)) {
-      const hasInventoryOIs: OrderInventory[] = orderInventories.filter(
-        (orderInventory: OrderInventory) => orderInventory.inventory !== null
-      )
+        type: TASK_NUMBER_RULE_TYPE.TASK_NO,
+        seed: {}
+      })
+      worksheet.status = WORKSHEET_STATUS.DEACTIVATED
+      worksheet.bizplace = releaseGoodWithBiz[i][0].bizplaceId
+      worksheet.domain = this.domain
+      worksheet.creator = this.user
+      worksheet.updater = this.user
+      worksheet = await this.trxMgr.getRepository(Worksheet).save(worksheet)
+
+      if (orderInventories.some((oi: OrderInventory) => oi.inventory?.id)) {
+        const hasInventoryOIs: OrderInventory[] = orderInventories.filter(
+          (orderInventory: OrderInventory) => orderInventory.inventory !== null
+        )
 
-      worksheet.worksheetDetails = await this.createWorksheetDetails(
-        worksheet,
-        WORKSHEET_TYPE.BATCH_PICKING,
-        hasInventoryOIs
-      )
-    }
+        worksheet.worksheetDetails = await this.createWorksheetDetails(
+          worksheet,
+          WORKSHEET_TYPE.BATCH_PICKING,
+          hasInventoryOIs
+        )
+      }
 
-    orderInventories.forEach((oi: OrderInventory) => {
-      oi.refWorksheetId = worksheet.id
-      oi.status = oi.inventory?.id ? ORDER_INVENTORY_STATUS.READY_TO_PICK : ORDER_INVENTORY_STATUS.PENDING_SPLIT
-      oi.updater = this.user
-    })
-    await this.updateOrderTargets(orderInventories)
+      orderInventories.forEach((oi: OrderInventory) => {
+        oi.refWorksheetId = worksheet.id
+        oi.status = oi.inventory?.id ? ORDER_INVENTORY_STATUS.READY_TO_PICK : ORDER_INVENTORY_STATUS.PENDING_SPLIT
+        oi.updater = this.user
+      })
+      await this.updateOrderTargets(orderInventories)
 
-    releaseGoods = releaseGoods.map((releaseGood: ReleaseGood) => {
-      return {
-        ...releaseGood,
-        status: ORDER_STATUS.READY_TO_PICK,
-        updater: this.user
-      }
-    })
-    await this.trxMgr.getRepository(ReleaseGood).save(releaseGoods)
+      releaseGoods = releaseGoods.map((releaseGood: ReleaseGood) => {
+        return {
+          ...releaseGood,
+          status: ORDER_STATUS.READY_TO_PICK,
+          updater: this.user
+        }
+      })
+      await this.trxMgr.getRepository(ReleaseGood).save(releaseGoods)
 
-    //asynchronously save packageId if found
-    Promise.all(
-      releaseGoods.map(async ro => {
-        if (ro?.packageId == null || ro?.packageId.trim() == '') {
-          const sellercraft: Sellercraft = await getRepository(Sellercraft).findOne({ domain: ro.bizplace.domain })
-          if (sellercraft) {
-            try {
-              await getConnection().transaction(async trx => {
-                const sellercraftCtrl: SellercraftController = new SellercraftController(trx, this.domain, this.user)
-                let packageInfo = await sellercraftCtrl.packOrder(sellercraft, {
-                  ...ro,
-                  orderProducts: ro.orderProducts
+      //asynchronously save packageId if found
+      Promise.all(
+        releaseGoods.map(async ro => {
+          if (ro?.packageId == null || ro?.packageId.trim() == '') {
+            const sellercraft: Sellercraft = await getRepository(Sellercraft).findOne({ domain: ro.bizplace.domain })
+            if (sellercraft) {
+              try {
+                await getConnection().transaction(async trx => {
+                  const sellercraftCtrl: SellercraftController = new SellercraftController(trx, this.domain, this.user)
+                  let packageInfo = await sellercraftCtrl.packOrder(sellercraft, {
+                    ...ro,
+                    orderProducts: ro.orderProducts
+                  })
+
+                  await trx.getRepository(ReleaseGood).update({ id: ro.id }, { packageId: packageInfo.packageId })
                 })
-
-                await trx.getRepository(ReleaseGood).update({ id: ro.id }, { packageId: packageInfo.packageId })
-              })
-            } catch (error) {
-              logger.error(
-                `picking-worksheet-controller:generateBatchPickingWorksheet[packageId][refNo: ${ro.refNo}, refNo2: ${
-                  ro.refNo2
-                }]: ${JSON.stringify(error)}`
-              )
+              } catch (error) {
+                logger.error(
+                  `picking-worksheet-controller:generateBatchPickingWorksheet[packageId][refNo: ${ro.refNo}, refNo2: ${
+                    ro.refNo2
+                  }]: ${JSON.stringify(error)}`
+                )
+              }
             }
           }
-        }
-      })
-    )
-    return worksheet
+        })
+      )
+      worksheets.push(worksheet)
+    }
+    return worksheets
   }
 
   async generateBatchPickingWorksheetDetail(
@@ -443,7 +449,8 @@ export class PickingWorksheetController extends VasWorksheetController {
     cartonId: string,
     binLocation?: string,
     serialNumber?: string,
-    toteNo?: string
+    toteNo?: string,
+    pickingQty?: number
   ): Promise<OrderInventory> {
     try {
       let worksheetDetail: WorksheetDetail = await this.findExecutableWorksheetDetailByName(
@@ -485,7 +492,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       const packingType: string = inventory.packingType
       const packingSize: number = inventory.packingSize
 
-      let pickedQty: number = 1
+      let pickedQty: number = pickingQty ? pickingQty : 1
       const releaseQty: number = targetInventory.releaseQty
 
       targetInventory = await this.checkAndSetBinPicking(targetInventory, binLocation)
@@ -510,14 +517,16 @@ export class PickingWorksheetController extends VasWorksheetController {
             parentDetail.packingType === packingType && parentDetail.packingSize == packingSize
         )
 
-        pickedQty = await this.getChildQty(productDetails, productBarcode, roProductDetail)
-        if (pickedQty + targetInventory.pickedQty > releaseQty) {
-          throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
-        }
+        let childQty = await this.getChildQty(productDetails, productBarcode, roProductDetail)
+        pickedQty *= childQty
       } else if (!foundProductDetail) {
         throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
       }
 
+      if (pickedQty + targetInventory.pickedQty > releaseQty) {
+        throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
+      }
+
       if (product?.isRequireSerialNumberScanningOutbound) {
         if (!serialNumber || serialNumber == '') {
           throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `require serial number`))
@@ -869,7 +878,8 @@ export class PickingWorksheetController extends VasWorksheetController {
     cartonId: string,
     productBarcode: string,
     inventory: any,
-    binLocationName: string
+    binLocationName: string,
+    pickingQty: number
   ): Promise<void> {
     const worksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
       where: { domain: this.domain, taskNo, type: worksheetType, status: WORKSHEET_STATUS.EXECUTING },
@@ -893,7 +903,7 @@ export class PickingWorksheetController extends VasWorksheetController {
     const batchId: string = inventory.batchId
     const packingType: string = inventory.packingType
     const packingSize: number = inventory.packingSize
-    let pickedQty: number = 1
+    let pickedQty: number = pickingQty ? pickingQty : 1
 
     const targetInventories: OrderInventory[] = worksheetDetails
       .map((wsd: WorksheetDetail) => wsd.targetInventory)
@@ -926,7 +936,8 @@ export class PickingWorksheetController extends VasWorksheetController {
           this.ERROR_MSG.FIND.NO_RESULT(`Packing Type ( ${packingType}) or Packing Size (${packingSize})`)
         )
 
-      pickedQty = await this.getChildQty(productDetails, productBarcode, roProductDetail)
+      let childQty = await this.getChildQty(productDetails, productBarcode, roProductDetail)
+      pickedQty *= childQty
     }
 
     const sumOfReleaseQty: number = targetInventories
@@ -1042,15 +1053,6 @@ export class PickingWorksheetController extends VasWorksheetController {
         itm.updater = this.user
       })
 
-      // let inventoryLists = InventoryItems.filter(
-      //   (value, index, self) => index === self.findIndex(itm => itm.inventory.id === value.inventory.id)
-      // )
-
-      // inventoryLists.forEach((itm: Inventory) => {
-      //   if (itm.inventory.qty - itm.releaseQty == 0)
-      //     this.transactionInventory(itm, releaseGood, 0, 0, INVENTORY_TRANSACTION_TYPE.TERMINATED)
-      // })
-
       await this.trxMgr.getRepository(InventoryItem).save(inventoryItems)
     }
 

package/server/controllers/outbound/returning-worksheet-controller.ts

@@ -87,6 +87,7 @@ export class ReturningWorksheetController extends VasWorksheetController {
     const releaseGood: ReleaseGood = worksheet.releaseGood
     let targetInventory: OrderInventory = worksheetDetail.targetInventory
     let inventory: Inventory = targetInventory.inventory
+    let location: Location = inventory.location
 
     const originLocation: Location = inventory.location
     const originPalletId: string = inventory.palletId
@@ -95,6 +96,17 @@ export class ReturningWorksheetController extends VasWorksheetController {
       where: { domain: this.domain, name: toLocationName },
       relations: ['warehouse']
     })
+
+    if (worksheet.type === 'WAREHOUSE_RETURN' && releaseGood.recall) {
+      if (
+        ![LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE].some(l => {
+          return l === toLocation.type
+        })
+      ) {
+        throw new Error('Location should be assigned only to Quarantine or Reserve Zone')
+      }
+    }
+
     if (!toLocation) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(toLocationName))
 
     const isPalletDiff: boolean = originPalletId !== palletId
@@ -158,6 +170,7 @@ export class ReturningWorksheetController extends VasWorksheetController {
       const releaseGood: ReleaseGood = worksheet.releaseGood
       let targetInventory: OrderInventory = worksheetDetail.targetInventory
       let inventory: Inventory = targetInventory.inventory
+      let invLocation: Location = inventory.location
 
       if (inventory.cartonId !== cartonId) {
         throw new Error(this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('cartonId', cartonId, inventory.cartonId))
@@ -178,6 +191,16 @@ export class ReturningWorksheetController extends VasWorksheetController {
         relations: ['warehouse']
       })
 
+      if (worksheet.type === 'WAREHOUSE_RETURN' && releaseGood.recall) {
+        if (
+          ![LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE].some(l => {
+            return l === location.type
+          })
+        ) {
+          throw new Error('Location should be assigned only to Quarantine or Reserve Zone')
+        }
+      }
+
       if (!location) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(toLocationName))
       const warehouse: Warehouse = location.warehouse
       const zone: string = warehouse.zone

package/server/entities/worksheet-detail.ts

@@ -12,6 +12,10 @@ import { Worksheet } from './worksheet'
   (worksheetDetail: WorksheetDetail) => [worksheetDetail.domain, worksheetDetail.bizplace, worksheetDetail.name],
   { unique: true }
 )
+@Index(
+  'ix_worksheet-detail_1',
+  (worksheetDetail: WorksheetDetail) => [worksheetDetail.targetInventory]
+)
 export class WorksheetDetail {
   @PrimaryGeneratedColumn('uuid')
   id: string