@things-factory/worksheet-base 4.3.367 → 4.3.369

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

@@ -298,6 +298,9 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         catch (error) {
             throw error;
         }
+        finally {
+            entities_1.ActiveWorksheetPickingView.refreshView();
+        }
         return worksheets;
     }
     async activateBatchPicking(worksheetNo) {
@@ -498,111 +501,88 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         }, { status: sales_base_1.ORDER_INVENTORY_STATUS.PENDING_SPLIT, updater: this.user, updatedAt: new Date() });
     }
     async scanProductPicking(worksheetDetailName, worksheetType, productBarcode, cartonId, binLocation, serialNumber, toteNo, pickedQty = 1) {
-        var _a;
         try {
             //find existing worksheet detail
-            let worksheetDetail = await this.trxMgr
-                .getRepository(entities_1.WorksheetDetail)
-                .createQueryBuilder('wd')
-                .innerJoinAndSelect('wd.worksheet', 'ws')
-                .innerJoinAndSelect('ws.bizplace', 'bz')
-                .innerJoinAndSelect('wd.targetInventory', 'oi')
-                .innerJoinAndSelect('oi.releaseGood', 'rg')
-                .innerJoinAndSelect('oi.inventory', 'inv')
-                .leftJoinAndSelect('oi.orderProduct', 'op')
-                .innerJoinAndSelect('oi.product', 'prd')
-                .innerJoinAndSelect('oi.productDetail', 'pd')
-                .innerJoinAndSelect('pd.productBarcodes', 'pb')
-                .where('wd.name = :name', { name: worksheetDetailName })
-                .andWhere('wd.domain_id = :domainId', { domainId: this.domain.id })
-                .andWhere('wd.type = :type', { type: worksheetType })
-                .andWhere('wd.status = :status', { status: constants_1.WORKSHEET_STATUS.EXECUTING })
-                .andWhere('inv.carton_id = :cartonId', { cartonId: cartonId })
-                .getOne();
+            let worksheetDetailFilters = [
+                { query: 'mawp."worksheetDetailName"', value: worksheetDetailName },
+                { query: 'mawp."domainId"', value: this.domain.id },
+                { query: 'mawp."inventoryCartonId"', value: cartonId }
+                // { query: 'mawp."gtin"', value: productBarcode }
+            ];
+            let worksheetDetailRaw = await this.trxMgr.query(`
+        select * from active_worksheet_picking_views mawp
+        where 1 = 1
+        and
+        ${worksheetDetailFilters.map((data, idx) => {
+                return `${data.query} = $${idx + 1}`;
+            }).join(' AND ')}
+      `, worksheetDetailFilters.map((data, idx) => {
+                return data.value;
+            }));
             //validation to check matching worksheet detail based on name
-            if (!worksheetDetail)
+            if ((worksheetDetailRaw.length < 1))
                 throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName));
