@things-factory/worksheet-base 4.3.753 → 4.3.755

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

@@ -9,6 +9,7 @@ import {
   OrderNoGenerator,
   OrderTote,
   OrderToteItem,
+  OrderToteSeal,
   ReleaseGood
 } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
@@ -250,7 +251,7 @@ export class SortingWorksheetController extends VasWorksheetController {
     } else {
       sortedQty = matchingProduct.qty
     }
-    
+
     const releaseGood: ReleaseGood =
       orderInventories.length > 1
         ? orderInventories.find(item => item.productId === scanProductBarcode.productId)?.releaseGood
@@ -535,12 +536,59 @@ export class SortingWorksheetController extends VasWorksheetController {
         throw new Error('Order is already sorted')
       }
 
-      const foundNotSealedOrderTote = await this.trxMgr
-        .getRepository(OrderTote)
-        .findOne({ where: { releaseGood, closedDate: IsNull() } })
+      // Check enable-tote-scanning setting
+      let enableToteScanningSetting: Setting = await this.trxMgr.getRepository(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: Setting = await this.trxMgr.getRepository(Setting).findOne({
+            where: {
+              domain: this.domain,
+              category: 'id-rule',
+              name: 'minimum-seal-number'
+            }
+          })
 
-      if (foundNotSealedOrderTote) {
-        throw new Error('Please seal the tote(s) before proceeding')
+          const minimumSealNumber = parseInt(minimumSealNumberSetting?.value || '0', 10)
+
+          // Check if there are unsealed totes (closedDate is null)
+          const foundNotSealedOrderTote = await this.trxMgr
+            .getRepository(OrderTote)
+            .findOne({ where: { releaseGood, closedDate: IsNull() } })
+
+          if (foundNotSealedOrderTote) {
+            throw new Error('Please seal the tote(s) before proceeding')
+          }
+
+          // If minimum-seal-number > 0, validate seal counts per tote
+          if (minimumSealNumber > 0) {
+            // Get all order totes for this release good
+            const orderTotes: OrderTote[] = await this.trxMgr.getRepository(OrderTote).find({
+              where: { releaseGood },
+              relations: ['orderToteSeals']
+            })
+
+            // Validate each tote has at least minimum-seal-number seals
+            for (const orderTote of orderTotes) {
+              const sealCount = orderTote.orderToteSeals?.length || 0
+              if (sealCount < minimumSealNumber) {
+                throw new Error(
+                  `Tote ${orderTote.name} has ${sealCount} seal(s), but minimum ${minimumSealNumber} seal(s) required`
+                )
+              }
+            }
+          }
+        }
       }
 
       releaseGood.status = ORDER_STATUS.READY_TO_LOAD
@@ -583,12 +631,59 @@ export class SortingWorksheetController extends VasWorksheetController {
 
     let releaseGoodIds = worksheet.worksheetDetails.map(itm => itm.targetInventory.releaseGood.id)
 
-    const foundNotSealedOrderTote = await this.trxMgr
-      .getRepository(OrderTote)
-      .findOne({ where: { releaseGood: In(releaseGoodIds), closedDate: IsNull() } })
+    // Check enable-tote-scanning setting
+    let enableToteScanningSetting: Setting = await this.trxMgr.getRepository(Setting).findOne({
+      where: {
+        domain: this.domain,
+        category: 'id-rule',
+        name: 'enable-tote-scanning'
+      }
+    })
 
-    if (foundNotSealedOrderTote) {
-      throw new Error('Please seal the tote(s) before proceeding')
+    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: Setting = await this.trxMgr.getRepository(Setting).findOne({
+          where: {
+            domain: this.domain,
+            category: 'id-rule',
+            name: 'minimum-seal-number'
+          }
+        })
+
+        const minimumSealNumber = parseInt(minimumSealNumberSetting?.value || '0', 10)
+
+        // Check if there are unsealed totes (closedDate is null) for any of the release goods
+        const foundNotSealedOrderTote = await this.trxMgr
+          .getRepository(OrderTote)
+          .findOne({ where: { releaseGood: In(releaseGoodIds), closedDate: IsNull() } })
+
+        if (foundNotSealedOrderTote) {
+          throw new Error('Please seal the tote(s) before proceeding')
+        }
+
+        // If minimum-seal-number > 0, validate seal counts per tote for all release goods
+        if (minimumSealNumber > 0) {
+          // Get all order totes for all release goods in this worksheet
+          const orderTotes: OrderTote[] = await this.trxMgr.getRepository(OrderTote).find({
+            where: { releaseGood: In(releaseGoodIds) },
+            relations: ['orderToteSeals']
+          })
+
+          // Validate each tote has at least minimum-seal-number seals
+          for (const orderTote of orderTotes) {
+            const sealCount = orderTote.orderToteSeals?.length || 0
+            if (sealCount < minimumSealNumber) {
+              throw new Error(
+                `Tote ${orderTote.name} has ${sealCount} seal(s), but minimum ${minimumSealNumber} seal(s) required`
+              )
+            }
+          }
+        }
+      }
     }
 
     this.checkRecordValidity(worksheet, { status: WORKSHEET_STATUS.EXECUTING })
