@things-factory/worksheet-base 5.0.12 → 6.0.0-alpha.0

package/dist-server/controllers/outbound/picking-worksheet-controller.js

@@ -3,7 +3,6 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PickingWorksheetController = void 0;
 const tslib_1 = require("tslib");
 const typeorm_1 = require("typeorm");
-const biz_base_1 = require("@things-factory/biz-base");
 const id_rule_base_1 = require("@things-factory/id-rule-base");
 const product_base_1 = require("@things-factory/product-base");
 const sales_base_1 = require("@things-factory/sales-base");
@@ -14,7 +13,7 @@ const entities_1 = require("../../entities");
 const utils_1 = require("../../utils");
 const vas_worksheet_controller_1 = require("../vas/vas-worksheet-controller");
 class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheetController {
-    async generatePickingWorksheet(releaseGoodNo) {
+    async generatePickingWorksheet(releaseGoodNo, currentStatus = null) {
         let releaseGood = await this.findRefOrder(sales_base_1.ReleaseGood, {
             domain: this.domain,
             name: releaseGoodNo,
@@ -40,60 +39,71 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         }
         releaseGood.status = sales_base_1.ORDER_STATUS.READY_TO_PICK;
         releaseGood.updater = this.user;
-        await this.updateRefOrder(releaseGood);
+        await this.updateRefOrder(releaseGood, null, currentStatus);
         return worksheet;
     }
-    async generateBatchPickingWorksheet(releaseGoodNos, partnerBizplaceId) {
-        let releaseGoods = await this.trxMgr.getRepository(sales_base_1.ReleaseGood).find({
-            where: { domain: this.domain, name: (0, typeorm_1.In)(releaseGoodNos), status: sales_base_1.ORDER_STATUS.PENDING_WORKSHEET },
-            relations: ['orderInventories', 'orderInventories.inventory']
-        });
-        const partnerBizplace = await this.trxMgr.getRepository(biz_base_1.Bizplace).findOne(partnerBizplaceId);
-        let orderInventories = [];
-        releaseGoods.map((releaseGood) => {
-            const foundOIs = releaseGood.orderInventories;
-            foundOIs.map((oi) => {
-                orderInventories.push(oi);
+    async generateBatchPickingWorksheet(releaseGoodWithBiz) {
+        let worksheets = [];
+        for (let i = 0; i < releaseGoodWithBiz.length; i++) {
+            let releaseGoodNos = releaseGoodWithBiz[i].map(itm => itm.releaseGoodNo);
+            let releaseGoods = await this.trxMgr.getRepository(sales_base_1.ReleaseGood).find({
+                where: { domain: this.domain, name: (0, typeorm_1.In)(releaseGoodNos), status: sales_base_1.ORDER_STATUS.PENDING_WORKSHEET },
+                relations: [
+                    'orderProducts',
+                    'orderProducts.product',
+                    'orderInventories',
+                    'orderInventories.inventory',
+                    'bizplace',
+                    'bizplace.domain'
+                ]
             });
-        });
-        const worksheetSetting = await this.trxMgr.getRepository(setting_base_1.Setting).findOne({
-            where: {
+            let orderInventories = [];
+            releaseGoods.map((releaseGood) => {
+                const foundOIs = releaseGood.orderInventories;
+                foundOIs.map((oi) => {
+                    orderInventories.push(oi);
+                });
+            });
+            const worksheetSetting = await this.trxMgr.getRepository(setting_base_1.Setting).findOne({
+                where: {
+                    domain: this.domain,
+                    name: constants_1.TASK_NUMBER_SETTING_KEY.TASK_NO_RULE
+                }
+            });
+            if (!worksheetSetting)
+                throw new Error(this.ERROR_MSG.FIND.NO_RESULT('task number rule'));
+            let worksheet = new entities_1.Worksheet();
+            worksheet.name = utils_1.WorksheetNoGenerator.generate(constants_1.WORKSHEET_TYPE.BATCH_PICKING);
+            worksheet.type = constants_1.WORKSHEET_TYPE.BATCH_PICKING;
+            worksheet.taskNo = await (0, id_rule_base_1.generateId)({
                 domain: this.domain,
-                name: constants_1.TASK_NUMBER_SETTING_KEY.TASK_NO_RULE
+                type: constants_1.TASK_NUMBER_RULE_TYPE.TASK_NO,
+                seed: {}
+            });
+            worksheet.status = constants_1.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(entities_1.Worksheet).save(worksheet);
+            if (orderInventories.some((oi) => { var _a; return (_a = oi.inventory) === null || _a === void 0 ? void 0 : _a.id; })) {
+                const hasInventoryOIs = orderInventories.filter((orderInventory) => orderInventory.inventory !== null);
+                worksheet.worksheetDetails = await this.createWorksheetDetails(worksheet, constants_1.WORKSHEET_TYPE.BATCH_PICKING, hasInventoryOIs);
             }
-        });
-        if (!worksheetSetting)
-            throw new Error(this.ERROR_MSG.FIND.NO_RESULT('task number rule'));
-        let worksheet = new entities_1.Worksheet();
-        worksheet.name = utils_1.WorksheetNoGenerator.generate(constants_1.WORKSHEET_TYPE.BATCH_PICKING);
-        worksheet.type = constants_1.WORKSHEET_TYPE.BATCH_PICKING;
-        worksheet.taskNo = await (0, id_rule_base_1.generateId)({
-            domain: this.domain,
-            type: constants_1.TASK_NUMBER_RULE_TYPE.TASK_NO,
-            seed: {}
-        });
-        worksheet.status = constants_1.WORKSHEET_STATUS.DEACTIVATED;
-        worksheet.bizplace = partnerBizplace;
-        worksheet.domain = this.domain;
-        worksheet.creator = this.user;
-        worksheet.updater = this.user;
-        worksheet = await this.trxMgr.getRepository(entities_1.Worksheet).save(worksheet);
-        if (orderInventories.some((oi) => { var _a; return (_a = oi.inventory) === null || _a === void 0 ? void 0 : _a.id; })) {
-            const hasInventoryOIs = orderInventories.filter((orderInventory) => orderInventory.inventory !== null);
-            worksheet.worksheetDetails = await this.createWorksheetDetails(worksheet, constants_1.WORKSHEET_TYPE.BATCH_PICKING, hasInventoryOIs);
+            orderInventories.forEach((oi) => {
+                var _a;
+                oi.refWorksheetId = worksheet.id;
+                oi.status = ((_a = oi.inventory) === null || _a === void 0 ? void 0 : _a.id) ? sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_PICK : sales_base_1.ORDER_INVENTORY_STATUS.PENDING_SPLIT;
+                oi.updater = this.user;
+            });
+            await this.updateOrderTargets(orderInventories);
+            releaseGoods = releaseGoods.map((releaseGood) => {
+                return Object.assign(Object.assign({}, releaseGood), { status: sales_base_1.ORDER_STATUS.READY_TO_PICK, updater: this.user });
+            });
+            await this.trxMgr.getRepository(sales_base_1.ReleaseGood).save(releaseGoods);
+            worksheets.push(worksheet);
         }
-        orderInventories.forEach((oi) => {
-            var _a;
-            oi.refWorksheetId = worksheet.id;
-            oi.status = ((_a = oi.inventory) === null || _a === void 0 ? void 0 : _a.id) ? sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_PICK : sales_base_1.ORDER_INVENTORY_STATUS.PENDING_SPLIT;
-            oi.updater = this.user;
-        });
-        await this.updateOrderTargets(orderInventories);
-        releaseGoods = releaseGoods.map((releaseGood) => {
-            return Object.assign(Object.assign({}, releaseGood), { status: sales_base_1.ORDER_STATUS.READY_TO_PICK, updater: this.user });
-        });
-        await this.trxMgr.getRepository(sales_base_1.ReleaseGood).save(releaseGoods);
-        return worksheet;
+        return worksheets;
     }
     async generateBatchPickingWorksheetDetail(worksheet, targetInventory) {
         // Create worksheet details
@@ -151,6 +161,8 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             'worksheetDetails.targetInventory',
             'worksheetDetails.targetInventory.releaseGood',
             'worksheetDetails.targetInventory.product',
+            'worksheetDetails.targetInventory.releaseGood.orderProducts',
+            'worksheetDetails.targetInventory.releaseGood.orderProducts.product',
             'bizplace',
             'bizplace.domain',
             'bizplace.company',
@@ -165,21 +177,18 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         });
         this.updateOrderTargets(targetInventories);
         worksheet = await this.activateWorksheet(worksheet, worksheetDetails, []);
-        const completeSplitOIs = await this.trxMgr.getRepository(sales_base_1.OrderInventory).find({
-            where: { domain: this.domain, refWorksheetId: worksheet.id, status: sales_base_1.ORDER_INVENTORY_STATUS.COMPLETE_SPLIT },
+        // retrieve order inventory
+        const pickingOrderInventory = await this.trxMgr.getRepository(sales_base_1.OrderInventory).find({
+            where: { domain: this.domain, refWorksheetId: worksheet.id, status: sales_base_1.ORDER_STATUS.PICKING },
             relations: ['releaseGood']
         });
-        let releaseGoods = completeSplitOIs.map((oi) => oi.releaseGood);
+        let releaseGoods = pickingOrderInventory.map((oi) => oi.releaseGood);
         if (releaseGoods === null || releaseGoods === void 0 ? void 0 : releaseGoods.length) {
             releaseGoods = releaseGoods.map((rg) => {
                 return Object.assign(Object.assign({}, rg), { status: sales_base_1.ORDER_STATUS.PICKING, updater: this.user });
             });
             await this.trxMgr.getRepository(sales_base_1.ReleaseGood).save(releaseGoods);
         }
-        if (completeSplitOIs === null || completeSplitOIs === void 0 ? void 0 : completeSplitOIs.length) {
-            const ids = completeSplitOIs.map((oi) => oi.id);
-            await this.trxMgr.getRepository(sales_base_1.OrderInventory).delete(ids);
-        }
         return worksheet;
     }
     async assignPickingInventories(worksheetNo, batchId, productId, packingType, packingSize, worksheetDetails) {
@@ -208,8 +217,10 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 ]);
             }
             const targetInventory = worksheetDetail.targetInventory;
-            let inventory = await this.trxMgr.getRepository(warehouse_base_1.Inventory).findOne(targetInventory.inventory.id);
-            const product = await this.trxMgr.getRepository(product_base_1.Product).findOne(productId);
+            let inventory = await this.trxMgr
+                .getRepository(warehouse_base_1.Inventory)
+                .findOneBy({ id: targetInventory.inventory.id });
+            const product = await this.trxMgr.getRepository(product_base_1.Product).findOneBy({ id: productId });
             // Create order inventories
             let newTargetInventory = Object.assign({}, targetInventory);
             delete newTargetInventory.id;
@@ -267,67 +278,58 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             packingType,
             packingSize,
             status: sales_base_1.ORDER_INVENTORY_STATUS.COMPLETE_SPLIT
-        }, { status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_SPLIT, updater: this.user, updatedAt: new Date() });
+        }, {
+            status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_SPLIT,
+            updater: this.user,
+            updatedAt: new Date()
+        });
     }
-    async scanProductPicking(worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber, toteNo) {
+    async scanProductPicking(worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber, toteNo, pickedQty = 1) {
+        var _a, _b, _c, _d, _e;
         try {
-            let worksheetDetail = await this.findExecutableWorksheetDetailByName(worksheetDetailName, worksheetType, [
-                'worksheet',
-                'worksheet.bizplace',
-                'targetInventory',
-                'targetInventory.releaseGood',
-                'targetInventory.inventory',
-                'targetInventory.product',
-                'targetInventory.orderProduct',
-                'targetInventory.product.productDetails',
-                'targetInventory.product.productDetails.product',
-                'targetInventory.product.productDetails.childProductDetail'
-            ]);
+            //find existing worksheet detail
+            let worksheetDetail = await this.trxMgr
+                .getRepository(entities_1.WorksheetDetail)
+                .createQueryBuilder('wd')
+                .innerJoinAndSelect('wd.worksheet', 'ws')
+                .innerJoinAndSelect('ws.bizplace', 'bz')
+                .innerJoinAndSelect('wd.targetInventory', 'oi')
+                .innerJoinAndSelect('oi.releaseGood', 'rg')
+                .innerJoinAndSelect('oi.inventory', 'inv')
+                .leftJoinAndSelect('oi.orderProduct', 'op')
+                .innerJoinAndSelect('oi.product', 'prd')
+                .leftJoinAndSelect('prd.productDetails', 'pd', 'pd.product_id = oi.product_id AND pd.deleted_at is null AND pd.packing_type = oi.packing_type AND pd.packing_size = oi.packing_size AND pd.uom = oi.uom')
+                .where('wd.name = :name', { name: worksheetDetailName })
+                .andWhere('wd.domain_id = :domainId', { domainId: this.domain.id })
+                .andWhere('wd.type = :type', { type: worksheetType })
+                .andWhere('wd.status = :status', { status: constants_1.WORKSHEET_STATUS.EXECUTING })
+                .andWhere('inv.carton_id = :cartonId', { cartonId: cartonId })
+                .getOne();
+            //validation to check matching worksheet detail based on name
+            if (!worksheetDetail || !worksheetDetail.targetInventory)
+                throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName));
+            //validation to prevent duplicated picking
+            if (((_a = worksheetDetail === null || worksheetDetail === void 0 ? void 0 : worksheetDetail.targetInventory) === null || _a === void 0 ? void 0 : _a.status) != sales_base_1.ORDER_INVENTORY_STATUS.PICKING)
+                throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`));
+            let matchingProduct = await this.getDirectQty(Object.assign(Object.assign({}, (_c = (_b = worksheetDetail === null || worksheetDetail === void 0 ? void 0 : worksheetDetail.targetInventory) === null || _b === void 0 ? void 0 : _b.product) === null || _c === void 0 ? void 0 : _c.productDetails[0]), { product: (_d = worksheetDetail === null || worksheetDetail === void 0 ? void 0 : worksheetDetail.targetInventory) === null || _d === void 0 ? void 0 : _d.product }), productBarcode, pickedQty);
+            //validate matching product details based on scanned barcode
+            if (!matchingProduct)
+                throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode));
+            pickedQty = matchingProduct.qty;
+            let pickedUomValue = matchingProduct.uomValue;
+            //validation to prevent over release
+            if (!(worksheetDetail === null || worksheetDetail === void 0 ? void 0 : worksheetDetail.targetInventory) ||
+                (worksheetDetail === null || worksheetDetail === void 0 ? void 0 : worksheetDetail.targetInventory.inventory.qty) < 1 ||
+                pickedQty + (((_e = worksheetDetail.targetInventory) === null || _e === void 0 ? void 0 : _e.pickedQty) || 0) > worksheetDetail.targetInventory.releaseQty)
+                throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`));
             const releaseGood = worksheetDetail.targetInventory.releaseGood;
             let targetInventory = worksheetDetail.targetInventory;
             let targetProduct = targetInventory.orderProduct;
