@things-factory/worksheet-base 4.3.355 → 4.3.357

package/server/graphql/resolvers/worksheet/inspecting/{relocate-pallet.ts → relocate-inventory.ts}

@@ -3,10 +3,14 @@ import { Domain } from '@things-factory/shell'
 import { EntityManager } from 'typeorm'
 import { CycleCountWorksheetController } from '../../../../controllers'
 
-export const relocatePalletResolver = {
-  async relocatePallet(_: any, { worksheetDetailName, inspectedBatchNo, inspectedQty, inspectedUomValue, inspectedLocationName }, context: any) {
+export const relocateInventoryResolver = {
+  async relocateInventory(
+    _: any,
+    { worksheetDetailName, inspectedBatchNo, inspectedQty, inspectedUomValue, inspectedLocationName },
+    context: any
+  ) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await relocatePallet(
+    await relocateInventory(
       tx,
       domain,
       user,
@@ -19,7 +23,7 @@ export const relocatePalletResolver = {
   }
 }
 
-export async function relocatePallet(
+export async function relocateInventory(
   tx: EntityManager,
   domain: Domain,
   user: User,
@@ -30,5 +34,11 @@ export async function relocatePallet(
   inspectedLocationName: string
 ) {
   const worksheetController: CycleCountWorksheetController = new CycleCountWorksheetController(tx, domain, user)
-  await worksheetController.relocatePallet(worksheetDetailName, inspectedBatchNo, inspectedQty, inspectedUomValue, inspectedLocationName)
+  await worksheetController.relocateInventory(
+    worksheetDetailName,
+    inspectedBatchNo,
+    inspectedQty,
+    inspectedUomValue,
+    inspectedLocationName
+  )
 }

package/server/graphql/resolvers/worksheet/inspecting/undo-inspection-carton.ts

@@ -0,0 +1,24 @@
+import { User } from '@things-factory/auth-base'
+import { Domain } from '@things-factory/shell'
+import { EntityManager } from 'typeorm'
+import { CycleCountWorksheetController } from '../../../../controllers'
+
+export const undoInspectionCartonResolver = {
+  async undoInspectionCarton(_: any, { productDetailId, cartonId, batchId, locationId }, context: any) {
+    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    await undoInspectionCarton(tx, domain, user, productDetailId, cartonId, batchId, locationId)
+  }
+}
+
+export async function undoInspectionCarton(
+  tx: EntityManager,
+  domain: Domain,
+  user: User,
+  productDetailId: string,
+  cartonId: string,
+  batchId: string,
+  locationId: string
+): Promise<void> {
+  const worksheetController: CycleCountWorksheetController = new CycleCountWorksheetController(tx, domain, user)
+  await worksheetController.undoInspectionCarton(productDetailId, cartonId, batchId, locationId)
+}

package/server/graphql/resolvers/worksheet/not-tally-target-inventories.ts

@@ -1,10 +1,12 @@
 import { createQueryBuilder, getRepository, SelectQueryBuilder } from 'typeorm'
 
-import { InventoryCheck, ORDER_INVENTORY_STATUS } from '@things-factory/sales-base'
+import { InventoryCheck, INVENTORY_CHECK_ITEM_STATUS } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 
 import { Worksheet, WorksheetDetail } from '../../../entities'
 
+import { WORKSHEET_STATUS } from '../../../constants'
+
 export const notTallyTargetInventoriesResolver = {
   async notTallyTargetInventories(_: any, { cycleCountNo }, context: any) {
     const { domain }: { domain: Domain } = context.state
@@ -14,21 +16,23 @@ export const notTallyTargetInventoriesResolver = {
     })
 
     const worksheet: Worksheet = await getRepository(Worksheet).findOne({
-      where: { domain, inventoryCheck: cycleCount }
+      where: { domain, inventoryCheck: cycleCount, status: WORKSHEET_STATUS.NOT_TALLY }
     })
-
     const qb: SelectQueryBuilder<WorksheetDetail> = createQueryBuilder(WorksheetDetail, 'WSD')
     const worksheetDetails: WorksheetDetail[] = await qb
-      .leftJoinAndSelect('WSD.targetInventory', 'T_INV')
+      .leftJoinAndSelect('WSD.targetInventoryCheckItem', 'T_INV')
       .leftJoinAndSelect('T_INV.inventory', 'INV')
       .leftJoinAndSelect('T_INV.originLocation', 'ORG_LOC')
       .leftJoinAndSelect('T_INV.inspectedLocation', 'ISP_LOC')
-      .leftJoinAndSelect('INV.product', 'PROD')
+      .leftJoinAndSelect('T_INV.product', 'PROD')
+      .leftJoinAndSelect('INV.product', 'PROD_INV')
+      .leftJoinAndSelect('T_INV.productDetail', 'PD')
+      .leftJoinAndSelect('INV.productDetail', 'PD_INV')
       .where('WSD.domain = :domainId', { domainId: domain.id })
       .andWhere('WSD.worksheet = :worksheetId', { worksheetId: worksheet.id })
-      .andWhere('WSD.status = :status', { status: ORDER_INVENTORY_STATUS.NOT_TALLY })
+      .andWhere('WSD.status = :status', { status: INVENTORY_CHECK_ITEM_STATUS.NOT_TALLY })
       .getMany()
 
-    return worksheetDetails.map((wsd: WorksheetDetail) => wsd.targetInventory)
+    return worksheetDetails.map((wsd: WorksheetDetail) => wsd.targetInventoryCheckItem)
   }
 }

package/server/graphql/resolvers/worksheet/worksheet-with-pagination.ts

@@ -11,18 +11,20 @@ export const worksheetWithPaginationResolver = {
     const { domain }: { domain: Domain } = context.state
     const worksheet: Worksheet = await getRepository(Worksheet).findOne({
       where: { domain, name },
-      relations: ['bizplace', 'arrivalNotice', 'releaseGood', 'inventoryCheck']
+      relations: ['bizplace', 'bizplace.domain', 'inventoryCheck']
     })
 
     let findManyOptions: FindManyOptions<WorksheetDetail> = {
       where: { domain, worksheet },
       relations: [
-        'targetInventory',
-        'targetInventory.originLocation',
-        'targetInventory.inspectedLocation',
-        'targetInventory.inventory',
-        'targetInventory.inventory.location',
-        'targetInventory.inventory.product'
+        'targetInventoryCheckItem',
+        'targetInventoryCheckItem.originLocation',
+        'targetInventoryCheckItem.inspectedLocation',
+        'targetInventoryCheckItem.inventory',
+        'targetInventoryCheckItem.inventory.location',
+        'targetInventoryCheckItem.inventory.product',
+        'targetInventoryCheckItem.product',
+        'targetInventoryCheckItem.productDetail'
       ]
     }
 

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

@@ -25,21 +25,21 @@ export const worksheetsResolver = {
             params.filters.findIndex(item => item.name == 'arrivalNoticeNo'),
             1
           )
-         // arrFilters.push({ ...arrivalNoticeParam, name: 'name' })
+          // arrFilters.push({ ...arrivalNoticeParam, name: 'name' })
         }
         if (arrivalNoticeRefNoParam) {
           params.filters.splice(
             params.filters.findIndex(item => item.name == 'arrivalNoticeRefNo'),
             1
           )
-         // arrFilters.push({ ...arrivalNoticeRefNoParam, name: 'refNo' })
+          // arrFilters.push({ ...arrivalNoticeRefNoParam, name: 'refNo' })
         }
         if (arrivalNoticeCrossDockingParam) {
           params.filters.splice(
             params.filters.findIndex(item => item.name == 'arrivalNoticeCrossDocking'),
             1
           )
-         // arrFilters.push({ ...arrivalNoticeCrossDockingParam, name: 'crossDocking' })
+          // arrFilters.push({ ...arrivalNoticeCrossDockingParam, name: 'crossDocking' })
         }
         // const foundArrivalNotices: ArrivalNotice[] = await getRepository(ArrivalNotice).find({
         //   ...convertListParams({ filters: arrFilters }, domain.id)
@@ -108,14 +108,16 @@ export const worksheetsResolver = {
       const releaseGoodPackingOptionParam = params.filters.find(param => param.name === 'releaseGoodPackingOption')
       const orderRemarkParam = params.filters.find(param => param.name === 'orderRemark')
       const manifestParam = params.filters.find(param => param.name === 'manifest')
-      const releaseGoodPriorityDeliveryParam = params.filters.find(param => param.name === 'releaseGoodPriorityDelivery')
+      const releaseGoodPriorityDeliveryParam = params.filters.find(
+        param => param.name === 'releaseGoodPriorityDelivery'
+      )
 
       if (
         releaseGoodParam ||
         releaseGoodRefNoParam ||
         releaseGoodCrossDockingParam ||
         releaseGoodCourierOptionParam ||
-        releaseGoodPackingOptionParam || 
+        releaseGoodPackingOptionParam ||
         releaseGoodPriorityDeliveryParam
       ) {
         // let arrFilters = []
@@ -124,8 +126,8 @@ export const worksheetsResolver = {
             params.filters.findIndex(item => item.name == 'releaseGoodNo'),
             1
           )
-          
-         // arrFilters.push({ ...releaseGoodParam, name: 'name' })
+
+          // arrFilters.push({ ...releaseGoodParam, name: 'name' })
         }
 
         if (releaseGoodRefNoParam) {
@@ -259,7 +261,7 @@ export const worksheetsResolver = {
       ////For inventory check worksheet filter
       const inventoryCheckParam = params.filters.find(param => param.name === 'inventoryCheckNo')
       const inventoryCheckStatusParam = params.filters.find(param => param.name === 'inventoryCheckStatus')
-      const inventoryCheckExecutionDateParam = params.filters.find(param => param.name === 'inventoryCheckExecutionDate')
+      const inventoryCheckExecutionDateParam = params.filters.find(param => param.name === 'executionDate')
       if (inventoryCheckParam || inventoryCheckExecutionDateParam || inventoryCheckStatusParam) {
         // let arrFilters = []
         if (inventoryCheckParam) {
@@ -278,7 +280,7 @@ export const worksheetsResolver = {
         }
         if (inventoryCheckExecutionDateParam) {
           params.filters.splice(
-            params.filters.findIndex(item => item.name == 'inventoryCheckExecutionDate'),
+            params.filters.findIndex(item => item.name == 'executionDate'),
             1
           )
           // arrFilters.push({ ...executionDateParam, name: 'executionDate' })
@@ -362,13 +364,13 @@ export const worksheetsResolver = {
 
       ////For vas worksheets filter
       let orderName: string = ''
-      if ( params.filters.find(param => param.name === 'name') ) {
+      if (params.filters.find(param => param.name === 'name')) {
         orderName = params.filters.find(param => param.name === 'name').value?.toLowerCase()
         params.filters = params.filters.filter(param => param.name !== 'name')
       }
 
       let vasNameFilter: string = ''
-      if ( params.filters.find(param => param.name === 'vasName') ) {
+      if (params.filters.find(param => param.name === 'vasName')) {
         vasNameFilter = params.filters.find(param => param.name === 'vasName').value?.toLowerCase()
         params.filters = params.filters.filter(param => param.name !== 'vasName')
       }
@@ -391,39 +393,38 @@ export const worksheetsResolver = {
           new Brackets(qb2 => {
             // qb2.where('vasOrder.name ILIKE :orderName', {orderName: orderName})
             // .orWhere('releaseGood.name ILIKE :orderName', {orderName: orderName})
-            qb2.where('ws.name ILIKE :orderName', {orderName: orderName})
+            qb2.where('ws.name ILIKE :orderName', { orderName: orderName })
           })
         )
       }
 
-      if (vasNameFilter ) {
+      if (vasNameFilter) {
         qb.andWhere(
           new Brackets(qb2 => {
-            qb2.where(`vasOrder.name ILIKE '${vasNameFilter}'`)
-            .orWhere(`releaseGood.name ILIKE '${vasNameFilter}'`)
+            qb2.where(`vasOrder.name ILIKE '${vasNameFilter}'`).orWhere(`releaseGood.name ILIKE '${vasNameFilter}'`)
           })
         )
       }
 
-      if(assigneeParam) {
+      if (assigneeParam) {
         qb.andWhere(`assignee.name ILIKE '${assigneeParam.value}'`)
       }
 
-      if(arrivalNoticeParam) {
+      if (arrivalNoticeParam) {
         qb.andWhere(`arrivalNotice.name ILIKE '${arrivalNoticeParam.value}'`)
       }
-      if(arrivalNoticeRefNoParam) {
+      if (arrivalNoticeRefNoParam) {
         qb.andWhere(`arrivalNotice.ref_no ILIKE '${arrivalNoticeRefNoParam.value}'`)
       }
 
-      if(returnOrderParam) {
+      if (returnOrderParam) {
         qb.andWhere(`returnOrder.name ILIKE '${returnOrderParam.value}'`)
       }
-      if(returnOrderRefNoParam) {
+      if (returnOrderRefNoParam) {
         qb.andWhere(`returnOrder.ref_no ILIKE '${returnOrderRefNoParam.value}'`)
       }
 
-      if(replenishmentParam) {
+      if (replenishmentParam) {
         qb.andWhere(`replenishment.name ILIKE '${replenishmentParam.value}'`)
       }
 
@@ -447,18 +448,18 @@ export const worksheetsResolver = {
         )`)
       }
 
-      if(releaseGoodRefNoParam) {
+      if (releaseGoodRefNoParam) {
         qb.andWhere(`releaseGood.ref_no ILIKE '${releaseGoodRefNoParam.value}'`)
       }
 
-      if(inventoryCheckParam) {
+      if (inventoryCheckParam) {
         qb.andWhere(`inventoryCheck.name ILIKE '${inventoryCheckParam.value}'`)
       }
-      if(inventoryCheckStatusParam) {
+      if (inventoryCheckStatusParam) {
         qb.andWhere(`inventoryCheck.status ILIKE '${inventoryCheckStatusParam.value}'`)
       }
-      if(inventoryCheckExecutionDateParam) {
-        qb.andWhere('DATE(ws.endedAt) = :endedAt', {endedAt:inventoryCheckExecutionDateParam.value})
+      if (inventoryCheckExecutionDateParam) {
+        qb.andWhere(`inventoryCheck.execution_date ILIKE '${inventoryCheckExecutionDateParam.value}'`)
       }
 
       if (outboundOrderInfoFilter) {
@@ -520,20 +521,26 @@ export const worksheetsResolver = {
         'cc.status = ws.status'
       )
 
-      if(arrivalNoticeCrossDockingParam) {
-        qb.andWhere(`arrivalNotice.cross_docking = :crossDocking`, { crossDocking: arrivalNoticeCrossDockingParam.value})
+      if (arrivalNoticeCrossDockingParam) {
+        qb.andWhere(`arrivalNotice.cross_docking = :crossDocking`, {
+          crossDocking: arrivalNoticeCrossDockingParam.value
+        })
       }
-      if(releaseGoodCrossDockingParam) {
-        qb.andWhere(`releaseGood.cross_docking = :crossDocking`, { crossDocking: releaseGoodCrossDockingParam.value})
+      if (releaseGoodCrossDockingParam) {
+        qb.andWhere(`releaseGood.cross_docking = :crossDocking`, { crossDocking: releaseGoodCrossDockingParam.value })
       }
-      if(releaseGoodCourierOptionParam) {
-        qb.andWhere(`releaseGood.courier_option = :transporter`, { transporter: releaseGoodCourierOptionParam.value})
+      if (releaseGoodCourierOptionParam) {
+        qb.andWhere(`releaseGood.courier_option = :transporter`, { transporter: releaseGoodCourierOptionParam.value })
       }
-      if(releaseGoodPackingOptionParam) {
-        qb.andWhere(`releaseGood.packing_option = :packingOption`, { packingOption: releaseGoodPackingOptionParam.value})
+      if (releaseGoodPackingOptionParam) {
+        qb.andWhere(`releaseGood.packing_option = :packingOption`, {
+          packingOption: releaseGoodPackingOptionParam.value
+        })
       }
-      if(releaseGoodPriorityDeliveryParam) {
-        qb.andWhere(`releaseGood.priority_delivery = :priorityDelivery`, { priorityDelivery: releaseGoodPriorityDeliveryParam.value})
+      if (releaseGoodPriorityDeliveryParam) {
+        qb.andWhere(`releaseGood.priority_delivery = :priorityDelivery`, {
+          priorityDelivery: releaseGoodPriorityDeliveryParam.value
+        })
       }
 
       ////Add sorting conditions
@@ -544,7 +551,8 @@ export const worksheetsResolver = {
             sort.name != 'arrivalRefNo' &&
             sort.name != 'releaseRefNo' &&
             sort.name != 'returnOrderNo' &&
-            sort.name != 'inventoryCheckStatus'
+            sort.name != 'inventoryCheckStatus' &&
+            sort.name != 'executionDate'
           ) {
             return {
               ...acc,
@@ -600,6 +608,17 @@ export const worksheetsResolver = {
         }
       }
 
+      if (params.sortings.some(e => e.name === 'executionDate')) {
+        // overwrite the worksheet status sorting since inventory check status is needed
+        sort = {
+          'inventoryCheck.executionDate': params.sortings[
+            params.sortings.findIndex(item => item.name == 'executionDate')
+          ].desc
+            ? 'DESC'
+            : 'ASC'
+        }
+      }
+
       qb.orderBy(sort)
 
       let [items, total] = await qb.getManyAndCount()
@@ -616,4 +635,4 @@ export const worksheetsResolver = {
       throw error
     }
   }
-}
+}

package/server/graphql/resolvers/worksheet-detail/create-worksheet-detail.ts

@@ -2,7 +2,7 @@ import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
 import { EntityManager } from 'typeorm'
 import { getPermittedBizplaceIds, Worker } from '@things-factory/biz-base'
-import { OrderProduct, OrderVas, OrderInventory } from '@things-factory/sales-base'
+import { OrderProduct, OrderVas, OrderInventory, InventoryCheckItem } from '@things-factory/sales-base'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 
 export const createWorksheetDetail = {
@@ -25,13 +25,21 @@ export const createWorksheetDetail = {
     }
 
     if (worksheetDetail.targetInventory && worksheetDetail.targetInventory.id) {
-      worksheetDetail.targetInventory = await tx.getRepository(OrderInventory).findOne(worksheetDetail.targetInventory.id)
+      worksheetDetail.targetInventory = await tx
+        .getRepository(OrderInventory)
+        .findOne(worksheetDetail.targetInventory.id)
     }
 
     if (worksheetDetail.targetVas && worksheetDetail.targetVas.id) {
       worksheetDetail.targetVas = await tx.getRepository(OrderVas).findOne(worksheetDetail.targetVas.id)
     }
 
+    if (worksheetDetail.targetInventoryCheckItem && worksheetDetail.targetInventoryCheckItem.id) {
+      worksheetDetail.targetInventoryCheckItem = await tx
+        .getRepository(InventoryCheckItem)
+        .findOne(worksheetDetail.targetInventoryCheckItem.id)
+    }
+
     return await tx.getRepository(WorksheetDetail).save({
       ...worksheetDetail,
       domain,

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

@@ -14,7 +14,18 @@ export const worksheetDetailResolver = {
         bizplace: In(await getPermittedBizplaceIds(domain, user)),
         name
       },
-      relations: ['domain', 'bizplace', 'worksheet', 'worker', 'targetInventory', 'targetProduct', 'targetVas', 'creator', 'updater']
+      relations: [
+        'domain',
+        'bizplace',
+        'worksheet',
+        'worker',
+        'targetInventory',
+        'targetInventoryCheckItem',
+        'targetProduct',
+        'targetVas',
+        'creator',
+        'updater'
+      ]
     })
   }
 }

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

@@ -95,9 +95,21 @@ export const Mutation = /* GraphQL */ `
   generateCycleCountWorksheet (
     executionDate: String!
     customerId: String!
-    orderInventoryIds: [String]
-    orderInventories: [OrderInventoryPatch]
+    inventoryCheckItemIds: [String]
+    inventoryCheckItems: [InventoryCheckItemPatch]
     limit: Int
+    selectedLocation: [String]
+    cycleCountNo: String
+  ): CycleCountWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
+
+  generateCycleCountWorksheetCarton (
+    executionDate: String!
+    customerId: String!
+    cycleCountNo: String
+    cartonIds: [String]
+    batchIds: [String]
+    productDetailIds: [String]
+    locationNames: [String]
   ): CycleCountWorksheet @privilege(category: "worksheet_control", privilege: "mutation") @transaction
 
   generateReturnOrderWorksheet (
@@ -231,6 +243,7 @@ export const Mutation = /* GraphQL */ `
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   cycleCountAdjustment (
+    worksheetNo: String!
     cycleCountNo: String!
   ): Boolean @privilege(category: "inventory_adjustment_approval", privilege: "mutation") @transaction
 
@@ -440,22 +453,47 @@ export const Mutation = /* GraphQL */ `
     releaseQty: Int!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
-  inspecting (
+
+  inspectingPallet ( 
     worksheetDetailName: String!
     inspectedBatchNo: String!
     inspectedQty: Int!
     inspectedUomValue: Float!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
+  inspectingCarton (
+    productDetailId: String!
+    cartonId: String!
+    batchId: String!
+    locationId: String!
+    inspectedBatchNo: String!
+    inspectedQty: Int!
+    inspectedUomValue: Float!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
   undoInspection (
     worksheetDetailName: String!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
-  checkMissingPallet (
+  undoInspectionCarton (
+    productDetailId: String!
+    cartonId: String!
+    batchId: String!
+    locationId: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
+  checkMissingInventory (
     worksheetDetailName: String!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
-  relocatePallet (
+  checkMissingInventoryCarton (
+    productDetailId: String!
+    cartonId: String!
+    batchId: String!
+    locationId: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
+  relocateInventory (
     worksheetDetailName: String!
     inspectedBatchNo: String!
     inspectedQty: Int!
@@ -463,15 +501,29 @@ export const Mutation = /* GraphQL */ `
     inspectedLocationName: String!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
-  addExtraPallet (
+  relocateInventoryCarton (
+    productDetailId: String!
+    cartonId: String!
+    batchId: String!
+    locationId: String!
+    inspectedBatchNo: String!
+    inspectedQty: Int!
+    inspectedUomValue: Float!
+    inspectedLocationName: String!
+  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+
+  addExtraInventory (
     cycleCountNo: String!
-    palletId: String!
+    inspectedLocation: String!
+    productDetailId: String!
+    productId: String!
     inspectedBatchNo: String!
     inspectedQty: Int!
     inspectedUomValue: Float!
-    locationName: String!
+    countNo: Int!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
+
   completePicking (
     releaseGoodNo: String!
   ): Inventory @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
@@ -717,7 +769,11 @@ export const Query = /* GraphQL */ `
     taskNo: String!
   ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
 
-  cycleCountWorksheet (
+  cycleCountWorksheetForPallet (
+    inventoryCheckNo: String!, locationSortingRules: [Sorting]
+  ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
+
+  cycleCountWorksheetForCarton (
     inventoryCheckNo: String!, locationSortingRules: [Sorting]
   ): ExecutingWorksheet @privilege(category: "worksheet", privilege: "query")
 

package/server/graphql/types/worksheet/inventory-check-worksheet.ts

@@ -2,6 +2,7 @@ import { gql } from 'apollo-server-koa'
 
 export const InventoryCheckWorksheet = gql`
   type InventoryCheckWorksheet {
-    cycleCountWorksheet: Worksheet
+    cycleCountWorksheetForPallet: Worksheet
+    cycleCountWorksheetForCarton: Worksheet
   }
 `

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

@@ -58,6 +58,8 @@ export const WorksheetDetailInfo = gql`
     reusablePallet: Pallet
     relatedOrderInv: OrderInventory
     targetInventory: OrderInventory
+    relatedInvCheckItem: InventoryCheckItem
+    targetInventoryCheckItem: InventoryCheckItem
     releaseGood: ReleaseGood
     actualQty: Int
     actualUomValue: Float
@@ -70,5 +72,6 @@ export const WorksheetDetailInfo = gql`
     packingTypeSize: String
     reusablePalletName: String
     expirationPeriod: Int
+    productDetail: ProductDetail
   }
 `

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

@@ -13,6 +13,7 @@ export const Worksheet = gql`
     replenishment: Replenishment
     returnOrder: ReturnOrder
     inventoryCheck: InventoryCheck
+    inventoryCheckItems: [InventoryCheckItem]
     orderInventories: [OrderInventory]
     shippingOrder: ShippingOrder
     vasOrder: VasOrder
@@ -27,6 +28,7 @@ export const Worksheet = gql`
     status: String
     startedAt: String
     endedAt: String
+    checkCount: Int
     creator: User
     updater: User
     createdAt: String

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

@@ -11,6 +11,7 @@ export const NewWorksheetDetail = gql`
     targetProduct: ObjectRef
     targetVas: ObjectRef
     targetInventory: OrderInventoryPatch
+    targetInventoryCheckItem: InventoryCheckItemPatch
     fromLocation: ObjectRef
     toLocation: ObjectRef
     status: String

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

@@ -13,6 +13,7 @@ export const WorksheetDetailPatch = gql`
     targetProduct: OrderProductPatch
     targetVas: OrderVasPatch
     targetInventory: OrderInventoryPatch
+    targetInventoryCheckItem: InventoryCheckItemPatch
     fromLocation: ObjectRef
     toLocation: ObjectRef
     batchId: String

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

@@ -14,6 +14,7 @@ export const WorksheetDetail = gql`
     targetProduct: OrderProduct
     targetVas: OrderVas
     targetInventory: OrderInventory
+    targetInventoryCheckItem: InventoryCheckItem
     targetDO: DeliveryOrder
     location: Location
     fromLocation: Location