npm - @things-factory/worksheet-base - Versions diffs - 4.3.144 → 4.3.146 - Mend

@things-factory/worksheet-base 4.3.144 → 4.3.146

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.

Files changed (34) hide show

package/dist-server/controllers/outbound/packing-worksheet-controller.js CHANGED Viewed

@@ -3,8 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.PackingWorksheetController = void 0;
 const typeorm_1 = require("typeorm");
 const auth_base_1 = require("@things-factory/auth-base");
-const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
 const env_1 = require("@things-factory/env");
+const integration_sellercraft_1 = require("@things-factory/integration-sellercraft");
 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");
@@ -95,227 +95,303 @@ class PackingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         }
         return worksheet;
     }
-    async packing(worksheetDetailName, packedQty, serialNumber) {
-        let worksheetDetail = await this.findExecutableWorksheetDetailByName(worksheetDetailName, constants_1.WORKSHEET_TYPE.PACKING, [
-            'worksheet',
-            'worksheet.bizplace',
-            'worksheet.bizplace.domain',
-            'targetInventory',
-            'targetInventory.releaseGood',
-            'targetInventory.inventory',
-            'targetInventory.inventory.location',
-            'targetInventory.product',
-            'targetInventory.productDetail'
-        ]);
-        let targetInventory = worksheetDetail.targetInventory;
-        let inventory = targetInventory.inventory;
-        const releaseGood = worksheetDetail.targetInventory.releaseGood;
-        const product = targetInventory.product;
-        const productDetail = targetInventory.productDetail;
-        const pickedQty = targetInventory.releaseQty;
-        if (packedQty > pickedQty) {
-            throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('pack', `packed quantity can't exceed release qty`));
-        }
-        // Serial Number scanning for batch picking
-        if (targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.refWorksheetId) {
-            if (product === null || product === void 0 ? void 0 : product.isRequireSerialNumberScanningOutbound) {
-                if (!serialNumber || serialNumber == '') {
-                    throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('packing', `require serial number`));
-                }
-                let foundSerialNumber = await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).findOne({
-                    where: { domain: this.domain, serialNumber: serialNumber, productDetail }
-                });
-                if (foundSerialNumber) {
-                    if (foundSerialNumber.outboundOrderId) {
-                        let releaseGood = await this.trxMgr
-                            .getRepository(sales_base_1.ReleaseGood)
-                            .findOne({ where: { id: foundSerialNumber.outboundOrderId } });
-                        throw new Error(`Inventory Item is already picked/packed in ${releaseGood.name}`);
+    async packing(orderPackageItemId, packedQty, serialNumber) {
+        let orderPackageItem = await this.trxMgr.getRepository(sales_base_1.OrderPackageItem).findOne({
+            where: { id: orderPackageItemId },
+            relations: [
+                'orderProduct',
+                'orderProduct.orderInventories',
+                'orderPackage',
+                'orderPackage.bizplace',
+                'orderPackage.bizplace.domain',
+                'orderPackage.releaseGood'
+            ]
+        });
+        const orderProduct = orderPackageItem.orderProduct;
+        const orderInventories = orderProduct.orderInventories.filter(oi => oi.packedQty != oi.pickedQty);
+        let remainingPackQty = packedQty;
+        let qtyToPack = 0;
+        for (let orderInventory of orderInventories) {
+            const remainPackedQty = orderInventory.pickedQty - orderInventory.packedQty;
+            let worksheetDetail = await this.trxMgr
+                .getRepository(entities_1.WorksheetDetail)
+                .createQueryBuilder('wd')
+                .innerJoinAndSelect('wd.bizplace', 'b')
+                .innerJoinAndSelect('wd.targetInventory', 'oi')
+                .innerJoinAndSelect('oi.releaseGood', 'rg')
+                .innerJoinAndSelect('oi.inventory', 'inv')
+                .innerJoinAndSelect('oi.product', 'prd')
+                .innerJoinAndSelect('oi.productDetail', 'pd')
+                .where('oi.id = :id', { id: orderInventory.id })
+                .andWhere('wd.type = :type', { type: constants_1.WORKSHEET_TYPE.PACKING })
+                .getOne();
+            let targetInventory = worksheetDetail.targetInventory;
+            let inventory = targetInventory.inventory;
+            const releaseGood = worksheetDetail.targetInventory.releaseGood;
+            const product = targetInventory.product;
+            const productDetail = targetInventory.productDetail;
+            const pickedQty = targetInventory.releaseQty;
+            if (remainPackedQty >= packedQty) {
+                qtyToPack = packedQty;
+                remainingPackQty = 0;
+            }
+            else {
+                qtyToPack = remainPackedQty;
+                remainingPackQty -= remainPackedQty;
+            }
+            if (qtyToPack > pickedQty) {
+                throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('pack', `packed quantity can't exceed release qty`));
+            }
+            // Serial Number scanning for batch picking
+            if (targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.refWorksheetId) {
+                if (product === null || product === void 0 ? void 0 : product.isRequireSerialNumberScanningOutbound) {
+                    if (!serialNumber || serialNumber == '') {
+                        throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('packing', `require serial number`));
+                    }
+                    let foundSerialNumber = await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).findOne({
+                        where: { domain: this.domain, serialNumber: serialNumber, productDetail }
+                    });
+                    if (foundSerialNumber) {
+                        if (foundSerialNumber.outboundOrderId) {
+                            let releaseGood = await this.trxMgr
+                                .getRepository(sales_base_1.ReleaseGood)
+                                .findOne({ where: { id: foundSerialNumber.outboundOrderId } });
+                            throw new Error(`Inventory Item is already picked/packed in ${releaseGood.name}`);
+                        }
+                        foundSerialNumber.status = warehouse_base_1.INVENTORY_STATUS.PACKING;
+                        foundSerialNumber.updater = this.user;
+                        foundSerialNumber.outboundOrderId = releaseGood.id;
+                        await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(foundSerialNumber);
+                    }
+                    else {
+                        let inventoryItem = new warehouse_base_1.InventoryItem();
+                        inventoryItem.name = warehouse_base_1.InventoryNoGenerator.inventoryItemName();
+                        inventoryItem.serialNumber = serialNumber;
+                        inventoryItem.status = warehouse_base_1.INVENTORY_STATUS.PACKING;
+                        inventoryItem.source = warehouse_base_1.INVENTORY_ITEM_SOURCE.OUTBOUND;
+                        inventoryItem.outboundOrderId = releaseGood.id;
+                        inventoryItem.product = product;
+                        inventoryItem.productDetail = productDetail;
+                        inventoryItem.inventory = inventory;
+                        inventoryItem.domain = this.domain;
+                        foundSerialNumber = await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItem);
                     }
-                    foundSerialNumber.status = warehouse_base_1.INVENTORY_STATUS.PACKING;
-                    foundSerialNumber.updater = this.user;
-                    foundSerialNumber.outboundOrderId = releaseGood.id;
-                    await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(foundSerialNumber);
                 }
-                else {
-                    let inventoryItem = new warehouse_base_1.InventoryItem();
-                    inventoryItem.name = warehouse_base_1.InventoryNoGenerator.inventoryItemName();
-                    inventoryItem.serialNumber = serialNumber;
-                    inventoryItem.status = warehouse_base_1.INVENTORY_STATUS.PACKING;
-                    inventoryItem.source = warehouse_base_1.INVENTORY_ITEM_SOURCE.OUTBOUND;
-                    inventoryItem.outboundOrderId = releaseGood.id;
-                    inventoryItem.product = product;
-                    inventoryItem.productDetail = productDetail;
-                    inventoryItem.inventory = inventory;
-                    inventoryItem.domain = this.domain;
-                    foundSerialNumber = await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItem);
+            }
+            targetInventory.packedQty = Boolean(targetInventory.packedQty) ? targetInventory.packedQty + qtyToPack : qtyToPack;
+            if (targetInventory.packedQty == targetInventory.releaseQty) {
+                targetInventory.status = sales_base_1.ORDER_INVENTORY_STATUS.PACKED;
+                let inventoryItems = await this.trxMgr
+                    .getRepository(warehouse_base_1.InventoryItem)
+                    .find({ where: { outboundOrderId: releaseGood.id } });
+                if (inventoryItems.length > 0) {
+                    inventoryItems.forEach((itm) => {
+                        itm.status = warehouse_base_1.INVENTORY_STATUS.PACKED;
+                        itm.updater = this.user;
+                    });
+                    await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItems);
                 }
