@things-factory/worksheet-base 4.3.122 → 4.3.123

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

@@ -2,11 +2,11 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SortingWorksheetController = void 0;
 const typeorm_1 = require("typeorm");
-const vas_worksheet_controller_1 = require("../vas/vas-worksheet-controller");
-const warehouse_base_1 = require("@things-factory/warehouse-base");
 const sales_base_1 = require("@things-factory/sales-base");
-const entities_1 = require("../../entities");
+const warehouse_base_1 = require("@things-factory/warehouse-base");
 const constants_1 = require("../../constants");
+const entities_1 = require("../../entities");
+const vas_worksheet_controller_1 = require("../vas/vas-worksheet-controller");
 class SortingWorksheetController extends vas_worksheet_controller_1.VasWorksheetController {
     async generateSortingWorksheet(batchPickingWorksheet, targetInventories) {
         const worksheet = await this.generateBatchWorksheet(constants_1.WORKSHEET_TYPE.SORTING, batchPickingWorksheet, targetInventories, sales_base_1.ORDER_INVENTORY_STATUS.READY_TO_SORT);
@@ -37,137 +37,159 @@ class SortingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             await this.updateOrderTargets(targetInventories);
         return await this.activateWorksheet(worksheet, worksheetDetails, sortingWorksheetDetails);
     }
-    async scanProductSorting(taskNo, releaseGoodNo, productBarcode, serialNumber, toteNo) {
-        const worksheet = await this.trxMgr.getRepository(entities_1.Worksheet).findOne({
-            where: {
-                domain: this.domain,
-                taskNo,
-                type: constants_1.WORKSHEET_TYPE.SORTING,
-                status: constants_1.WORKSHEET_STATUS.EXECUTING
-            },
-            relations: [
-                'worksheetDetails',
-                'worksheetDetails.targetInventory',
-                'worksheetDetails.targetInventory.product',
-                'worksheetDetails.targetInventory.orderProduct',
-                'worksheetDetails.targetInventory.bizplace',
-                'worksheetDetails.targetInventory.inventory',
-                'worksheetDetails.targetInventory.inventory.product',
-                'worksheetDetails.targetInventory.inventory.product.productDetails',
-                'worksheetDetails.targetInventory.inventory.product.productDetails.product',
-                'worksheetDetails.targetInventory.releaseGood'
-            ]
-        });
-        this.checkRecordValidity(worksheet, { status: constants_1.WORKSHEET_STATUS.EXECUTING });
+    async scanProductSorting(releaseGoodNo, taskNo, productBarcode, serialNumber, toteNo, sortingQty) {
+        const worksheet = await this.trxMgr
+            .getRepository(entities_1.Worksheet)
+            .createQueryBuilder('worksheet')
+            .innerJoinAndSelect('worksheet.worksheetDetails', 'worksheetDetails')
+            .innerJoinAndSelect('worksheetDetails.targetInventory', 'targetInventory')
+            .innerJoinAndSelect('targetInventory.product', 'product')
+            .innerJoinAndSelect('product.productDetails', 'productDetails')
+            .leftJoinAndSelect('productDetails.childProductDetail', 'childProductDetail')
+            .leftJoinAndSelect('targetInventory.orderProduct', 'orderProduct')
+            .leftJoinAndSelect('targetInventory.bizplace', 'bizplace')
+            .leftJoinAndSelect('targetInventory.inventory', 'inventory')
+            .leftJoinAndSelect('targetInventory.releaseGood', 'releaseGood')
+            .where('worksheet.domain_id = :domainId', { domainId: this.domain.id })
+            .andWhere('worksheet.task_no = :taskNo', { taskNo })
+            .andWhere('worksheet.type = :type', { type: constants_1.WORKSHEET_TYPE.SORTING })
+            .andWhere('worksheet.status = :status', { status: constants_1.WORKSHEET_STATUS.EXECUTING })
+            .andWhere('releaseGood.name = :rg', { rg: releaseGoodNo })
+            .andWhere('productDetails.gtin = :gtin', { gtin: productBarcode })
+            .getOne();
+        if (!worksheet) {
+            throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode));
+        }
         const worksheetDetails = worksheet.worksheetDetails;
-        const orderInventories = worksheetDetails
-            .map((wsd) => wsd.targetInventory)
-            .filter((oi) => oi.releaseGood.name === releaseGoodNo);
-        if (productBarcode) {
-            let productDetails = [];
-            orderInventories.map((oi) => {
-                const foundPDs = oi.inventory && oi.inventory.product && oi.inventory.product.productDetails;
-                foundPDs.map(productDetail => {
-                    productDetails.push(productDetail);
-                });
-            });
-            const matchingProductDetail = productDetails.find((productDetail) => productDetail.gtin === productBarcode);
-            if (!matchingProductDetail)
-                throw new Error('Unable to find product barcode.');
-            const packingType = matchingProductDetail.packingType;
-            const packingSize = matchingProductDetail.packingSize;
-            if (!matchingProductDetail)
-                throw new Error(this.ERROR_MSG.PRODUCT.BARCODE_NOT_EXIST(productBarcode, packingType, packingSize));
-            let matchingOIs = orderInventories.filter((oi) => {
-                var _a, _b;
-                return oi.packingType === packingType &&
-                    oi.packingSize === packingSize &&
-                    ((_a = oi.product) === null || _a === void 0 ? void 0 : _a.id) === ((_b = matchingProductDetail.product) === null || _b === void 0 ? void 0 : _b.id);
-            });
-            let sortedQty = 1;
-            if (!(matchingOIs === null || matchingOIs === void 0 ? void 0 : matchingOIs.length)) {
-                throw new Error(this.ERROR_MSG.ORDER_ITEM.NO_MATCHING_RESULT(packingType, packingSize));
+        const orderInventories = worksheetDetails.map((wsd) => wsd.targetInventory);
+        const productDetails = orderInventories[0].product.productDetails;
+        const scannedProductDetail = productDetails.find(itm => itm.gtin == productBarcode);
+        const scannedChildProductDetail = scannedProductDetail.childProductDetail;
+        //find matching order inventories based on scanned product detail
+        let matchingOIs = orderInventories.filter(oi => oi.packingType == scannedProductDetail.packingType &&
+            oi.packingSize == scannedProductDetail.packingSize &&
+            oi.uom == scannedProductDetail.uom);
+        let productDetail = scannedProductDetail;
+        //if no order inventories found then find based on child product detail of scanned product detail
+        //if found then user is scanning parent product detail
+        if (!(matchingOIs === null || matchingOIs === void 0 ? void 0 : matchingOIs.length)) {
+            if (!scannedChildProductDetail) {
+                throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode));
             }
-            else {
-                await Promise.all(matchingOIs.map(async (matchingOI) => {
-                    const releaseQty = matchingOI.releaseQty;
-                    const inventory = matchingOI.inventory;
-                    const releaseGood = matchingOI.releaseGood;
-                    const product = inventory.product;
-                    if (releaseQty != (matchingOI === null || matchingOI === void 0 ? void 0 : matchingOI.sortedQty) && sortedQty == 1) {
-                        // Serial Number scanning for batch picking
-                        if (matchingOI === null || matchingOI === void 0 ? void 0 : matchingOI.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('sorting', `require serial number`));
-                                }
-                                let foundSerialNumber = await this.trxMgr
-                                    .getRepository(warehouse_base_1.InventoryItem)
-                                    .findOne({ where: { domain: this.domain, serialNumber: serialNumber, product } });
-                                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/sorted in ${releaseGood.name}`);
-                                    }
-                                    foundSerialNumber.status = warehouse_base_1.INVENTORY_STATUS.SORTING;
-                                    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.SORTING;
-                                    inventoryItem.outboundOrderId = releaseGood.id;
-                                    inventoryItem.source = warehouse_base_1.INVENTORY_ITEM_SOURCE.OUTBOUND;
-                                    inventoryItem.product = product;
-                                    inventoryItem.inventory = inventory;
-                                    inventoryItem.domain = this.domain;
-                                    await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItem);
-                                }
-                            }
+            matchingOIs = orderInventories.filter(oi => oi.packingType == scannedChildProductDetail.packingType &&
+                oi.packingSize == scannedChildProductDetail.packingSize &&
+                oi.uom == scannedChildProductDetail.uom);
+            productDetail = scannedChildProductDetail;
+            if (!(matchingOIs === null || matchingOIs === void 0 ? void 0 : matchingOIs.length) || matchingOIs[0].product.isRequireSerialNumberScanningOutbound) {
+                throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode));
+            }
+        }
+        const packingType = productDetail.packingType;
+        const packingSize = productDetail.packingSize;
+        let matchingProduct = await this.getDirectQty(Object.assign({}, productDetail), productBarcode, sortingQty ? sortingQty : 1);
+        // validate matching product details based on scanned barcode
+        if (!matchingProduct)
+            throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode));
+        let sortedQty = matchingProduct.qty;
+        const releaseGood = matchingOIs[0].releaseGood;
+        //update order inventories
+        await Promise.all(matchingOIs.map(async (matchingOI, index) => {
+            //if sortedQty is more than 0, then logic will run
+            //this validation is to handle multiple ois with multiple release qty
+            if (sortedQty > 0) {
+                const releaseQty = matchingOI.releaseQty;
+                const inventory = matchingOI.inventory;
+                const product = matchingOI.product;
+                // Serial Number scanning for batch picking
+                if (matchingOI === null || matchingOI === void 0 ? void 0 : matchingOI.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('sorting', `require serial number`));
                         }
-                        matchingOI.sortedQty = Boolean(matchingOI === null || matchingOI === void 0 ? void 0 : matchingOI.sortedQty) ? matchingOI.sortedQty + sortedQty : sortedQty;
-                        sortedQty -= 1;
-                        if (matchingOI.sortedQty == releaseQty) {
-                            matchingOI.status = sales_base_1.ORDER_INVENTORY_STATUS.SORTED;
-                            await this.updateOrderTargets([matchingOI]);
-                            await this.transactionInventory(inventory, releaseGood, 0, 0, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.SORTING);
-                            let worksheetDetail = worksheetDetails.find(wsd => wsd.targetInventory.id === matchingOI.id);
-                            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.SORTED;
-                                    itm.updater = this.user;
-                                });
-                                await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItems);
+                        let foundSerialNumber = await this.trxMgr
+                            .getRepository(warehouse_base_1.InventoryItem)
+                            .findOne({ where: { domain: this.domain, serialNumber: serialNumber, product } });
+                        if (foundSerialNumber) {
+                            if (foundSerialNumber.inventoryId !== inventory.id) {
+                                throw new Error('Serial Number scanned is in another inventory');
                             }
-                        }
-                        else if ((matchingOI === null || matchingOI === void 0 ? void 0 : matchingOI.sortedQty) > releaseQty) {
-                            const product = matchingOI.inventory.product;
-                            throw new Error(this.ERROR_MSG.ORDER_ITEM.EXCESS_QTY(product.sku, packingType, packingSize));
+                            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/sorted in ${releaseGood.name}`);
+                            }
+                            foundSerialNumber.status = warehouse_base_1.INVENTORY_STATUS.SORTING;
+                            foundSerialNumber.updater = this.user;
+                            foundSerialNumber.outboundOrderId = releaseGood.id;
+                            await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(foundSerialNumber);
                         }
                         else {
-                            await this.updateOrderTargets([matchingOI]);
-                        }
-                        if (toteNo) {
-                            await this.toteScanning(toteNo, matchingOI.orderProduct, matchingOI, 1, releaseGood, matchingOI.bizplace);
+                            let inventoryItem = new warehouse_base_1.InventoryItem();
+                            inventoryItem.name = warehouse_base_1.InventoryNoGenerator.inventoryItemName();
+                            inventoryItem.serialNumber = serialNumber;
+                            inventoryItem.status = warehouse_base_1.INVENTORY_STATUS.SORTING;
+                            inventoryItem.outboundOrderId = releaseGood.id;
+                            inventoryItem.source = warehouse_base_1.INVENTORY_ITEM_SOURCE.OUTBOUND;
+                            inventoryItem.product = product;
+                            inventoryItem.inventory = inventory;
+                            inventoryItem.domain = this.domain;
+                            await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItem);
                         }
                     }
-                }));
+                }
+                let tempSortedQty = 0;
+                //when sortedQty is more than releaseQty, check if the loop is running the last order inventory
+                //if yes then throw error
+                if (sortedQty > releaseQty && index == orderInventories.length - 1) {
+                    throw new Error(this.ERROR_MSG.ORDER_ITEM.EXCESS_QTY(product.sku, packingType, packingSize));
+                }
+                else {
+                    //if not proceed to sorting
+                    if (sortedQty < releaseQty) {
+                        tempSortedQty = sortedQty;
+                    }
+                    else {
+                        //if sortedQty is more than releaseQty then releaseQty - previous sorted qty will be the qty that needs to be sorted for current oi
+                        //overflow qty will be sorted to next oi
+                        tempSortedQty = Boolean(matchingOI === null || matchingOI === void 0 ? void 0 : matchingOI.sortedQty) ? releaseQty - matchingOI.sortedQty : releaseQty;
+                    }
+                    sortedQty -= tempSortedQty;
+                }
+                matchingOI.sortedQty = Boolean(matchingOI === null || matchingOI === void 0 ? void 0 : matchingOI.sortedQty) ? tempSortedQty + matchingOI.sortedQty : tempSortedQty;
+                if (matchingOI.sortedQty == releaseQty) {
+                    matchingOI.status = sales_base_1.ORDER_INVENTORY_STATUS.SORTED;
+                    await this.updateOrderTargets([matchingOI]);
+                    await this.transactionInventory(inventory, releaseGood, 0, 0, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.SORTING);
+                    let worksheetDetail = worksheetDetails.find(wd => (wd.targetInventory.id = matchingOI.id));
+                    await this.trxMgr
+                        .getRepository(entities_1.WorksheetDetail)
+                        .update({ id: worksheetDetail.id }, { status: constants_1.WORKSHEET_STATUS.DONE, updater: this.user });
+                    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.SORTED;
+                            itm.updater = this.user;
+                        });
+                        await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItems);
+                    }
+                }
+                else if ((matchingOI === null || matchingOI === void 0 ? void 0 : matchingOI.sortedQty) > releaseQty) {
+                    const product = matchingOI.product;
+                    throw new Error(this.ERROR_MSG.ORDER_ITEM.EXCESS_QTY(product.sku, packingType, packingSize));
+                }
+                else {
+                    await this.updateOrderTargets([matchingOI]);
+                }
+                if (toteNo) {
+                    await this.toteScanning(toteNo, matchingOI.orderProduct, matchingOI, 1, releaseGood, matchingOI.bizplace);
+                }
             }
