@things-factory/worksheet-base 4.0.22 → 4.0.26

package/server/controllers/inbound/unloading-worksheet-controller.ts

@@ -508,170 +508,148 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     )
   }
 
-  async undoUnload(worksheetDetailName: string, palletId: string): Promise<void> {
-    const worksheetDetail: WorksheetDetail = await this.findWorksheetDetailByName(worksheetDetailName, [
-      'targetProduct',
-      'targetInventory',
-      'worksheet',
-      'worksheet.arrivalNotice',
-      'worksheet.returnOrder'
-    ])
-    this.checkRecordValidity(worksheetDetail, {
-      status: (status: string) => {
-        const availableStatus: string[] = [WORKSHEET_STATUS.EXECUTING, WORKSHEET_STATUS.PARTIALLY_UNLOADED]
-        if (availableStatus.indexOf(status) < 0) {
-          throw new Error(
-            this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('status', 'Executing or Partially Unloaded', status)
-          )
-        }
-        return true
-      }
-    })
-
-    const worksheet: Worksheet = worksheetDetail.worksheet
-
-    let arrivalNotice: ArrivalNotice
-    let returnOrder: ReturnOrder
-    if (worksheet?.arrivalNotice) arrivalNotice = worksheet.arrivalNotice
-    else if (worksheet?.returnOrder) returnOrder = worksheet.returnOrder
-
-    let inventory: Inventory = await this.trxMgr.getRepository(Inventory).findOne({
-      where: { domain: this.domain, status: INVENTORY_STATUS.UNLOADED, palletId },
-      relations: ['location']
-    })
-
-    const qty: number = inventory.qty
-
-    if (arrivalNotice) {
-      let targetProduct: OrderProduct = worksheetDetail.targetProduct
-      targetProduct.actualPackQty -= qty
-      targetProduct.actualPalletQty--
-      targetProduct.remark = null
-      targetProduct.issue = null
-      targetProduct.status = ORDER_PRODUCT_STATUS.UNLOADING
-      targetProduct.updater = this.user
-      await this.updateOrderTargets([targetProduct])
-    } else if (returnOrder) {
-      let targetInventory: OrderInventory = worksheetDetail.targetInventory
-      targetInventory.actualPackQty -= qty
-      targetInventory.actualPalletQty--
-      targetInventory.status = ORDER_PRODUCT_STATUS.UNLOADING
-      targetInventory.updater = this.user
-      await this.updateOrderTargets([targetInventory])
-    }
-
-    worksheetDetail.issue = null
-    worksheetDetail.status = WORKSHEET_STATUS.EXECUTING
-    worksheetDetail.updater = this.user
-    await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
-
-    inventory.lastSeq++
-    inventory.status = INVENTORY_STATUS.DELETED
-    inventory = await this.transactionInventory(
-      inventory,
-      Boolean(arrivalNotice) ? arrivalNotice : returnOrder,
-      -inventory.qty,
-      -inventory.uomValue,
-      INVENTORY_TRANSACTION_TYPE.UNDO_UNLOADING
-    )
-    inventory.qty = 0
-    inventory.uomValue = 0
-    inventory.updater = this.user
-
-    await this.trxMgr.getRepository(InventoryHistory).update({ inventory }, { inventory: null })
-
-    await this.trxMgr.getRepository(Inventory).delete({ id: inventory.id })
-  }
+  async undoUnload(orderType: string, orderNo: string, inventoryIds: [string]): Promise<void> {
+    for (var i = 0; i < inventoryIds.length; i++) {
+      const inventoryId: string = inventoryIds[i]
+      let inventory: Inventory = await this.trxMgr.getRepository(Inventory).findOne({
+        where: { domain: this.domain, id: inventoryId },
+        relations: ['location', 'product']
+      })
 
-  async undoProductScanUnload(worksheetDetailName: string, palletId: string, cartonId: string): Promise<void> {
-    const worksheetDetail: WorksheetDetail = await this.findWorksheetDetailByName(worksheetDetailName, [
-      'targetProduct',
-      'targetInventory',
-      'bizplace',
-      'targetProduct.product',
-      'targetInventory.product',
-      'worksheet',
-      'worksheet.arrivalNotice',
-      'worksheet.returnOrder'
-    ])
-    this.checkRecordValidity(worksheetDetail, {
-      status: (status: string) => {
-        const availableStatus: string[] = [WORKSHEET_STATUS.EXECUTING, WORKSHEET_STATUS.PARTIALLY_UNLOADED]
-        if (availableStatus.indexOf(status) < 0) {
-          throw new Error(
-            this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('status', 'Executing or Partially Unloaded', status)
-          )
+      this.checkRecordValidity(inventory, {
+        status: (status: string) => {
+          const availableStatus: string[] = [INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED]
+          if (availableStatus.indexOf(status) < 0) {
+            throw new Error(
+              this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE(
+                'status',
+                'Inventory current status unable to undo',
+                status
+              )
+            )
+          }
+          return true
         }
-        return true
-      }
-    })
+      })
 
-    let targetProduct: OrderProduct = worksheetDetail.targetProduct
-    let targetInventory: OrderInventory = worksheetDetail.targetInventory
-    const bizplace: Bizplace = worksheetDetail.bizplace
-    const arrivalNotice: ArrivalNotice = worksheetDetail.worksheet.arrivalNotice
-    const returnOrder: ReturnOrder = worksheetDetail.worksheet.returnOrder
-    const product: Product = Boolean(arrivalNotice) ? targetProduct.product : targetInventory.product
-    const packingType: string = Boolean(arrivalNotice) ? targetProduct.packingType : targetInventory.packingType
-    const packingSize: number = Boolean(arrivalNotice) ? targetProduct.packingSize : targetInventory.packingSize
-    const batchId: string = Boolean(arrivalNotice) ? targetProduct.batchId : targetInventory.batchId
+      const qty: number = inventory.qty
+
+      let targetProduct: OrderProduct
+      let targetInventory: OrderInventory
+      let arrivalNotice: ArrivalNotice
+      let returnOrder: ReturnOrder
+      let worksheetDetail: WorksheetDetail
+
+      if (orderType === ORDER_TYPES.ARRIVAL_NOTICE) {
+        arrivalNotice = await this.trxMgr.getRepository(ArrivalNotice).findOne({
+          where: { domain: this.domain, name: orderNo },
+          relations: ['orderProducts', 'orderProducts.product']
+        })
+
+        targetProduct = arrivalNotice.orderProducts.find(
+          op =>
+            op.batchId == inventory.batchId &&
+            op.packingType == inventory.packingType &&
+            op.product.id === inventory.product.id
+        )
 
-    const invQb: SelectQueryBuilder<Inventory> = await this.trxMgr
-      .getRepository(Inventory)
-      .createQueryBuilder('INV')
-      .where('INV.domain_id = :domainId', { domainId: this.domain.id })
-      .andWhere('INV.bizplace_id = :bizplaceId', { bizplaceId: bizplace.id })
-      .andWhere('INV.product_id = :productId', { productId: product.id })
-      .andWhere('INV.batch_id = :batchId', { batchId: batchId })
-      .andWhere('INV.packing_type = :packingType', { packingType: packingType })
-      .andWhere('INV.packing_size = :packingSize', { packingSize: packingSize })
+        if (inventory.status == INVENTORY_STATUS.UNLOADED) {
+          targetProduct.actualPackQty -= qty
+          targetProduct.actualPalletQty--
+          targetProduct.remark = null
+          targetProduct.issue = null
+          targetProduct.status = ORDER_PRODUCT_STATUS.UNLOADING
+        } else {
+          targetProduct.actualPackQty--
+        }
+        targetProduct.updater = this.user
+        await this.updateOrderTargets([targetProduct])
 
-    if (arrivalNotice) invQb.andWhere('INV.ref_order_id = :arrivalNoticeId', { arrivalNoticeId: arrivalNotice.id })
-    else if (returnOrder) invQb.andWhere('INV.ref_order_id = :returnOrderId', { returnOrderId: returnOrder.id })
+        worksheetDetail = await this.trxMgr
+          .getRepository(WorksheetDetail)
+          .findOne({ where: { domain: this.domain, targetProduct } })
+      } else {
+        returnOrder = await this.trxMgr.getRepository(ReturnOrder).findOne({
+          where: { domain: this.domain, name: orderNo },
+          relations: ['orderInventories', 'orderInventories.inventory', 'orderInventories.product']
+        })
+
+        targetInventory = returnOrder.orderInventories.find(
+          oi =>
+            oi.batchId == inventory.batchId &&
+            oi.packingType == inventory.packingType &&
+            oi.product.id == inventory.product.id &&
+            oi.inventory.id == inventory.id
+        )
+        if (inventory.status == INVENTORY_STATUS.UNLOADED) {
+          targetInventory.actualPackQty -= qty
+          targetInventory.actualPalletQty--
+          targetInventory.status = ORDER_PRODUCT_STATUS.UNLOADING
+        } else {
+          targetInventory.actualPackQty--
+        }
+        targetInventory.updater = this.user
+        await this.updateOrderTargets([targetInventory])
 
-    if (cartonId) invQb.andWhere('INV.carton_id = :cartonId', { cartonId: cartonId })
-    else invQb.andWhere('INV.pallet_id = :palletId', { palletId: palletId })
+        worksheetDetail = await this.trxMgr
+          .getRepository(WorksheetDetail)
+          .findOne({ where: { domain: this.domain, targetInventory } })
+      }
 
-    let foundInventory: Inventory = await invQb.getOne()
-    if (!foundInventory) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(foundInventory.palletId))
+      if (inventory.status == INVENTORY_STATUS.CHECKED) {
+        inventory.qty--
+        inventory.uomValue =
+          Math.round(
+            inventory.qty *
+              (Boolean(orderType === ORDER_TYPES.ARRIVAL_NOTICE)
+                ? targetProduct.uomValue
+                : targetInventory.returnUomValue) *
+              100
+          ) / 100
+        inventory.updater = this.user
+        await this.trxMgr.getRepository(Inventory).save(inventory)
+
+        if (inventory == 0) {
+          inventory.lastSeq++
+          inventory.status = INVENTORY_STATUS.DELETED
+          inventory = await this.transactionInventory(
+            inventory,
+            Boolean(orderType === ORDER_TYPES.ARRIVAL_NOTICE) ? arrivalNotice : returnOrder,
+            -inventory.qty,
+            -inventory.uomValue,
+            INVENTORY_TRANSACTION_TYPE.UNDO_UNLOADING
+          )
+          inventory.qty = 0
+          inventory.uomValue = 0
+          inventory.updater = this.user
 
-    if (arrivalNotice) {
-      targetProduct.actualPackQty--
-      targetProduct.status = ORDER_PRODUCT_STATUS.UNLOADING
-      targetProduct.updater = this.user
-    } else if (returnOrder) {
-      targetInventory.actualPackQty--
-      targetInventory.status = ORDER_PRODUCT_STATUS.UNLOADING
-      targetInventory.updater = this.user
-    }
+          await this.trxMgr.getRepository(InventoryHistory).update({ inventory }, { inventory: null })
 
-    foundInventory.qty--
-    foundInventory.uomValue =
-      Math.round(
-        foundInventory.qty * (Boolean(arrivalNotice) ? targetProduct.uomValue : targetInventory.returnUomValue) * 100
-      ) / 100
-    foundInventory.updater = this.user
+          await this.trxMgr.getRepository(Inventory).delete({ id: inventory.id })
+        }
+      } else {
+        inventory.lastSeq++
+        inventory.status = INVENTORY_STATUS.DELETED
+        inventory = await this.transactionInventory(
+          inventory,
+          Boolean(orderType === ORDER_TYPES.ARRIVAL_NOTICE) ? arrivalNotice : returnOrder,
+          -inventory.qty,
+          -inventory.uomValue,
+          INVENTORY_TRANSACTION_TYPE.UNDO_UNLOADING
+        )
+        inventory.qty = 0
+        inventory.uomValue = 0
+        inventory.updater = this.user
 
-    worksheetDetail.issue = foundInventory.qty == 0 && worksheetDetail.issue ? null : worksheetDetail.issue
-    worksheetDetail.status = WORKSHEET_STATUS.EXECUTING
-    worksheetDetail.updater = this.user
-    await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
+        await this.trxMgr.getRepository(InventoryHistory).update({ inventory }, { inventory: null })
 
-    if (foundInventory.qty == 0) {
-      if (arrivalNotice) {
-        targetProduct.actualPalletQty--
-        targetProduct.issue = null
-        targetProduct.remark = null
-        await this.updateOrderTargets([targetProduct])
-      } else if (returnOrder) {
-        targetInventory.actualPalletQty--
-        await this.updateOrderTargets([targetInventory])
+        await this.trxMgr.getRepository(Inventory).delete({ id: inventory.id })
       }
-      await this.trxMgr.getRepository(Inventory).delete({ id: foundInventory.id })
-    } else {
-      if (arrivalNotice) await this.updateOrderTargets([targetProduct])
-      else if (returnOrder) await this.updateOrderTargets([targetInventory])
-      await this.trxMgr.getRepository(Inventory).save(foundInventory)
+
+      worksheetDetail.issue = inventory.qty == 0 && worksheetDetail?.issue ? null : worksheetDetail.issue
+      worksheetDetail.status = WORKSHEET_STATUS.EXECUTING
+      worksheetDetail.updater = this.user
+      await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
     }
   }
 

package/server/controllers/outbound/packing-worksheet-controller.ts

@@ -12,12 +12,11 @@ export class PackingWorksheetController extends VasWorksheetController {
       ReleaseGood,
       {
         domain: this.domain,
-        name: releaseGoodNo,
-        status: ORDER_STATUS.READY_TO_PACK
+        name: releaseGoodNo
       },
       ['orderInventories', 'orderInventories.inventory']
     )
-    const orderInventories: OrderInventory[] = releaseGood.orderInventories
+    let orderInventories: OrderInventory[] = releaseGood.orderInventories
 
     const existingPackingWorksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
       where: { domain: this.domain, releaseGood, type: WORKSHEET_TYPE.PACKING, status: WORKSHEET_STATUS.DEACTIVATED }
@@ -40,10 +39,6 @@ export class PackingWorksheetController extends VasWorksheetController {
     })
     await this.updateOrderTargets(orderInventories)
 
-    releaseGood.status = ORDER_STATUS.READY_TO_PACK
-    releaseGood.updater = this.user
-    await this.updateRefOrder(releaseGood)
-
     return worksheet
   }
 

package/server/controllers/outbound/picking-worksheet-controller.ts

@@ -823,16 +823,16 @@ export class PickingWorksheetController extends VasWorksheetController {
       status: ORDER_STATUS.PICKING
     })
 
