@things-factory/worksheet-base 4.3.137 → 4.3.139

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

@@ -18,6 +18,7 @@ const product_base_1 = require("@things-factory/product-base");
 const sales_base_1 = require("@things-factory/sales-base");
 const setting_base_1 = require("@things-factory/setting-base");
 const warehouse_base_1 = require("@things-factory/warehouse-base");
+const env_1 = require("@things-factory/env");
 const constants_1 = require("../../constants");
 const entities_1 = require("../../entities");
 const utils_1 = require("../../utils");
@@ -287,7 +288,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         }, { status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_SPLIT, updater: this.user, updatedAt: new Date() });
     }
     async scanProductPicking(worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber, toteNo, pickedQty = 1) {
-        var _a, _b, _c, _d, _e;
+        var _a;
         try {
             //find existing worksheet detail
             let worksheetDetail = await this.trxMgr
@@ -300,7 +301,8 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 .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')
+                .innerJoinAndSelect('oi.productDetail', 'pd')
+                .innerJoinAndSelect('pd.productBarcodes', 'pb')
                 .where('wd.name = :name', { name: worksheetDetailName })
                 .andWhere('wd.domain_id = :domainId', { domainId: this.domain.id })
                 .andWhere('wd.type = :type', { type: worksheetType })
@@ -308,29 +310,54 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 .andWhere('inv.carton_id = :cartonId', { cartonId: cartonId })
                 .getOne();
             //validation to check matching worksheet detail based on name
-            if (!worksheetDetail || !worksheetDetail.targetInventory)
+            if (!worksheetDetail)
                 throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName));
+            const releaseGood = worksheetDetail.targetInventory.releaseGood;
+            let targetInventory = worksheetDetail.targetInventory;
+            let targetProduct = targetInventory.orderProduct;
+            const product = targetInventory.product;
+            const matchProductBarcode = await this.trxMgr.getRepository(product_base_1.ProductBarcode).findOne({
+                where: { gtin: productBarcode },
+                relations: ['productDetail']
+            });
+            const productDetail = targetInventory.productDetail;
+            const productBarcodes = productDetail.productBarcodes;
+            let inventory = targetInventory.inventory;
+            let bizplace = worksheetDetail.worksheet.bizplace;
+            let pickedUomValue = pickedQty * productDetail.uomValue;
+            let matchingProduct;
             //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)
+            if ((targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.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);
+            if (!productBarcodes.find(itm => itm.gtin == productBarcode) && (product === null || product === void 0 ? void 0 : product.isRequireSerialNumberScanningOutbound)) {
+                throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode));
+            }
+            matchingProduct = await this.getDirectQty(Object.assign(Object.assign({}, productDetail), { product: targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.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;
+            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)
+                pickedQty + (((_a = worksheetDetail.targetInventory) === null || _a === void 0 ? void 0 : _a.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;
-            let inventory = targetInventory.inventory;
-            let bizplace = worksheetDetail.worksheet.bizplace;
-            const product = targetInventory.product;
             targetInventory = await this.checkAndSetBinPicking(targetInventory, binLocation);
+            // // search for matching product barcode
+            // const productDetails: ProductDetail[] = product?.productDetails.filter(detail => !detail.deletedAt)
+            // // scannedProductDetail can be child or gtin
+            // const scannedProductDetail: ProductDetail = productDetails.find(detail => detail.gtin == productBarcode)
+            // if (!scannedProductDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+            // // case for scanning parent packing type, packing size
+            // // when scannedProductDetail id is not the same as productDetail id, then it's not child gtin, proceed to get child qty
+            // if (scannedProductDetail.id !== productDetail.id && !product?.isRequireSerialNumberScanningOutbound) {
+            //   let childQty = await this.getChildQty(productDetails, productBarcode, productDetail, scannedProductDetail)
+            //   pickedQty *= childQty
+            // }
+            // if (pickedQty + targetInventory.pickedQty > releaseQty) {
+            //   throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
+            // }
             // for required outbound serial number scanning
             if (product === null || product === void 0 ? void 0 : product.isRequireSerialNumberScanningOutbound) {
                 if (!serialNumber || serialNumber == '') {
@@ -371,6 +398,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                     inventoryItem.outboundOrderId = releaseGood.id;
                     inventoryItem.source = warehouse_base_1.INVENTORY_ITEM_SOURCE.OUTBOUND;
                     inventoryItem.product = product;
+                    inventoryItem.productDetail = productDetail;
                     inventoryItem.inventory = inventory;
                     inventoryItem.domain = this.domain;
                     await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItem);
@@ -440,7 +468,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                         .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);
+                    await (0, warehouse_base_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 } });
@@ -459,7 +487,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                             .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);
+                        await (0, warehouse_base_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TERMINATED, 0, 0, this.user, tx);
                     }
                 });
             }