-        }
+        }));
+        await this.trxMgr.getRepository(sales_base_1.ReleaseGood).update({ id: releaseGood.id }, { sortedBy: this.user });
+        console.timeEnd('scanProductSorting');
     }
     async sortingProduct(taskNo, releaseGoodNo, productId, sortingQty, serialNumber, toteNo) {
         const worksheet = await this.trxMgr.getRepository(entities_1.Worksheet).findOne({
@@ -281,11 +303,10 @@ class SortingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
     }
     async completeOrderSorting(releaseGoodNo) {
         try {
-            let releaseGood = await this.findRefOrder(sales_base_1.ReleaseGood, {
-                domain: this.domain,
-                name: releaseGoodNo,
-                status: sales_base_1.ORDER_STATUS.SORTING
-            }, ['bizplace', 'orderInventories']);
+            let releaseGood = await this.trxMgr.getRepository(sales_base_1.ReleaseGood).findOne({
+                where: { domain: this.domain, name: releaseGoodNo, status: sales_base_1.ORDER_STATUS.SORTING },
+                relations: ['bizplace', 'orderInventories']
+            });
             if (!releaseGood) {
                 throw new Error('Order is already sorted');
             }
@@ -361,7 +382,7 @@ class SortingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         let foundOrderTote = await this.trxMgr
             .getRepository(sales_base_1.OrderTote)
             .findOne({ where: { domain: this.domain, name: toteNo, releaseGood } });
-        //if order tote not found the create one, if tote not found means it's tote box
+        //if order tote not found then create one, if tote not found means it's tote box
         //create order tote item
         if (!foundOrderTote) {
             const orderTote = await this.trxMgr.getRepository(sales_base_1.OrderTote).save({

package/dist-server/controllers/outbound/sorting-worksheet-controller.js.map

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

package/dist-server/graphql/resolvers/worksheet/find-sorting-release-orders-by-task-no.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.findSortingReleaseOrdersByTaskNoResolver = void 0;
 const sales_base_1 = require("@things-factory/sales-base");
 const shell_1 = require("@things-factory/shell");
+const auth_base_1 = require("@things-factory/auth-base");
 const warehouse_base_1 = require("@things-factory/warehouse-base");
 const constants_1 = require("../../../constants");
 const entities_1 = require("../../../entities");
@@ -49,19 +50,23 @@ exports.findSortingReleaseOrdersByTaskNoResolver = {
             .createQueryBuilder('ws')
             .select('rg.id as id')
             .addSelect('rg.name as name')
+            .addSelect('rg.refNo as "refNo"')
+            .addSelect('rg.refNo2 as "refNo2"')
             .addSelect('rg.status as status')
+            .addSelect('user.name as "sortedByUser"')
             .innerJoin(shell_1.Domain, 'domain', 'ws.domain_id = domain.id')
             .innerJoin(entities_1.WorksheetDetail, 'wsd', 'ws.id = wsd.worksheet_id')
             .innerJoin(sales_base_1.OrderInventory, 'oi', 'oi.id = wsd.target_inventory_id')
             .innerJoin(sales_base_1.ReleaseGood, 'rg', 'rg.id = oi.release_good_id')
+            .leftJoin(auth_base_1.User, 'user', 'rg.sorted_by_id = user.id')
             .where('domain.id = :domainId', { domainId: domain.id })
             .andWhere('ws.taskNo = :taskNo', { taskNo: taskNo })
             .andWhere('ws.type = :worksheetType', { worksheetType: constants_1.WORKSHEET_TYPE.SORTING })
             .andWhere('ws.status = :worksheetStatus', { worksheetStatus: constants_1.WORKSHEET_STATUS.EXECUTING })
-            .andWhere('rg.status = :roStatus', { roStatus: sales_base_1.ORDER_STATUS.SORTING })
             .groupBy('rg.id')
             .addGroupBy('rg.name')
             .addGroupBy('rg.status')
+            .addGroupBy('user.name')
             .orderBy('rg.createdAt', 'ASC');
         const releaseGoods = await qb.getRawMany();
         return { releaseGoods, taskNo };

package/dist-server/graphql/resolvers/worksheet/find-sorting-release-orders-by-task-no.js.map

@@ -1 +1 @@
-{"version":3,"file":"find-sorting-release-orders-by-task-no.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/find-sorting-release-orders-by-task-no.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"find-sorting-release-orders-by-task-no.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/find-sorting-release-orders-by-task-no.ts"],"names":[],"mappings":"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"}

package/dist-server/graphql/resolvers/worksheet/sorting/scan-product-sorting.js

@@ -3,14 +3,14 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.scanProductSorting = exports.scanProductSortingResolver = void 0;
 const controllers_1 = require("../../../../controllers");
 exports.scanProductSortingResolver = {
-    async scanProductSorting(_, { taskNo, releaseGoodNo, productBarcode, serialNumber, toteNo }, context) {
+    async scanProductSorting(_, { releaseGoodNo, taskNo, productBarcode, serialNumber, toteNo, sortingQty }, context) {
         const { tx, domain, user } = context.state;
-        await scanProductSorting(tx, domain, user, taskNo, releaseGoodNo, productBarcode, serialNumber, toteNo);
+        await scanProductSorting(tx, domain, user, releaseGoodNo, taskNo, productBarcode, serialNumber, toteNo, sortingQty);
     }
 };
-async function scanProductSorting(tx, domain, user, taskNo, releaseGoodNo, productBarcode, serialNumber, toteNo) {
+async function scanProductSorting(tx, domain, user, releaseGoodNo, taskNo, productBarcode, serialNumber, toteNo, sortingQty) {
     const worksheetController = new controllers_1.SortingWorksheetController(tx, domain, user);
-    await worksheetController.scanProductSorting(taskNo, releaseGoodNo, productBarcode, serialNumber, toteNo);
+    await worksheetController.scanProductSorting(releaseGoodNo, taskNo, productBarcode, serialNumber, toteNo, sortingQty);
 }
 exports.scanProductSorting = scanProductSorting;
 //# sourceMappingURL=scan-product-sorting.js.map

package/dist-server/graphql/resolvers/worksheet/sorting/scan-product-sorting.js.map

@@ -1 +1 @@
-{"version":3,"file":"scan-product-sorting.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/sorting/scan-product-sorting.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CAAC,CAAM,EAAE,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,EAAE,OAAY;QAC5G,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,CAAC,CAAA;IACzG,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,MAAc,EACd,aAAqB,EACrB,cAAuB,EACvB,YAAqB,EACrB,MAAe;IAEf,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,kBAAkB,CAAC,MAAM,EAAE,aAAa,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,CAAC,CAAA;AAC3G,CAAC;AAZD,gDAYC"}
+{"version":3,"file":"scan-product-sorting.js","sourceRoot":"","sources":["../../../../../server/graphql/resolvers/worksheet/sorting/scan-product-sorting.ts"],"names":[],"mappings":";;;AAGA,yDAAoE;AAEvD,QAAA,0BAA0B,GAAG;IACxC,KAAK,CAAC,kBAAkB,CACtB,CAAM,EACN,EAAE,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,EAAE,EAC3E,OAAY;QAEZ,MAAM,EAAE,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,GAAsD,OAAO,CAAC,KAAK,CAAA;QAC7F,MAAM,kBAAkB,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,CAAC,CAAA;IACrH,CAAC;CACF,CAAA;AAEM,KAAK,UAAU,kBAAkB,CACtC,EAAiB,EACjB,MAAc,EACd,IAAU,EACV,aAAqB,EACrB,MAAc,EACd,cAAuB,EACvB,YAAqB,EACrB,MAAe,EACf,UAAmB;IAEnB,MAAM,mBAAmB,GAA+B,IAAI,wCAA0B,CAAC,EAAE,EAAE,MAAM,EAAE,IAAI,CAAC,CAAA;IACxG,MAAM,mBAAmB,CAAC,kBAAkB,CAAC,aAAa,EAAE,MAAM,EAAE,cAAc,EAAE,YAAY,EAAE,MAAM,EAAE,UAAU,CAAC,CAAA;AACvH,CAAC;AAbD,gDAaC"}

package/dist-server/graphql/resolvers/worksheet/sorting-worksheet.js

@@ -11,7 +11,7 @@ exports.sortingWorksheetResolver = {
         const { domain } = context.state;
         const releaseGood = await (0, typeorm_1.getRepository)(sales_base_1.ReleaseGood).findOne({
             where: { domain, name: releaseGoodNo, status: sales_base_1.ORDER_STATUS.SORTING },
-            relations: ['bizplace', 'bizplace.domain']
+            relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
         });
         if (!releaseGood)
             throw new Error(`Couldn't find sorting worksheet by order no (${releaseGoodNo})`);
@@ -49,6 +49,7 @@ exports.sortingWorksheetResolver = {
             worksheetInfo: {
                 bizplaceName: releaseGood.bizplace.name,
                 partnerDomainId: (_a = releaseGood.bizplace) === null || _a === void 0 ? void 0 : _a.domain.id,
+                customerCompanyDomainId: releaseGood.bizplace.company.domain.id,
                 startedAt: worksheet.startedAt,
                 refNo: releaseGood.refNo,
                 refNo2: releaseGood.refNo2,

package/dist-server/graphql/resolvers/worksheet/sorting-worksheet.js.map

@@ -1 +1 @@
-{"version":3,"file":"sorting-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/sorting-worksheet.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"sorting-worksheet.js","sourceRoot":"","sources":["../../../../server/graphql/resolvers/worksheet/sorting-worksheet.ts"],"names":[],"mappings":";;;AAAA,qCAA2D;AAE3D,2DAA8G;AAG9G,kDAAmD;AACnD,0CAA6D;AAEhD,QAAA,wBAAwB,GAAG;IACtC,KAAK,CAAC,gBAAgB,CAAC,CAAM,EAAE,EAAE,aAAa,EAAE,MAAM,EAAE,EAAE,OAAY;;QACpE,MAAM,EAAE,MAAM,EAAE,GAAuB,OAAO,CAAC,KAAK,CAAA;QACpD,MAAM,WAAW,GAAgB,MAAM,IAAA,uBAAa,EAAC,wBAAW,CAAC,CAAC,OAAO,CAAC;YACxE,KAAK,EAAE,EAAE,MAAM,EAAE,IAAI,EAAE,aAAa,EAAE,MAAM,EAAE,yBAAY,CAAC,OAAO,EAAE;YACpE,SAAS,EAAE,CAAC,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,yBAAyB,CAAC;SAC1F,CAAC,CAAA;QACF,IAAI,CAAC,WAAW;YAAE,MAAM,IAAI,KAAK,CAAC,gDAAgD,aAAa,GAAG,CAAC,CAAA;QAEnG,MAAM,SAAS,GAAG,MAAM,IAAA,oCAA4B,EAClD,MAAM,EACN,MAAM,EACN,WAAW,CAAC,QAAQ,EACpB,CAAC,UAAU,CAAC,EACZ,0BAAc,CAAC,OAAO,CACvB,CAAA;QAED,MAAM,EAAE,GAAuC,IAAA,uBAAa,EAAC,2BAAc,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,CAAA;QACrG,EAAE,CAAC,MAAM,CAAC,oBAAoB,EAAE,YAAY,CAAC;aAC1C,SAAS,CAAC,mBAAmB,EAAE,WAAW,CAAC;aAC3C,SAAS,CAAC,6DAA6D,EAAE,YAAY,CAAC;aACtF,SAAS,CAAC,SAAS,EAAE,WAAW,CAAC;aACjC,SAAS,CAAC,WAAW,EAAE,aAAa,CAAC;aACrC,SAAS,CAAC,UAAU,EAAE,YAAY,CAAC;aACnC,SAAS,CAAC,kBAAkB,EAAE,oBAAoB,CAAC;aACnD,SAAS,CAAC,4CAA4C,EAAE,uCAAuC,CAAC;aAChG,SAAS,CAAC,aAAa,EAAE,SAAS,CAAC;aACnC,SAAS,CAAC,iBAAiB,EAAE,aAAa,CAAC;aAC3C,SAAS,CAAC,iBAAiB,EAAE,aAAa,CAAC;aAC3C,SAAS,CAAC,qBAAqB,EAAE,gBAAgB,CAAC;aAClD,QAAQ,CAAC,YAAY,EAAE,MAAM,CAAC;aAC9B,QAAQ,CAAC,cAAc,EAAE,KAAK,CAAC;aAC/B,QAAQ,CAAC,gBAAgB,EAAE,KAAK,CAAC;aACjC,KAAK,CAAC,qCAAqC,EAAE,EAAE,aAAa,EAAE,WAAW,aAAX,WAAW,uBAAX,WAAW,CAAE,EAAE,EAAE,CAAC;aAChF,QAAQ,CAAC,iCAAiC,EAAE,EAAE,iBAAiB,EAAE,mCAAsB,CAAC,cAAc,EAAE,CAAC;aACzG,OAAO,CAAC,SAAS,CAAC;aAClB,UAAU,CAAC,WAAW,CAAC;aACvB,UAAU,CAAC,UAAU,CAAC;aACtB,UAAU,CAAC,kBAAkB,CAAC;aAC9B,UAAU,CAAC,4CAA4C,CAAC;aACxD,UAAU,CAAC,qBAAqB,CAAC;aACjC,UAAU,CAAC,aAAa,CAAC;aACzB,UAAU,CAAC,iBAAiB,CAAC;aAC7B,UAAU,CAAC,iBAAiB,CAAC;aAC7B,OAAO,CAAC,UAAU,EAAE,KAAK,CAAC,CAAA;QAE7B,MAAM,KAAK,GAAU,MAAM,EAAE,CAAC,UAAU,EAAE,CAAA;QAE1C,OAAO;YACL,aAAa,EAAE;gBACb,YAAY,EAAE,WAAW,CAAC,QAAQ,CAAC,IAAI;gBACvC,eAAe,EAAE,MAAA,WAAW,CAAC,QAAQ,0CAAE,MAAM,CAAC,EAAE;gBAChD,uBAAuB,EAAE,WAAW,CAAC,QAAQ,CAAC,OAAO,CAAC,MAAM,CAAC,EAAE;gBAC/D,SAAS,EAAE,SAAS,CAAC,SAAS;gBAC9B,KAAK,EAAE,WAAW,CAAC,KAAK;gBACxB,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,MAAM,EAAE,WAAW,CAAC,MAAM;gBAC1B,WAAW;aACZ;YACD,oBAAoB,EAAE,KAAK,CAAC,GAAG,CAAC,CAAC,IAAS,EAAE,EAAE;gBAC5C,OAAO;oBACL,OAAO,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,OAAO;oBACtB,SAAS,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,SAAS;oBAC1B,UAAU,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU;oBAC5B,WAAW,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW;oBAC9B,kBAAkB,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,kBAAkB;oBAC5C,qCAAqC,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,qCAAqC;oBAClF,UAAU,EAAE,IAAI,CAAC,UAAU;oBAC3B,SAAS,EAAE,IAAI,CAAC,SAAS;oBACzB,MAAM,EAAE,IAAI,CAAC,MAAM;oBACnB,cAAc,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,cAAc;oBACpC,WAAW,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW;oBAC9B,WAAW,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,WAAW;oBAC9B,UAAU,EAAE,IAAI,aAAJ,IAAI,uBAAJ,IAAI,CAAE,UAAU;oBAC5B,WAAW;iBACZ,CAAA;YACH,CAAC,CAAC;SACH,CAAA;IACH,CAAC;CACF,CAAA"}

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

@@ -353,6 +353,7 @@ exports.Mutation = `
     productBarcode: String!
     serialNumber: String
     toteNo: String
+    sortingQty: Int
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   packing (

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

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

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.122",
+  "version": "4.3.123",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -27,19 +27,19 @@
     "@things-factory/auth-base": "^4.3.122",
     "@things-factory/biz-base": "^4.3.122",
     "@things-factory/document-template-base": "^4.3.122",
-    "@things-factory/id-rule-base": "^4.3.122",
-    "@things-factory/integration-accounting": "^4.3.122",
-    "@things-factory/integration-lmd": "^4.3.122",
-    "@things-factory/integration-marketplace": "^4.3.122",
-    "@things-factory/integration-sellercraft": "^4.3.122",
-    "@things-factory/integration-sftp": "^4.3.122",
-    "@things-factory/marketplace-base": "^4.3.122",
+    "@things-factory/id-rule-base": "^4.3.123",
+    "@things-factory/integration-accounting": "^4.3.123",
+    "@things-factory/integration-lmd": "^4.3.123",
+    "@things-factory/integration-marketplace": "^4.3.123",
+    "@things-factory/integration-sellercraft": "^4.3.123",
+    "@things-factory/integration-sftp": "^4.3.123",
+    "@things-factory/marketplace-base": "^4.3.123",
     "@things-factory/notification": "^4.3.122",
-    "@things-factory/sales-base": "^4.3.122",
+    "@things-factory/sales-base": "^4.3.123",
     "@things-factory/setting-base": "^4.3.122",
     "@things-factory/shell": "^4.3.122",
     "@things-factory/transport-base": "^4.3.122",
-    "@things-factory/warehouse-base": "^4.3.122"
+    "@things-factory/warehouse-base": "^4.3.123"
   },
-  "gitHead": "3edd80e6ca68480b22ee0e25eba34d13ab0e49f1"
+  "gitHead": "4b257504bfc8c0a626dd90dc0216abb7ca30d8d3"
 }

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

@@ -1,29 +1,41 @@
-import { IsNull, In } from 'typeorm'
+import {
+  In,
+  IsNull
+} from 'typeorm'
 
-import { VasWorksheetController } from '../vas/vas-worksheet-controller'
-import { Product, ProductDetail } from '@things-factory/product-base'
+import {
+  Product,
+  ProductDetail
+} from '@things-factory/product-base'
+import {
+  ORDER_INVENTORY_STATUS,
+  ORDER_STATUS,
+  OrderInventory,
+  OrderNoGenerator,
+  OrderTote,
+  OrderToteItem,
+  ReleaseGood
+} from '@things-factory/sales-base'
 import {
   Inventory,
+  INVENTORY_ITEM_SOURCE,
+  INVENTORY_STATUS,
   INVENTORY_TRANSACTION_TYPE,
   InventoryItem,
-  INVENTORY_STATUS,
   InventoryNoGenerator,
-  INVENTORY_ITEM_SOURCE,
   Tote,
   TOTE_STATUS
 } from '@things-factory/warehouse-base'
+
 import {
-  ReleaseGood,
-  OrderInventory,
-  ORDER_INVENTORY_STATUS,
-  ORDER_STATUS,
-  OrderTote,
-  OrderToteItem,
-  OrderNoGenerator
-} from '@things-factory/sales-base'
-import { Worksheet, WorksheetDetail } from '../../entities'
-import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
-import { temporaryGetRemainInventoryAmount } from 'server/graphql/resolvers/worksheet/vas-transactions/common-utils'
+  WORKSHEET_STATUS,
+  WORKSHEET_TYPE
+} from '../../constants'
+import {
+  Worksheet,
+  WorksheetDetail
+} from '../../entities'
+import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export class SortingWorksheetController extends VasWorksheetController {
   async generateSortingWorksheet(
@@ -72,170 +84,201 @@ export class SortingWorksheetController extends VasWorksheetController {
   }
 
   async scanProductSorting(
-    taskNo: string,
     releaseGoodNo: string,
+    taskNo: string,
     productBarcode: string,
     serialNumber: string,
-    toteNo: string
+    toteNo: string,
+    sortingQty: number
   ): Promise<void> {
-    const worksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
-      where: {
-        domain: this.domain,
-        taskNo,
-        type: WORKSHEET_TYPE.SORTING,
-        status: WORKSHEET_STATUS.EXECUTING
-      },
-      relations: [
-        'worksheetDetails',
-        'worksheetDetails.targetInventory',
-        'worksheetDetails.targetInventory.product',
-        'worksheetDetails.targetInventory.orderProduct',
-        'worksheetDetails.targetInventory.bizplace',
-        'worksheetDetails.targetInventory.inventory',
-        'worksheetDetails.targetInventory.inventory.product',
-        'worksheetDetails.targetInventory.inventory.product.productDetails',
-        'worksheetDetails.targetInventory.inventory.product.productDetails.product',
-        'worksheetDetails.targetInventory.releaseGood'
-      ]
-    })
+    const worksheet: Worksheet = await this.trxMgr
+      .getRepository(Worksheet)
+      .createQueryBuilder('worksheet')
+      .innerJoinAndSelect('worksheet.worksheetDetails', 'worksheetDetails')
+      .innerJoinAndSelect('worksheetDetails.targetInventory', 'targetInventory')
+      .innerJoinAndSelect('targetInventory.product', 'product')
+      .innerJoinAndSelect('product.productDetails', 'productDetails')
+      .leftJoinAndSelect('productDetails.childProductDetail', 'childProductDetail')
+      .leftJoinAndSelect('targetInventory.orderProduct', 'orderProduct')
+      .leftJoinAndSelect('targetInventory.bizplace', 'bizplace')
+      .leftJoinAndSelect('targetInventory.inventory', 'inventory')
+      .leftJoinAndSelect('targetInventory.releaseGood', 'releaseGood')
+      .where('worksheet.domain_id = :domainId', { domainId: this.domain.id })
+      .andWhere('worksheet.task_no = :taskNo', { taskNo })
+      .andWhere('worksheet.type = :type', { type: WORKSHEET_TYPE.SORTING })
+      .andWhere('worksheet.status = :status', { status: WORKSHEET_STATUS.EXECUTING })
+      .andWhere('releaseGood.name = :rg', { rg: releaseGoodNo })
+      .andWhere('productDetails.gtin = :gtin', { gtin: productBarcode })
+      .getOne()
+
+    if (!worksheet) {
+      throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+    }
 
-    this.checkRecordValidity(worksheet, { status: WORKSHEET_STATUS.EXECUTING })
+    const worksheetDetails = worksheet.worksheetDetails
+    const orderInventories: OrderInventory[] = worksheetDetails.map((wsd: WorksheetDetail) => wsd.targetInventory)
+    const productDetails: ProductDetail[] = orderInventories[0].product.productDetails
+    const scannedProductDetail: ProductDetail = productDetails.find(itm => itm.gtin == productBarcode)
+    const scannedChildProductDetail: ProductDetail = scannedProductDetail.childProductDetail
+
+    //find matching order inventories based on scanned product detail
+    let matchingOIs = orderInventories.filter(
+      oi =>
+        oi.packingType == scannedProductDetail.packingType &&
+        oi.packingSize == scannedProductDetail.packingSize &&
+        oi.uom == scannedProductDetail.uom
+    )
 
-    const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
-    const orderInventories: OrderInventory[] = worksheetDetails
-      .map((wsd: WorksheetDetail) => wsd.targetInventory)
-      .filter((oi: OrderInventory) => oi.releaseGood.name === releaseGoodNo)
-
-    if (productBarcode) {
-      let productDetails: ProductDetail[] = []
-      orderInventories.map((oi: OrderInventory) => {
-        const foundPDs: ProductDetail[] = oi.inventory && oi.inventory.product && oi.inventory.product.productDetails
-        foundPDs.map(productDetail => {
-          productDetails.push(productDetail)
-        })
-      })
+    let productDetail = scannedProductDetail
 
-      const matchingProductDetail: ProductDetail = productDetails.find(
-        (productDetail: ProductDetail) => productDetail.gtin === productBarcode
-      )
-      if (!matchingProductDetail) throw new Error('Unable to find product barcode.')
-      const packingType: string = matchingProductDetail.packingType
-      const packingSize: number = matchingProductDetail.packingSize
-      if (!matchingProductDetail)
-        throw new Error(this.ERROR_MSG.PRODUCT.BARCODE_NOT_EXIST(productBarcode, packingType, packingSize))
-
-      let matchingOIs: OrderInventory[] = orderInventories.filter(
-        (oi: OrderInventory) =>
-          oi.packingType === packingType &&
-          oi.packingSize === packingSize &&
-          oi.product?.id === matchingProductDetail.product?.id
+    //if no order inventories found then find based on child product detail of scanned product detail
+    //if found then user is scanning parent product detail
+    if (!matchingOIs?.length) {
+      if (!scannedChildProductDetail) {
+        throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+      }
+      matchingOIs = orderInventories.filter(
+        oi =>
+          oi.packingType == scannedChildProductDetail.packingType &&
+          oi.packingSize == scannedChildProductDetail.packingSize &&
+          oi.uom == scannedChildProductDetail.uom
       )
 
-      let sortedQty: number = 1
+      productDetail = scannedChildProductDetail
 
-      if (!matchingOIs?.length) {
-        throw new Error(this.ERROR_MSG.ORDER_ITEM.NO_MATCHING_RESULT(packingType, packingSize))
-      } else {
-        await Promise.all(
-          matchingOIs.map(async (matchingOI: OrderInventory) => {
-            const releaseQty: number = matchingOI.releaseQty
-            const inventory: Inventory = matchingOI.inventory
-            const releaseGood: ReleaseGood = matchingOI.releaseGood
-            const product: Product = inventory.product
-
-            if (releaseQty != matchingOI?.sortedQty && sortedQty == 1) {
-              // Serial Number scanning for batch picking
-              if (matchingOI?.refWorksheetId) {
-                if (product?.isRequireSerialNumberScanningOutbound) {
-                  if (!serialNumber || serialNumber == '') {
-                    throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('sorting', `require serial number`))
-                  }
-
-                  let foundSerialNumber: InventoryItem = await this.trxMgr
-                    .getRepository(InventoryItem)
-                    .findOne({ where: { domain: this.domain, serialNumber: serialNumber, product } })
-
-                  if (foundSerialNumber) {
-                    if (foundSerialNumber.inventoryId !== inventory.id) {
-                      throw new Error('Serial Number scanned is in another inventory')
-                    }
-
-                    if (foundSerialNumber.outboundOrderId) {
-                      let releaseGood: ReleaseGood = await this.trxMgr
-                        .getRepository(ReleaseGood)
-                        .findOne({ where: { id: foundSerialNumber.outboundOrderId } })
-                      throw new Error(`Inventory Item is already picked/sorted in ${releaseGood.name}`)
-                    }
-
-                    foundSerialNumber.status = INVENTORY_STATUS.SORTING
-                    foundSerialNumber.updater = this.user
-                    foundSerialNumber.outboundOrderId = releaseGood.id
-
-                    await this.trxMgr.getRepository(InventoryItem).save(foundSerialNumber)
-                  } else {
-                    let inventoryItem: InventoryItem = new InventoryItem()
-                    inventoryItem.name = InventoryNoGenerator.inventoryItemName()
-                    inventoryItem.serialNumber = serialNumber
-                    inventoryItem.status = INVENTORY_STATUS.SORTING
-                    inventoryItem.outboundOrderId = releaseGood.id
-                    inventoryItem.source = INVENTORY_ITEM_SOURCE.OUTBOUND
-                    inventoryItem.product = product
-                    inventoryItem.inventory = inventory
-                    inventoryItem.domain = this.domain
-
-                    await this.trxMgr.getRepository(InventoryItem).save(inventoryItem)
-                  }
-                }
+      if (!matchingOIs?.length || matchingOIs[0].product.isRequireSerialNumberScanningOutbound) {
+        throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+      }
+    }
+
+    const packingType: string = productDetail.packingType
+    const packingSize: number = productDetail.packingSize
+
+    let matchingProduct = await this.getDirectQty(
+      {
+        ...productDetail
+      },
+      productBarcode,
+      sortingQty ? sortingQty : 1
+    )
+
+    // validate matching product details based on scanned barcode
+    if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+
+    let sortedQty: number = matchingProduct.qty
+    const releaseGood: ReleaseGood = matchingOIs[0].releaseGood
+
+    //update order inventories
+    await Promise.all(
+      matchingOIs.map(async (matchingOI, index) => {
+        //if sortedQty is more than 0, then logic will run
+        //this validation is to handle multiple ois with multiple release qty
+        if (sortedQty > 0) {
+          const releaseQty: number = matchingOI.releaseQty
+          const inventory: Inventory = matchingOI.inventory
+          const product: Product = matchingOI.product
+
+          // Serial Number scanning for batch picking
+          if (matchingOI?.refWorksheetId) {
+            if (product?.isRequireSerialNumberScanningOutbound) {
+              if (!serialNumber || serialNumber == '') {
+                throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('sorting', `require serial number`))
               }
 
-              matchingOI.sortedQty = Boolean(matchingOI?.sortedQty) ? matchingOI.sortedQty + sortedQty : sortedQty
-              sortedQty -= 1
-              if (matchingOI.sortedQty == releaseQty) {
-                matchingOI.status = ORDER_INVENTORY_STATUS.SORTED
-                await this.updateOrderTargets([matchingOI])
-                await this.transactionInventory(inventory, releaseGood, 0, 0, INVENTORY_TRANSACTION_TYPE.SORTING)
-
-                let worksheetDetail: WorksheetDetail = worksheetDetails.find(
-                  wsd => wsd.targetInventory.id === matchingOI.id
-                )
-                worksheetDetail.status = WORKSHEET_STATUS.DONE
-                worksheetDetail.updater = this.user
-                await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
-
-                let inventoryItems: InventoryItem = await this.trxMgr
-                  .getRepository(InventoryItem)
-                  .find({ where: { outboundOrderId: releaseGood.id } })
-
-                if (inventoryItems.length > 0) {
-                  inventoryItems.forEach((itm: InventoryItem) => {
-                    itm.status = INVENTORY_STATUS.SORTED
-                    itm.updater = this.user
-                  })
-
-                  await this.trxMgr.getRepository(InventoryItem).save(inventoryItems)
+              let foundSerialNumber: InventoryItem = await this.trxMgr
+                .getRepository(InventoryItem)
+                .findOne({ where: { domain: this.domain, serialNumber: serialNumber, product } })
+
+              if (foundSerialNumber) {
+                if (foundSerialNumber.inventoryId !== inventory.id) {
+                  throw new Error('Serial Number scanned is in another inventory')
                 }
-              } else if (matchingOI?.sortedQty > releaseQty) {
-                const product: Product = matchingOI.inventory.product
-                throw new Error(this.ERROR_MSG.ORDER_ITEM.EXCESS_QTY(product.sku, packingType, packingSize))
+
+                if (foundSerialNumber.outboundOrderId) {
+                  let releaseGood: ReleaseGood = await this.trxMgr
+                    .getRepository(ReleaseGood)
+                    .findOne({ where: { id: foundSerialNumber.outboundOrderId } })
+                  throw new Error(`Inventory Item is already picked/sorted in ${releaseGood.name}`)
+                }
+
+                foundSerialNumber.status = INVENTORY_STATUS.SORTING
+                foundSerialNumber.updater = this.user
+                foundSerialNumber.outboundOrderId = releaseGood.id
+
+                await this.trxMgr.getRepository(InventoryItem).save(foundSerialNumber)
               } else {
-                await this.updateOrderTargets([matchingOI])
+                let inventoryItem: InventoryItem = new InventoryItem()
+                inventoryItem.name = InventoryNoGenerator.inventoryItemName()
+                inventoryItem.serialNumber = serialNumber
+                inventoryItem.status = INVENTORY_STATUS.SORTING
+                inventoryItem.outboundOrderId = releaseGood.id
+                inventoryItem.source = INVENTORY_ITEM_SOURCE.OUTBOUND
+                inventoryItem.product = product
+                inventoryItem.inventory = inventory
+                inventoryItem.domain = this.domain
+
+                await this.trxMgr.getRepository(InventoryItem).save(inventoryItem)
               }
+            }
+          }
 
-              if (toteNo) {
-                await this.toteScanning(
-                  toteNo,
-                  matchingOI.orderProduct,
-                  matchingOI,
-                  1,
-                  releaseGood,
-                  matchingOI.bizplace
-                )
-              }
+          let tempSortedQty = 0
+
+          //when sortedQty is more than releaseQty, check if the loop is running the last order inventory
+          //if yes then throw error
+          if (sortedQty > releaseQty && index == orderInventories.length - 1) {
+            throw new Error(this.ERROR_MSG.ORDER_ITEM.EXCESS_QTY(product.sku, packingType, packingSize))
+          } else {
+            //if not proceed to sorting
+            if (sortedQty < releaseQty) {
+              tempSortedQty = sortedQty
+            } else {
+              //if sortedQty is more than releaseQty then releaseQty - previous sorted qty will be the qty that needs to be sorted for current oi
+              //overflow qty will be sorted to next oi
+              tempSortedQty = Boolean(matchingOI?.sortedQty) ? releaseQty - matchingOI.sortedQty : releaseQty
             }
-          })
-        )
-      }
-    }
+            sortedQty -= tempSortedQty
+          }
+
+          matchingOI.sortedQty = Boolean(matchingOI?.sortedQty) ? tempSortedQty + matchingOI.sortedQty : tempSortedQty
+
+          if (matchingOI.sortedQty == releaseQty) {
+            matchingOI.status = ORDER_INVENTORY_STATUS.SORTED
+            await this.updateOrderTargets([matchingOI])
+            await this.transactionInventory(inventory, releaseGood, 0, 0, INVENTORY_TRANSACTION_TYPE.SORTING)
+
+            let worksheetDetail = worksheetDetails.find(wd => (wd.targetInventory.id = matchingOI.id))
+            await this.trxMgr
+              .getRepository(WorksheetDetail)
+              .update({ id: worksheetDetail.id }, { status: WORKSHEET_STATUS.DONE, updater: this.user })
+
+            let inventoryItems: InventoryItem = await this.trxMgr
+              .getRepository(InventoryItem)
+              .find({ where: { outboundOrderId: releaseGood.id } })
+
+            if (inventoryItems.length > 0) {
+              inventoryItems.forEach((itm: InventoryItem) => {
+                itm.status = INVENTORY_STATUS.SORTED
+                itm.updater = this.user
+              })
+
+              await this.trxMgr.getRepository(InventoryItem).save(inventoryItems)
+            }
+          } else if (matchingOI?.sortedQty > releaseQty) {
+            const product: Product = matchingOI.product
+            throw new Error(this.ERROR_MSG.ORDER_ITEM.EXCESS_QTY(product.sku, packingType, packingSize))
+          } else {
+            await this.updateOrderTargets([matchingOI])
+          }
+
+          if (toteNo) {
+            await this.toteScanning(toteNo, matchingOI.orderProduct, matchingOI, 1, releaseGood, matchingOI.bizplace)
+          }
+        }
+      })
+    )
+    await this.trxMgr.getRepository(ReleaseGood).update({ id: releaseGood.id }, { sortedBy: this.user })
+    console.timeEnd('scanProductSorting')
   }
 
   async sortingProduct(
@@ -380,15 +423,10 @@ export class SortingWorksheetController extends VasWorksheetController {
 
   async completeOrderSorting(releaseGoodNo: string): Promise<ReleaseGood> {
     try {
-      let releaseGood: ReleaseGood = await this.findRefOrder(
-        ReleaseGood,
-        {
-          domain: this.domain,
-          name: releaseGoodNo,
-          status: ORDER_STATUS.SORTING
-        },
-        ['bizplace', 'orderInventories']
-      )
+      let releaseGood: ReleaseGood = await this.trxMgr.getRepository(ReleaseGood).findOne({
+        where: { domain: this.domain, name: releaseGoodNo, status: ORDER_STATUS.SORTING },
+        relations: ['bizplace', 'orderInventories']
+      })
 
       if (!releaseGood) {
         throw new Error('Order is already sorted')
@@ -485,7 +523,7 @@ export class SortingWorksheetController extends VasWorksheetController {
       .getRepository(OrderTote)
       .findOne({ where: { domain: this.domain, name: toteNo, releaseGood } })
 
-    //if order tote not found the create one, if tote not found means it's tote box
+    //if order tote not found then create one, if tote not found means it's tote box
     //create order tote item
     if (!foundOrderTote) {
       const orderTote = await this.trxMgr.getRepository(OrderTote).save({

package/server/graphql/resolvers/worksheet/find-sorting-release-orders-by-task-no.ts

@@ -7,6 +7,7 @@ import {
   ReleaseGood as ReleaseGoodEntity
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
+import { User } from '@things-factory/auth-base'
 import { Location } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
@@ -59,22 +60,27 @@ export const findSortingReleaseOrdersByTaskNoResolver = {
       .createQueryBuilder('ws')
       .select('rg.id as id')
       .addSelect('rg.name as name')
+      .addSelect('rg.refNo as "refNo"')
+      .addSelect('rg.refNo2 as "refNo2"')
       .addSelect('rg.status as status')
+      .addSelect('user.name as "sortedByUser"')
       .innerJoin(Domain, 'domain', 'ws.domain_id = domain.id')
       .innerJoin(WorksheetDetailEntity, 'wsd', 'ws.id = wsd.worksheet_id')
       .innerJoin(OrderInventoryEntity, 'oi', 'oi.id = wsd.target_inventory_id')
       .innerJoin(ReleaseGoodEntity, 'rg', 'rg.id = oi.release_good_id')
+      .leftJoin(User, 'user', 'rg.sorted_by_id = user.id')
       .where('domain.id = :domainId', { domainId: domain.id })
       .andWhere('ws.taskNo = :taskNo', { taskNo: taskNo })
       .andWhere('ws.type = :worksheetType', { worksheetType: WORKSHEET_TYPE.SORTING })
       .andWhere('ws.status = :worksheetStatus', { worksheetStatus: WORKSHEET_STATUS.EXECUTING })
-      .andWhere('rg.status = :roStatus', { roStatus: ORDER_STATUS.SORTING })
       .groupBy('rg.id')
       .addGroupBy('rg.name')
       .addGroupBy('rg.status')
+      .addGroupBy('user.name')
       .orderBy('rg.createdAt', 'ASC')
 
     const releaseGoods: ReleaseGoodEntity[] = await qb.getRawMany()
+
     return { releaseGoods, taskNo }
   }
 }

package/server/graphql/resolvers/worksheet/sorting/scan-product-sorting.ts

@@ -4,9 +4,13 @@ import { EntityManager } from 'typeorm'
 import { SortingWorksheetController } from '../../../../controllers'
 
 export const scanProductSortingResolver = {
-  async scanProductSorting(_: any, { taskNo, releaseGoodNo, productBarcode, serialNumber, toteNo }, context: any) {
+  async scanProductSorting(
+    _: any,
+    { releaseGoodNo, taskNo, productBarcode, serialNumber, toteNo, sortingQty },
+    context: any
+  ) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await scanProductSorting(tx, domain, user, taskNo, releaseGoodNo, productBarcode, serialNumber, toteNo)
+    await scanProductSorting(tx, domain, user, releaseGoodNo, taskNo, productBarcode, serialNumber, toteNo, sortingQty)
   }
 }
 
@@ -14,12 +18,13 @@ export async function scanProductSorting(
   tx: EntityManager,
   domain: Domain,
   user: User,
-  taskNo: string,
   releaseGoodNo: string,
+  taskNo: string,
   productBarcode?: string,
   serialNumber?: string,
-  toteNo?: string
+  toteNo?: string,
+  sortingQty?: number
 ) {
   const worksheetController: SortingWorksheetController = new SortingWorksheetController(tx, domain, user)
-  await worksheetController.scanProductSorting(taskNo, releaseGoodNo, productBarcode, serialNumber, toteNo)
+  await worksheetController.scanProductSorting(releaseGoodNo, taskNo, productBarcode, serialNumber, toteNo, sortingQty)
 }

package/server/graphql/resolvers/worksheet/sorting-worksheet.ts

@@ -11,7 +11,7 @@ export const sortingWorksheetResolver = {
     const { domain }: { domain: Domain } = context.state
     const releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({
       where: { domain, name: releaseGoodNo, status: ORDER_STATUS.SORTING },
-      relations: ['bizplace', 'bizplace.domain']
+      relations: ['bizplace', 'bizplace.domain', 'bizplace.company', 'bizplace.company.domain']
     })
     if (!releaseGood) throw new Error(`Couldn't find sorting worksheet by order no (${releaseGoodNo})`)
 
@@ -58,6 +58,7 @@ export const sortingWorksheetResolver = {
       worksheetInfo: {
         bizplaceName: releaseGood.bizplace.name,
         partnerDomainId: releaseGood.bizplace?.domain.id,
+        customerCompanyDomainId: releaseGood.bizplace.company.domain.id,
         startedAt: worksheet.startedAt,
         refNo: releaseGood.refNo,
         refNo2: releaseGood.refNo2,

package/server/graphql/types/worksheet/index.ts

@@ -351,6 +351,7 @@ export const Mutation = /* GraphQL */ `
     productBarcode: String!
     serialNumber: String
     toteNo: String
+    sortingQty: Int
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   packing (