-    const worksheet: Worksheet = await this.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.PICKING, [
+    let worksheet: Worksheet = await this.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.PICKING, [
       'worksheetDetails',
       'worksheetDetails.targetInventory'
     ])
-    this.checkRecordValidity(worksheet, { status: WORKSHEET_STATUS.EXECUTING })
+    await this.checkRecordValidity(worksheet, { status: WORKSHEET_STATUS.EXECUTING })
 
     let orderStatus: string
     if (releaseGood?.packingOption) {
       orderStatus = ORDER_STATUS.READY_TO_PACK
-    } else if (!releaseGood?.courierOption && !releaseGood?.packingOption) {
+    } else {
       orderStatus = ORDER_STATUS.LOADING
     }
 
@@ -933,7 +933,7 @@ export class PickingWorksheetController extends VasWorksheetController {
         name: 'enable-bin-picking'
       }
     })
-    if (binPickingSetting?.value && binPickingSetting.value.toLowerCase() === 'true') {
+    if (binPickingSetting != undefined && binPickingSetting.value.toLowerCase() == 'true') {
       if (binLocation) {
         const foundBinLocation: Location = await this.trxMgr.getRepository(Location).findOne({
           where: { domain: this.domain, name: binLocation, type: LOCATION_TYPE.BIN }

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

@@ -1,14 +1,16 @@
+import FormData from 'form-data'
+import fetch from 'node-fetch'
+import { Equal, getRepository, In } 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 { DeliveryOrder, OrderInventory, ORDER_STATUS, ReleaseGood } from '@things-factory/sales-base'
+import { ProductDetail } from '@things-factory/product-base'
+import { DeliveryOrder, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Product, ProductDetail } from '@things-factory/product-base'
 import { Inventory, Pallet } from '@things-factory/warehouse-base'
-import FormData from 'form-data'
-import fetch from 'node-fetch'
-import { Equal, getRepository, In } from 'typeorm'
+
 import { TEMPLATE_TYPE, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
 import { Worksheet, WorksheetDetail } from '../entities'
 

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/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