+                await this.transactionInventory(inventory, releaseGood, 0, 0, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.PACKING);
+                worksheetDetail.status = constants_1.WORKSHEET_STATUS.DONE;
             }
-        }
-        targetInventory.packedQty = Boolean(targetInventory.packedQty) ? targetInventory.packedQty + packedQty : packedQty;
-        if (targetInventory.packedQty == targetInventory.releaseQty) {
-            targetInventory.status = sales_base_1.ORDER_INVENTORY_STATUS.PACKED;
-            let inventoryItems = await this.trxMgr
-                .getRepository(warehouse_base_1.InventoryItem)
-                .find({ where: { outboundOrderId: releaseGood.id } });
-            if (inventoryItems.length > 0) {
-                inventoryItems.forEach((itm) => {
-                    itm.status = warehouse_base_1.INVENTORY_STATUS.PACKED;
-                    itm.updater = this.user;
-                });
-                await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItems);
+            await this.updateOrderTargets([targetInventory]);
+            worksheetDetail.updater = this.user;
+            worksheetDetail = await this.trxMgr.getRepository(entities_1.WorksheetDetail).save(worksheetDetail);
+            if (!remainingPackQty) {
+                break;
             }
-            await this.transactionInventory(inventory, releaseGood, 0, 0, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.PACKING);
-            worksheetDetail.status = constants_1.WORKSHEET_STATUS.DONE;
         }
