@things-factory/operato-wms 4.3.752 → 4.3.755

package/server/graphql/resolvers/zone-worksheet/zone-picking.ts

@@ -27,6 +27,7 @@ import {
 } from '@things-factory/warehouse-base'
 import { Product, ProductBarcode, ProductDetail } from '@things-factory/product-base'
 import { User } from '@things-factory/auth-base'
+import { Setting } from '@things-factory/setting-base'
 import { v4 as uuidv4 } from 'uuid'
 
 export const zonePicking = {
@@ -345,14 +346,62 @@ async function completeZonePicking(worksheetId: string, context: any, isPartial:
       }
     )
   } else if (!isPartial) {
-    await tx.getRepository(ReleaseGood).update(
-      { id: In(roIds), status: ORDER_STATUS.PARTIAL_PROCESSING },
-      {
-        status: ORDER_STATUS.PROCESSING,
-        updater: user,
-        updatedAt: new Date()
+    // When completing fully, check if all OrderInventories for each ReleaseGood are actually completed
+    // Only update from PARTIAL_PROCESSING to PROCESSING if all OrderInventories are completed
+    const releaseGoods: ReleaseGood[] = await tx.getRepository(ReleaseGood).find({
+      where: { id: In(roIds) },
+      relations: ['orderInventories']
+    })
+
+    const completedRoIds: string[] = []
+    const incompleteRoIds: string[] = []
+
+    for (const rg of releaseGoods) {
+      // Check if all OrderInventories are in a completed state (not PROCESSING)
+      const completedStatuses = [
+        ORDER_INVENTORY_STATUS.PICKED,
+        ORDER_INVENTORY_STATUS.SORTING,
+        ORDER_INVENTORY_STATUS.LOADING,
+        ORDER_INVENTORY_STATUS.LOADED,
+        ORDER_INVENTORY_STATUS.TERMINATED,
+        ORDER_INVENTORY_STATUS.MISSING,
+        ORDER_INVENTORY_STATUS.CANCELLED
+      ]
+
+      const allCompleted = rg.orderInventories.every(oi => completedStatuses.includes(oi.status))
+
+      if (allCompleted) {
+        completedRoIds.push(rg.id)
+      } else {
+        incompleteRoIds.push(rg.id)
       }
-    )
+    }
+
+    // Update ReleaseGoods that are fully completed from PARTIAL_PROCESSING to PROCESSING
+    if (completedRoIds.length > 0) {
+      await tx.getRepository(ReleaseGood).update(
+        { id: In(completedRoIds), status: ORDER_STATUS.PARTIAL_PROCESSING },
+        {
+          status: ORDER_STATUS.PROCESSING,
+          updater: user,
+          updatedAt: new Date()
+        }
+      )
+    }
+
+    // For ReleaseGoods that still have incomplete OrderInventories:
+    // - If they're in PROCESSING, update to PARTIAL_PROCESSING
+    // - If they're already in PARTIAL_PROCESSING, leave them as is
+    if (incompleteRoIds.length > 0) {
+      await tx.getRepository(ReleaseGood).update(
+        { id: In(incompleteRoIds), status: ORDER_STATUS.PROCESSING },
+        {
+          status: ORDER_STATUS.PARTIAL_PROCESSING,
+          updater: user,
+          updatedAt: new Date()
+        }
+      )
+    }
   }
 
   //find exist loading worksheet
@@ -368,31 +417,75 @@ async function completeZonePicking(worksheetId: string, context: any, isPartial:
   let roWithoutLoadingWorksheet = roIds.filter(roId => !existLoadingWorksheet.some(ws => ws.releaseGood.id === roId))
   let roWithLoadingWorksheet = roIds.filter(roId => existLoadingWorksheet.some(ws => ws.releaseGood.id === roId))
 
+  // Get disable-QC-in-loading setting
+  const disableQcSetting: Setting = await tx.getRepository(Setting).findOne({
+    where: {
+      domain,
+      name: 'disable-QC-in-loading'
+    }
+  })
+
+  const disableQc = disableQcSetting?.value === 'true'
+
   if (roWithoutLoadingWorksheet.length > 0) {
-    await generateLoadingWorksheets(tx, domain, user, roWithoutLoadingWorksheet)
+    await generateLoadingWorksheets(tx, domain, user, roWithoutLoadingWorksheet, disableQc)
   }
   if (roWithLoadingWorksheet.length > 0) {
-    //update picked oi to loading
-    await tx.getRepository(OrderInventory).update(
-      { releaseGood: In(roWithLoadingWorksheet), status: ORDER_INVENTORY_STATUS.PICKED },
-      {
-        status: ORDER_INVENTORY_STATUS.SORTING,
-        updater: user,
-        updatedAt: new Date()
-      }
-    )
-    const loadingOrderInventories: OrderInventory[] = await tx.getRepository(OrderInventory).find({
-      where: { releaseGood: In(roWithLoadingWorksheet), status: ORDER_INVENTORY_STATUS.SORTING }
-    })
-    //update loading wsd deactivated to executing
-    await tx.getRepository(WorksheetDetail).update(
-      {
-        targetInventory: In(loadingOrderInventories.map(oi => oi.id)),
-        type: WORKSHEET_TYPE.LOADING,
-        status: WORKSHEET_STATUS.DEACTIVATED
-      },
-      { status: WORKSHEET_STATUS.EXECUTING, updatedAt: new Date(), updater: user }
-    )
+    if (disableQc) {
+      // When QC is disabled: update PICKED to LOADING status and set sortedQty = pickedQty automatically
+      // Use query builder with raw SQL to set sortedQty = pickedQty in a single update
+      await tx
+        .getRepository(OrderInventory)
+        .createQueryBuilder()
+        .update(OrderInventory)
+        .set({
+          status: ORDER_INVENTORY_STATUS.LOADING,
+          sortedQty: () => '"picked_qty"', // Set sortedQty equal to pickedQty using raw SQL expression
+          updater: user,
+          updatedAt: new Date()
+        })
+        .where('release_good_id IN (:...roIds)', { roIds: roWithLoadingWorksheet })
+        .andWhere('status = :status', { status: ORDER_INVENTORY_STATUS.PICKED })
+        .execute()
+
+      const loadingOrderInventories: OrderInventory[] = await tx.getRepository(OrderInventory).find({
+        where: { releaseGood: In(roWithLoadingWorksheet), status: ORDER_INVENTORY_STATUS.LOADING }
+      })
+
+      //update loading wsd deactivated to executing
+      await tx.getRepository(WorksheetDetail).update(
+        {
+          targetInventory: In(loadingOrderInventories.map(oi => oi.id)),
+          type: WORKSHEET_TYPE.LOADING,
+          status: WORKSHEET_STATUS.DEACTIVATED
+        },
+        { status: WORKSHEET_STATUS.EXECUTING, updatedAt: new Date(), updater: user }
+      )
+    } else {
+      // When QC is enabled: update PICKED to SORTING status (existing behavior)
+      await tx.getRepository(OrderInventory).update(
+        { releaseGood: In(roWithLoadingWorksheet), status: ORDER_INVENTORY_STATUS.PICKED },
+        {
+          status: ORDER_INVENTORY_STATUS.SORTING,
+          updater: user,
+          updatedAt: new Date()
+        }
+      )
+
+      const loadingOrderInventories: OrderInventory[] = await tx.getRepository(OrderInventory).find({
+        where: { releaseGood: In(roWithLoadingWorksheet), status: ORDER_INVENTORY_STATUS.SORTING }
+      })
+
+      //update loading wsd deactivated to executing
+      await tx.getRepository(WorksheetDetail).update(
+        {
+          targetInventory: In(loadingOrderInventories.map(oi => oi.id)),
+          type: WORKSHEET_TYPE.LOADING,
+          status: WORKSHEET_STATUS.DEACTIVATED
+        },
+        { status: WORKSHEET_STATUS.EXECUTING, updatedAt: new Date(), updater: user }
+      )
+    }
   }
 
   const wsStatus = isPartial ? WORKSHEET_STATUS.PARTIAL_EXECUTING : WORKSHEET_STATUS.DONE
@@ -401,7 +494,13 @@ async function completeZonePicking(worksheetId: string, context: any, isPartial:
   return true
 }
 
-async function generateLoadingWorksheets(tx: EntityManager, domain: Domain, user: User, roWithoutLoadingWorksheet) {
+async function generateLoadingWorksheets(
+  tx: EntityManager,
+  domain: Domain,
+  user: User,
+  roWithoutLoadingWorksheet,
+  disableQc: boolean
+) {
   const releaseGoods: ReleaseGood[] = await tx.getRepository(ReleaseGood).find({
     where: { id: In(roWithoutLoadingWorksheet), status: Not(In(ORDER_STATUS.OBSOLETE)) },
     relations: ['orderInventories', 'sortedBy']
@@ -442,15 +541,33 @@ async function generateLoadingWorksheets(tx: EntityManager, domain: Domain, user
 
     await tx.getRepository(WorksheetDetail).insert(loadingWorksheetDetails)
 
-    //update picked oi to loading
-    await tx.getRepository(OrderInventory).update(
-      { id: In(orderInventories.map(oi => oi.id)), status: ORDER_INVENTORY_STATUS.PICKED },
-      {
-        status: ORDER_INVENTORY_STATUS.SORTING,
-        updater: user,
-        updatedAt: new Date()
-      }
-    )
+    // Update picked OrderInventories based on disableQc setting
+    if (disableQc) {
+      // When QC is disabled: update PICKED to LOADING status and set sortedQty = pickedQty automatically
+      await tx
+        .getRepository(OrderInventory)
+        .createQueryBuilder()
+        .update(OrderInventory)
+        .set({
+          status: ORDER_INVENTORY_STATUS.LOADING,
+          sortedQty: () => '"picked_qty"', // Set sortedQty equal to pickedQty using raw SQL expression
+          updater: user,
+          updatedAt: new Date()
+        })
+        .where('id IN (:...oiIds)', { oiIds: orderInventories.map(oi => oi.id) })
+        .andWhere('status = :status', { status: ORDER_INVENTORY_STATUS.PICKED })
+        .execute()
+    } else {
+      // When QC is enabled: update PICKED to SORTING status (existing behavior)
+      await tx.getRepository(OrderInventory).update(
+        { id: In(orderInventories.map(oi => oi.id)), status: ORDER_INVENTORY_STATUS.PICKED },
+        {
+          status: ORDER_INVENTORY_STATUS.SORTING,
+          updater: user,
+          updatedAt: new Date()
+        }
+      )
+    }
   }
 }
 

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

@@ -1,9 +1,8 @@
 import { EntityManager, getRepository, In, Not } from 'typeorm'
 import { Domain } from '@things-factory/biz-base'
-import { Worksheet, WorksheetDetail, WORKSHEET_STATUS } from '@things-factory/worksheet-base'
+import { Worksheet, WorksheetDetail, WORKSHEET_TYPE } from '@things-factory/worksheet-base'
 import { Inventories, InventoryChange } from '@things-factory/warehouse-base'
 import { OrderInventory, ReleaseGood, ORDER_STATUS, ORDER_INVENTORY_STATUS } from '@things-factory/sales-base'
-
 export const zoneWorksheetOverview = {
   async zoneWorksheetOverview(_: any, { releaseGoods }, context: any) {
     const { domain, tx }: { domain: Domain; tx: EntityManager } = context.state

package/server/graphql/types/index.ts

@@ -8,6 +8,7 @@ import * as Reports from './reports'
 import * as InventoryComparison from './inventory-comparison'
 import * as ShippingProvider from './shipping-provider'
 import * as WarehouseInventory from './warehouse-inventory-adjustment'
+import * as RouteLabel from './route-label'
 import * as ZoneWorksheet from './zone-worksheet'
 import * as Outbound from './outbound'
 
@@ -21,6 +22,7 @@ export const queries = [
   InventoryComparison.Query,
   ShippingProvider.Query,
   Other.Query,
+  RouteLabel.Query,
   ZoneWorksheet.Query,
   Outbound.Query
 ]
@@ -28,6 +30,7 @@ export const queries = [
 export const mutations = [
   Other.Mutation,
   WarehouseInventory.Mutation,
+  RouteLabel.Mutation,
   ZoneWorksheet.Mutation,
   Outbound.Mutation
 ]
@@ -41,6 +44,7 @@ export const types = [
   ...InventoryComparison.Types,
   ...ShippingProvider.Types,
   ...Other.Types,
+  ...RouteLabel.Types,
   ...ZoneWorksheet.Types,
   ...Outbound.Types
 ]

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

@@ -12,7 +12,13 @@ export const Query = `
 
 export const Mutation = `
   getLoadingTask: LoadingWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
-  sortItem(releaseGoodNo: String!, productBarcode: String!, qty: Float!, worksheetDetails: [Object!]): Boolean @transaction
+  sortItem(
+    releaseGoodNo: String!
+    productBarcode: String!
+    qty: Float!
+    worksheetDetails: [Object!]
+    toteNo: String
+  ): Boolean @transaction
   loadByQty(worksheetDetailPatch: LoadingWorksheetDetails): Boolean @transaction
   undoLoad(doId: String!): Boolean @transaction
   warehouseReturn (releaseGoodNo: String!, worksheetDetails: [Object!]): Worksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction

package/server/graphql/types/route-label/index.ts

@@ -0,0 +1,18 @@
+import {
+  RouteLabelReleaseGood,
+  RouteLabelSequenceLogEntry,
+  RouteLabelSequenceReservation,
+  RouteLabelSequenceStatus
+} from './route-label-sequence'
+
+export const Query = `
+  routeLabelReleaseGoodsInExecutingWorksheet(partnerId: String!, refNo: String, worksheetType: String!, seqField: String): [RouteLabelReleaseGood] @transaction
+  routeLabelSequenceStatuses(releaseGoodIds: [String!]!, field: String!): [RouteLabelSequenceStatus] @transaction
+  routeLabelSequenceLogs(releaseGoodId: String!, field: String!): [RouteLabelSequenceLogEntry] @transaction
+`
+
+export const Mutation = `
+  reserveRouteLabelSequence(releaseGoodId: String!, field: String!, qty: Int!): RouteLabelSequenceReservation @transaction
+`
+
+export const Types = [RouteLabelReleaseGood, RouteLabelSequenceStatus, RouteLabelSequenceReservation, RouteLabelSequenceLogEntry]

package/server/graphql/types/route-label/route-label-sequence.ts

@@ -0,0 +1,50 @@
+import gql from 'graphql-tag'
+
+export const RouteLabelReleaseGood = gql`
+  type RouteLabelReleaseGood {
+    id: String!
+    name: String!
+    refNo: String
+    refNo2: String
+    refNo3: String
+    routeId: String
+    storeId: String
+    storeName: String
+    stopId: String
+    createdAt: String
+    lastSeq: Int
+    lastPrintedBy: String
+  }
+`
+
+export const RouteLabelSequenceStatus = gql`
+  type RouteLabelSequenceStatus {
+    releaseGoodId: String!
+    field: String!
+    lastSeq: Int!
+    history: [String!]
+    lastPrintedBy: String
+  }
+`
+
+export const RouteLabelSequenceReservation = gql`
+  type RouteLabelSequenceReservation {
+    releaseGoodId: String!
+    field: String!
+    from: Int!
+    to: Int!
+  }
+`
+
+export const RouteLabelSequenceLogEntry = gql`
+  type RouteLabelSequenceLogEntry {
+    id: String!
+    releaseGoodId: String!
+    field: String!
+    from: Int!
+    to: Int!
+    qty: Int!
+    createdAt: String!
+    creatorName: String
+  }
+`

package/server/index.ts

@@ -1,4 +1,10 @@
 export * from './graphql'
 export * from './migrations'
+export * from './entities'
 
-import './routes'
+import './routes'
+
+// Register setting validators at module load time (before schema is built)
+// This ensures validators are available when mutations are called
+import { registerOperatoWmsSettingValidators } from './validators/setting-validators'
+registerOperatoWmsSettingValidators()