@things-factory/worksheet-base 4.3.82 → 4.3.87

package/server/controllers/vas/vas-worksheet-controller.ts

@@ -22,8 +22,7 @@ import {
   InventoryNoGenerator,
   Location,
   LOCATION_TYPE,
-  Warehouse,
-  generateInventoryHistory
+  Warehouse
 } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
@@ -37,6 +36,7 @@ import {
   RefOrderType
 } from '../../graphql/resolvers/worksheet/vas-transactions'
 import { PackingUnits } from '../../graphql/resolvers/worksheet/vas-transactions/interfaces/repackaging'
+import { generateInventoryHistory } from '../../utils'
 import { ReferenceOrderType, WorksheetController } from '../worksheet-controller'
 
 type CompleteTransactionType = (trxMgr: EntityManager, orderVas: OrderVas, user: User) => Promise<void>

package/server/controllers/worksheet-controller.ts

@@ -19,11 +19,11 @@ import {
   VasOrder
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, INVENTORY_STATUS, InventoryItem, Pallet, generateInventoryHistory } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, InventoryItem, Pallet } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
 import { Worksheet, WorksheetDetail } from '../entities'
-import { WorksheetNoGenerator } from '../utils'
+import { generateInventoryHistory, WorksheetNoGenerator } from '../utils'
 
 export type ReferenceOrderType = ArrivalNotice | ReleaseGood | VasOrder | InventoryCheck | DeliveryOrder | ReturnOrder
 export type OrderTargetTypes = OrderProduct | OrderInventory | OrderVas