-        await this.updateOrderTargets([targetInventory]);
-        worksheetDetail.updater = this.user;
-        worksheetDetail = await this.trxMgr.getRepository(entities_1.WorksheetDetail).save(worksheetDetail);
-        return worksheetDetail;
+        orderPackageItem.packedQty = Boolean(orderPackageItem === null || orderPackageItem === void 0 ? void 0 : orderPackageItem.packedQty)
+            ? orderPackageItem.packedQty + packedQty
+            : packedQty;
+        if (orderPackageItem.packedQty == orderPackageItem.releaseQty) {
+            orderPackageItem.status = sales_base_1.ORDER_STATUS.DONE;
+        }
+        await this.trxMgr.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItem);
+        return {
+            releaseGood: orderPackageItem.orderPackage.releaseGood,
+            bizplace: orderPackageItem.orderPackage.bizplace,
+            bizplaceDomain: orderPackageItem.orderPackage.bizplace.domain
+        };
     }
-    async scanProductPacking(worksheetDetailName, productBarcode, serialNumber) {
-        let worksheetDetail = await this.trxMgr
-            .getRepository(entities_1.WorksheetDetail)
-            .createQueryBuilder('wd')
-            .innerJoinAndSelect('wd.bizplace', 'b') //
-            .innerJoinAndSelect('wd.targetInventory', 'oi')
-            .innerJoinAndSelect('oi.releaseGood', 'rg')
-            .innerJoinAndSelect('oi.inventory', 'inv')
-            .leftJoinAndSelect('oi.orderProduct', 'op')
-            .innerJoinAndSelect('oi.product', 'prd')
-            .innerJoinAndSelect('oi.productDetail', 'pd')
-            .innerJoinAndSelect('pd.productBarcodes', 'pb')
-            .where('wd.id = :id', { id: worksheetDetailName })
-            .getOne();
-        let targetInventory = worksheetDetail.targetInventory;
-        let inventory = targetInventory.inventory;
+    async scanProductPacking(orderPackageItemId, productBarcode, serialNumber) {
+        let orderPackageItem = await this.trxMgr.getRepository(sales_base_1.OrderPackageItem).findOne({
+            where: { id: orderPackageItemId },
+            relations: ['orderPackage', 'orderProduct', 'orderProduct.orderInventories']
+        });
+        const orderProduct = orderPackageItem.orderProduct;
+        const orderInventories = orderProduct.orderInventories.filter(oi => oi.packedQty != oi.pickedQty);
         let packedQty = 1;
-        let pickedQty = targetInventory.releaseQty;
-        const releaseGood = targetInventory.releaseGood;
-        const product = targetInventory.product;
-        const productDetail = targetInventory.productDetail;
-        const productBarcodes = productDetail.productBarcodes;
-        let matchingProduct;
-        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, packedQty);
-        //validate matching product details based on scanned barcode
-        if (!matchingProduct)
-            throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode));
-        packedQty = matchingProduct.qty;
-        if (packedQty + targetInventory.packedQty > pickedQty) {
-            throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`));
-        }
-        // Serial Number scanning for batch picking
-        if (targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.refWorksheetId) {
-            if (product === null || product === void 0 ? void 0 : product.isRequireSerialNumberScanningOutbound) {
-                if (!serialNumber || serialNumber == '') {
-                    throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('packing', `require serial number`));
-                }
-                let foundSerialNumber = await this.trxMgr
-                    .getRepository(warehouse_base_1.InventoryItem)
-                    .findOne({ where: { domain: this.domain, serialNumber: serialNumber, productDetail } });
-                if (foundSerialNumber) {
-                    if (foundSerialNumber.inventoryId !== inventory.id) {
-                        throw new Error('Serial Number scanned is in another inventory');
+        for (let orderInventory of orderInventories) {
+            let worksheetDetail = await this.trxMgr
+                .getRepository(entities_1.WorksheetDetail)
+                .createQueryBuilder('wd')
+                .innerJoinAndSelect('wd.bizplace', 'b')
+                .innerJoinAndSelect('wd.targetInventory', 'oi')
+                .innerJoinAndSelect('oi.releaseGood', 'rg')
+                .innerJoinAndSelect('oi.inventory', 'inv')
+                .leftJoinAndSelect('oi.orderProduct', 'op')
+                .innerJoinAndSelect('oi.product', 'prd')
+                .innerJoinAndSelect('oi.productDetail', 'pd')
+                .innerJoinAndSelect('pd.productBarcodes', 'pb')
+                .where('oi.id = :id', { id: orderInventory.id })
+                .getOne();
+            let targetInventory = worksheetDetail.targetInventory;
+            let inventory = targetInventory.inventory;
+            let pickedQty = targetInventory.releaseQty;
+            const releaseGood = targetInventory.releaseGood;
+            const product = targetInventory.product;
+            const productDetail = targetInventory.productDetail;
+            const productBarcodes = productDetail.productBarcodes;
+            let matchingProduct;
+            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, packedQty);
+            //validate matching product details based on scanned barcode
+            if (!matchingProduct)
+                throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode));
+            packedQty = matchingProduct.qty;
+            if (packedQty + targetInventory.packedQty > pickedQty) {
+                throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`));
+            }
+            // Serial Number scanning for batch picking
+            if (targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.refWorksheetId) {
+                if (product === null || product === void 0 ? void 0 : product.isRequireSerialNumberScanningOutbound) {
+                    if (!serialNumber || serialNumber == '') {
+                        throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('packing', `require serial number`));
+                    }
+                    let foundSerialNumber = await this.trxMgr
+                        .getRepository(warehouse_base_1.InventoryItem)
+                        .findOne({ where: { domain: this.domain, serialNumber: serialNumber, productDetail } });
+                    if (foundSerialNumber) {
+                        if (foundSerialNumber.inventoryId !== inventory.id) {
+                            throw new Error('Serial Number scanned is in another inventory');
+                        }
+                        if (foundSerialNumber.outboundOrderId) {
+                            let releaseGood = await this.trxMgr
+                                .getRepository(sales_base_1.ReleaseGood)
+                                .findOne({ where: { id: foundSerialNumber.outboundOrderId } });
+                            throw new Error(`Inventory Item is already picked/packed in ${releaseGood.name}`);
+                        }
+                        foundSerialNumber.status = warehouse_base_1.INVENTORY_STATUS.PACKING;
+                        foundSerialNumber.updater = this.user;
+                        foundSerialNumber.outboundOrderId = releaseGood.id;
+                        await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(foundSerialNumber);
                     }
-                    if (foundSerialNumber.outboundOrderId) {
-                        let releaseGood = await this.trxMgr
-                            .getRepository(sales_base_1.ReleaseGood)
-                            .findOne({ where: { id: foundSerialNumber.outboundOrderId } });
-                        throw new Error(`Inventory Item is already picked/packed in ${releaseGood.name}`);
+                    else {
+                        let inventoryItem = new warehouse_base_1.InventoryItem();
+                        inventoryItem.name = warehouse_base_1.InventoryNoGenerator.inventoryItemName();
+                        inventoryItem.serialNumber = serialNumber;
+                        inventoryItem.status = warehouse_base_1.INVENTORY_STATUS.PACKING;
+                        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);
                     }
-                    foundSerialNumber.status = warehouse_base_1.INVENTORY_STATUS.PACKING;
-                    foundSerialNumber.updater = this.user;
-                    foundSerialNumber.outboundOrderId = releaseGood.id;
-                    await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(foundSerialNumber);
                 }
