@things-factory/worksheet-base 4.0.24 → 4.0.28

package/server/controllers/render-orientage-grn.ts

@@ -1,19 +1,21 @@
+import FormData from 'form-data'
+import fetch from 'node-fetch'
+import { getRepository, IsNull, Not } from 'typeorm'
+
 import { Attachment, STORAGE } from '@things-factory/attachment-base'
 import { Partner } from '@things-factory/auth-base'
 import { Bizplace, ContactPoint } from '@things-factory/biz-base'
 import { config } from '@things-factory/env'
+import { ProductDetail } from '@things-factory/product-base'
 import {
   ArrivalNotice,
   GoodsReceivalNote,
-  OrderProduct,
   ORDER_PRODUCT_STATUS,
-  ORDER_STATUS
+  ORDER_STATUS,
+  OrderProduct
 } from '@things-factory/sales-base'
-import { Product, ProductDetail } from '@things-factory/product-base'
 import { Domain } from '@things-factory/shell'
-import FormData from 'form-data'
-import fetch from 'node-fetch'
-import { getRepository, IsNull, Not } from 'typeorm'
+
 import { TEMPLATE_TYPE } from '../constants'
 import { Worksheet } from '../entities'
 import { DateTimeConverter } from '../utils/datetime-util'
@@ -134,7 +136,7 @@ export async function renderOrientageGRN({ grnNo }, context: any) {
         pack_qty: item.packQty ? item.packQty : 0,
         actual_pack_qty: item.actualPackQty ? item.actualPackQty : 0,
         container_no: foundGAN.containerNo ? foundGAN.containerNo : '',
-        aux_value_3: item.product.auxValue3 ? item.product.auxValue3 : '',
+        aux_value_3: matchedProductDetail?.auxValue3 ? matchedProductDetail.auxValue3 : '',
         product_volume: matchedProductDetail
           ? matchedProductDetail?.volume
             ? matchedProductDetail.volume

package/server/controllers/render-ro-do.ts

@@ -138,6 +138,7 @@ export async function renderRODO({ doNo }, context: any) {
         product_batch: inventory.batchId,
         product_qty: targetInventory.releaseQty,
         product_weight: targetInventory.releaseWeight,
+        product_gross_weight: inventory.product.grossWeight,
         product_uom_value: targetInventory.releaseUomValue,
         product_uom: inventory.uom,
         remark: targetInventory.remark,

package/server/controllers/worksheet-controller.ts

@@ -387,7 +387,7 @@ export class WorksheetController {
     type: string,
     additionalProps: Partial<Worksheet> = {}
   ): Promise<Worksheet> {
-    let refOrderType: string = this.getRefOrderField(refOrder)
+    let refOrderType: string = await this.getRefOrderField(refOrder)
     const bizplace: Bizplace = await this.extractBizplaceFromRefOrder(refOrder)
 
     const worksheet: Partial<Worksheet> = {
@@ -676,7 +676,7 @@ export class WorksheetController {
       'worksheetDetails.targetVas'
     ])
 
-    const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
+    let worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
 
     worksheetDetails
       .filter((wsd: WorksheetDetail) => wsd.status !== ORDER_INVENTORY_STATUS.REPLACED)
@@ -687,7 +687,7 @@ export class WorksheetController {
     await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetails)
 
     if (worksheetType === WORKSHEET_TYPE.UNLOADING) {
-      const targetProducts: OrderProduct[] = worksheet.worksheetDetails.map((wsd: WorksheetDetail) => {
+      let targetProducts: OrderProduct[] = worksheet.worksheetDetails.map((wsd: WorksheetDetail) => {
         let targetProduct: OrderProduct = wsd.targetProduct
         targetProduct.status = ORDER_PRODUCT_STATUS.TERMINATED
         targetProduct.updater = this.user
@@ -696,7 +696,7 @@ export class WorksheetController {
 
       await this.updateOrderTargets(targetProducts)
     } else if (worksheetType === WORKSHEET_TYPE.VAS) {
-      const targetVASs: OrderVas[] = worksheet.worksheetDetails.map((wsd: WorksheetDetail) => {
+      let targetVASs: OrderVas[] = worksheet.worksheetDetails.map((wsd: WorksheetDetail) => {
         let targetVAS: OrderVas = wsd.targetVas
         targetVAS.status = ORDER_VAS_STATUS.TERMINATED
         targetVAS.updater = this.user
@@ -712,7 +712,7 @@ export class WorksheetController {
       worksheetType === WORKSHEET_TYPE.WAREHOUSE_RETURN ||
       worksheetType === WORKSHEET_TYPE.UNLOADING_RETURN
     ) {
-      const targetInventories: OrderInventory[] = worksheet.worksheetDetails
+      let targetInventories: OrderInventory[] = worksheet.worksheetDetails
         .filter((wsd: WorksheetDetail) => wsd.status !== ORDER_INVENTORY_STATUS.REPLACED)
         .map((wsd: WorksheetDetail) => {
           let targetInventory: OrderInventory = wsd.targetInventory

package/server/graphql/resolvers/worksheet/generate-worksheet/generate-multiple-release-good-worksheet.ts

@@ -0,0 +1,22 @@
+import { EntityManager } from 'typeorm'
+
+import { User } from '@things-factory/auth-base'
+import { OrderInventory } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
+
+import { PickingWorksheetController } from '../../../../controllers/'
+import { Worksheet, WorksheetDetail } from '../../../../entities'
+
+import { generatePickingWorksheet } from './generate-release-good-worksheet'
+
+export const generateMultipleReleaseGoodWorksheetResolver = {
+  async generateMultipleReleaseGoodWorksheet(_: any, { releaseGoodNos }, context: any) {
+    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+
+    for (let idx = 0; idx < releaseGoodNos.length; idx++) {
+      await generatePickingWorksheet(tx, domain, user, releaseGoodNos[idx])
+    }
+
+    return true
+  }
+}

package/server/graphql/resolvers/worksheet/generate-worksheet/generate-release-good-worksheet.ts

@@ -1,7 +1,9 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { OrderInventory } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { PickingWorksheetController } from '../../../../controllers/'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
 

package/server/graphql/resolvers/worksheet/generate-worksheet/index.ts

@@ -4,6 +4,7 @@ import { generateCycleCountWorksheetResolver } from './generate-cycle-count-work
 import { generatePartialPutawayWorksheetResolver } from './generate-partial-putaway-worksheet'
 import { generatePutawayWorksheetResolver } from './generate-putaway-worksheet'
 import { generateReleaseGoodWorksheetResolver } from './generate-release-good-worksheet'
+import { generateMultipleReleaseGoodWorksheetResolver } from './generate-multiple-release-good-worksheet'
 import { generateVasOrderWorksheetResolver } from './generate-vas-order-worksheet'
 import { generateReturnOrderWorksheetResolver } from './generate-return-order-worksheet'
 import { generatePartialPutawayReturnWorksheetResolver } from './generate-partial-putaway-return-worksheet'
@@ -15,6 +16,7 @@ export const Mutations = {
   ...generatePartialPutawayWorksheetResolver,
   ...generatePutawayWorksheetResolver,
   ...generateReleaseGoodWorksheetResolver,
+  ...generateMultipleReleaseGoodWorksheetResolver,
   ...generateVasOrderWorksheetResolver,
   ...generateReturnOrderWorksheetResolver,
   ...generatePartialPutawayReturnWorksheetResolver

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

@@ -1,9 +1,9 @@
-import { EntityManager, In, SelectQueryBuilder } from 'typeorm'
+import { EntityManager, SelectQueryBuilder } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder, MarketplaceOrderItem, MarketplaceOrderShipping } from '@things-factory/marketplace-base'
-import { ORDER_INVENTORY_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
+import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, Location } from '@things-factory/warehouse-base'
 
@@ -11,7 +11,6 @@ import { WORKSHEET_TYPE } from '../../../constants'
 import { SellercraftController } from '../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 import { fetchExecutingWorksheet } from '../../../utils'
-import { ORDER_STATUS } from '@things-factory/sales-base'
 
 export const packingWorksheetResolver = {
   async packingWorksheet(_: any, { releaseGoodNo }, context: any) {
@@ -30,12 +29,16 @@ export const packingWorksheetResolver = {
         where: { domain, name: releaseGoodNo }
       })
 
-      const qb: SelectQueryBuilder<OrderInventory> = tx.getRepository(OrderInventory).createQueryBuilder('orderInventory')
+      const qb: SelectQueryBuilder<OrderInventory> = tx
+        .getRepository(OrderInventory)
+        .createQueryBuilder('orderInventory')
       qb.innerJoinAndSelect('orderInventory.releaseGood', 'releaseGood')
         .innerJoinAndSelect('releaseGood.bizplace', 'bizplace')
         .innerJoinAndSelect('bizplace.domain', 'domain')
         .where('orderInventory.domain_id = :domainId', { domainId: domain.id })
-        .andWhere('orderInventory.status IN (:...orderInventoryStatus)', { orderInventoryStatus: [ORDER_INVENTORY_STATUS.PACKING, ORDER_INVENTORY_STATUS.PACKED] })
+        .andWhere('orderInventory.status IN (:...orderInventoryStatus)', {
+          orderInventoryStatus: [ORDER_INVENTORY_STATUS.PACKING, ORDER_INVENTORY_STATUS.PACKED]
+        })
         .andWhere('orderInventory.bin_location_id = :locationId', { locationId: binLocation.id })
         .andWhere('releaseGood.status = :status', { status: ORDER_STATUS.PACKING })
 
@@ -138,6 +141,7 @@ export const packingWorksheetResolver = {
         bizplaceName: releaseGood.bizplace.name,
         refNo: releaseGood.refNo,
         refNo2: releaseGood.refNo2,
+        refNo3: releaseGood.refNo3,
         partnerDomainId: releaseGood.bizplace?.domain.id,
         startedAt: worksheet.startedAt,
         shippingProvider: shippingProvider ? shippingProvider : '',

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

@@ -52,11 +52,14 @@ export async function activatePicking(
         where: { orderNo: releaseGood.refNo, domain: companyDomain },
         relations: ['marketplaceStore']
       })
-      const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
 
-      if (marketplaceStore.isAutoUpdateShipment) {
-        const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-        await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PICKING)
+      if (marketplaceOrder) {
+        const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
+
+        if (marketplaceStore.isAutoUpdateShipment) {
+          const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+          await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PICKING)
+        }
       }
     }
   }

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

@@ -45,7 +45,7 @@ export async function completePicking(
   releaseGoodNo: string
 ): Promise<void> {
   const pickingWSCtrl: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
-  const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
+  let releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
     where: { domain, name: releaseGoodNo },
     relations: [
       'bizplace',
@@ -53,6 +53,7 @@ export async function completePicking(
       'bizplace.company',
       'bizplace.company.domain',
       'orderInventories',
+      'orderInventories.inventory',
       'orderInventories.product'
     ]
   })
@@ -84,13 +85,13 @@ export async function completePicking(
 
     if (sellercraft) {
       const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
+      releaseGood = await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
       await sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
     } else {
       const companyDomain: Domain = releaseGood.bizplace.company.domain
       let marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
         where: { orderNo: releaseGood.refNo, domain: companyDomain },
-        relations: ['marketplaceStore']
+        relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceOrderShipping']
       })
       const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
       let eTraxOption: boolean
@@ -100,11 +101,6 @@ export async function completePicking(
         await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PACKING)
       }
 
-      marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-        where: { orderNo: releaseGood.refNo },
-        relations: ['marketplaceStore', 'marketplaceOrderItems', 'marketplaceOrderItems.marketplaceOrderShipping']
-      })
-
       if (!marketplaceOrder)
         throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue')
       eTraxOption = marketplaceOrder?.marketplaceStore.eTrax

package/server/graphql/resolvers/worksheet/picking/fetch-and-assign-picking-task.ts

@@ -1,6 +1,7 @@
 import { EntityManager, getRepository } from 'typeorm'
 
 import { User } from '@things-factory/auth-base'
+import { ReleaseGood, OrderInventory } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
@@ -10,69 +11,79 @@ import { pickingWorksheet } from '../picking-worksheet'
 import { activatePicking } from './activate-picking'
 
 export const fetchAndAssignPickingTaskResolver = {
-  async fetchAndAssignPickingTask(_: any, {}, context: any) {
-    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    const assignee: User = await tx.getRepository(User).findOne(user.id, { relations: ['domains'] })
-    if ((assignee?.domains || []).every((userDomain: Domain) => userDomain.id !== domain.id))
-      throw new Error('Target user is not belong to current domain')
+  async fetchAndAssignPickingTask(_: any, { }, context: any) {
+    try {
+      const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+      const assignee: User = await tx.getRepository(User).findOne(user.id, { relations: ['domains'] })
+      if ((assignee?.domains || []).every((userDomain: Domain) => userDomain.id !== domain.id))
+        throw new Error('Target user is not belong to current domain')
 
-    if (!assignee) throw new Error('failed to find target user')
+      if (!assignee) throw new Error('failed to find target user')
 
-    let worksheet: Worksheet
-    worksheet = await tx.getRepository(Worksheet).findOne({
-      relations: ['releaseGood'],
-      where: [
-        {
-          domain,
-          type: WORKSHEET_TYPE.PICKING,
-          status: WORKSHEET_STATUS.EXECUTING,
-          assignee: assignee
-        },
-        {
-          domain,
-          type: WORKSHEET_TYPE.PICKING,
-          status: WORKSHEET_STATUS.DEACTIVATED,
-          assignee: assignee
-        }
-      ],
-      order: {
-        name: 'ASC'
-      }
-    })
+      let worksheet: any
+      let worksheetQb = await tx.getRepository(Worksheet).createQueryBuilder('ws')
+        .select('ws.id')
+        .addSelect('ws.name')
+        .addSelect('ws.status')
+        .addSelect('ws.release_good_id')
+        .where('(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id =:assignee AND (ws.status = :status1 OR ws.status = :status2))', { domain_id: domain.id, type: WORKSHEET_TYPE.PICKING, assignee: assignee.id, status1: WORKSHEET_STATUS.EXECUTING, status2: WORKSHEET_STATUS.DEACTIVATED })
+        .andWhere(qb => {
+          const subQuery = qb
+            .subQuery()
+            .select('COUNT(*) AS totalPS')
+            .from(OrderInventory, 'OrderInventory')
+            .where('OrderInventory.release_good_id = ws.release_good_id')
+            .andWhere(`OrderInventory.status = 'PENDING_SPLIT'`)
+            .groupBy('OrderInventory.release_good_id')
+            .having('COUNT(*) > 0')
+            .getQuery()
+          return 'NOT EXISTS ' + subQuery
+        })
 
-    if (!worksheet) {
-      worksheet = await tx.getRepository(Worksheet).findOne({
-        relations: ['releaseGood'],
-        where: [
-          {
-            domain,
-            type: WORKSHEET_TYPE.PICKING,
-            status: WORKSHEET_STATUS.EXECUTING,
-            assignee: null
-          },
-          {
-            domain,
-            type: WORKSHEET_TYPE.PICKING,
-            status: WORKSHEET_STATUS.DEACTIVATED,
-            assignee: null
-          }
-        ]
-      })
+      worksheet = await worksheetQb.getRawOne();
 
-      await getRepository(Worksheet).update({ id: worksheet.id }, { assignee: assignee })
-    }
+      if (!worksheet) {
+        let worksheetQb = await tx.getRepository(Worksheet).createQueryBuilder('ws')
+          .select('ws.id')
+          .addSelect('ws.name')
+          .addSelect('ws.status')
+          .addSelect('ws.release_good_id')
+          .where('(ws.domain_id = :domain_id AND ws.type = :type AND ws.assignee_id IS NULL AND (ws.status = :status1 OR ws.status = :status2))', { domain_id: domain.id, type: WORKSHEET_TYPE.PICKING, status1: WORKSHEET_STATUS.EXECUTING, status2: WORKSHEET_STATUS.DEACTIVATED })
+          .andWhere(qb => {
+            const subQuery = qb
+              .subQuery()
+              .select('COUNT(*) AS totalPS')
+              .from(OrderInventory, 'OrderInventory')
+              .where('OrderInventory.release_good_id = ws.release_good_id')
+              .andWhere(`OrderInventory.status = 'PENDING_SPLIT'`)
+              .groupBy('OrderInventory.release_good_id')
+              .having('COUNT(*) > 0')
+              .getQuery()
+            return 'NOT EXISTS ' + subQuery
+          })
+
+        worksheet = await worksheetQb.getRawOne();
+
+        if (!worksheet) throw new Error('no suitable worksheet found')
+        await getRepository(Worksheet).update({ id: worksheet.id }, { assignee: assignee })
+      }
 
-    if (worksheet.status == WORKSHEET_STATUS.DEACTIVATED) await activatePicking(tx, domain, user, worksheet.name)
+      if (worksheet.ws_status == WORKSHEET_STATUS.DEACTIVATED) await activatePicking(tx, domain, user, worksheet.ws_name)
 
-    const locationSortingRules: Setting = await tx.getRepository(Setting).findOne({
-      where: { domain, name: 'rule-for-picking-product' }
-    })
+      const locationSortingRules: Setting = await tx.getRepository(Setting).findOne({
+        where: { domain, name: 'rule-for-picking-product' }
+      })
 
-    const sortingRule = JSON.parse(locationSortingRules.value)
-    const locationSortingRule = Object.keys(sortingRule).map(field => {
-      return { name: field, desc: sortingRule[field] === 'DESC' }
-    })
+      const sortingRule = JSON.parse(locationSortingRules.value)
+      const locationSortingRule = Object.keys(sortingRule).map(field => {
+        return { name: field, desc: sortingRule[field] === 'DESC' }
+      })
 
-    return await pickingWorksheet(domain, worksheet.releaseGood.name, locationSortingRule, tx)
+      const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne(worksheet.release_good_id)
+
+      return await pickingWorksheet(domain, releaseGood.name, locationSortingRule, tx)
+    } catch (error) {
+      throw error
+    }
   }
 }

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

@@ -90,6 +90,7 @@ export async function pickingWorksheet(
       startedAt: worksheet.startedAt,
       refNo: releaseGood.refNo,
       refNo2: releaseGood.refNo2,
+      refNo3: releaseGood.refNo3,
       releaseGood
     },
     worksheetDetailInfos: worksheetDetails.map(async (pickingWSD: WorksheetDetail) => {

package/server/graphql/resolvers/worksheet/putaway-returning-worksheet.ts

@@ -1,11 +1,13 @@
-import { Domain } from '@things-factory/shell'
 import { getRepository } from 'typeorm'
+
 import { Bizplace } from '@things-factory/biz-base'
-import { fetchExecutingWorksheet } from '../../../utils'
+import { OrderInventory, ReturnOrder } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
-import { ReturnOrder, OrderInventory } from '@things-factory/sales-base'
+
 import { WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
+import { fetchExecutingWorksheet } from '../../../utils'
 
 export const putawayReturningWorksheetResolver = {
   async putawayReturningWorksheet(_: any, { returnOrderNo }, context: any) {
@@ -32,6 +34,7 @@ export const putawayReturningWorksheetResolver = {
       [
         'bizplace',
         'returnOrder',
+        'bufferLocation',
         'worksheetDetails',
         'worksheetDetails.targetInventory',
         'worksheetDetails.targetInventory.inventory',
@@ -49,7 +52,10 @@ export const putawayReturningWorksheetResolver = {
         bizplaceName: returnOrder.bizplace.name,
         partnerDomainId: customerBizplace?.domain.id,
         customerCompanyDomainId: customerCompanyDomain.id,
+        bufferLocation: worksheet?.bufferLocation.name,
         refNo: returnOrder.refNo,
+        refNo2: returnOrder.refNo2,
+        refNo3: returnOrder.refNo3,
         startedAt: worksheet.startedAt
       },
       worksheetDetailInfos: worksheet.worksheetDetails.map(async (putawayWSD: WorksheetDetail) => {

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

@@ -1,11 +1,13 @@
-import { ArrivalNotice, OrderInventory } from '@things-factory/sales-base'
+import { getRepository } from 'typeorm'
+
 import { Bizplace } from '@things-factory/biz-base'
+import { ArrivalNotice, OrderInventory } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { getRepository } from 'typeorm'
-import { fetchExecutingWorksheet } from '../../../utils'
 import { Inventory } from '@things-factory/warehouse-base'
+
 import { WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
+import { fetchExecutingWorksheet } from '../../../utils'
 
 export const putawayWorksheetResolver = {
   async putawayWorksheet(_: any, { arrivalNoticeNo }, context: any) {
@@ -31,6 +33,7 @@ export const putawayWorksheetResolver = {
       [
         'bizplace',
         'arrivalNotice',
+        'bufferLocation',
         'worksheetDetails',
         'worksheetDetails.targetInventory',
         'worksheetDetails.targetInventory.inventory',
@@ -48,7 +51,10 @@ export const putawayWorksheetResolver = {
         bizplaceName: customerBizplace.name,
         partnerDomainId: customerBizplace?.domain.id,
         customerCompanyDomainId: customerCompanyDomain.id,
+        bufferLocation: worksheet?.bufferLocation.name,
         refNo: arrivalNotice.refNo,
+        refNo2: arrivalNotice.refNo2,
+        refNo3: arrivalNotice.refNo3,
         startedAt: worksheet.startedAt
       },
       worksheetDetailInfos: worksheet.worksheetDetails.map(async (putawayWSD: WorksheetDetail) => {

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

@@ -1,10 +1,12 @@
-import { Domain } from '@things-factory/shell'
 import { getRepository } from 'typeorm'
-import { fetchExecutingWorksheet } from '../../../utils'
-import { Inventory } from '@things-factory/warehouse-base'
+
 import { OrderInventory, ReleaseGood } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
+import { Inventory } from '@things-factory/warehouse-base'
+
 import { WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
+import { fetchExecutingWorksheet } from '../../../utils'
 
 export const returnWorksheetResolver = {
   async returnWorksheet(_: any, { releaseGoodNo }, context: any) {
@@ -41,6 +43,8 @@ export const returnWorksheetResolver = {
         partnerDomainId: worksheet?.bizplace.domain.id,
         customerCompanyDomainId: customerCompanyDomain.id,
         refNo: releaseGood.refNo,
+        refNo2: releaseGood.refNo2,
+        refNo3: releaseGood.refNo3,
         startedAt: worksheet.startedAt
       },
       worksheetDetailInfos: worksheet.worksheetDetails.map((returnWSD: WorksheetDetail) => {

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

@@ -1,6 +1,8 @@
-import { OrderInventory, ORDER_STATUS, ORDER_INVENTORY_STATUS, ReleaseGood } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
 import { getRepository, SelectQueryBuilder } from 'typeorm'
+
+import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
+import { Domain } from '@things-factory/shell'
+
 import { WORKSHEET_TYPE } from '../../../constants'
 import { fetchExecutingBatchWorksheet } from '../../../utils'
 
@@ -55,6 +57,7 @@ export const sortingWorksheetResolver = {
         startedAt: worksheet.startedAt,
         refNo: releaseGood.refNo,
         refNo2: releaseGood.refNo2,
+        refNo3: releaseGood.refNo3,
         releaseGood
       },
       worksheetDetailInfos: items.map((item: any) => {

package/server/graphql/resolvers/worksheet/unloading/index.ts

@@ -1,18 +1,16 @@
 import { activateUnloadingResolver } from './activate-unloading'
-import { unloadResolver } from './unload'
-import { scanProductUnloadResolver } from './scan-product-unload'
-import { undoUnloadingResolver } from './undo-unloading'
-import { undoProductScanUnloadResolver } from './undo-product-scan-unload'
 import { completeProductScanUnloadResolver } from './complete-product-scan-unload'
 import { completeUnloadingResolver } from './complete-unloading'
 import { completeUnloadingPartiallyResolver } from './complete-unloading-partially'
+import { scanProductUnloadResolver } from './scan-product-unload'
+import { undoUnloadingResolver } from './undo-unloading'
+import { unloadResolver } from './unload'
 
 export const Mutations = {
   ...activateUnloadingResolver,
   ...scanProductUnloadResolver,
   ...unloadResolver,
   ...undoUnloadingResolver,
-  ...undoProductScanUnloadResolver,
   ...completeProductScanUnloadResolver,
   ...completeUnloadingResolver,
   ...completeUnloadingPartiallyResolver

package/server/graphql/resolvers/worksheet/unloading/undo-unloading.ts

@@ -1,12 +1,14 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
+
 import { UnloadingWorksheetController } from '../../../../controllers'
 
 export const undoUnloadingResolver = {
-  async undoUnloading(_: any, { worksheetDetailName, palletId }, context: any) {
+  async undoUnloading(_: any, { orderType, orderNo, inventoryIds }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await undoUnloading(tx, domain, user, worksheetDetailName, palletId)
+    await undoUnloading(tx, domain, user, orderType, orderNo, inventoryIds)
   }
 }
 
@@ -14,9 +16,10 @@ async function undoUnloading(
   tx: EntityManager,
   domain: Domain,
   user: User,
-  worksheetDetailName: string,
-  palletId: string
+  orderType: string,
+  orderNo: string,
+  inventoryIds: [string]
 ): Promise<void> {
   const worksheetController: UnloadingWorksheetController = new UnloadingWorksheetController(tx, domain, user)
-  await worksheetController.undoUnload(worksheetDetailName, palletId)
+  await worksheetController.undoUnload(orderType, orderNo, inventoryIds)
 }

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

@@ -1,10 +1,12 @@
-import { ArrivalNotice, OrderProduct } from '@things-factory/sales-base'
+import { getRepository } from 'typeorm'
+
 import { Bizplace } from '@things-factory/biz-base'
+import { ArrivalNotice, OrderProduct } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { getRepository } from 'typeorm'
-import { fetchExecutingWorksheet } from '../../../utils'
+
 import { WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
+import { fetchExecutingWorksheet } from '../../../utils'
 
 export const unloadingWorksheetResolver = {
   async unloadingWorksheet(_: any, { arrivalNoticeNo }, context: any) {
@@ -64,6 +66,8 @@ export const unloadingWorksheetResolver = {
         bufferLocation: worksheet.bufferLocation.name,
         startedAt: worksheet.startedAt,
         refNo: arrivalNotice.refNo,
+        refNo2: arrivalNotice?.refNo2,
+        refNo3: arrivalNotice?.refNo3,
         looseItem: arrivalNotice.looseItem,
         orderVas: vasWorksheet ? vasWorksheet.worksheetDetails : null
       },

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

@@ -18,7 +18,8 @@ interface WorksheetInterface extends Worksheet {
 export const worksheetResolver = {
   async worksheet(_: any, { name }, context: any) {
     const { domain }: { domain: Domain } = context.state
-    const worksheet: WorksheetInterface = (await getRepository(Worksheet).findOne({
+    let worksheet: WorksheetInterface
+    worksheet = (await getRepository(Worksheet).findOne({
       where: {
         domain,
         name
@@ -60,6 +61,33 @@ export const worksheetResolver = {
       ]
     })) as WorksheetInterface
 
+    if (!worksheet) {
+      worksheet = (await getRepository(Worksheet).findOne({
+        where: {
+          domain,
+          arrivalNotice: name
+        },
+        relations: [
+          'domain',
+          'bizplace',
+          'bizplace.domain',
+          'worksheetDetails',
+          'worksheetDetails.targetProduct',
+          'worksheetDetails.targetProduct.product',
+          'worksheetDetails.targetInventory',
+          'worksheetDetails.targetInventory.releaseGood',
+          'worksheetDetails.targetInventory.product',
+          'worksheetDetails.targetInventory.inventory',
+          'worksheetDetails.targetInventory.inventory.product',
+          'worksheetDetails.targetInventory.inventory.warehouse',
+          'worksheetDetails.targetInventory.inventory.location',
+          'worksheetDetails.targetInventory.inspectedLocation',
+          'creator',
+          'updater'
+        ]
+      })) as WorksheetInterface
+    }
+
     let pWorksheetPickingItemSorting = getRepository(Setting).findOne({
       where: { domain, category: 'location', name: 'rule-for-worksheet-release-goods-item' }
     })