@things-factory/worksheet-base 5.0.0-alpha.26 → 5.0.0-alpha.29

package/server/graphql/resolvers/worksheet-detail/generate-picking-worksheet-details.ts

@@ -20,7 +20,7 @@ import { WorksheetNoGenerator } from '../../../utils'
 export const generatePickingWorksheetDetailsResolver = {
   async generatePickingWorksheetDetails(
     _: any,
-    { bizplaceId, selectedItems, pickingStrategy, worksheetNo, locationSortingRules },
+    { bizplaceId, selectedItems, worksheetNo, locationSortingRules },
     context: any
   ): Promise<Boolean> {
     const { tx, user, domain }: { tx: EntityManager; user: User; domain: Domain } = context.state
@@ -54,7 +54,6 @@ export const generatePickingWorksheetDetailsResolver = {
         bizplaceId,
         worksheetId,
         selectedItems,
-        pickingStrategy,
         locationSortingRules,
         tx
       )
@@ -162,6 +161,9 @@ function _composeWorksheetDetails(
 
   while (compReleaseQty < record.releaseQty) {
     const inv = inventories[idx]
+
+    if (!inv) break
+
     let releaseQty: number = 0
     let releaseUomValue: number = 0
 

package/server/graphql/types/worksheet/find-release-orders-by-task-no.ts

@@ -0,0 +1,8 @@
+import { gql } from 'apollo-server-koa'
+
+export const FindReleaseOrdersByTaskNo = gql`
+  type FindReleaseOrdersByTaskNo {
+    taskNo: String
+    releaseGoods: [ReleaseGood]
+  }
+`

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

@@ -22,6 +22,7 @@ import { WorksheetInfo } from './worksheet-info'
 import { WorksheetList } from './worksheet-list'
 import { WorksheetPatch } from './worksheet-patch'
 import { WorksheetWithPagination } from './worksheet-with-pagination'
+import { FindReleaseOrdersByTaskNo } from './find-release-orders-by-task-no'
 
 export const Mutation = /* GraphQL */ `
   createWorksheet (
@@ -164,6 +165,11 @@ export const Mutation = /* GraphQL */ `
     worksheetNo: [String!]!
   ): [Worksheet] @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
+  undoSerialNumberPacking (
+    worksheetDetailName: String!
+    inventoryItemId: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   activateBatchPicking (
     worksheetNo: String!
   ): Worksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
@@ -323,22 +329,26 @@ export const Mutation = /* GraphQL */ `
     releaseGoodNo: String!
     productId: String!
     sortingQty: Float!
+    serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   scanProductSorting (
     taskNo: String!
     releaseGoodNo: String!
     productBarcode: String!
+    serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   packing (
     worksheetDetailName: String!
     releaseQty: Int!
+    serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   scanProductPacking (
     worksheetDetailName: String!
     productBarcode: String!
+    serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   batchPicking (
@@ -530,7 +540,7 @@ export const Mutation = /* GraphQL */ `
   ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
   assignPickingWorker (
-    worksheetId: String!
+    worksheetId: [String]!
     userId: String!
   ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
@@ -671,7 +681,6 @@ export const Query = /* GraphQL */ `
   ): [Inventory] @privilege(category: "worksheet", privilege: "query")
 
   pickingAssignmentStatusByUsers(
-    bizplaceId: String!
     name: String
     email: String
   ): [PickingAssignmentStatus] @privilege(category: "worksheet", privilege: "query")
@@ -680,7 +689,7 @@ export const Query = /* GraphQL */ `
   
   recommendPutawayLocation(worksheetDetailName: String!, optCnt: Int): [Location] @privilege(category: "worksheet", privilege: "query")
 
-  findReleaseOrdersByTaskNo(taskNo: String!): [ReleaseGood] @privilege(category: "worksheet", privilege: "query") @transaction
+  findReleaseOrdersByTaskNo(taskNo: String!): FindReleaseOrdersByTaskNo @privilege(category: "worksheet", privilege: "query") @transaction
 `
 
 export const Types = /* GraphQL */ [
@@ -707,5 +716,6 @@ export const Types = /* GraphQL */ [
   ProductApproval,
   WorksheetWithPagination,
   PickingAssignmentStatus,
-  MyPickingAssignmentStatus
+  MyPickingAssignmentStatus,
+  FindReleaseOrdersByTaskNo
 ]

package/server/graphql/types/worksheet/worksheet-detail-info.ts

@@ -60,5 +60,7 @@ export const WorksheetDetailInfo = gql`
     actualQty: Int
     actualUomValue: Float
     manufactureDate: String
+    binRemarks: String
+    isRequireSerialNumberScanningOutbound: Boolean
   }
 `

package/server/graphql/types/worksheet-detail/index.ts

@@ -41,13 +41,11 @@ export const Mutation = /* GraphQL */ `
     bizplaceId: String
     locationSortingRules: [Sorting]
     selectedItems: [OrderInventoryPatch]!
-    pickingStrategy: String!
   ): Boolean @transaction
 
   generatePickingWorksheetDetails(
     bizplaceId: String!
     selectedItems: [OrderInventoryPatch]!
-    pickingStrategy: String!
     worksheetNo: String!
     locationSortingRules: [Sorting]
   ): Boolean @transaction

package/server/utils/inventory-util.ts

@@ -265,7 +265,9 @@ export async function inventoriesByStrategy(
     .andWhere('"INV"."packing_size" = :packingSize')
     .andWhere('"INV"."uom" = :uom')
     .andWhere('"INV"."status" = :status', { status: 'STORED' })
-    .andWhere('"LOC"."type" NOT IN (:...locationTypes)', { locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE] })
+    .andWhere('"LOC"."type" NOT IN (:...locationTypes)', {
+      locationTypes: [LOCATION_TYPE.QUARANTINE, LOCATION_TYPE.RESERVE]
+    })
     .setParameters({
       domainId: domain.id,
       productId,
@@ -289,12 +291,7 @@ export async function inventoriesByStrategy(
       qb.orderBy('"INV"."created_at"', 'ASC')
       if (locationSortingRules) {
         for (const key in locationSortingRules) {
-          if (locIdx === 0) {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          } else {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          }
-          ++locIdx
+          qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
         }
       }
       break
@@ -303,12 +300,7 @@ export async function inventoriesByStrategy(
       qb.orderBy('"INV"."created_at"', 'DESC')
       if (locationSortingRules) {
         for (const key in locationSortingRules) {
-          if (locIdx === 0) {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          } else {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          }
-          ++locIdx
+          qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
         }
       }
       break
@@ -317,12 +309,16 @@ export async function inventoriesByStrategy(
       qb.orderBy('"INV"."expiration_date"', 'ASC')
       if (locationSortingRules) {
         for (const key in locationSortingRules) {
-          if (locIdx === 0) {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          } else {
-            qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
-          }
-          ++locIdx
+          qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
+        }
+      }
+      break
+
+    case 'FMFO':
+      qb.orderBy('"INV"."manufacture_date"', 'ASC')
+      if (locationSortingRules) {
+        for (const key in locationSortingRules) {
+          qb.addOrderBy(`LOC.${key}`, locationSortingRules[key])
         }
       }
       break
@@ -338,10 +334,6 @@ export async function inventoriesByStrategy(
           ++locIdx
         }
       } else qb.orderBy('"LOC"."name"', 'DESC')
-      break
-    default:
-      qb.orderBy('"INV"."created_at"', 'ASC')
-
       break
   }