-                else {
-                    let inventoryItem = new warehouse_base_1.InventoryItem();
-                    inventoryItem.name = warehouse_base_1.InventoryNoGenerator.inventoryItemName();
-                    inventoryItem.serialNumber = serialNumber;
-                    inventoryItem.status = warehouse_base_1.INVENTORY_STATUS.PACKING;
-                    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);
+            }
+            targetInventory.packedQty = Boolean(targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.packedQty)
+                ? targetInventory.packedQty + packedQty
+                : packedQty;
+            if (targetInventory.packedQty > pickedQty) {
+                throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('pack', `packed quantity can't exceed release qty`));
+            }
+            targetInventory.packedAt = new Date();
+            targetInventory.packedByUser = this.user;
+            let packedBy = targetInventory.packedBy ? targetInventory.packedBy.split(',') : [];
+            if (!packedBy.find(x => x == this.user.name)) {
+                packedBy.push(this.user.name);
+                targetInventory.packedBy = packedBy.join(',');
+            }
+            if (targetInventory.packedQty == pickedQty) {
+                targetInventory.status = sales_base_1.ORDER_INVENTORY_STATUS.PACKED;
+                await this.updateOrderTargets([targetInventory]);
+                await this.transactionInventory(inventory, releaseGood, 0, 0, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.PACKING);
+                worksheetDetail.status = constants_1.WORKSHEET_STATUS.DONE;
+                worksheetDetail.updater = this.user;
+                await this.trxMgr.getRepository(entities_1.WorksheetDetail).save(worksheetDetail);
+                let inventoryItems = await this.trxMgr
+                    .getRepository(warehouse_base_1.InventoryItem)
+                    .find({ where: { outboundOrderId: releaseGood.id } });
+                if (inventoryItems.length > 0) {
+                    inventoryItems.forEach((itm) => {
+                        itm.status = warehouse_base_1.INVENTORY_STATUS.PACKED;
+                        itm.updater = this.user;
+                    });
+                    await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItems);
                 }
             }
