@things-factory/worksheet-base 4.3.753 → 4.3.756

package/dist-server/graphql/types/worksheet/validate-qc-seals-result.js

@@ -0,0 +1,12 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ValidateQcSealsResult = void 0;
+const apollo_server_koa_1 = require("apollo-server-koa");
+exports.ValidateQcSealsResult = (0, apollo_server_koa_1.gql) `
+  type ValidateQcSealsResult {
+    valid: Boolean!
+    error: String
+    minimumSealNumber: Int
+  }
+`;
+//# sourceMappingURL=validate-qc-seals-result.js.map

package/dist-server/graphql/types/worksheet/validate-qc-seals-result.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"validate-qc-seals-result.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/validate-qc-seals-result.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,qBAAqB,GAAG,IAAA,uBAAG,EAAA;;;;;;CAMvC,CAAA"}

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

@@ -16,6 +16,7 @@ exports.WorksheetInfo = (0, apollo_server_koa_1.gql) `
     marketplaceStatus: String
     customerCompanyDomainId: String
     binLocationName: String
+    isReleaseGoodScan: Boolean
     bizplace: Bizplace
     containerNo: String
     airwayBill: String

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

@@ -1 +1 @@
-{"version":3,"file":"worksheet-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,aAAa,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CAyC/B,CAAA"}
+{"version":3,"file":"worksheet-info.js","sourceRoot":"","sources":["../../../../server/graphql/types/worksheet/worksheet-info.ts"],"names":[],"mappings":";;;AAAA,yDAAuC;AAE1B,QAAA,aAAa,GAAG,IAAA,uBAAG,EAAA;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;CA0C/B,CAAA"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.753",
+  "version": "4.3.756",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -23,28 +23,28 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^4.3.752",
-    "@things-factory/biz-base": "^4.3.752",
-    "@things-factory/document-template-base": "^4.3.752",
-    "@things-factory/id-rule-base": "^4.3.752",
-    "@things-factory/integration-accounting": "^4.3.752",
-    "@things-factory/integration-base": "^4.3.752",
-    "@things-factory/integration-lmd": "^4.3.752",
-    "@things-factory/integration-marketplace": "^4.3.752",
-    "@things-factory/integration-powrup": "^4.3.752",
-    "@things-factory/integration-sellercraft": "^4.3.752",
-    "@things-factory/integration-sftp": "^4.3.752",
-    "@things-factory/marketplace-base": "^4.3.752",
-    "@things-factory/notification": "^4.3.752",
-    "@things-factory/sales-base": "^4.3.752",
-    "@things-factory/setting-base": "^4.3.752",
-    "@things-factory/shell": "^4.3.752",
-    "@things-factory/transport-base": "^4.3.752",
-    "@things-factory/warehouse-base": "^4.3.752",
-    "@things-factory/worksheet-ui": "^4.3.752",
+    "@things-factory/auth-base": "^4.3.755",
+    "@things-factory/biz-base": "^4.3.755",
+    "@things-factory/document-template-base": "^4.3.755",
+    "@things-factory/id-rule-base": "^4.3.755",
+    "@things-factory/integration-accounting": "^4.3.755",
+    "@things-factory/integration-base": "^4.3.755",
+    "@things-factory/integration-lmd": "^4.3.755",
+    "@things-factory/integration-marketplace": "^4.3.755",
+    "@things-factory/integration-powrup": "^4.3.755",
+    "@things-factory/integration-sellercraft": "^4.3.755",
+    "@things-factory/integration-sftp": "^4.3.755",
+    "@things-factory/marketplace-base": "^4.3.755",
+    "@things-factory/notification": "^4.3.755",
+    "@things-factory/sales-base": "^4.3.755",
+    "@things-factory/setting-base": "^4.3.755",
+    "@things-factory/shell": "^4.3.755",
+    "@things-factory/transport-base": "^4.3.755",
+    "@things-factory/warehouse-base": "^4.3.755",
+    "@things-factory/worksheet-ui": "^4.3.755",
     "jspdf": "2.5.1",
     "puppeteer": "21.0.3",
     "uuid": "^9.0.0"
   },
-  "gitHead": "b8d997d26b2b149d46ee6ba33c0db6f57fa13fa7"
+  "gitHead": "b16ce3a1cde77139646a0812c3b198a854e48a19"
 }

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

@@ -1730,12 +1730,59 @@ export class PickingWorksheetController extends VasWorksheetController {
   }
 
   async completePicking(releaseGood: ReleaseGood, worksheet: Worksheet, inventories: Inventory[]): Promise<any> {
-    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 completing')
+        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 completing')
+        }
+
+        // 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`
+              )
+            }
+          }
+        }
+      }
     }
 
     //check if any inventories is obsolete
@@ -2198,31 +2245,30 @@ export class PickingWorksheetController 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() } })
 
-    if (foundTote?.status == TOTE_STATUS.DAMAGED || foundTote?.status == TOTE_STATUS.DISPATCHED) {
-      foundTote = null
-    }
+    const validTote = foundTote?.status !== TOTE_STATUS.DAMAGED && foundTote?.status !== TOTE_STATUS.DISPATCHED
+      ? foundTote
+      : null
 
     //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 the 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 order tote not found then create one, if tote not found means it's tote box
+    if (!orderTote) {
+      orderTote = await this.trxMgr.getRepository(OrderTote).save({
         name: toteNo,
         domain: this.domain,
         releaseGood,
-        tote: foundTote ? foundTote : null,
+        tote: validTote ?? 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,
@@ -2232,7 +2278,7 @@ export class PickingWorksheetController extends VasWorksheetController {
         updater: this.user
       })
     } else {
-      if (foundOrderTote.closedDate) {
+      if (orderTote.closedDate) {
         throw new Error('Tote has been sealed, please try another tote!')
       }
 
@@ -2241,25 +2287,45 @@ export class PickingWorksheetController 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({
-          ...foundOrderToteItem,
-          qty: foundOrderToteItem.qty + pickedQty
+        await this.trxMgr.getRepository(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: 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).update(orderTote.id, {
+          closedDate: new Date(),
+          updater: this.user,
+          updatedAt: new Date()
         })
       }
     }
@@ -2376,7 +2442,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       throw new Error('Tote not scanned under this order')
     }
 
-    let totalOrderToteItems = await this.trxMgr.getRepository(OrderToteItem).count({
+    const totalOrderToteItems = await this.trxMgr.getRepository(OrderToteItem).count({
       where: {
         orderTote: foundOrderTote
       }
@@ -2386,7 +2452,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       throw new Error('Tote carton is empty')
     }
 
-    const newToteOrderSeal: OrderToteSeal = await this.trxMgr.getRepository(OrderToteSeal).save({
+    await this.trxMgr.getRepository(OrderToteSeal).save({
       domain: this.domain,
       name: sealNo,
       orderTote: foundOrderTote,
@@ -2397,10 +2463,18 @@ export class PickingWorksheetController extends VasWorksheetController {
       orderTote: foundOrderTote
     })
 
-    if (totalSeal >= parseInt(sealNoSetting?.value || 0)) {
-      await this.trxMgr.getRepository(OrderTote).save({
-        ...foundOrderTote,
-        closedDate: new Date()
+    // Determine minimum seals required; clamp negative values to 0
+    const minimumSealRequiredRaw = parseInt(sealNoSetting?.value ?? '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(OrderTote).update(foundOrderTote.id, {
+        closedDate: new Date(),
+        updater: this.user,
+        updatedAt: new Date()
       })
     }
   }

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()
+        })
+      }
+    }
   }
 }