@things-factory/worksheet-base 4.3.753 → 4.3.756

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

@@ -1304,11 +1304,51 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         }
     }
     async completePicking(releaseGood, worksheet, inventories) {
-        const foundNotSealedOrderTote = await this.trxMgr
-            .getRepository(sales_base_1.OrderTote)
-            .findOne({ where: { releaseGood, closedDate: (0, typeorm_1.IsNull)() } });
-        if (foundNotSealedOrderTote) {
-            throw new Error('Please seal the tote(s) before completing');
+        var _a;
+        // Check enable-tote-scanning setting
+        let enableToteScanningSetting = await this.trxMgr.getRepository(setting_base_1.Setting).findOne({
+            where: {
+                domain: this.domain,
+                category: 'id-rule',
+                name: 'enable-tote-scanning'
+            }
+        });
+        if (enableToteScanningSetting) {
+            // enable-tote-scanning is numeric: 0 = disabled, >= 1 = enabled
+            const enableToteScanningValue = parseInt(enableToteScanningSetting.value || '0', 10);
+            if (enableToteScanningValue >= 1) {
+                // Check minimum-seal-number setting
+                let minimumSealNumberSetting = await this.trxMgr.getRepository(setting_base_1.Setting).findOne({
+                    where: {
+                        domain: this.domain,
+                        category: 'id-rule',
+                        name: 'minimum-seal-number'
+                    }
+                });
+                const minimumSealNumber = parseInt((minimumSealNumberSetting === null || minimumSealNumberSetting === void 0 ? void 0 : minimumSealNumberSetting.value) || '0', 10);
+                // Check if there are unsealed totes (closedDate is null)
+                const foundNotSealedOrderTote = await this.trxMgr
+                    .getRepository(sales_base_1.OrderTote)
+                    .findOne({ where: { releaseGood, closedDate: (0, typeorm_1.IsNull)() } });
+                if (foundNotSealedOrderTote) {
+                    throw new Error('Please seal the tote(s) before completing');
+                }
+                // If minimum-seal-number > 0, validate seal counts per tote
+                if (minimumSealNumber > 0) {
+                    // Get all order totes for this release good
+                    const orderTotes = await this.trxMgr.getRepository(sales_base_1.OrderTote).find({
+                        where: { releaseGood },
+                        relations: ['orderToteSeals']
+                    });
+                    // Validate each tote has at least minimum-seal-number seals
+                    for (const orderTote of orderTotes) {
+                        const sealCount = ((_a = orderTote.orderToteSeals) === null || _a === void 0 ? void 0 : _a.length) || 0;
+                        if (sealCount < minimumSealNumber) {
+                            throw new Error(`Tote ${orderTote.name} has ${sealCount} seal(s), but minimum ${minimumSealNumber} seal(s) required`);
+                        }
+                    }
+                }
+            }
         }
         //check if any inventories is obsolete
         if (!releaseGood.recall) {
@@ -1639,28 +1679,28 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         }
     }
     async toteScanning(toteNo, targetProduct, targetInventory, pickedQty, releaseGood, bizplace) {
+        var _a;
         //1. find tote
-        let foundTote = await this.trxMgr
+        const foundTote = await this.trxMgr
             .getRepository(warehouse_base_1.Tote)
             .findOne({ where: { bizplace, name: toteNo, deletedAt: (0, typeorm_1.IsNull)() } });
-        if ((foundTote === null || foundTote === void 0 ? void 0 : foundTote.status) == warehouse_base_1.TOTE_STATUS.DAMAGED || (foundTote === null || foundTote === void 0 ? void 0 : foundTote.status) == warehouse_base_1.TOTE_STATUS.DISPATCHED) {
-            foundTote = null;
-        }
+        const validTote = (foundTote === null || foundTote === void 0 ? void 0 : foundTote.status) !== warehouse_base_1.TOTE_STATUS.DAMAGED && (foundTote === null || foundTote === void 0 ? void 0 : foundTote.status) !== warehouse_base_1.TOTE_STATUS.DISPATCHED
+            ? foundTote
+            : null;
         //2. find order tote
-        let foundOrderTote = await this.trxMgr
+        let orderTote = 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
-        //create order tote item
-        if (!foundOrderTote) {
-            const orderTote = await this.trxMgr.getRepository(sales_base_1.OrderTote).save({
+        //if order tote not found then create one, if tote not found means it's tote box
+        if (!orderTote) {
+            orderTote = await this.trxMgr.getRepository(sales_base_1.OrderTote).save({
                 name: toteNo,
                 domain: this.domain,
                 releaseGood,
-                tote: foundTote ? foundTote : null,
+                tote: validTote !== null && validTote !== void 0 ? validTote : null,
                 updater: this.user
             });
-            const orderToteItem = await this.trxMgr.getRepository(sales_base_1.OrderToteItem).save({
+            await this.trxMgr.getRepository(sales_base_1.OrderToteItem).save({
                 domain: this.domain,
                 name: sales_base_1.OrderNoGenerator.orderToteItem(),
                 orderProduct: targetProduct,
@@ -1671,7 +1711,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
             });
         }
         else {
-            if (foundOrderTote.closedDate) {
+            if (orderTote.closedDate) {
                 throw new Error('Tote has been sealed, please try another tote!');
             }
             //if found order tote then check if order tote item exist
@@ -1679,23 +1719,43 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
                 domain: this.domain,
                 orderProduct: targetProduct,
                 orderInventory: targetInventory,
-                orderTote: foundOrderTote
+                orderTote
             });
-            //if not order tote item doesnt exist then create one
             if (!foundOrderToteItem) {
-                const orderToteItem = await this.trxMgr.getRepository(sales_base_1.OrderToteItem).save({
+                await this.trxMgr.getRepository(sales_base_1.OrderToteItem).save({
                     domain: this.domain,
                     name: sales_base_1.OrderNoGenerator.orderToteItem(),
                     orderProduct: targetProduct,
                     orderInventory: targetInventory,
-                    orderTote: foundOrderTote,
+                    orderTote,
                     qty: pickedQty,
                     updater: this.user
                 });
             }
             else {
-                //if found order tote item found then add the quantity
-                const orderToteItem = await this.trxMgr.getRepository(sales_base_1.OrderToteItem).save(Object.assign(Object.assign({}, foundOrderToteItem), { qty: foundOrderToteItem.qty + pickedQty }));
+                await this.trxMgr.getRepository(sales_base_1.OrderToteItem).update(foundOrderToteItem.id, {
+                    qty: foundOrderToteItem.qty + pickedQty,
+                    updater: this.user,
+                    updatedAt: new Date()
+                });
+            }
+        }
+        // Check minimum-seal-number setting - if 0, automatically close the tote
+        if (!orderTote.closedDate) {
+            const sealNoSetting = await this.trxMgr.getRepository(setting_base_1.Setting).findOne({
+                where: {
+                    domain: this.domain,
+                    name: 'minimum-seal-number'
+                }
+            });
+            const minimumSealRequiredRaw = parseInt((_a = sealNoSetting === null || sealNoSetting === void 0 ? void 0 : sealNoSetting.value) !== null && _a !== void 0 ? _a : '0', 10);
+            const minimumSealRequired = isNaN(minimumSealRequiredRaw) ? 0 : Math.max(0, minimumSealRequiredRaw);
+            if (minimumSealRequired === 0) {
+                await this.trxMgr.getRepository(sales_base_1.OrderTote).update(orderTote.id, {
+                    closedDate: new Date(),
+                    updater: this.user,
+                    updatedAt: new Date()
+                });
             }
         }
     }
@@ -1756,6 +1816,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         await this.updateOrderTargets([targetInventory]);
     }
     async sealTote(sealNo, toteNo, orderNo) {
+        var _a;
         const checkDuplicateSeal = await this.trxMgr.getRepository(sales_base_1.OrderToteSeal).findOne({
             where: {
                 name: sealNo
@@ -1787,7 +1848,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         if (!foundOrderTote) {
             throw new Error('Tote not scanned under this order');
         }
-        let totalOrderToteItems = await this.trxMgr.getRepository(sales_base_1.OrderToteItem).count({
+        const totalOrderToteItems = await this.trxMgr.getRepository(sales_base_1.OrderToteItem).count({
             where: {
                 orderTote: foundOrderTote
             }
@@ -1795,7 +1856,7 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         if (totalOrderToteItems < 1) {
             throw new Error('Tote carton is empty');
         }
-        const newToteOrderSeal = await this.trxMgr.getRepository(sales_base_1.OrderToteSeal).save({
+        await this.trxMgr.getRepository(sales_base_1.OrderToteSeal).save({
             domain: this.domain,
             name: sealNo,
             orderTote: foundOrderTote,
@@ -1804,8 +1865,17 @@ class PickingWorksheetController extends vas_worksheet_controller_1.VasWorksheet
         const totalSeal = await this.trxMgr.getRepository(sales_base_1.OrderToteSeal).count({
             orderTote: foundOrderTote
         });
-        if (totalSeal >= parseInt((sealNoSetting === null || sealNoSetting === void 0 ? void 0 : sealNoSetting.value) || 0)) {
-            await this.trxMgr.getRepository(sales_base_1.OrderTote).save(Object.assign(Object.assign({}, foundOrderTote), { closedDate: new Date() }));
+        // Determine minimum seals required; clamp negative values to 0
+        const minimumSealRequiredRaw = parseInt((_a = sealNoSetting === null || sealNoSetting === void 0 ? void 0 : sealNoSetting.value) !== null && _a !== void 0 ? _a : '0', 10);
+        const minimumSealRequired = isNaN(minimumSealRequiredRaw) ? 0 : Math.max(0, minimumSealRequiredRaw);
+        // Close tote if: seals are optional (0) OR minimum seal count reached
+        const shouldCloseTote = minimumSealRequired === 0 || totalSeal >= minimumSealRequired;
+        if (shouldCloseTote) {
+            await this.trxMgr.getRepository(sales_base_1.OrderTote).update(foundOrderTote.id, {
+                closedDate: new Date(),
+                updater: this.user,
+                updatedAt: new Date()
+            });
         }
     }
     async assignInventoriesForUnassignedOrder(worksheet, tx) {