@things-factory/worksheet-base 4.3.186 → 4.3.187

package/server/graphql/resolvers/worksheet/worksheets.ts

@@ -2,7 +2,7 @@ import { Brackets, getRepository, SelectQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { getPermittedBizplaceIds } from '@things-factory/biz-base'
-import { ArrivalNotice, InventoryCheck, ReleaseGood, ReturnOrder } from '@things-factory/sales-base'
+import { ArrivalNotice, InventoryCheck, ReleaseGood, ReturnOrder, Replenishment } from '@things-factory/sales-base'
 import { buildQuery, convertListParams, Domain, ListParam } from '@things-factory/shell'
 
 import { WORKSHEET_TYPE } from '../../../constants'
@@ -109,7 +109,6 @@ export const worksheetsResolver = {
       const orderRemarkParam = params.filters.find(param => param.name === 'orderRemark')
       const manifestParam = params.filters.find(param => param.name === 'manifest')
 
-      const releaseGoodPickerOptionParam = params.filters.find(param => param.name === 'assignee')
       if (
         releaseGoodParam ||
         releaseGoodRefNoParam ||
@@ -217,6 +216,36 @@ export const worksheetsResolver = {
         }
       }
 
+      ////For replenishment filter
+      const replenishmentParam: any = params.filters.find((param: any) => param.name === 'replenishmentNo')
+
+      if (replenishmentParam) {
+        let arrFilters = []
+        params.filters.splice(
+          params.filters.findIndex(item => item.name == 'replenishmentNo'),
+          1
+        )
+        arrFilters.push({ ...replenishmentParam, name: 'name' })
+
+        const foundReplenishments: Replenishment[] = await getRepository(Replenishment).find({
+          ...convertListParams({ filters: arrFilters })
+        })
+
+        if (foundReplenishments && foundReplenishments.length) {
+          params.filters.push({
+            name: 'replenishmentId',
+            operator: 'in',
+            value: foundReplenishments.map((foundAN: Replenishment) => foundAN.id),
+            relation: false
+          })
+        } else {
+          params.filters.push({
+            name: 'replenishmentId',
+            operator: 'is_null',
+            relation: false
+          })
+        }
+      }
       ////For inventory check worksheet filter
       const inventoryCheckParam = params.filters.find(param => param.name === 'inventoryCheckNo')
       const inventoryCheckStatusParam = params.filters.find(param => param.name === 'inventoryCheckStatus')
@@ -305,7 +334,11 @@ export const worksheetsResolver = {
       }
       ////Set default bizplace filter
       const bizplaceFilter = params.filters.find(param => param.name === 'bizplaceId')
-      if (!bizplaceFilter && typeParam.value[0] !== WORKSHEET_TYPE.BATCH_PICKING) {
+      if (
+        !bizplaceFilter &&
+        typeParam.value[0] !== WORKSHEET_TYPE.BATCH_PICKING &&
+        typeParam.value[0] !== WORKSHEET_TYPE.PICKING_REPLENISHMENT
+      ) {
         params.filters.push({
           name: 'bizplaceId',
           operator: 'in',
@@ -335,6 +368,7 @@ export const worksheetsResolver = {
             qb2.orWhere(`arrivalNotice.name ILIKE '${orderName}'`)
             qb2.orWhere(`releaseGood.name ILIKE '${orderName}'`)
             qb2.orWhere(`vasOrder.name ILIKE '${orderName}'`)
+            qb2.orWhere(`replenishment.name ILIKE '${orderName}'`)
           })
         )
       }
@@ -377,6 +411,7 @@ export const worksheetsResolver = {
       qb.leftJoinAndSelect('ws.bizplace', 'bizplace')
       qb.leftJoinAndSelect('ws.arrivalNotice', 'arrivalNotice')
       qb.leftJoinAndSelect('ws.releaseGood', 'releaseGood')
+      qb.leftJoinAndSelect('ws.replenishment', 'replenishment')
       qb.leftJoinAndSelect('ws.returnOrder', 'returnOrder')
       qb.leftJoinAndSelect('ws.inventoryCheck', 'inventoryCheck')
       qb.leftJoinAndSelect('ws.vasOrder', 'vasOrder')

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

@@ -103,6 +103,10 @@ export const Mutation = /* GraphQL */ `
     vasNo: String!
   ): VasOrderWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
+  generateReplenishmentWorksheets (
+    replenishmentNos: [String!]
+  ): Boolean @privilege(category: "worksheet_control", privilege: "mutation") @transaction
+
   activateUnloading (
     worksheetNo: String!
     unloadingWorksheetDetails: [WorksheetDetailPatch]
@@ -159,6 +163,10 @@ export const Mutation = /* GraphQL */ `
     worksheetNo: String!
   ): Worksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
+  activatePickingReplenishment (
+    worksheetNo: String!
+  ): Worksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
+
   activateSorting (
     worksheetNo: String!
     sortingWorksheetDetails: [WorksheetDetailPatch]
@@ -258,6 +266,12 @@ export const Mutation = /* GraphQL */ `
     toLocation: String!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
+  replenishmentPutaway (
+    worksheetDetailName: [String]!
+    cartonId: String
+    toLocation: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   putawayReturn (
     worksheetDetailName: [String]!
     palletId: String
@@ -271,6 +285,11 @@ export const Mutation = /* GraphQL */ `
     cartonId: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
+  undoReplenishmentPutaway (
+    worksheetDetailName: [String]!
+    cartonId: String
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   undoPutawayReturn (
     worksheetDetailName: [String]!
     palletId: String
@@ -305,6 +324,10 @@ export const Mutation = /* GraphQL */ `
     arrivalNoticeNo: String!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
+  completeReplenishmentPutaway (
+    replenishmentNo: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   completePutawayReturn (
     returnOrderNo: String!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
@@ -336,6 +359,16 @@ export const Mutation = /* GraphQL */ `
     pickingQty: Int
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
+  replenishmentPicking (
+    worksheetDetailName: String!
+    worksheetType: String!
+    productBarcode: String!
+    cartonId: String!
+    binLocation: String
+    serialNumber: String
+    pickingQty: Int
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   sortingProduct (
     taskNo: String!
     releaseGoodNo: String!
@@ -572,6 +605,10 @@ export const Mutation = /* GraphQL */ `
   cancelDraftReleaseOrder (
     name: String!
   ): Boolean @transaction
+
+  cancelReplenishment (
+    name: String!
+  ): Boolean @transaction
 `
 
 export const Query = /* GraphQL */ `
@@ -614,6 +651,10 @@ export const Query = /* GraphQL */ `
     arrivalNoticeNo: String!
   ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
 
+  putawayReplenishmentWorksheet (
+    replenishmentNo: String!
+  ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
+
   putawayReturningWorksheet (
     returnOrderNo: String!
   ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
@@ -643,7 +684,7 @@ export const Query = /* GraphQL */ `
   ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
 
   pickingWorksheet (
-    releaseGoodNo: String!, locationSortingRules: [Sorting]
+    orderNo: String!, locationSortingRules: [Sorting]
   ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query") @transaction
 
   sortingWorksheet (

package/server/graphql/types/worksheet/replenish-inventory-patch.ts

@@ -0,0 +1,8 @@
+import { gql } from 'apollo-server-koa'
+
+export const ReplenishInventoryPatch = gql`
+  input ReplenishInventoryPatch {
+    productSKU: String!
+    transferQty: Float!
+  }
+`

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

@@ -4,6 +4,7 @@ export const WorksheetInfo = gql`
   type WorksheetInfo {
     arrivalNotice: ArrivalNotice
     releaseGood: ReleaseGood
+    replenishment: Replenishment
     returnOrder: ReturnOrder
     bizplaceName: String
     partnerDomainId: String

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

@@ -10,6 +10,7 @@ export const Worksheet = gql`
     marketplaceOrder: MarketplaceOrder
     orderProducts: [OrderProduct]
     releaseGood: ReleaseGood
+    replenishment: Replenishment
     returnOrder: ReturnOrder
     inventoryCheck: InventoryCheck
     orderInventories: [OrderInventory]

package/server/utils/inventory-util.ts

@@ -118,6 +118,7 @@ export async function inventoriesByStrategy(
   const qb = await trxMgr.getRepository(Inventory).createQueryBuilder('INV')
   qb.innerJoinAndSelect('INV.product', 'PROD')
     .innerJoinAndSelect('INV.location', 'LOC')
+    .innerJoin('warehouse_inventory_assignment_rankings', 'WIAR', '"WIAR"."location_type" = "LOC"."type"')
     .addSelect(subQuery =>
       subQuery
         .select('COALESCE(SUM(release_qty), 0)', 'releaseQty')
@@ -165,6 +166,8 @@ export async function inventoriesByStrategy(
 
   let locIdx = 0
 
+  qb.addOrderBy('"WIAR"."rank"', 'ASC')
+
   switch (pickingStrategy.toUpperCase()) {
     case 'FIFO':
       qb.orderBy('"INV"."created_at"', 'ASC')

package/server/utils/worksheet-no-generator.ts

@@ -46,6 +46,12 @@ export class WorksheetNoGenerator {
 
         case WORKSHEET_TYPE.PUTAWAY_RETURN:
           return this.putawayReturn()
+
+        case WORKSHEET_TYPE.PICKING_REPLENISHMENT:
+          return this.pickingReplenishment()
+
+        case WORKSHEET_TYPE.PUTAWAY_REPLENISHMENT:
+          return this.putawayReplenishment()
       }
     }
   }
@@ -91,6 +97,12 @@ export class WorksheetNoGenerator {
 
       case WORKSHEET_TYPE.PUTAWAY_RETURN:
         return this.putawayReturnDetail()
+
+      case WORKSHEET_TYPE.PICKING_REPLENISHMENT:
+        return this.pickingReplenishmentDetail()
+
+      case WORKSHEET_TYPE.PUTAWAY_REPLENISHMENT:
+        return this.putawayReplenishmentDetail()
     }
   }
 
@@ -122,8 +134,16 @@ export class WorksheetNoGenerator {
     return `PICK-${uuidv4()}`
   }
 
+  static pickingReplenishment() {
+    return `PICKRP-${uuidv4()}`
+  }
+
+  static putawayReplenishment() {
+    return `PUTAWAYRP-${uuidv4()}`
+  }
+
   static packing() {
-    return `PICK-${uuidv4()}`
+    return `PACK-${uuidv4()}`
   }
 
   static batchPicking() {
@@ -184,6 +204,14 @@ export class WorksheetNoGenerator {
     return `PICK-DETAIL-${uuidv4()}`
   }
 
+  static pickingReplenishmentDetail() {
+    return `PICKRP-DETAIL-${uuidv4()}`
+  }
+
+  static putawayReplenishmentDetail() {
+    return `PUTAWAYRP-DETAIL-${uuidv4()}`
+  }
+
   static packingDetail() {
     return `PACK-DETAIL-${uuidv4()}`
   }

package/server/utils/worksheet-util.ts

@@ -1,5 +1,5 @@
 import { Bizplace } from '@things-factory/biz-base'
-import { ArrivalNotice, ReleaseGood, VasOrder, ReturnOrder } from '@things-factory/sales-base'
+import { ArrivalNotice, ReleaseGood, VasOrder, ReturnOrder, Replenishment } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { EntityManager, FindOneOptions, getRepository, Repository } from 'typeorm'
 import { WORKSHEET_STATUS } from '../constants'
@@ -10,7 +10,7 @@ export async function fetchExecutingWorksheet(
   bizplace: Bizplace,
   relations: string[],
   type: string,
-  refOrder: ArrivalNotice | ReleaseGood | VasOrder | ReturnOrder,
+  refOrder: ArrivalNotice | ReleaseGood | VasOrder | ReturnOrder | Replenishment,
   trxMgr?: EntityManager
 ): Promise<Worksheet> {
   const wsRepo: Repository<Worksheet> = trxMgr?.getRepository(Worksheet) || getRepository(Worksheet)
@@ -31,6 +31,8 @@ export async function fetchExecutingWorksheet(
     findOneOption.where['vasOrder'] = refOrder
   } else if (refOrder instanceof ReturnOrder) {
     findOneOption.where['returnOrder'] = refOrder
+  } else if (refOrder instanceof Replenishment) {
+    findOneOption.where['replenishment'] = refOrder
   }
 
   const worksheet: Worksheet = await wsRepo.findOne(findOneOption)