@@ -487,11 +515,13 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 'targetInventory.orderProduct',
                 'targetInventory.inventory',
                 'targetInventory.inventory.location',
-                'targetInventory.product'
+                'targetInventory.product',
+                'targetInventory.productDetail'
             ]);
             const releaseGood = worksheetDetail.targetInventory.releaseGood;
             let targetInventory = worksheetDetail.targetInventory;
             const product = targetInventory.product;
+            const productDetail = targetInventory.productDetail;
             let inventory = targetInventory.inventory;
             let targetProduct = targetInventory.orderProduct;
             let bizplace = worksheetDetail.worksheet.bizplace;
@@ -517,12 +547,12 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                     }
                 });
                 let foundSerialNumber = await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).findOne({
-                    where: { domain: this.domain, serialNumber: serialNumber, product },
-                    relations: ['product', 'inventory']
+                    where: { domain: this.domain, serialNumber: serialNumber, productDetail },
+                    relations: ['product', 'productDetail', 'inventory']
                 });
                 let scannedPalletIdInventory = await this.trxMgr
                     .getRepository(warehouse_base_1.Inventory)
-                    .findOne({ where: { domain: this.domain, palletId }, relations: ['product'] });
+                    .findOne({ where: { domain: this.domain, palletId }, relations: ['productDetail'] });
                 if (foundSerialNumber) {
                     if (foundSerialNumber.outboundOrderId) {
                         let releaseGood = await this.trxMgr
@@ -546,6 +576,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                     inventoryItem.source = warehouse_base_1.INVENTORY_ITEM_SOURCE.OUTBOUND;
                     inventoryItem.outboundOrderId = releaseGood.id;
                     inventoryItem.product = product;
+                    inventoryItem.productDetail = productDetail;
                     inventoryItem.inventory = scannedPalletIdInventory;
                     inventoryItem.domain = this.domain;
                     foundSerialNumber = await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItem);
@@ -563,10 +594,9 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                         await this.serialNumberReplacementForExistingOrderInv(existingOrderInv, targetInventory, worksheetDetail, foundSerialNumber);
                     }
                     else if (scannedPalletIdInventory.batchId == inventory.batchId &&
-                        scannedPalletIdInventory.product.id == product.id &&
-                        scannedPalletIdInventory.product.packingType == product.packingType) {
+                        scannedPalletIdInventory.productDetail.id == productDetail.id) {
                         //if replacement order inventory does not exist
-                        await this.serialNumberReplacement(targetInventory, scannedPalletIdInventory, releaseGood, product, worksheetDetail, foundSerialNumber);
+                        await this.serialNumberReplacement(targetInventory, scannedPalletIdInventory, releaseGood, product, productDetail, worksheetDetail, foundSerialNumber);
                     }
                     else {
                         throw new Error(this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('Pallet ID', palletId, inventory.palletId));
@@ -682,105 +712,107 @@ 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, 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: [
-                'worksheetDetails',
-                'worksheetDetails.targetInventory',
-                'worksheetDetails.targetInventory.releaseGood',
-                'worksheetDetails.targetInventory.inventory',
-                'worksheetDetails.targetInventory.inventory.location',
-                'worksheetDetails.targetInventory.product',
-                'worksheetDetails.targetInventory.product.productDetails',
-                'worksheetDetails.targetInventory.product.productDetails.childProductDetail'
-            ]
-        });
-        const worksheetDetails = worksheet.worksheetDetails;
-        const product = worksheetDetails
-            .map((wsd) => wsd.targetInventory.product)
-            .find((product) => product.id === inventory.product.id);
-        const batchId = inventory.batchId;
-        const packingType = inventory.packingType;
-        const packingSize = inventory.packingSize;
-        let pickedQty = pickingQty ? pickingQty : 1;
-        const targetInventories = worksheetDetails
-            .map((wsd) => wsd.targetInventory)
-            .filter((targetInventory) => targetInventory.batchId === batchId &&
-            targetInventory.packingType === packingType &&
-            targetInventory.inventory.cartonId === cartonId &&
-            targetInventory.product.id === product.id);
-        // 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(`GTIN (${productBarcode})`));
-        // case for scanning parent packing type, packing size
-        const foundProductDetail = productDetails.find((detail) => detail.gtin === productBarcode && detail.packingType === packingType && detail.packingSize == packingSize);
-        if (!foundProductDetail) {
-            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})`));
-            let childQty = await this.getChildQty(productDetails, productBarcode, roProductDetail);
-            pickedQty *= childQty;
-        }
-        const sumOfReleaseQty = targetInventories
-            .map((oi) => oi.releaseQty)
-            .reduce((a, b) => a + b, 0);
-        const sumOfPickedQty = targetInventories.map((oi) => oi.pickedQty).reduce((a, b) => a + b, 0) + pickedQty;
-        if (sumOfPickedQty > sumOfReleaseQty)
-            throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `quantity can't exceed limitation`));
-        for (var i = 0; i < targetInventories.length; i++) {
-            let targetInventory = targetInventories[i];
-            let inventory = targetInventory.inventory;
-            const targetReleaseQty = targetInventory.releaseQty;
-            const targetPickedQty = targetInventory.pickedQty;
-            const releaseGood = targetInventory.releaseGood;
-            if (pickedQty <= 0)
-                break;
-            if (targetInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.PICKING &&
-                targetReleaseQty > targetPickedQty &&
-                pickedQty > 0) {
-                let remainingAssignedQty = pickedQty - (targetReleaseQty - targetPickedQty); // -1, 0, 1
-                const gapQtyRemaining = targetReleaseQty - targetPickedQty; // > 0
-                if (binLocationName && !(targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.binLocation)) {
-                    const binLocation = await this.trxMgr.getRepository(warehouse_base_1.Location).findOne({
-                        where: { domain: this.domain, name: binLocationName, type: warehouse_base_1.LOCATION_TYPE.BIN }
-                    });
-                    if (!binLocation)
-                        throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `invalid bin location id`));
-                    targetInventory.binLocation = binLocation;
-                }
-                //  pickedQty = 1, gap = 5 || pickedQty = 12, gap = 5 || pickedQty = 5, gap = 5
-                targetInventory.pickedQty += pickedQty > gapQtyRemaining ? gapQtyRemaining : pickedQty;
-                remainingAssignedQty = remainingAssignedQty < 0 ? 0 : remainingAssignedQty;
-                if (targetInventory.pickedQty == targetReleaseQty) {
-                    const leftQty = inventory.qty - targetInventory.releaseQty;
-                    if (leftQty < 0) {
-                        throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `quantity can't exceed limitation`));
+        try {
+            console.time(`scanProductBatchPicking:${taskNo}`);
+            const worksheet = await this.trxMgr
+                .getRepository(entities_1.Worksheet)
+                .createQueryBuilder('worksheet')
+                .innerJoinAndSelect('worksheet.worksheetDetails', 'worksheetDetails')
+                .innerJoinAndSelect('worksheetDetails.targetInventory', 'targetInventory')
+                .innerJoinAndSelect('targetInventory.product', 'product')
+                .leftJoinAndSelect('targetInventory.productDetail', 'productDetail')
+                .leftJoinAndSelect('targetInventory.inventory', 'inventory')
+                .leftJoinAndSelect('inventory.location', 'location')
+                .leftJoinAndSelect('targetInventory.releaseGood', 'releaseGood')
+                .where('worksheet.domain_id = :domainId', { domainId: this.domain.id })
+                .andWhere('worksheet.task_no = :taskNo', { taskNo })
+                .andWhere('worksheet.type = :type', { type: worksheetType })
+                .andWhere('worksheet.status = :status', { status: constants_1.WORKSHEET_STATUS.EXECUTING })
+                .getOne();
+            const worksheetDetails = worksheet.worksheetDetails;
+            const productDetail = worksheetDetails
+                .map(wsd => wsd.targetInventory.productDetail)
+                .find(productDetail => productDetail.id === inventory.productDetail.id);
+            const product = productDetail.product;
+            const batchId = inventory.batchId;
+            let pickedQty = pickingQty ? pickingQty : 1;
+            let matchingProduct;
+            const targetInventories = worksheetDetails
+                .map((wsd) => wsd.targetInventory)
+                .filter((targetInventory) => targetInventory.batchId === batchId &&
+                targetInventory.inventory.cartonId === cartonId &&
+                targetInventory.productDetail.id === productDetail.id);
+            matchingProduct = await this.getDirectQty(Object.assign(Object.assign({}, productDetail), { 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;
+            const sumOfReleaseQty = targetInventories
+                .map((oi) => oi.releaseQty)
+                .reduce((a, b) => a + b, 0);
+            const sumOfPickedQty = targetInventories.map((oi) => oi.pickedQty).reduce((a, b) => a + b, 0) + pickedQty;
+            if (sumOfPickedQty > sumOfReleaseQty)
+                throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `quantity can't exceed limitation`));
+            for (var i = 0; i < targetInventories.length; i++) {
+                let targetInventory = targetInventories[i];
+                let inventory = targetInventory.inventory;
+                const targetReleaseQty = targetInventory.releaseQty;
+                const targetPickedQty = targetInventory.pickedQty;
+                const releaseGood = targetInventory.releaseGood;
+                if (pickedQty <= 0)
+                    break;
+                if (targetInventory.status === sales_base_1.ORDER_INVENTORY_STATUS.PICKING &&
+                    targetReleaseQty > targetPickedQty &&
+                    pickedQty > 0) {
+                    let remainingAssignedQty = pickedQty - (targetReleaseQty - targetPickedQty); // -1, 0, 1
+                    const gapQtyRemaining = targetReleaseQty - targetPickedQty; // > 0
+                    if (binLocationName && !(targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.binLocation)) {
+                        const binLocation = await this.trxMgr.getRepository(warehouse_base_1.Location).findOne({
+                            where: { domain: this.domain, name: binLocationName, type: warehouse_base_1.LOCATION_TYPE.BIN }
+                        });
+                        if (!binLocation)
+                            throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `invalid bin location id`));
+                        targetInventory.binLocation = binLocation;
                     }
-                    targetInventory.status = sales_base_1.ORDER_INVENTORY_STATUS.PICKED;
-                    await this.updateOrderTargets([targetInventory]);
-                    inventory.qty -= targetInventory.releaseQty;
-                    inventory.uomValue = Math.round((inventory.uomValue - targetInventory.releaseUomValue) * 100) / 100;
-                    inventory.lockedQty = inventory.lockedQty - targetInventory.releaseQty;
-                    inventory.lockedUomValue =
-                        Math.round((inventory.lockedUomValue - targetInventory.releaseUomValue) * 100) / 100;
-                    await this.transactionInventory(inventory, releaseGood, -targetInventory.releaseQty, -targetInventory.releaseUomValue, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.PICKING);
-                    if (leftQty === 0) {
-                        inventory.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
-                        await this.transactionInventory(inventory, releaseGood, 0, 0, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TERMINATED);
+                    //  pickedQty = 1, gap = 5 || pickedQty = 12, gap = 5 || pickedQty = 5, gap = 5
+                    targetInventory.pickedQty += pickedQty > gapQtyRemaining ? gapQtyRemaining : pickedQty;
+                    remainingAssignedQty = remainingAssignedQty < 0 ? 0 : remainingAssignedQty;
+                    if (targetInventory.pickedQty == targetReleaseQty) {
+                        const leftQty = inventory.qty - targetInventory.releaseQty;
+                        if (leftQty < 0) {
+                            throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `quantity can't exceed limitation`));
+                        }
+                        targetInventory.status = sales_base_1.ORDER_INVENTORY_STATUS.PICKED;
+                        await this.updateOrderTargets([targetInventory]);
+                        inventory.qty -= targetInventory.releaseQty;
+                        inventory.uomValue = Math.round((inventory.uomValue - targetInventory.releaseUomValue) * 100) / 100;
+                        inventory.lockedQty = inventory.lockedQty - targetInventory.releaseQty;
+                        inventory.lockedUomValue =
+                            Math.round((inventory.lockedUomValue - targetInventory.releaseUomValue) * 100) / 100;
+                        await this.transactionInventory(inventory, releaseGood, -targetInventory.releaseQty, -targetInventory.releaseUomValue, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.PICKING);
+                        if (leftQty === 0) {
+                            inventory.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
+                            await this.transactionInventory(inventory, releaseGood, 0, 0, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.TERMINATED);
+                        }
+                        let worksheetDetail = worksheetDetails.find((wsd) => wsd.targetInventory.id === targetInventory.id);
+                        worksheetDetail.status = constants_1.WORKSHEET_STATUS.DONE;
+                        worksheetDetail.updater = this.user;
+                        await this.trxMgr.getRepository(entities_1.WorksheetDetail).save(worksheetDetail);
                     }
-                    let worksheetDetail = worksheetDetails.find((wsd) => wsd.targetInventory.id === targetInventory.id);
-                    worksheetDetail.status = constants_1.WORKSHEET_STATUS.DONE;
-                    worksheetDetail.updater = this.user;
-                    await this.trxMgr.getRepository(entities_1.WorksheetDetail).save(worksheetDetail);
-                }
-                else {
-                    await this.updateOrderTargets([targetInventory]);
+                    else {
+                        await this.updateOrderTargets([targetInventory]);
+                    }
+                    pickedQty = pickedQty - (targetReleaseQty - targetPickedQty);
                 }