-            const product = targetInventory.product;
             let inventory = targetInventory.inventory;
             let bizplace = worksheetDetail.worksheet.bizplace;
-            //validation to prevent duplicated picking
-            let oiValidate = await this.trxMgr.getRepository(sales_base_1.OrderInventory).findOne({
-                where: { domain: this.domain, id: targetInventory.id, status: sales_base_1.ORDER_INVENTORY_STATUS.PICKING }
-            });
-            if (!oiValidate)
-                throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`));
-            //validation to prevent over release
-            if (inventory.qty <= 0)
-                throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`));
-            if (inventory.cartonId !== cartonId)
-                throw new Error(this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('Carton ID', cartonId, inventory.cartonId));
-            const packingType = inventory.packingType;
-            const packingSize = inventory.packingSize;
-            let pickedQty = 1;
-            const releaseQty = targetInventory.releaseQty;
+            const product = targetInventory.product;
             targetInventory = await this.checkAndSetBinPicking(targetInventory, binLocation);
-            // search for matching product barcode
-            const productDetails = product === null || product === void 0 ? void 0 : product.productDetails.filter(detail => !detail.deletedAt);
-            const isMatchingBarcode = productDetails.map(detail => detail.gtin).includes(productBarcode);
-            if (!isMatchingBarcode)
-                throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode));
-            // case for scanning parent packing type, packing size
-            const foundProductDetail = productDetails.find((detail) => {
-                var _a;
-                return detail.gtin === productBarcode &&
-                    detail.packingType === packingType &&
-                    detail.packingSize == packingSize &&
-                    ((_a = detail.product) === null || _a === void 0 ? void 0 : _a.id) === product.id;
-            });
-            if (!foundProductDetail && !(product === null || product === void 0 ? void 0 : product.isRequireSerialNumberScanningOutbound)) {
-                const roProductDetail = productDetails.find((parentDetail) => 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`));
-                }
-            }
-            else if (!foundProductDetail) {
-                throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode));
-            }
+            // for required outbound serial number scanning
             if (product === null || product === void 0 ? void 0 : product.isRequireSerialNumberScanningOutbound) {
                 if (!serialNumber || serialNumber == '') {
                     throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `require serial number`));
@@ -372,10 +374,102 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                     await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItem);
                 }
             }
+            // for tote scanning
             if (toteNo) {
                 await this.toteScanning(toteNo, targetProduct, targetInventory, pickedQty, releaseGood, bizplace);
             }
-            await this.updatePickingTransaction(releaseGood, targetInventory, worksheetDetail, inventory, pickedQty);
+            // temporarily override with separate logic to handle transaction to speed up function
+            // await this.updatePickingTransaction(releaseGood, targetInventory, worksheetDetail, inventory, pickedQty)
+            const releaseQty = targetInventory.releaseQty;
+            targetInventory.pickedQty = ((targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.pickedQty) || 0) + pickedQty;
+            let updateOiObj = {
+                pickedQty: () => `"picked_qty" + ${pickedQty}`,
+                updatedAt: new Date(),
+                updater: this.user,
+                pickedBy: this.user.name,
+                pickedByUser: this.user,
+                pickedAt: new Date()
+            };
+            if (targetInventory.pickedQty == releaseQty) {
+                updateOiObj['status'] = sales_base_1.ORDER_INVENTORY_STATUS.PICKED;
+            }
+            if (targetInventory.binLocation) {
+                updateOiObj['binLocation'] = targetInventory.binLocation;
+            }
+            await this.trxMgr
+                .getRepository(sales_base_1.OrderInventory)
+                .createQueryBuilder()
+                .update(sales_base_1.OrderInventory)
+                .set(updateOiObj)
+                .where({ id: targetInventory.id })
+                .andWhere(`picked_qty + :pickedQty <= release_qty`, { pickedQty })
+                .execute();
+            if (targetInventory.pickedQty == releaseQty) {
+                //update worksheet details only when line item picking complete
+                await this.trxMgr
+                    .getRepository(entities_1.WorksheetDetail)
+                    .createQueryBuilder()
+                    .update(entities_1.WorksheetDetail)
+                    .set({
+                    status: constants_1.WORKSHEET_STATUS.DONE,
+                    updater: this.user,
+                    updatedAt: new Date()
+                })
+                    .where('id = :id', { id: worksheetDetail.id })
+                    .execute();
+                (0, typeorm_1.getConnection)().transaction(async (tx) => {
+                    let releaseUomValue = Math.round((pickedUomValue / pickedQty) * releaseQty * 100) / 100;
+                    let updateInvObj = {
+                        qty: () => `"qty" - ${releaseQty}`,
+                        lockedQty: () => `"locked_qty" - ${releaseQty}`,
+                        uomValue: () => `"uom_value" - ${releaseUomValue}`,
+                        lockedUomValue: () => `"locked_uom_value" - ${releaseUomValue}`,
+                        updater: this.user,
+                        updatedAt: new Date()
+                    };
+                    let remainingQty = await tx
+                        .getRepository(warehouse_base_1.Inventory)
+                        .createQueryBuilder()
+                        .update(warehouse_base_1.Inventory)
+                        .set(updateInvObj)
+                        .where('id = :id', { id: targetInventory.inventory.id })
+                        .returning(['qty'])
+                        .execute()
+                        .then(dt => {
+                        return dt.raw[0].qty;
+                    });
+                    await (0, utils_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.PICKING, -releaseQty, -releaseUomValue, this.user, tx);
+                    let inventoryItems = await tx
+                        .getRepository(warehouse_base_1.InventoryItem)
+                        .find({ where: { outboundOrderId: releaseGood.id } });
+                    if (inventoryItems.length > 0) {
+                        inventoryItems.forEach((itm) => {
+                            itm.status = warehouse_base_1.INVENTORY_STATUS.PICKED;
+                            itm.updater = this.user;
+                        });
+                        await tx.getRepository(warehouse_base_1.InventoryItem).save(inventoryItems);
+                    }
+                    if (remainingQty === 0) {
+                        await tx
+                            .getRepository(warehouse_base_1.Inventory)
+                            .createQueryBuilder()
+                            .update(warehouse_base_1.Inventory)
+                            .set({ status: warehouse_base_1.INVENTORY_STATUS.TERMINATED })
+                            .where('id = :id', { id: targetInventory.inventory.id })
+                            .execute();
+                        await (0, utils_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TERMINATED, 0, 0, this.user, tx);
+                    }
+                });
+            }
+            // return worksheet details
+            worksheetDetail = await this.trxMgr
+                .getRepository(entities_1.WorksheetDetail)
+                .createQueryBuilder('wd')
+                .innerJoin('wd.targetInventory', 'oi')
+                .innerJoinAndSelect('oi.releaseGood', 'rg')
+                .where('wd.id = :id', { id: worksheetDetail.id })
+                .getOne();
+            return worksheetDetail;
         }
         catch (error) {
             throw error;
@@ -585,7 +679,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         });
         await this.trxMgr.getRepository(entities_1.WorksheetDetail).save(worksheetDetails);
     }
-    async scanProductBatchPicking(taskNo, worksheetType, cartonId, productBarcode, inventory, binLocationName) {
+    async scanProductBatchPicking(taskNo, worksheetType, cartonId, productBarcode, inventory, binLocationName, pickingQty) {
         const worksheet = await this.trxMgr.getRepository(entities_1.Worksheet).findOne({
             where: { domain: this.domain, taskNo, type: worksheetType, status: constants_1.WORKSHEET_STATUS.EXECUTING },
             relations: [
@@ -606,7 +700,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         const batchId = inventory.batchId;
         const packingType = inventory.packingType;
         const packingSize = inventory.packingSize;
-        let pickedQty = 1;
+        let pickedQty = pickingQty ? pickingQty : 1;
         const targetInventories = worksheetDetails
             .map((wsd) => wsd.targetInventory)
             .filter((targetInventory) => targetInventory.batchId === batchId &&
@@ -624,7 +718,8 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             const roProductDetail = productDetails.find((parentDetail) => parentDetail.packingType === packingType && parentDetail.packingSize == packingSize);
             if (!roProductDetail)
                 throw new Error(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 = targetInventories
             .map((oi) => oi.releaseQty)
@@ -710,13 +805,6 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 itm.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
                 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(warehouse_base_1.InventoryItem).save(inventoryItems);
         }
         let orderStatus;
@@ -795,31 +883,20 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
     }
     async checkAndSetBinPicking(orderInventory, binLocation) {
         // bin picking validation
-        const binPickingSetting = await this.trxMgr.getRepository(setting_base_1.Setting).findOne({
-            where: {
-                domain: this.domain,
-                name: 'enable-bin-picking'
-            }
-        });
-        if (binPickingSetting != undefined && binPickingSetting.value.toLowerCase() == 'true') {
-            if (binLocation) {
-                const foundBinLocation = await this.trxMgr.getRepository(warehouse_base_1.Location).findOne({
-                    where: { domain: this.domain, name: binLocation, type: warehouse_base_1.LOCATION_TYPE.BIN }
-                });
-                if (!foundBinLocation)
-                    throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `invalid bin location id`));
-                orderInventory.binLocation = foundBinLocation;
-            }
-            else {
+        if (binLocation) {
+            const foundBinLocation = await this.trxMgr.getRepository(warehouse_base_1.Location).findOne({
+                where: { domain: this.domain, name: binLocation, type: warehouse_base_1.LOCATION_TYPE.BIN }
+            });
+            if (!foundBinLocation)
                 throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `invalid bin location id`));
-            }
+            orderInventory.binLocation = foundBinLocation;
         }
         return orderInventory;
     }
     async updatePickingTransaction(releaseGood, orderInventory, worksheetDetail, inventory, pickedQty) {
         var _a;
         const releaseQty = orderInventory.releaseQty;
-        orderInventory.pickedQty = Boolean(orderInventory === null || orderInventory === void 0 ? void 0 : orderInventory.pickedQty) ? orderInventory.pickedQty + pickedQty : pickedQty;
+        orderInventory.pickedQty = ((orderInventory === null || orderInventory === void 0 ? void 0 : orderInventory.pickedQty) || 0) + pickedQty;
         if (orderInventory.pickedQty == releaseQty) {
             const leftQty = inventory.qty - releaseQty;
             if (leftQty < 0) {
@@ -1039,8 +1116,8 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 throw new Error('Tote has been sealed, please try another tote!');
             }
             //if found order tote then check if order tote item exist
-            const foundOrderToteItem = await this.trxMgr.getRepository(sales_base_1.OrderToteItem).findOne({
-                domain: this.domain,
+            const foundOrderToteItem = await this.trxMgr.getRepository(sales_base_1.OrderToteItem).findOneBy({
+                domain: { id: this.domain.id },
                 orderProduct: targetProduct,
                 orderInventory: targetInventory,
                 orderTote: foundOrderTote
@@ -1165,7 +1242,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             orderTote: foundOrderTote,
             updater: this.user
         });
-        const totalSeal = await this.trxMgr.getRepository(sales_base_1.OrderToteSeal).count({
+        const totalSeal = await this.trxMgr.getRepository(sales_base_1.OrderToteSeal).countBy({
             orderTote: foundOrderTote
         });
         if (totalSeal >= parseInt((sealNoSetting === null || sealNoSetting === void 0 ? void 0 : sealNoSetting.value) || 0)) {