-            const releaseGood = worksheetDetail.targetInventory.releaseGood;
-            let targetInventory = worksheetDetail.targetInventory;
-            let targetProduct = targetInventory.orderProduct;
-            const product = targetInventory.product;
-            const matchProductBarcode = await this.trxMgr.getRepository(product_base_1.ProductBarcode).findOne({
-                where: { gtin: productBarcode },
-                relations: ['productDetail']
-            });
-            const productDetail = targetInventory.productDetail;
-            const productBarcodes = productDetail.productBarcodes;
-            let inventory = targetInventory.inventory;
-            let bizplace = worksheetDetail.worksheet.bizplace;
-            let pickedUomValue = pickedQty * productDetail.uomValue;
-            let matchingProduct;
-            // validation to prevent picking if the inventory is involved in cycle count
-            let inventoryCheckItem = await this.trxMgr.getRepository(sales_base_1.InventoryCheckItem).findOne({
-                where: {
-                    domain: this.domain,
-                    inventory: inventory.id,
-                    status: (0, typeorm_1.In)([
-                        sales_base_1.INVENTORY_CHECK_ITEM_STATUS.PENDING,
-                        sales_base_1.INVENTORY_CHECK_ITEM_STATUS.INSPECTING,
-                        sales_base_1.INVENTORY_CHECK_ITEM_STATUS.INSPECTED,
-                        sales_base_1.INVENTORY_CHECK_ITEM_STATUS.NOT_TALLY,
-                        sales_base_1.INVENTORY_CHECK_ITEM_STATUS.GROUP_NOT_TALLY,
-                        sales_base_1.INVENTORY_CHECK_ITEM_STATUS.MISSING,
-                        sales_base_1.INVENTORY_CHECK_ITEM_STATUS.ADDED
-                    ])
-                }
-            });
-            if (inventoryCheckItem) {
+            let worksheetDetailInfos = worksheetDetailRaw[0];
+            let targetInventory = await this.trxMgr.getRepository(sales_base_1.OrderInventory).findOne({ where: { id: worksheetDetailInfos.orderInventoryId } });
+            const inventory = await this.trxMgr.getRepository(warehouse_base_1.Inventory).findOne({ where: { id: worksheetDetailInfos.inventoryId } });
+            let targetProduct = { id: worksheetDetailInfos.targetProductId };
+            let bizplace = { id: worksheetDetailInfos.bizplaceId };
+            const releaseGood = { id: worksheetDetailInfos.releaseGoodId };
+            let matchingProduct, pickedUomValue;
+            // // validation to prevent picking if the inventory is involved in cycle count
+            const inventoryCheckStatus = new Set([
+                sales_base_1.INVENTORY_CHECK_ITEM_STATUS.PENDING,
+                sales_base_1.INVENTORY_CHECK_ITEM_STATUS.INSPECTING,
+                sales_base_1.INVENTORY_CHECK_ITEM_STATUS.INSPECTED,
+                sales_base_1.INVENTORY_CHECK_ITEM_STATUS.NOT_TALLY,
+                sales_base_1.INVENTORY_CHECK_ITEM_STATUS.GROUP_NOT_TALLY,
+                sales_base_1.INVENTORY_CHECK_ITEM_STATUS.MISSING,
+                sales_base_1.INVENTORY_CHECK_ITEM_STATUS.ADDED
+            ]);
+            if (inventoryCheckStatus.has(worksheetDetailInfos.inventoryCheckItemStatus)) {
                 throw new Error(`Inventory currently involved in an ongoing cycle count. Please complete the cycle count to proceed with picking.`);
             }
             //validation to prevent duplicated picking
-            if ((targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.status) != sales_base_1.ORDER_INVENTORY_STATUS.PICKING)
+            if (targetInventory.status != sales_base_1.ORDER_INVENTORY_STATUS.PICKING)
                 throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`));
-            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));
+            // if (!productBarcodes.find(itm => itm.gtin == productBarcode) && product?.isRequireSerialNumberScanningOutbound) {
+            //   throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+            // }
+            matchingProduct = worksheetDetailRaw.find(x => x.gtin === productBarcode);
+            if (matchingProduct) {
+                pickedUomValue = pickedQty * (matchingProduct.uomValue || 1);
             }
-            matchingProduct = await this.getDirectQty(Object.assign(Object.assign({}, productDetail), { product: targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.product }), productBarcode, pickedQty);
-            //validate matching product details based on scanned barcode
-            if (!matchingProduct)
-                throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode));
-            pickedQty = matchingProduct.qty;
-            pickedUomValue = matchingProduct.uomValue;
-            //validation to prevent over release
-            if (!(worksheetDetail === null || worksheetDetail === void 0 ? void 0 : worksheetDetail.targetInventory) ||
-                (worksheetDetail === null || worksheetDetail === void 0 ? void 0 : worksheetDetail.targetInventory.inventory.qty) < 1 ||
-                pickedQty + (((_a = worksheetDetail.targetInventory) === null || _a === void 0 ? void 0 : _a.pickedQty) || 0) > worksheetDetail.targetInventory.releaseQty)
+            else {
+                matchingProduct = await this.getDirectQty({ id: worksheetDetailInfos.productDetailId }, productBarcode, pickedQty);
+                //validate matching product details based on scanned barcode
+                if (!matchingProduct)
+                    throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode));
+                pickedQty = matchingProduct.qty;
+                pickedUomValue = matchingProduct.uomValue;
+            }
+            // //validation to prevent over release
+            if (!targetInventory)
+                throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `inventory not assigned`));
+            // //validation to prevent over release
+            if (inventory.qty < 1 || pickedQty + ((targetInventory === null || targetInventory === void 0 ? void 0 : targetInventory.pickedQty) || 0) > targetInventory.releaseQty)
                 throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`));
             targetInventory = await this.checkAndSetBinPicking(targetInventory, binLocation);
-            // // search for matching product barcode
-            // const productDetails: ProductDetail[] = product?.productDetails.filter(detail => !detail.deletedAt)
-            // // scannedProductDetail can be child or gtin
-            // const scannedProductDetail: ProductDetail = productDetails.find(detail => detail.gtin == productBarcode)
-            // if (!scannedProductDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
-            // // case for scanning parent packing type, packing size
-            // // when scannedProductDetail id is not the same as productDetail id, then it's not child gtin, proceed to get child qty
-            // if (scannedProductDetail.id !== productDetail.id && !product?.isRequireSerialNumberScanningOutbound) {
-            //   let childQty = await this.getChildQty(productDetails, productBarcode, productDetail, scannedProductDetail)
-            //   pickedQty *= childQty
-            // }
-            // if (pickedQty + targetInventory.pickedQty > releaseQty) {
-            //   throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
-            // }
             // for required outbound serial number scanning