-                pickedQty = pickedQty - (targetReleaseQty - targetPickedQty);
             }
         }
+        catch (error) {
+            env_1.logger.error(`picking-worksheet-controller[scanProductBatchPicking]: ${error}`);
+            throw new Error(error);
+        }
+        finally {
+            console.timeEnd(`scanProductBatchPicking:${taskNo}`);
+        }
     }
     async completePicking(releaseGoodNo) {
         let releaseGood = await this.findRefOrder(sales_base_1.ReleaseGood, {
@@ -1004,9 +1036,11 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 await this.trxMgr.getRepository(sales_base_1.OrderInventory).delete(targetInventory.id);
             }
         }
-        catch (e) { }
+        catch (e) {
+            env_1.logger.error(`picking-worksheet-controller[serialNumberReplacementForExistingOrderInv]: ${e}`);
+        }
     }
-    async serialNumberReplacement(targetInventory, scannedPalletIdInventory, releaseGood, product, worksheetDetail, foundSerialNumber) {
+    async serialNumberReplacement(targetInventory, scannedPalletIdInventory, releaseGood, product, productDetail, worksheetDetail, foundSerialNumber) {
         try {
             //1. create new inventory, new order inventory, update old inventory, old order inventory quantity
             let newInventory = await this.trxMgr
@@ -1050,7 +1084,8 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 var { id } = _a, targetInventory = __rest(_a, ["id"]);
                 return targetInventory;
             })(targetInventory);
-            let newOrderInventory = await this.trxMgr.getRepository(sales_base_1.OrderInventory).save(Object.assign(Object.assign({}, newTargetInventory), { domain: this.domain, name: sales_base_1.OrderNoGenerator.orderInventory(), releaseGood, releaseQty: newOrderInventoryReleaseQty, releaseUomValue: newOrderInventoryReleaseUomValue, pickedQty: 1, product, inventory: scannedPalletIdInventory, creator: this.user, updater: this.user }));
+            let newOrderInventory = await this.trxMgr.getRepository(sales_base_1.OrderInventory).save(Object.assign(Object.assign({}, newTargetInventory), { domain: this.domain, name: sales_base_1.OrderNoGenerator.orderInventory(), releaseGood, releaseQty: newOrderInventoryReleaseQty, releaseUomValue: newOrderInventoryReleaseUomValue, pickedQty: 1, product,
+                productDetail, inventory: scannedPalletIdInventory, creator: this.user, updater: this.user }));
             oldInventory = await this.trxMgr.getRepository(warehouse_base_1.Inventory).save(Object.assign(Object.assign({}, oldInventory), { updater: this.user }));
             foundSerialNumber = await this.trxMgr
                 .getRepository(warehouse_base_1.InventoryItem)
@@ -1079,7 +1114,9 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 await this.trxMgr.getRepository(sales_base_1.OrderInventory).delete(targetInventory.id);
             }
         }
-        catch (e) { }
+        catch (e) {
+            env_1.logger.error(`picking-worksheet-controller[serialNumberReplacement]: ${e}`);
+        }
     }
     async toteScanning(toteNo, targetProduct, targetInventory, pickedQty, releaseGood, bizplace) {
         //1. find tote