-        }
-        targetInventory.packedQty = Boolean(targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.packedQty) ? targetInventory.packedQty + packedQty : packedQty;
-        if (targetInventory.packedQty > pickedQty) {
-            throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('pack', `packed quantity can't exceed release qty`));
-        }
-        targetInventory.packedAt = new Date();
-        targetInventory.packedByUser = this.user;
-        let packedBy = targetInventory.packedBy ? targetInventory.packedBy.split(',') : [];
-        if (!packedBy.find(x => x == this.user.name)) {
-            packedBy.push(this.user.name);
-            targetInventory.packedBy = packedBy.join(',');
-        }
-        if (targetInventory.packedQty == pickedQty) {
-            targetInventory.status = sales_base_1.ORDER_INVENTORY_STATUS.PACKED;
-            await this.updateOrderTargets([targetInventory]);
-            await this.transactionInventory(inventory, releaseGood, 0, 0, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.PACKING);
-            worksheetDetail.status = constants_1.WORKSHEET_STATUS.DONE;
-            worksheetDetail.updater = this.user;
-            await this.trxMgr.getRepository(entities_1.WorksheetDetail).save(worksheetDetail);
-            let inventoryItems = await this.trxMgr
-                .getRepository(warehouse_base_1.InventoryItem)
-                .find({ where: { outboundOrderId: releaseGood.id } });
-            if (inventoryItems.length > 0) {
-                inventoryItems.forEach((itm) => {
-                    itm.status = warehouse_base_1.INVENTORY_STATUS.PACKED;
-                    itm.updater = this.user;
-                });
-                await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItems);
+            else {
+                await this.trxMgr.getRepository(sales_base_1.OrderInventory).save(targetInventory);
             }
+            break;
         }