-            if (product === null || product === void 0 ? void 0 : product.isRequireSerialNumberScanningOutbound) {
+            if (worksheetDetailInfos === null || worksheetDetailInfos === void 0 ? void 0 : worksheetDetailInfos.productIsRequireSerialNumberScanningOutbound) {
                 if (!serialNumber || serialNumber == '') {
                     throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `require serial number`));
                 }
                 let totalInventoryItems = await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).count({
                     where: {
-                        inventory,
+                        inventory: { id: worksheetDetailInfos.inventoryId },
                         status: (0, typeorm_1.Not)((0, typeorm_1.In)([warehouse_base_1.INVENTORY_STATUS.TERMINATED, warehouse_base_1.INVENTORY_STATUS.PICKED]))
                     }
                 });
                 let foundSerialNumber = await this.trxMgr
                     .getRepository(warehouse_base_1.InventoryItem)
-                    .findOne({ where: { domain: this.domain, serialNumber: serialNumber, product } });
+                    .findOne({ where: { domain: this.domain, serialNumber: serialNumber, product: { id: worksheetDetailInfos.productId } } });
                 if (foundSerialNumber) {
-                    if (foundSerialNumber.inventoryId !== inventory.id) {
+                    if (foundSerialNumber.inventoryId !== worksheetDetailInfos.inventoryId) {
                         throw new Error('Serial Number scanned is in another inventory');
                     }
                     if (foundSerialNumber.outboundOrderId) {
@@ -615,7 +595,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                     }
                     foundSerialNumber.status = warehouse_base_1.INVENTORY_STATUS.PICKING;
                     foundSerialNumber.updater = this.user;
-                    foundSerialNumber.outboundOrderId = releaseGood.id;
+                    foundSerialNumber.outboundOrderId = worksheetDetailInfos.releaseGoodId;
                     await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(foundSerialNumber);
                 }
                 else {
@@ -626,11 +606,11 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                     inventoryItem.name = warehouse_base_1.InventoryNoGenerator.inventoryItemName();
                     inventoryItem.serialNumber = serialNumber;
                     inventoryItem.status = warehouse_base_1.INVENTORY_STATUS.PICKING;
-                    inventoryItem.outboundOrderId = releaseGood.id;
+                    inventoryItem.outboundOrderId = worksheetDetailInfos.releaseGoodId;
                     inventoryItem.source = warehouse_base_1.INVENTORY_ITEM_SOURCE.OUTBOUND;
-                    inventoryItem.product = product;
-                    inventoryItem.productDetail = productDetail;
-                    inventoryItem.inventory = inventory;
+                    inventoryItem.product = { id: worksheetDetailInfos.productId };
+                    inventoryItem.productDetail = { id: worksheetDetailInfos.productDetailId };
+                    inventoryItem.inventory = { id: worksheetDetailInfos.inventoryId };
                     inventoryItem.domain = this.domain;
                     await this.trxMgr.getRepository(warehouse_base_1.InventoryItem).save(inventoryItem);
                 }
@@ -649,11 +629,9 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 updater: this.user,
                 pickedBy: this.user.name,
                 pickedByUser: this.user,
-                pickedAt: new Date()
+                pickedAt: new Date(),
+                status: () => `case when release_qty = "picked_qty" + ${pickedQty} then '${sales_base_1.ORDER_INVENTORY_STATUS.PICKED}' else status end`
             };
-            if (targetInventory.pickedQty == releaseQty) {
-                updateOiObj['status'] = sales_base_1.ORDER_INVENTORY_STATUS.PICKED;
-            }
             if (targetInventory.binLocation) {
                 updateOiObj['binLocation'] = targetInventory.binLocation;
             }