@@ -617,7 +712,7 @@ export class SortingWorksheetController extends VasWorksheetController {
 
   private async toteScanning(toteNo, targetProduct, targetInventory, pickedQty, releaseGood, bizplace) {
     //1. find tote
-    let foundTote: Tote = await this.trxMgr
+    const foundTote: Tote = await this.trxMgr
       .getRepository(Tote)
       .findOne({ where: { bizplace, name: toteNo, deletedAt: IsNull() } })
 
@@ -630,22 +725,21 @@ export class SortingWorksheetController extends VasWorksheetController {
     }
 
     //2. find order tote
-    let foundOrderTote: OrderTote = await this.trxMgr
+    let orderTote: OrderTote = await this.trxMgr
       .getRepository(OrderTote)
       .findOne({ where: { domain: this.domain, name: toteNo, releaseGood } })
 
     //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({
+    if (!orderTote) {
+      orderTote = await this.trxMgr.getRepository(OrderTote).save({
         name: toteNo,
         domain: this.domain,
         releaseGood,
-        tote: foundTote ? foundTote : null,
+        tote: foundTote ?? null,
         updater: this.user
       })
 
-      const orderToteItem = await this.trxMgr.getRepository(OrderToteItem).save({
+      await this.trxMgr.getRepository(OrderToteItem).save({
         domain: this.domain,
         name: OrderNoGenerator.orderToteItem(),
         orderProduct: targetProduct,
@@ -655,7 +749,7 @@ export class SortingWorksheetController extends VasWorksheetController {
         updater: this.user
       })
     } else {
-      if (foundOrderTote.closedDate) {
+      if (orderTote.closedDate) {
         throw new Error('Tote has been sealed, please try another tote!')
       }
 
@@ -664,27 +758,45 @@ export class SortingWorksheetController extends VasWorksheetController {
         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(OrderToteItem).save({
+        await this.trxMgr.getRepository(OrderToteItem).save({
           domain: this.domain,
           name: 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(OrderToteItem).save({
+        await this.trxMgr.getRepository(OrderToteItem).save({
           ...foundOrderToteItem,
           qty: foundOrderToteItem.qty + pickedQty
         })
       }
     }
+
+    // Check minimum-seal-number setting - if 0, automatically close the tote
+    if (!orderTote.closedDate) {
+      const sealNoSetting: Setting = await this.trxMgr.getRepository(Setting).findOne({
+        where: {
+          domain: this.domain,
+          name: 'minimum-seal-number'
+        }
+      })
+
+      const minimumSealRequiredRaw = parseInt(sealNoSetting?.value ?? '0', 10)
+      const minimumSealRequired = isNaN(minimumSealRequiredRaw) ? 0 : Math.max(0, minimumSealRequiredRaw)
+
+      if (minimumSealRequired === 0) {
+        await this.trxMgr.getRepository(OrderTote).save({
+          ...orderTote,
+          closedDate: new Date()
+        })
+      }
+    }
   }
 }