-        else {
-            await this.trxMgr.getRepository(sales_base_1.OrderInventory).save(targetInventory);
+        orderPackageItem.packedQty = Boolean(orderPackageItem === null || orderPackageItem === void 0 ? void 0 : orderPackageItem.packedQty)
+            ? orderPackageItem.packedQty + packedQty
+            : packedQty;
+        if (orderPackageItem.packedQty == orderPackageItem.releaseQty) {
+            orderPackageItem.status = sales_base_1.ORDER_STATUS.DONE;
         }
+        await this.trxMgr.getRepository(sales_base_1.OrderPackageItem).save(orderPackageItem);
+        await this.trxMgr
+            .getRepository(sales_base_1.OrderPackage)
+            .update({ id: orderPackageItem.orderPackage.id }, { updatedAt: new Date() });
         return {
             worksheetDetailInfos: [
                 {
-                    id: worksheetDetail.id,
-                    releaseQty: worksheetDetail.targetInventory.releaseQty,
-                    packedQty: worksheetDetail.targetInventory.packedQty,
-                    status: worksheetDetail.status
+                    id: orderPackageItem.id,
+                    releaseQty: orderPackageItem.releaseQty,
+                    packedQty: orderPackageItem.packedQty,
+                    status: orderPackageItem.status
                 }
             ]
         };
     }
-    async completePacking(releaseGoodNo) {
+    async completePacking(releaseGoodNo, orderPackageId) {
+        let orderPackage = await this.trxMgr
+            .getRepository(sales_base_1.OrderPackage)
+            .findOne({ where: { id: orderPackageId } });
+        await this.trxMgr
+            .getRepository(sales_base_1.OrderPackage)
+            .update({ id: orderPackage.id }, { status: sales_base_1.ORDER_STATUS.DONE, updater: this.user, updatedAt: new Date() });
         let releaseGood = await this.findRefOrder(sales_base_1.ReleaseGood, {
             domain: this.domain,
             name: releaseGoodNo,
             status: sales_base_1.ORDER_STATUS.PACKING
-        });
+        }, ['bizplace']);
         const worksheet = await this.findWorksheetByRefOrder(releaseGood, constants_1.WORKSHEET_TYPE.PACKING, [
             'worksheetDetails',
             'worksheetDetails.targetInventory'
         ]);
         this.checkRecordValidity(worksheet, { status: constants_1.WORKSHEET_STATUS.EXECUTING });
