@things-factory/worksheet-base 4.3.144 → 4.3.146

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

@@ -6,12 +6,11 @@ import { ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 
 import { PackingWorksheetController, SellercraftController } from '../../../../controllers'
-import { Worksheet } from '../../../../entities'
 
 export const packingResolver = {
-  async packing(_: any, { worksheetDetailName, releaseQty, serialNumber }, context: any) {
+  async packing(_: any, { orderPackageItemId, releaseQty, serialNumber }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await packing(tx, domain, user, worksheetDetailName, releaseQty, serialNumber)
+    await packing(tx, domain, user, orderPackageItemId, releaseQty, serialNumber)
   }
 }
 
@@ -19,22 +18,21 @@ export async function packing(
   tx: EntityManager,
   domain: Domain,
   user: User,
-  worksheetDetailName: string,
+  orderPackageItemId: string,
   releaseQty: number,
   serialNumber: string
 ) {
   const worksheetController: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
-  const worksheetDetail = await worksheetController.packing(worksheetDetailName, releaseQty, serialNumber)
+  const worksheetDetail = await worksheetController.packing(orderPackageItemId, releaseQty, serialNumber)
 
-  let releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
-  const worksheet: Worksheet = worksheetDetail.worksheet
+  let releaseGood: ReleaseGood = worksheetDetail.releaseGood
 
   const orderSource: string = releaseGood.source
   switch (orderSource) {
     case ApplicationType.SELLERCRAFT:
       const sellercraft: Sellercraft = await tx
         .getRepository(Sellercraft)
-        .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
+        .findOne({ domain: worksheetDetail.bizplace.domain, status: SellercraftStatus.ACTIVE })
 
       if (sellercraft) {
         const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)

package/server/graphql/resolvers/worksheet/packing/scan-product-packing.ts

@@ -1,17 +1,14 @@
 import { EntityManager } from 'typeorm'
 
-import { ApplicationType, User } from '@things-factory/auth-base'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { ReleaseGood } from '@things-factory/sales-base'
+import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
 
-import { PackingWorksheetController, SellercraftController } from '../../../../controllers'
-import { Worksheet } from '../../../../entities'
+import { PackingWorksheetController } from '../../../../controllers'
 
 export const scanProductPackingResolver = {
-  async scanProductPacking(_: any, { worksheetDetailName, productBarcode, serialNumber }, context: any) {
+  async scanProductPacking(_: any, { orderPackageItemId, productBarcode, serialNumber }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    return await scanProductPacking(tx, domain, user, worksheetDetailName, productBarcode, serialNumber)
+    return await scanProductPacking(tx, domain, user, orderPackageItemId, productBarcode, serialNumber)
   }
 }
 
@@ -19,7 +16,7 @@ export async function scanProductPacking(
   tx: EntityManager,
   domain: Domain,
   user: User,
-  worksheetDetailName: string,
+  orderPackageItemId: string,
   productBarcode: string,
   serialNumber?: string
 ) {
@@ -27,7 +24,7 @@ export async function scanProductPacking(
     console.time('execution time to scan for packing')
     const worksheetController: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
     const inventoryItems = await worksheetController.scanProductPacking(
-      worksheetDetailName,
+      orderPackageItemId,
       productBarcode,
       serialNumber
     )

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

@@ -1,22 +1,48 @@
-import { EntityManager, getManager, SelectQueryBuilder } from 'typeorm'
+import {
+  EntityManager,
+  getManager,
+  SelectQueryBuilder
+} from 'typeorm'
 
-import { ApplicationType, User } from '@things-factory/auth-base'
+import {
+  ApplicationType,
+  User
+} from '@things-factory/auth-base'
 import { logger } from '@things-factory/env'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
+import {
+  Sellercraft,
+  SellercraftStatus
+} from '@things-factory/integration-sellercraft'
 import {
   MarketplaceOrder,
   MarketplaceOrderItem,
   MarketplaceOrderShipping,
   MarketplaceOrderShippingItem
 } from '@things-factory/marketplace-base'
-import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
-import { PartnerSetting, Setting } from '@things-factory/setting-base'
+import {
+  ORDER_INVENTORY_STATUS,
+  ORDER_STATUS,
+  OrderInventory,
+  OrderPackage,
+  OrderProduct,
+  ReleaseGood
+} from '@things-factory/sales-base'
+import {
+  PartnerSetting,
+  Setting
+} from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, Location } from '@things-factory/warehouse-base'
+import { Location } from '@things-factory/warehouse-base'
 
-import { WORKSHEET_TYPE, WORKSHEET_STATUS } from '../../../constants'
-import { PackingWorksheetController, SellercraftController } from '../../../controllers'
-import { Worksheet, WorksheetDetail } from '../../../entities'
+import {
+  WORKSHEET_STATUS,
+  WORKSHEET_TYPE
+} from '../../../constants'
+import {
+  PackingWorksheetController,
+  SellercraftController
+} from '../../../controllers'
+import { Worksheet } from '../../../entities'
 
 export const packingWorksheetResolver = {
   async packingWorksheet(_: any, { releaseGoodNo }, context: any) {
@@ -30,9 +56,12 @@ export const packingWorksheetResolver = {
         relations: ['bizplace', 'bizplace.domain']
       })
 
+      let binLocation: Location = null
+      let isBatchPicking: boolean = false
+
       // Find Release Order based on Bin
       if (!releaseGood) {
-        const binLocation: Location = await tx.getRepository(Location).findOne({
+        binLocation = await tx.getRepository(Location).findOne({
           where: { domain, name: releaseGoodNo }
         })
 
@@ -68,14 +97,42 @@ export const packingWorksheetResolver = {
           // @oscarchuaweiwen-fsd @chrislim I suggest using getMany() instead since the total is redundant here
 
           // remove duplicated count of release good
-          const filteredRO = orderInventoriesByBin.map(oiBin => {
-            return oiBin.releaseGood.name
-          })
+          const filteredRO = [
+            ...new Set(
+              orderInventoriesByBin.map(oiBin => {
+                return oiBin.releaseGood.id
+              })
+            )
+          ]
 
           if (orderInventoriesByBin.length > 0) {
-            releaseGoodNo = orderInventoriesByBin[0].releaseGood.name
-            releaseGood = orderInventoriesByBin[0].releaseGood
-            releaseGood.totalInventoriesByBin = [...new Set(filteredRO)].length
+            if (filteredRO?.length > 1) {
+              await Promise.all(
+                filteredRO.map(async roId => {
+                  let orderPackages: OrderPackage[] = await tx
+                    .getRepository(OrderPackage)
+                    .createQueryBuilder('opk')
+                    .innerJoinAndSelect('opk.releaseGood', 'rg')
+                    .innerJoinAndSelect('rg.bizplace', 'bizplace')
+                    .innerJoinAndSelect('bizplace.domain', 'domain')
+                    .innerJoinAndSelect('rg.orderInventories', 'oi')
+                    .where('rg.id = :releaseGoodId', { releaseGoodId: roId })
+                    .getMany()
+
+                  if (orderPackages?.length) {
+                    releaseGood = orderPackages[0].releaseGood
+                  }
+                })
+              )
+              releaseGoodNo = releaseGood?.name
+              isBatchPicking = releaseGood?.orderInventories[0]?.refWorksheetId ? true : false
+            } else {
+              releaseGoodNo = orderInventoriesByBin[0].releaseGood.name
+              releaseGood = orderInventoriesByBin[0].releaseGood
+              isBatchPicking = orderInventoriesByBin[0]?.refWorksheetId ? true : false
+            }
+
+            releaseGood.totalInventoriesByBin = filteredRO.length
             releaseGood.isOrderInventoryBin = true
           } else {
             throw new Error(`Bin do not have any existing order.`)
@@ -85,6 +142,8 @@ export const packingWorksheetResolver = {
 
       if (!releaseGood) throw new Error(`Release good do not exist.`)
 
+      const orderSource: string = releaseGood.source
+
       const worksheet: Worksheet = await tx
         .getRepository(Worksheet)
         .createQueryBuilder('w')
@@ -104,9 +163,28 @@ export const packingWorksheetResolver = {
 
       if (!worksheet) throw new Error('Worksheet does not exist')
 
+      const orderPackages: OrderPackage[] = await tx.getRepository(OrderPackage).find({
+        where: { releaseGood, domain, bizplace: releaseGood.bizplace },
+        order: { updatedAt: 'DESC' },
+        relations: [
+          'orderPackageItems',
+          'orderPackageItems.orderProduct',
+          'orderPackageItems.orderProduct.product',
+          'orderPackageItems.orderProduct.product.productDetails'
+        ]
+      })
+
       if (worksheet.status === WORKSHEET_STATUS.DONE) {
         throw new Error(`Worksheet is completed already`)
+      } else if (worksheet.status === WORKSHEET_STATUS.EXECUTING) {
+        if (orderPackages?.length == 0 && orderSource == ApplicationType.SELLERCRAFT) {
+          throw new Error('Waiting for packages from marketplace. Please retry in while.')
+        }
       } else if (worksheet.status === WORKSHEET_STATUS.DEACTIVATED) {
+        if (orderPackages?.length == 0 && orderSource == ApplicationType.SELLERCRAFT) {
+          throw new Error('Waiting for packages from marketplace. Please retry in while.')
+        }
+
         const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
 
         const directActivatePackingWorksheet: Setting = await tx.getRepository(Setting).findOne({
@@ -145,7 +223,6 @@ export const packingWorksheetResolver = {
       let shippingProvider: string
       let marketplaceStatus: string
 
-      const orderSource: string = releaseGood.source
       switch (orderSource) {
         case ApplicationType.SELLERCRAFT:
           const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
@@ -201,6 +278,9 @@ export const packingWorksheetResolver = {
           break
       }
 
+      let processingOrderPackage: OrderPackage[] =
+        orderPackages.filter(opk => opk.status == ORDER_STATUS.PROCESSING) || []
+
       return {
         worksheetInfo: {
           releaseGood,
@@ -212,37 +292,39 @@ export const packingWorksheetResolver = {
           startedAt: worksheet.startedAt,
           shippingProvider: shippingProvider ? shippingProvider : '',
           trackingNo: trackingNo ? trackingNo : '',
-          airwayBill: releaseGood?.airwayBill,
+          airwayBill: processingOrderPackage[0]?.airwayBill,
           checkedRemarkBy: releaseGood?.checkedRemarkBy,
-          invoice: releaseGood?.invoice,
+          invoice: processingOrderPackage[0]?.invoice,
           platform: Object.keys(marketplaceOrder).length > 0 ? marketplaceOrder.marketplaceStore?.platform : 'operato',
           marketplaceStoreId: Object.keys(marketplaceOrder).length > 0 ? marketplaceOrder.marketplaceStore?.id : '',
           marketplaceStatus: marketplaceStatus ? marketplaceStatus : '',
-          marketplaceOrder: marketplaceOrder ? marketplaceOrder : ''
+          marketplaceOrder: marketplaceOrder ? marketplaceOrder : '',
+          orderPackage: processingOrderPackage[0],
+          orderPackages
         },
-        worksheetDetailInfos: worksheet.worksheetDetails
-          .map((packingWSD: WorksheetDetail) => {
-            const targetInventory: OrderInventory = packingWSD.targetInventory
-            const inventory: Inventory = targetInventory.inventory
+        worksheetDetailInfos: processingOrderPackage[0].orderPackageItems
+          .map(opi => {
+            const orderProduct: OrderProduct = opi.orderProduct
             return {
-              id: packingWSD.id,
-              name: packingWSD.name,
-              palletId: inventory.palletId,
-              cartonId: inventory.cartonId,
-              batchId: inventory.batchId,
-              batchIdRef: inventory.batchIdRef,
-              product: inventory.product,
-              sku: inventory.product.sku,
-              releaseQty: targetInventory.releaseQty,
-              packedQty: targetInventory.packedQty,
-              status: packingWSD.status,
-              description: packingWSD.description,
-              targetName: targetInventory.name,
-              packingType: inventory.packingType,
-              packingSize: inventory.packingSize,
-              binLocation: targetInventory?.binLocation,
-              location: inventory.location,
-              relatedOrderInv: targetInventory
+              id: opi.id,
+              name: opi.name,
+              // palletId: inventory.palletId,
+              // cartonId: inventory.cartonId,
+              batchId: orderProduct.batchId,
+              // batchIdRef: inventory.batchIdRef,
+              product: orderProduct.product,
+              sku: orderProduct.product.sku,
+              releaseQty: opi.releaseQty,
+              packedQty: opi?.packedQty || 0,
+              status: opi.status,
+              // description: packingWSD.description,
+              // targetName: targetInventory.name,
+              // packingType: inventory.packingType,
+              // packingSize: inventory.packingSize,
+              binLocation: binLocation,
+              isBatchPicking
+              // location: inventory.location,
+              // relatedOrderInv: targetInventory
             }
           })
           .sort((a, b) => {

package/server/graphql/resolvers/worksheet/picking/complete-batch-picking.ts

@@ -5,7 +5,14 @@ import { Bizplace, getMyBizplace } from '@things-factory/biz-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
-import { OrderInventory, ReleaseGood } from '@things-factory/sales-base'
+import {
+  ORDER_STATUS,
+  OrderInventory,
+  OrderNoGenerator,
+  OrderPackage,
+  OrderPackageItem,
+  ReleaseGood
+} from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
@@ -66,7 +73,17 @@ export async function completeBatchPicking(
     uniqueReleaseGoods.map(async releaseGood => {
       let foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
         where: { id: releaseGood.id },
-        relations: ['orderProducts', 'orderProducts.product', 'bizplace', 'bizplace.company', 'bizplace.company.domain']
+        relations: [
+          'domain',
+          'creator',
+          'updater',
+          'orderPackages',
+          'orderProducts',
+          'orderProducts.product',
+          'bizplace',
+          'bizplace.company',
+          'bizplace.company.domain'
+        ]
       })
       const orderSource: string = foundReleaseGood.source
       switch (orderSource) {
@@ -80,14 +97,8 @@ export async function completeBatchPicking(
               await getManager().transaction(async txMgr => {
                 const sellercraftCtrl: SellercraftController = new SellercraftController(txMgr, domain, user)
 
-                if (!releaseGood?.packageId) {
-                  releaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood)
-
-                  if (releaseGood?.packageId) {
-                    await txMgr
-                      .getRepository(ReleaseGood)
-                      .update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater })
-                  }
+                if (!releaseGood?.orderPackages?.length) {
+                  await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood)
                 }
 
                 const rtsTriggerLevel: Setting = await tx.getRepository(Setting).findOne({
@@ -119,13 +130,50 @@ export async function completeBatchPicking(
           })
           const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
 
+          const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
           if (marketplaceStore?.isAutoUpdateShipment) {
-            const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
             await ecommerceCtrl.createOrderShip(foundReleaseGood, marketplaceStore, marketplaceOrder, companyDomain)
           }
+          await ecommerceCtrl.createOrderPackage(
+            tx,
+            marketplaceOrder,
+            companyDomain,
+            marketplaceStore,
+            foundReleaseGood
+          )
           break
 
         default:
+          const orderPackage: OrderPackage = {
+            name: OrderNoGenerator.orderPackage(),
+            packageId: null,
+            trackingNo: null,
+            transporter: null,
+            airwayBill: null,
+            status: ORDER_STATUS.PROCESSING,
+            releaseGood,
+            domain: releaseGood.domain,
+            bizplace: releaseGood.bizplace,
+            creator: releaseGood.creator,
+            updater: releaseGood.updater
+          }
+
+          let savedOrderPackage: OrderPackage = await tx.getRepository(OrderPackage).save(orderPackage)
+          const orderPackageItems: OrderPackageItem[] = releaseGood.orderProducts.map(op => {
+            return {
+              name: OrderNoGenerator.orderPackageItem(),
+              orderProduct: op,
+              status: ORDER_STATUS.PROCESSING,
+              releaseQty: op.releaseQty,
+              orderPackage: savedOrderPackage,
+              domain: releaseGood.domain,
+              bizplace: releaseGood.bizplace,
+              creator: releaseGood.creator,
+              updater: releaseGood.updater
+            }
+          })
+
+          await tx.getRepository(OrderPackageItem).save(orderPackageItems)
           break
       }
     })

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

@@ -7,7 +7,6 @@ import { Account, AccountingAPI } from '@things-factory/integration-accounting'
 import { LastMileAPI, LastMileDelivery } from '@things-factory/integration-lmd'
 import { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integration-marketplace'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { Setting } from '@things-factory/setting-base'
 import {
   MarketplaceOrder,
   MarketplaceOrderItem,
@@ -18,9 +17,13 @@ import {
   ORDER_INVENTORY_STATUS,
   ORDER_STATUS,
   OrderInventory,
+  OrderNoGenerator,
+  OrderPackage,
+  OrderPackageItem,
   OrderProduct,
   ReleaseGood
 } from '@things-factory/sales-base'
+import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'
@@ -61,13 +64,17 @@ export async function completePicking(
   let releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
     where: { domain, name: releaseGoodNo },
     relations: [
+      'domain',
       'bizplace',
       'bizplace.domain',
       'bizplace.company',
       'bizplace.company.domain',
+      'orderPackages',
       'orderProducts',
       'orderProducts.product',
-      'orderProducts.productDetail'
+      'orderProducts.productDetail',
+      'creator',
+      'updater'
     ]
   })
 
@@ -103,18 +110,12 @@ export async function completePicking(
           await getManager().transaction(async txMgr => {
             const sellercraftCtrl: SellercraftController = new SellercraftController(txMgr, domain, user)
 
-            if (!releaseGood?.packageId) {
+            if (!releaseGood?.orderPackages?.length) {
               const orderProducts: OrderProduct[] = await tx.getRepository(OrderProduct).find({
                 where: { releaseGood },
                 relations: ['product', 'product.productDetails']
               })
-              releaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })
-
-              if (releaseGood?.packageId) {
-                await txMgr
-                  .getRepository(ReleaseGood)
-                  .update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater })
-              }
+              await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })
             }
 
             const rtsTriggerLevel: Setting = await tx.getRepository(Setting).findOne({
@@ -145,18 +146,20 @@ export async function completePicking(
       })
 
       if (marketplaceOrder) {
+        const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
         const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
         let eTraxOption: boolean
 
         if (marketplaceStore?.isAutoUpdateShipment) {
-          const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
           await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PACKING)
 
           await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain)
         }
 
-        if (!marketplaceOrder)
+        if (!marketplaceOrder) {
           throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue')
+        }
+
         eTraxOption = marketplaceOrder?.marketplaceStore.eTrax
 
         // if eTrax option is true
@@ -248,10 +251,42 @@ export async function completePicking(
             else throw resp
           }
         }
+
+        await ecommerceCtrl.createOrderPackage(tx, marketplaceOrder, companyDomain, marketplaceStore, releaseGood)
       }
       break
 
     default:
+      const orderPackage: OrderPackage = {
+        name: OrderNoGenerator.orderPackage(),
+        packageId: null,
+        trackingNo: null,
+        transporter: null,
+        airwayBill: null,
+        status: ORDER_STATUS.PROCESSING,
+        releaseGood,
+        domain: releaseGood.domain,
+        bizplace: releaseGood.bizplace,
+        creator: releaseGood.creator,
+        updater: releaseGood.updater
+      }
+
+      let savedOrderPackage: OrderPackage = await tx.getRepository(OrderPackage).save(orderPackage)
+      const orderPackageItems: OrderPackageItem[] = releaseGood.orderProducts.map(op => {
+        return {
+          name: OrderNoGenerator.orderPackageItem(),
+          orderProduct: op,
+          status: ORDER_STATUS.PROCESSING,
+          releaseQty: op.releaseQty,
+          orderPackage: savedOrderPackage,
+          domain: releaseGood.domain,
+          bizplace: releaseGood.bizplace,
+          creator: releaseGood.creator,
+          updater: releaseGood.updater
+        }
+      })
+
+      await tx.getRepository(OrderPackageItem).save(orderPackageItems)
       break
   }
 

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

@@ -1,5 +1,5 @@
-import { SellercraftDocument } from './sellercraft-document'
 import { ArrivalNoticeWorksheet } from './arrival-notice-worksheet'
+import { GenerateBatchPickInfo } from './batch-pick-worksheet-info'
 import { ContactPointInfo } from './contact-point-info'
 import { CycleCountWorksheet } from './cycle-count-worksheet'
 import { DeliveryInfo } from './delivery-info'
@@ -11,12 +11,14 @@ import { FindReleaseOrdersByTaskNo } from './find-release-orders-by-task-no'
 import { GoodsDeliveryNote } from './goods-delivery-note'
 import { InventoryCheckWorksheet } from './inventory-check-worksheet'
 import { LoadedWorksheetDetail } from './loaded-worksheet-detail'
+import { MultipleReleaseGoodWorksheet } from './multiple-release-good-worksheet'
 import { MyPickingAssignmentStatus } from './my-picking-assignment-status'
 import { NewWorksheet } from './new-worksheet'
 import { PickingAssignmentStatus } from './picking-assignment-status'
 import { ProductApproval } from './product-approval'
 import { ReleaseGoodWorksheet } from './release-good-worksheet'
 import { ReturnOrderWorksheet } from './return-order-worksheet'
+import { SellercraftDocument } from './sellercraft-document'
 import { VasOrderWorksheet } from './vas-order-worksheet'
 import { Worksheet } from './worksheet'
 import { WorksheetDetailInfo } from './worksheet-detail-info'
@@ -24,8 +26,6 @@ import { WorksheetInfo } from './worksheet-info'
 import { WorksheetList } from './worksheet-list'
 import { WorksheetPatch } from './worksheet-patch'
 import { WorksheetWithPagination } from './worksheet-with-pagination'
-import { GenerateBatchPickInfo } from './batch-pick-worksheet-info'
-import { MultipleReleaseGoodWorksheet } from './multiple-release-good-worksheet'
 
 export const Mutation = /* GraphQL */ `
   createWorksheet (
@@ -355,13 +355,13 @@ export const Mutation = /* GraphQL */ `
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   packing (
-    worksheetDetailName: String!
+    orderPackageItemId: String!
     releaseQty: Int!
     serialNumber: String
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   scanProductPacking (
-    worksheetDetailName: String!
+    orderPackageItemId: String!
     productBarcode: String!
     serialNumber: String
   ): ExecutingWorksheet @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
@@ -438,6 +438,7 @@ export const Mutation = /* GraphQL */ `
 
   completePacking (
     releaseGoodNo: String!
+    orderPackageId: String!
   ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   completeBatchPicking (

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

@@ -29,5 +29,7 @@ export const WorksheetInfo = gql`
     refNo3: String
     looseItem: String
     orderVas: [WorksheetDetail]
+    orderPackage: OrderPackage
+    orderPackages: [OrderPackage]
   }
 `