@@ -393,7 +393,7 @@ export class WorksheetController {
     let existingWorksheet: Worksheet
     try {
       existingWorksheet = await this.findWorksheetByRefOrder(refOrder, type)
-    } catch (e) {}
+    } catch (e) { }
 
     if (existingWorksheet)
       throw new Error(
@@ -1007,9 +1007,11 @@ export class WorksheetController {
   async getChildQty(
     productDetails: ProductDetail[],
     productBarcode: string,
-    orderProductDetail: ProductDetail,
-    scannedProductDetail: ProductDetail
+    orderProductDetail: ProductDetail
   ): Promise<number> {
+    const scannedProductDetail: ProductDetail = productDetails.find(
+      (productDetail: ProductDetail) => productDetail.gtin === productBarcode
+    )
     let hasChildRelation: boolean = Boolean(scannedProductDetail?.childProductDetail)
     let hasMatchingChild: boolean
     let childQty: number
@@ -1052,6 +1054,48 @@ export class WorksheetController {
     return childQty
   }
 
+  public async getDirectQty(
+    productDetail: ProductDetail,
+    productBarcode: string,
+    qty: number
+  ): Promise<any> {
+    try {
+      console.time('getDirectQty')
+      let results = await this.trxMgr.query(`
+        WITH RECURSIVE cte as (
+          select * from (
+            select pd.product_id as "productId", id, pd.packing_size as "packingSize",
+            pd.packing_type as "packingType", pd.uom as "uom", (pd.uom_value * $2::float) as "uomValue", $2::float as "qty", pd.gtin            
+            from product_details pd 
+            where pd.id = $1
+          ) as dt
+          union all
+          select pd.product_id as "productId", pd.id, pd.packing_size as "packingSize",
+          pd.packing_type as "packingType", pd.uom,
+          dt1.qty * pd.packing_size * pd.uom_value as "uomValue", dt1.qty * pd.packing_size as "qty", pd.gtin
+          from product_details pd
+          inner join cte dt1 on dt1.id = pd.child_product_detail_id 
+          where pd.deleted_at is null
+        )
+        select * from cte where gtin = $3
+      `, [
+        productDetail.id,
+        qty,
+        productBarcode
+      ])
+
+      if (results.length <= 0)
+        throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+
+      console.timeEnd('getDirectQty')
+      return results[0]
+    } catch (error) {
+      throw error
+    }
+  }
+
+
+
   /**
    * @summary Check for product child qty at any scanned level
    * @description It will check every level of product detail by comparing scanned level and GAN registered level.

package/server/entities/worksheet-detail.ts

@@ -16,6 +16,11 @@ import { Worksheet } from './worksheet'
   'ix_worksheet-detail_1',
   (worksheetDetail: WorksheetDetail) => [worksheetDetail.targetInventory]
 )
+@Index(
+  'ix_worksheet-detail_2',
+  (worksheetDetail: WorksheetDetail) => [worksheetDetail.id],
+  { unique: true }
+)
 export class WorksheetDetail {
   @PrimaryGeneratedColumn('uuid')
   id: string

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

@@ -32,7 +32,6 @@ export const batchPickingWorksheetResolver = {
       .addSelect('"PROD".name', 'productName')
       .addSelect('"PROD".sku', 'productSku')
       .addSelect('"PROD".description', 'productDescription')
-      .addSelect('"PROD_DET".id', 'productDetailId')
       .addSelect('"INV".qty', 'qty')
       .addSelect('"INV".packing_type', 'packingType')
       .addSelect('"INV".packing_size', 'packingSize')
@@ -48,7 +47,6 @@ export const batchPickingWorksheetResolver = {
       .leftJoin('WSD.targetInventory', 'T_INV')
       .leftJoin('T_INV.inventory', 'INV')
       .leftJoin('T_INV.product', 'PROD')
-      .leftJoin('T_INV.productDetail', 'PROD_DET')
       .leftJoin('T_INV.binLocation', 'BIN_LOC')
       .leftJoin('INV.location', 'LOC')
       .where('"WSD"."worksheet_id" = :worksheetId', { worksheetId: worksheet.id })
@@ -66,7 +64,6 @@ export const batchPickingWorksheetResolver = {
       .addGroupBy('"PROD".name')
       .addGroupBy('"PROD".sku')
       .addGroupBy('"PROD".description')
-      .addGroupBy('"PROD_DET".id')
       .addGroupBy('"T_INV".batch_id')
       .addGroupBy('"T_INV".packing_type')
       .addGroupBy('BIN_LOC.name')
@@ -129,9 +126,6 @@ export const batchPickingWorksheetResolver = {
               name: item?.productName,
               description: item?.productDescription,
               sku: item?.productSku
-            },
-            productDetail: {
-              id: item?.productDetailId
             }
           }
         }

package/server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts

@@ -11,9 +11,10 @@ import {
   ReleaseGood
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location, generateInventoryHistory } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location } from '@things-factory/warehouse-base'
 
 import { Worksheet, WorksheetDetail } from '../../../entities'
+import { generateInventoryHistory } from '../../../utils'
 
 export const confirmCancellationReleaseOrder = {
   async confirmCancellationReleaseOrder(_: any, { name }, context: any) {

package/server/graphql/resolvers/worksheet/cycle-count-adjustment.ts

@@ -4,12 +4,12 @@ import { User } from '@things-factory/auth-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { InventoryCheck, ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location, generateInventoryHistory } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { SellercraftController } from '../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../entities'
-import { switchLocationStatus } from '../../../utils'
+import { generateInventoryHistory, switchLocationStatus } from '../../../utils'
 
 export const cycleCountAdjustmentResolver = {
   async cycleCountAdjustment(_: any, { cycleCountNo }, context: any) {

package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts

@@ -40,7 +40,6 @@ export const inventoriesByPalletResolver = {
     qb.leftJoinAndSelect('iv.domain', 'domain')
       .leftJoinAndSelect('iv.bizplace', 'bizplace')
       .leftJoinAndSelect('iv.product', 'product')
-      .leftJoinAndSelect('iv.productDetail', 'productDetail')
       .leftJoinAndSelect('iv.warehouse', 'warehouse')
       .leftJoinAndSelect('iv.location', 'location')
       .leftJoinAndSelect('iv.creator', 'creator')
@@ -135,8 +134,7 @@ export const inventoriesByPalletResolver = {
           productName: item.product.name,
           productSKU: item.product.sku,
           productBrand: item.product.brand,
-          productId: item.product.id,
-          productDetailId: item.productDetail.id
+          productId: item.product.id
         }
       })
     )

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

@@ -1,6 +1,6 @@
 import { EntityManager } from 'typeorm'
 
-import { ApplicationType, User } from '@things-factory/auth-base'
+import { User } from '@things-factory/auth-base'
 import { Bizplace, Company } from '@things-factory/biz-base'
 import { FulfillmentCenter } from '@things-factory/integration-fulfillment'
 import { Sftp, SftpAPI } from '@things-factory/integration-sftp'
@@ -58,86 +58,42 @@ export async function completeLoading(
   const warehouseCompanyBizplaces: Bizplace[] = warehouseBizplaces.filter(biz => biz.domain.extType == 'company')
   const warehouseCompanyDomain: Domain = warehouseCompanyBizplaces[0].domain
 
-  const orderSource: string = releaseGood.source
-  switch (orderSource) {
-    case ApplicationType.SFTP:
-      const customerDomain: Domain = releaseGood.bizplace.domain
-      const fulfillmentCenter: FulfillmentCenter = await tx
-        .getRepository(FulfillmentCenter)
-        .findOne({ domain: warehouseCompanyDomain, centerId: domain.subdomain, status: 'active' })
-
-      if (fulfillmentCenter) {
-        let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
-          where: { domain: customerDomain, status: 'ACTIVE', fulfillmentCenter }
+  const customerDomain: Domain = releaseGood.bizplace.domain
+  const fulfillmentCenter: FulfillmentCenter = await tx
+    .getRepository(FulfillmentCenter)
+    .findOne({ domain: warehouseCompanyDomain, centerId: domain.subdomain, status: 'active' })
+
+  if (fulfillmentCenter) {
+    let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
+      where: { domain: customerDomain, status: 'ACTIVE', fulfillmentCenter }
+    })
+    if (customerAvailableSftp) {
+      const responseFileTypes: any = JSON.parse(customerAvailableSftp.responseFileTypes)
+
+      let inventoryItems: InventoryItem[] = await tx.getRepository(InventoryItem).find({
+        where: { domain, outboundOrderId: releaseGood.id }
+      })
+
+      // if (responseFileTypes.enableShipment) {
+      //   let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
+      //     releaseGood,
+      //     orderInventories: targetInventories,
+      //     sftp: customerAvailableSftp
+      //   })
+      //   customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
+      // }
+
+      if (responseFileTypes.enableSerialNumber) {
+        let snResult: Sftp = await SftpAPI.createSerialNumber(customerAvailableSftp, {
+          releaseGood,
+          inventoryItems,
+          sftp: customerAvailableSftp
         })
-        if (customerAvailableSftp) {
-          const responseFileTypes: any = JSON.parse(customerAvailableSftp.responseFileTypes)
-
-          let inventoryItems: InventoryItem[] = await tx.getRepository(InventoryItem).find({
-            where: { domain, outboundOrderId: releaseGood.id }
-          })
-
-          // if (responseFileTypes.enableShipment) {
-          //   let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
-          //     releaseGood,
-          //     orderInventories: targetInventories,
-          //     sftp: customerAvailableSftp
-          //   })
-          //   customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
-          // }
-
-          if (responseFileTypes.enableSerialNumber) {
-            let snResult: Sftp = await SftpAPI.createSerialNumber(customerAvailableSftp, {
-              releaseGood,
-              inventoryItems,
-              sftp: customerAvailableSftp
-            })
-            customerAvailableSftp = await tx.getRepository(Sftp).save(snResult)
-          }
-        }
+        customerAvailableSftp = await tx.getRepository(Sftp).save(snResult)
       }
-      break
-
-    default:
-      break
+    }
   }
 
-  // const customerDomain: Domain = releaseGood.bizplace.domain
-  // const fulfillmentCenter: FulfillmentCenter = await tx
-  //   .getRepository(FulfillmentCenter)
-  //   .findOne({ domain: warehouseCompanyDomain, centerId: domain.subdomain, status: 'active' })
-
-  // if (fulfillmentCenter) {
-  //   let customerAvailableSftp: Sftp = await tx.getRepository(Sftp).findOne({
-  //     where: { domain: customerDomain, status: 'ACTIVE', fulfillmentCenter }
-  //   })
-  //   if (customerAvailableSftp) {
-  //     const responseFileTypes: any = JSON.parse(customerAvailableSftp.responseFileTypes)
-
-  //     let inventoryItems: InventoryItem[] = await tx.getRepository(InventoryItem).find({
-  //       where: { domain, outboundOrderId: releaseGood.id }
-  //     })
-
-  //     // if (responseFileTypes.enableShipment) {
-  //     //   let shipmentResult: Sftp = await SftpAPI.createShipment(customerAvailableSftp, {
-  //     //     releaseGood,
-  //     //     orderInventories: targetInventories,
-  //     //     sftp: customerAvailableSftp
-  //     //   })
-  //     //   customerAvailableSftp = await tx.getRepository(Sftp).save(shipmentResult)
-  //     // }
-
-  //     if (responseFileTypes.enableSerialNumber) {
-  //       let snResult: Sftp = await SftpAPI.createSerialNumber(customerAvailableSftp, {
-  //         releaseGood,
-  //         inventoryItems,
-  //         sftp: customerAvailableSftp
-  //       })
-  //       customerAvailableSftp = await tx.getRepository(Sftp).save(snResult)
-  //     }
-  //   }
-  // }
-
   await worksheetController.completeLoading(releaseGoodNo)
 
   if (remainInventories.length) {

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

@@ -1,6 +1,6 @@
 import { EntityManager, getManager } from 'typeorm'
 
-import { ApplicationType, User } from '@things-factory/auth-base'
+import { User } from '@things-factory/auth-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
@@ -38,32 +38,15 @@ export async function activatePacking(
   const worksheet = await worksheetController.activatePacking(worksheetNo)
   let releaseGood: ReleaseGood = worksheet.releaseGood
 
-  const orderSource: string = releaseGood.source
-  switch (orderSource) {
-    case ApplicationType.SELLERCRAFT:
-      const sellercraft: Sellercraft = await tx
-        .getRepository(Sellercraft)
-        .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
+  if (releaseGood.type == 'b2c') {
+    const sellercraft: Sellercraft = await tx
+      .getRepository(Sellercraft)
+      .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
 
-      if (sellercraft) {
-        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-        sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
-      }
-      break
-
-    default:
-      break
+    if (sellercraft) {
+      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+      sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
+    }
   }
-
-  // if (releaseGood.type == 'b2c') {
-  //   const sellercraft: Sellercraft = await tx
-  //     .getRepository(Sellercraft)
-  //     .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
-
-  //   if (sellercraft) {
-  //     const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-  //     sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
-  //   }
-  // }
   return worksheet
 }

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

@@ -1,8 +1,9 @@
 import { EntityManager } from 'typeorm'
 
-import { ApplicationType, User } from '@things-factory/auth-base'
+import { User } from '@things-factory/auth-base'
 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 { ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
@@ -28,9 +29,12 @@ export const completePackingResolver = {
       ]
     })
 
-    const orderSource: string = releaseGood.source
-    switch (orderSource) {
-      case ApplicationType.MMS:
+    if (releaseGood.type === 'b2c') {
+      const sellercraft: Sellercraft = await tx
+        .getRepository(Sellercraft)
+        .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+      if (!sellercraft) {
         const companyDomain: Domain = releaseGood.bizplace.company.domain
         const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
           where: { orderNo: releaseGood.refNo, domain: companyDomain },
@@ -48,38 +52,9 @@ export const completePackingResolver = {
           const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
           await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain)
         }
-        break
-
-      default:
-        break
+      }
     }
 
-    // if (releaseGood.type === 'b2c') {
-    //   const sellercraft: Sellercraft = await tx
-    //     .getRepository(Sellercraft)
-    //     .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
-
-    //   if (!sellercraft) {
-    //     const companyDomain: Domain = releaseGood.bizplace.company.domain
-    //     const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-    //       where: { orderNo: releaseGood.refNo, domain: companyDomain },
-    //       relations: [
-    //         'marketplaceOrderItems',
-    //         'marketplaceOrderItems.marketplaceOrderShippingItems',
-    //         'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping',
-    //         'marketplaceStore',
-    //         'marketplaceStore.marketplaceDistributors'
-    //       ]
-    //     })
-    //     const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
-
-    //     if (marketplaceStore.isAutoUpdateShipment) {
-    //       const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-    //       await ecommerceCtrl.createOrderShip(releaseGood, marketplaceStore, marketplaceOrder, companyDomain)
-    //     }
-    //   }
-    // }
-
     const bizplace: Bizplace = await getMyBizplace(domain, user)
     const worksheetController: WorksheetController = new WorksheetController(tx, domain, user)
     await worksheetController.notifyToCustomer(bizplace, {

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

@@ -1,6 +1,6 @@
 import { EntityManager } from 'typeorm'
 
-import { ApplicationType, User } from '@things-factory/auth-base'
+import { User } from '@things-factory/auth-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
@@ -29,31 +29,14 @@ export async function packing(
   let releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
   const worksheet: Worksheet = worksheetDetail.worksheet
 
-  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 })
+  if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
+    const sellercraft: Sellercraft = await tx
+      .getRepository(Sellercraft)
+      .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
 
-      if (sellercraft) {
-        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-        await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
-      }
-      break
-
-    default:
-      break
+    if (sellercraft) {
+      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+      await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
+    }
   }
-
-  // if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
-  //   const sellercraft: Sellercraft = await tx
-  //     .getRepository(Sellercraft)
-  //     .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
-
-  //   if (sellercraft) {
-  //     const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-  //     await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
-  //   }
-  // }
 }

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

@@ -1,6 +1,6 @@
 import { EntityManager } from 'typeorm'
 
-import { ApplicationType, User } from '@things-factory/auth-base'
+import { User } from '@things-factory/auth-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
@@ -34,36 +34,17 @@ export async function scanProductPacking(
     let releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
     const worksheet: Worksheet = worksheetDetail.worksheet
 
-    const orderSource: string = releaseGood.source
-    switch (orderSource) {
-      case ApplicationType.SELLERCRAFT:
-        if (!releaseGood?.airwayBill) {
-          const sellercraft: Sellercraft = await tx
-            .getRepository(Sellercraft)
-            .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
+    if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
+      const sellercraft: Sellercraft = await tx
+        .getRepository(Sellercraft)
+        .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
 
-          if (sellercraft) {
-            const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-            sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
-          }
-        }
-
-        break
-
-      default:
-        break
+      if (sellercraft) {
+        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+        sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
+      }
     }
 
-    // if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
-    //   const sellercraft: Sellercraft = await tx
-    //     .getRepository(Sellercraft)
-    //     .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
-
-    //   if (sellercraft) {
-    //     const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-    //     sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
-    //   }
-    // }
   } catch (error) {
     throw error
   }

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

@@ -1,6 +1,6 @@
-import { EntityManager, getManager, SelectQueryBuilder } from 'typeorm'
+import { EntityManager, SelectQueryBuilder, getManager } from 'typeorm'
 
-import { ApplicationType, User } from '@things-factory/auth-base'
+import { User } from '@things-factory/auth-base'
 import { logger } from '@things-factory/env'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import {
@@ -10,7 +10,6 @@ import {
   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 { Domain } from '@things-factory/shell'
 import { Inventory, Location } from '@things-factory/warehouse-base'
 
@@ -18,6 +17,7 @@ import { WORKSHEET_TYPE } from '../../../constants'
 import { PackingWorksheetController, SellercraftController } from '../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 import { fetchExecutingWorksheet } from '../../../utils'
+import { PartnerSetting, Setting } from '@things-factory/setting-base'
 
 export const packingWorksheetResolver = {
   async packingWorksheet(_: any, { releaseGoodNo }, context: any) {
@@ -146,20 +146,16 @@ 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({
-            domain: worksheet.bizplace.domain,
-            status: SellercraftStatus.ACTIVE
-          })
-
-          if (sellercraft) {
-            getSellercraftDocument(sellercraft, releaseGood, domain, user)
-          }
-          break
+      if (releaseGood.type === 'b2c') {
+        const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
+          domain: worksheet.bizplace.domain,
+          status: SellercraftStatus.ACTIVE
+        })
 
-        case ApplicationType.MMS:
+        if (sellercraft) {
+          // asynchronously get document from sellercraft
+          getSellercraftDocument(sellercraft, releaseGood, domain, user)
+        } else {
           marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
             where: { orderNo: releaseGood.refNo },
             relations: [
@@ -195,60 +191,9 @@ export const packingWorksheetResolver = {
 
           marketplaceStore = marketplaceOrder?.marketplaceStore
           marketplaceStatus = marketplaceOrder?.status
-          break
-
-        default:
-          break
+        }
       }
 
-      // if (releaseGood.type === 'b2c') {
-      //   const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
-      //     domain: worksheet.bizplace.domain,
-      //     status: SellercraftStatus.ACTIVE
-      //   })
-
-      //   if (sellercraft) {
-      //     // asynchronously get document from sellercraft
-      //     getSellercraftDocument(sellercraft, releaseGood, domain, user)
-      //   } else {
-      //     marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-      //       where: { orderNo: releaseGood.refNo },
-      //       relations: [
-      //         'domain',
-      //         'marketplaceStore',
-      //         'marketplaceOrderItems',
-      //         'marketplaceOrderItems.marketplaceOrderShippingItems',
-      //         'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
-      //       ]
-      //     })
-
-      //     if (!marketplaceOrder) {
-      //       throw new Error('Failed to retrieve ecommerce information, kindly contact our support team for this issue.')
-      //     }
-
-      //     let marketplaceOrderShipping: MarketplaceOrderShipping
-      //     if (marketplaceOrder.isSplitted) {
-      //       marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
-      //         where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
-      //       })
-      //     } else {
-      //       marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
-      //         where: { orderNoRef: worksheet.releaseGood.refNo }
-      //       })
-      //     }
-
-      //     trackingNo = marketplaceOrderShipping.ownTrackingNo
-      //       ? marketplaceOrderShipping.ownTrackingNo
-      //       : marketplaceOrderShipping.trackingNo
-      //     shippingProvider = marketplaceOrderShipping.ownTransporter
-      //       ? marketplaceOrderShipping.ownTransporter
-      //       : marketplaceOrderShipping.transporter
-
-      //     marketplaceStore = marketplaceOrder?.marketplaceStore
-      //     marketplaceStatus = marketplaceOrder?.status
-      //   }
-      // }
-
       return {
         worksheetInfo: {
           releaseGood,