-        let inventoryItems = await this.trxMgr
-            .getRepository(warehouse_base_1.InventoryItem)
-            .find({ where: { outboundOrderId: releaseGood.id } });
-        if (inventoryItems.length > 0) {
-            inventoryItems.forEach((itm) => {
-                itm.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
-                itm.updater = this.user;
-            });
-            await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItems);
+        let orderPackages = await this.trxMgr
+            .getRepository(sales_base_1.OrderPackage)
+            .find({ where: { releaseGood, domain: this.domain, bizplace: releaseGood.bizplace } });
+        if (orderPackages.every(op => op.status == sales_base_1.ORDER_STATUS.DONE)) {
+            let inventoryItems = await this.trxMgr
+                .getRepository(warehouse_base_1.InventoryItem)
+                .find({ where: { outboundOrderId: releaseGood.id } });
+            if (inventoryItems.length > 0) {
+                inventoryItems.forEach((itm) => {
+                    itm.status = warehouse_base_1.INVENTORY_STATUS.TERMINATED;
+                    itm.updater = this.user;
+                });
+                await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItems);
+            }
+            let orderStatus;
+            if (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.courierOption)
+                orderStatus = sales_base_1.ORDER_STATUS.DONE;
+            else
+                orderStatus = sales_base_1.ORDER_STATUS.LOADING;
+            return await this.completeWorksheet(worksheet, orderStatus);
+        }
+        else {
+            return worksheet;
         }
-        let orderStatus;
-        if (releaseGood === null || releaseGood === void 0 ? void 0 : releaseGood.courierOption)
-            orderStatus = sales_base_1.ORDER_STATUS.DONE;
-        else
-            orderStatus = sales_base_1.ORDER_STATUS.LOADING;
-        return await this.completeWorksheet(worksheet, orderStatus);
     }
     async undoSerialNumberPacking(worksheetDetailName, inventoryItemId) {
         const worksheetDetail = await this.trxMgr.getRepository(entities_1.WorksheetDetail).findOne({

package/dist-server/controllers/outbound/packing-worksheet-controller.js.map CHANGED Viewed

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

package/dist-server/graphql/resolvers/worksheet/packing/complete-packing.js CHANGED Viewed

@@ -9,9 +9,9 @@ const controllers_1 = require("../../../../controllers/");
 const pos_1 = require("../../../../controllers/pos");
 const worksheet_controller_1 = require("../../../../controllers/worksheet-controller");
 exports.completePackingResolver = {
-    async completePacking(_, { releaseGoodNo }, context) {
+    async completePacking(_, { releaseGoodNo, orderPackageId }, context) {
         const { tx, domain, user } = context.state;
-        await completePacking(tx, domain, user, releaseGoodNo);
+        await completePacking(tx, domain, user, releaseGoodNo, orderPackageId);
         const releaseGood = await tx.getRepository(sales_base_1.ReleaseGood).findOne({
             where: { name: releaseGoodNo, domain },
             relations: ['bizplace', 'bizplace.domain']
@@ -40,9 +40,9 @@ exports.completePackingResolver = {
         });
     }
 };
-async function completePacking(tx, domain, user, releaseGoodNo) {
+async function completePacking(tx, domain, user, releaseGoodNo, orderPackageId) {
     const packingWSCtrl = new controllers_1.PackingWorksheetController(tx, domain, user);
-    await packingWSCtrl.completePacking(releaseGoodNo);
+    await packingWSCtrl.completePacking(releaseGoodNo, orderPackageId);
 }
 exports.completePacking = completePacking;
 //# sourceMappingURL=complete-packing.js.map