@@ -666,68 +644,61 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 .andWhere(`picked_qty + :pickedQty <= release_qty`, { pickedQty })
                 .execute();
             if (targetInventory.pickedQty == releaseQty) {
-                //update worksheet details only when line item picking complete
-                await this.trxMgr
-                    .getRepository(entities_1.WorksheetDetail)
-                    .createQueryBuilder()
-                    .update(entities_1.WorksheetDetail)
-                    .set({
-                    status: constants_1.WORKSHEET_STATUS.DONE,
-                    updater: this.user,
-                    updatedAt: new Date()
-                })
-                    .where('id = :id', { id: worksheetDetail.id })
-                    .execute();
                 (0, typeorm_1.getConnection)().transaction(async (tx) => {
-                    let releaseUomValue = Math.round((pickedUomValue / pickedQty) * releaseQty * 100) / 100;
-                    let updateInvObj = {
-                        qty: () => `"qty" - ${releaseQty}`,
-                        lockedQty: () => `"locked_qty" - ${releaseQty}`,
-                        uomValue: () => `"uom_value" - ${releaseUomValue}`,
-                        lockedUomValue: () => `"locked_uom_value" - ${releaseUomValue}`,
-                        updater: this.user,
-                        updatedAt: new Date()
-                    };
-                    let remainingQty = await tx
-                        .getRepository(warehouse_base_1.Inventory)
-                        .createQueryBuilder()
-                        .update(warehouse_base_1.Inventory)
-                        .set(updateInvObj)
-                        .where('id = :id', { id: targetInventory.inventory.id })
-                        .returning(['qty'])
-                        .execute()
-                        .then(dt => {
-                        return dt.raw[0].qty;
-                    });
-                    await (0, warehouse_base_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.PICKING, -releaseQty, -releaseUomValue, this.user, tx);
-                    let inventoryItems = await tx
-                        .getRepository(warehouse_base_1.InventoryItem)
-                        .find({ where: { outboundOrderId: releaseGood.id } });
-                    if (inventoryItems.length > 0) {
-                        inventoryItems.forEach((itm) => {
-                            itm.status = warehouse_base_1.INVENTORY_STATUS.PICKED;
-                            itm.updater = this.user;
-                        });
-                        await tx.getRepository(warehouse_base_1.InventoryItem).save(inventoryItems);
-                    }
-                    if (remainingQty === 0) {
+                    try {
+                        //update worksheet details only when line item picking complete
+                        await tx
+                            .getRepository(entities_1.WorksheetDetail)
+                            .createQueryBuilder()
+                            .update(entities_1.WorksheetDetail)
+                            .set({
+                            status: constants_1.WORKSHEET_STATUS.DONE,
+                            updater: this.user,
+                            updatedAt: new Date()
+                        })
+                            .where('id = :id', { id: worksheetDetailInfos.worksheetDetailId })
+                            .execute();
+                        let releaseUomValue = Math.round((pickedUomValue / pickedQty) * releaseQty * 100) / 100;
+                        let updateInvObj = {
+                            qty: () => `"qty" - ${releaseQty}`,
+                            lockedQty: () => `"locked_qty" - ${releaseQty}`,
+                            uomValue: () => `"uom_value" - ${releaseUomValue}`,
+                            lockedUomValue: () => `"locked_uom_value" - ${releaseUomValue}`,
+                            status: () => `case when "qty" - ${releaseQty} <= 0 then '${warehouse_base_1.INVENTORY_STATUS.TERMINATED}' else status end`,
+                            updater: this.user,
+                            updatedAt: new Date()
+                        };
                         await tx
                             .getRepository(warehouse_base_1.Inventory)
                             .createQueryBuilder()
                             .update(warehouse_base_1.Inventory)
-                            .set({ status: warehouse_base_1.INVENTORY_STATUS.TERMINATED })
-                            .where('id = :id', { id: targetInventory.inventory.id })
+                            .set(updateInvObj)
+                            .where('id = :id', { id: worksheetDetailInfos.inventoryId })
+                            .returning(['qty'])
                             .execute();
+                        await (0, warehouse_base_1.generateInventoryHistory)(inventory, releaseGood, warehouse_base_1.INVENTORY_TRANSACTION_TYPE.PICKING, -releaseQty, -releaseUomValue, this.user, tx);
+                        let inventoryItems = await tx
+                            .getRepository(warehouse_base_1.InventoryItem)
+                            .find({ where: { outboundOrderId: worksheetDetailInfos.releaseGoodId } });
+                        if (inventoryItems.length > 0) {
+                            inventoryItems.forEach((itm) => {
+                                itm.status = warehouse_base_1.INVENTORY_STATUS.PICKED;
+                                itm.updater = this.user;
+                            });
+                            await tx.getRepository(warehouse_base_1.InventoryItem).save(inventoryItems);
+                        }
+                    }
+                    catch (error) {
+                        throw error;
                     }
                 });
             }
-            // return worksheet details
-            worksheetDetail = await this.trxMgr
+            let worksheetDetail = await this.trxMgr
                 .getRepository(entities_1.WorksheetDetail)
                 .createQueryBuilder('wd')
                 .innerJoin('wd.targetInventory', 'oi')
                 .innerJoinAndSelect('oi.releaseGood', 'rg')
-                .where('wd.id = :id', { id: worksheetDetail.id })
+                .where('wd.id = :id', { id: worksheetDetailInfos.worksheetDetailId })
                 .getOne();
             return worksheetDetail;
         }