@things-factory/worksheet-base 4.0.0-alpha.6 → 4.0.0-beta.0

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

@@ -1,9 +1,13 @@
+import { EntityManager, In } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
-import { InventoryCheck, OrderInventory, ORDER_INVENTORY_STATUS, ORDER_STATUS } from '@things-factory/sales-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 } from '@things-factory/warehouse-base'
-import { EntityManager, In } from 'typeorm'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
+import { SellercraftController } from '../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 import { generateInventoryHistory, switchLocationStatus } from '../../../utils'
 
@@ -48,6 +52,11 @@ export async function cycleCountAdjustment(
     relations: [
       'targetInventory',
       'targetInventory.inventory',
+      'targetInventory.inventory.product',
+      'targetInventory.inventory.product.productDetails',
+      'targetInventory.inventory.product.productDetails.childProductDetail',
+      'targetInventory.inventory.bizplace',
+      'targetInventory.inventory.bizplace.domain',
       'targetInventory.inventory.location',
       'targetInventory.inspectedLocation',
       'targetInventory.inspectedLocation.warehouse'
@@ -61,6 +70,10 @@ export async function cycleCountAdjustment(
     const transactQty: number = targetInventory.inspectedQty - inventory.qty
     const transactUomValue: number = targetInventory.inspectedUomValue - inventory.uomValue
 
+    const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
+      where: { domain: inventory.bizplace.domain, status: SellercraftStatus.ACTIVE }
+    })
+
     if (targetInventory.status === ORDER_INVENTORY_STATUS.MISSING) {
       // create STORED, CC_ADJUSTMENT history
       await generateInventoryHistory(
@@ -83,6 +96,11 @@ export async function cycleCountAdjustment(
 
       // create TERMINATED, TERMINATED history
       await generateInventoryHistory(inventory, cycleCount, INVENTORY_TRANSACTION_TYPE.TERMINATED, 0, 0, user, tx)
+
+      if (sellercraft) {
+        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+        await sellercraftCtrl.updateSellercraftStock(sellercraft, inventory)
+      }
     } else if (targetInventory.inspectedQty == 0) {
       // create STORED, CC_ADJUSTMENT history
       await generateInventoryHistory(
@@ -109,6 +127,11 @@ export async function cycleCountAdjustment(
 
       // create TERMINATED, TERMINATED history
       await generateInventoryHistory(inventory, cycleCount, INVENTORY_TRANSACTION_TYPE.TERMINATED, 0, 0, user, tx)
+
+      if (sellercraft) {
+        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+        await sellercraftCtrl.updateSellercraftStock(sellercraft, inventory)
+      }
     } else {
       const prevLocationId: string = inventory.location.id
 
@@ -153,6 +176,11 @@ export async function cycleCountAdjustment(
       )
     }
 
+    if (sellercraft) {
+      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+      await sellercraftCtrl.updateSellercraftStock(sellercraft, inventory)
+    }
+
     targetInventory.status = ORDER_INVENTORY_STATUS.TERMINATED
     targetInventory.updater = user
     await tx.getRepository(OrderInventory).save(targetInventory)

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

@@ -1,7 +1,9 @@
+import { createQueryBuilder, getRepository, In, SelectQueryBuilder } from 'typeorm'
+
+import { InventoryCheck, ORDER_STATUS, OrderInventory } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { getRepository, createQueryBuilder, SelectQueryBuilder, In } from 'typeorm'
 import { Inventory } from '@things-factory/warehouse-base'
-import { OrderInventory, ORDER_STATUS, InventoryCheck } from '@things-factory/sales-base'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 
@@ -21,7 +23,7 @@ export const cycleCountWorksheetResolver = {
         type: In([WORKSHEET_TYPE.CYCLE_COUNT, WORKSHEET_TYPE.CYCLE_COUNT_RECHECK]),
         status: WORKSHEET_STATUS.EXECUTING
       },
-      relations: ['bizplace']
+      relations: ['bizplace', 'bizplace.domain']
     })
 
     const qb: SelectQueryBuilder<WorksheetDetail> = createQueryBuilder(WorksheetDetail, 'WSD')
@@ -46,7 +48,8 @@ export const cycleCountWorksheetResolver = {
     return {
       worksheetInfo: {
         startedAt: worksheet.startedAt,
-        bizplace: worksheet.bizplace
+        bizplace: worksheet.bizplace,
+        partnerDomainId: worksheet.bizplace?.domain.id
       },
       worksheetDetailInfos: worksheetDetails.map(async (cycleCountWSD: WorksheetDetail) => {
         const targetInventory: OrderInventory = cycleCountWSD.targetInventory

package/server/graphql/resolvers/worksheet/fetch-sellercraft-airway-bill.ts

@@ -0,0 +1,30 @@
+import { EntityManager } from 'typeorm'
+
+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'
+
+import { SellercraftController } from '../../../controllers'
+
+export const fetchSellercraftAirwayBillResolver = {
+  async fetchSellercraftAirwayBill(_: any, { releaseGoodNo }, context: any) {
+    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    let releaseGood: ReleaseGood = await tx
+      .getRepository(ReleaseGood)
+      .findOne({ where: { domain, name: releaseGoodNo }, relations: ['bizplace', 'bizplace.domain'] })
+
+    const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
+      domain: releaseGood.bizplace.domain,
+      status: SellercraftStatus.ACTIVE
+    })
+
+    if (sellercraft && !releaseGood?.airwayBill) {
+      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+      await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
+    }
+
+    const airwayBill: string = releaseGood?.airwayBill
+    return { airwayBill }
+  }
+}

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

@@ -1,11 +1,18 @@
+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 { CycleCountWorksheetController } from '../../../../controllers'
 import { Worksheet } from '../../../../entities'
 
 export const generateCycleCountWorksheetResolver = {
-  async generateCycleCountWorksheet(_: any, { executionDate, customerId, orderInventoryIds, limit }, context: any) {
+  async generateCycleCountWorksheet(
+    _: any,
+    { executionDate, customerId, orderInventoryIds, orderInventories, limit },
+    context: any
+  ) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
 
     const cycleCountWorksheet: Worksheet = await generateCycleCountWorksheet(
@@ -15,6 +22,7 @@ export const generateCycleCountWorksheetResolver = {
       executionDate,
       customerId,
       orderInventoryIds,
+      orderInventories,
       limit
     )
 
@@ -29,8 +37,15 @@ export async function generateCycleCountWorksheet(
   executionDate: string,
   customerId: string,
   orderInventoryIds: string[] = [],
+  orderInventories: OrderInventory[],
   limit: number
 ): Promise<Worksheet> {
   const worksheetController: CycleCountWorksheetController = new CycleCountWorksheetController(tx, domain, user)
-  return await worksheetController.generateCycleCountWorksheet(executionDate, customerId, orderInventoryIds, limit)
+  return await worksheetController.generateCycleCountWorksheet(
+    executionDate,
+    customerId,
+    orderInventoryIds,
+    orderInventories,
+    limit
+  )
 }

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

@@ -8,6 +8,8 @@ import { cycleCountAdjustmentResolver } from './cycle-count-adjustment'
 import { cycleCountWorksheetResolver } from './cycle-count-worksheet'
 import { deleteWorksheet } from './delete-worksheet'
 import { deliveryOrderByWorksheetResolver } from './delivery-order-by-worksheet'
+import { fetchSellercraftAirwayBillResolver } from './fetch-sellercraft-airway-bill'
+import { findReleaseOrdersByTaskNoResolver } from './find-release-orders-by-task-no'
 import { Mutations as GenerateWorksheetMutations } from './generate-worksheet'
 import { havingVasResolver } from './having-vas'
 import { Mutations as InspectMutations } from './inspecting'
@@ -33,13 +35,13 @@ import { recommendPutawayLocationResolver } from './recommend-putway-location'
 import { rejectCancellationReleaseOrder } from './reject-cancellation-release-order'
 import { replacePickingPalletsResolver } from './replace-picking-pallets'
 import { returnWorksheetResolver } from './return-worksheet'
-import { sortingWorksheetResolver } from './sorting-worksheet'
 import { Mutations as ReturningMutations } from './returning'
+import { Mutations as SortingMutations } from './sorting'
+import { sortingWorksheetResolver } from './sorting-worksheet'
 import { transfer } from './transfer'
 import { unloadedInventories } from './unloaded-inventories'
 import { unloadedInventoriesByReusablePallet } from './unloaded-inventories-by-reusable-pallet'
 import { Mutations as UnloadingMutations } from './unloading'
-import { Mutations as SortingMutations } from './sorting'
 import { Mutations as UnloadingReturnMutations } from './unloading-return'
 import { unloadingReturnWorksheetResolver } from './unloading-return-worksheet'
 import { unloadingWorksheetResolver } from './unloading-worksheet'
@@ -62,7 +64,6 @@ import { worksheetResolver } from './worksheet'
 import { worksheetByOrderNoResolver } from './worksheet-by-order-no'
 import { worksheetWithPaginationResolver } from './worksheet-with-pagination'
 import { worksheetsResolver } from './worksheets'
-import { findReleaseOrdersByTaskNoResolver } from './find-release-orders-by-task-no'
 
 export const Query = {
   ...worksheetsResolver,
@@ -130,5 +131,6 @@ export const Mutation = {
   ...undoRelabelingResolver,
   ...crossDockPickingResolver,
   ...unpackingResolver,
-  ...palletizingPallets
+  ...palletizingPallets,
+  ...fetchSellercraftAirwayBillResolver
 }

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

@@ -1,6 +1,8 @@
+import { createQueryBuilder, getRepository, SelectQueryBuilder } from 'typeorm'
+
 import { InventoryCheck, ORDER_INVENTORY_STATUS } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { createQueryBuilder, getRepository, SelectQueryBuilder } from 'typeorm'
+
 import { Worksheet, WorksheetDetail } from '../../../entities'
 
 export const notTallyTargetInventoriesResolver = {
@@ -24,7 +26,7 @@ export const notTallyTargetInventoriesResolver = {
       .leftJoinAndSelect('INV.product', 'PROD')
       .where('WSD.domain = :domainId', { domainId: domain.id })
       .andWhere('WSD.worksheet = :worksheetId', { worksheetId: worksheet.id })
-      .andWhere('T_INV.status = :status', { status: ORDER_INVENTORY_STATUS.NOT_TALLY })
+      .andWhere('WSD.status = :status', { status: ORDER_INVENTORY_STATUS.NOT_TALLY })
       .getMany()
 
     return worksheetDetails.map((wsd: WorksheetDetail) => wsd.targetInventory)

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

@@ -1,7 +1,11 @@
+import { EntityManager } from 'typeorm'
+
 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'
-import { EntityManager } from 'typeorm'
-import { PackingWorksheetController } from '../../../../controllers'
+
+import { PackingWorksheetController, SellercraftController } from '../../../../controllers'
 import { Worksheet } from '../../../../entities'
 
 export const activatePackingResolver = {
@@ -18,5 +22,18 @@ export async function activatePacking(
   worksheetNo: string
 ): Promise<Worksheet> {
   const worksheetController: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
-  return await worksheetController.activatePacking(worksheetNo)
+  const worksheet = await worksheetController.activatePacking(worksheetNo)
+  let releaseGood: ReleaseGood = worksheet.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)
+      await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
+    }
+  }
+  return worksheet
 }

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

@@ -1,11 +1,15 @@
-import { Bizplace, getMyBizplace } from '@things-factory/biz-base'
-import { Domain } from '@things-factory/shell'
 import { EntityManager } from 'typeorm'
-import { LoadingWorksheetController, PackingWorksheetController } from '../../../../controllers/'
-import { OrderInventory, ORDER_INVENTORY_STATUS, ReleaseGood } from '@things-factory/sales-base'
+
 import { User } from '@things-factory/auth-base'
-import { WORKSHEET_TYPE } from '../../../../constants'
-import { Worksheet, WorksheetDetail } from '../../../../entities'
+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'
+
+import { PackingWorksheetController } from '../../../../controllers/'
+import { EcommerceController } from '../../../../controllers/ecommerce'
 import { WorksheetController } from '../../../../controllers/worksheet-controller'
 
 export const completePackingResolver = {
@@ -13,6 +17,43 @@ export const completePackingResolver = {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
     await completePacking(tx, domain, user, releaseGoodNo)
 
+    const releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
+      where: { domain, name: releaseGoodNo },
+      relations: [
+        'bizplace',
+        'bizplace.domain',
+        'bizplace.company',
+        'bizplace.company.domain',
+        'orderInventories',
+        'orderInventories.product'
+      ]
+    })
+
+    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.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, {
@@ -31,37 +72,5 @@ export async function completePacking(
   releaseGoodNo: string
 ): Promise<void> {
   const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
-  const releaseGood: ReleaseGood = await packingWSCtrl.findRefOrder(ReleaseGood, {
-    domain,
-    name: releaseGoodNo
-  })
-  const worksheet: Worksheet = await packingWSCtrl.findWorksheetByRefOrder(releaseGood, WORKSHEET_TYPE.PACKING, [
-    'worksheetDetails',
-    'worksheetDetails.targetInventory'
-  ])
-
-  const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
-  const targetInventories: OrderInventory[] = worksheetDetails.map((wsd: WorksheetDetail) => wsd.targetInventory)
-  const packedTargetInventories: OrderInventory[] = targetInventories
-    .filter(targetInventory => targetInventory.status === ORDER_INVENTORY_STATUS.PACKED)
-    .map((packedTargetInventory: OrderInventory) => {
-      return packedTargetInventory
-    })
-
   await packingWSCtrl.completePacking(releaseGoodNo)
-
-  if (!releaseGood.courierOption) {
-    const loadingWSCtrl: LoadingWorksheetController = new LoadingWorksheetController(tx, domain, user)
-    let loadingWorksheet: Worksheet = await loadingWSCtrl.generateLoadingWorksheet(
-      releaseGoodNo,
-      packedTargetInventories
-    )
-
-    if (!loadingWorksheet.worksheetDetails?.length) {
-      loadingWorksheet = await packingWSCtrl.findWorksheetById(loadingWorksheet.id)
-    }
-
-    const loadingWorksheetDetails: WorksheetDetail[] = loadingWorksheet.worksheetDetails
-    await loadingWSCtrl.activateLoading(loadingWorksheet.name, loadingWorksheetDetails)
-  }
 }

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

@@ -1,7 +1,12 @@
+import { EntityManager } from 'typeorm'
+
 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'
-import { EntityManager } from 'typeorm'
-import { PackingWorksheetController } from '../../../../controllers'
+
+import { PackingWorksheetController, SellercraftController } from '../../../../controllers'
+import { Worksheet } from '../../../../entities'
 
 export const packingResolver = {
   async packing(_: any, { worksheetDetailName, releaseQty }, context: any) {
@@ -18,5 +23,19 @@ export async function packing(
   releaseQty: number
 ) {
   const worksheetController: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
-  await worksheetController.packing(worksheetDetailName, releaseQty)
+  const worksheetDetail = await worksheetController.packing(worksheetDetailName, releaseQty)
+
+  let releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
+  const worksheet: Worksheet = worksheetDetail.worksheet
+
+  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,7 +1,12 @@
+import { EntityManager } from 'typeorm'
+
 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'
-import { EntityManager } from 'typeorm'
-import { PackingWorksheetController } from '../../../../controllers'
+
+import { PackingWorksheetController, SellercraftController } from '../../../../controllers'
+import { Worksheet } from '../../../../entities'
 
 export const scanProductPackingResolver = {
   async scanProductPacking(_: any, { worksheetDetailName, productBarcode }, context: any) {
@@ -18,5 +23,19 @@ export async function scanProductPacking(
   productBarcode: string
 ) {
   const worksheetController: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
-  await worksheetController.scanProductPacking(worksheetDetailName, productBarcode)
+  const worksheetDetail = await worksheetController.scanProductPacking(worksheetDetailName, productBarcode)
+
+  let releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
+  const worksheet: Worksheet = worksheetDetail.worksheet
+
+  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-worksheet.ts

@@ -1,16 +1,21 @@
-import { MarketplaceOrder, MarketplaceOrderItem } from '@things-factory/marketplace-base'
+import { EntityManager } 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 { OrderInventory, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory } from '@things-factory/warehouse-base'
-import { getRepository } from 'typeorm'
+
 import { WORKSHEET_TYPE } from '../../../constants'
+import { SellercraftController } from '../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 import { fetchExecutingWorksheet } from '../../../utils'
 
 export const packingWorksheetResolver = {
   async packingWorksheet(_: any, { releaseGoodNo }, context: any) {
-    const { domain }: { domain: Domain } = context.state
-    const releaseGood: ReleaseGood = await getRepository(ReleaseGood).findOne({
+    const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
+    let releaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
       where: {
         domain,
         name: releaseGoodNo
@@ -24,7 +29,9 @@ export const packingWorksheetResolver = {
       releaseGood.bizplace,
       [
         'bizplace',
+        'bizplace.domain',
         'releaseGood',
+        'releaseGood.domain',
         'worksheetDetails',
         'worksheetDetails.targetInventory',
         'worksheetDetails.targetInventory.binLocation',
@@ -37,31 +44,84 @@ export const packingWorksheetResolver = {
       releaseGood
     )
 
-    const marketplaceOrder: MarketplaceOrder = await getRepository(MarketplaceOrder).findOne({
-      where: { releaseOrderId: releaseGood.id },
-      relations: [
-        'domain',
-        'marketplaceStore',
-        'marketplaceOrderItems',
-        'marketplaceOrderItems.marketplaceOrderShipping'
-      ]
-    })
+    let marketplaceOrder: MarketplaceOrder
+    let marketplaceOrderItems: MarketplaceOrderItem[] = []
+    let marketplaceStore
+    let trackingNo: string
+    let shippingProvider: string
+    let marketplaceStatus: string
+
+    if (releaseGood.type === 'b2c') {
+      const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
+        domain: worksheet.bizplace.domain,
+        status: SellercraftStatus.ACTIVE
+      })
+
+      if (sellercraft) {
+        if (!releaseGood?.airwayBill) {
+          const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+          releaseGood = await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
+        }
+        trackingNo = releaseGood?.trackingNo
+        shippingProvider = releaseGood?.transporter
+        marketplaceStatus = releaseGood?.marketplaceOrderStatus
+      }
 
-    const marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
-    const marketplaceStore = marketplaceOrder.marketplaceStore
-    const trackingNo: string = await getTrackingNo(marketplaceStore, marketplaceOrderItems)
+      if (!sellercraft) {
+        marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+          where: { orderNo: releaseGood.refNo },
+          relations: [
+            'domain',
+            'marketplaceStore',
+            'marketplaceOrderItems',
+            'marketplaceOrderItems.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
+
+        marketplaceOrderItems = marketplaceOrder.marketplaceOrderItems.filter(
+          item => item.marketplaceOrderShipping.id === marketplaceOrderShipping.id
+        )
+        marketplaceStore = marketplaceOrder?.marketplaceStore
+        marketplaceStatus = marketplaceOrder?.status
+      }
+    }
 
     return {
       worksheetInfo: {
         bizplaceName: releaseGood.bizplace.name,
         refNo: releaseGood.refNo,
+        refNo2: releaseGood.refNo2,
         partnerDomainId: releaseGood.bizplace?.domain.id,
         startedAt: worksheet.startedAt,
-        shippingProvider: marketplaceOrder ? marketplaceOrder.shippingProvider : '',
+        shippingProvider: shippingProvider ? shippingProvider : '',
         trackingNo: trackingNo ? trackingNo : '',
-        platform: marketplaceOrder ? marketplaceOrder.marketplaceStore.platform : '',
+        airwayBill: releaseGood?.airwayBill,
+        invoice: releaseGood?.invoice,
+        platform: marketplaceOrder ? marketplaceOrder.marketplaceStore.platform : 'operato',
         marketplaceStoreId: marketplaceOrder ? marketplaceOrder.marketplaceStore.id : '',
-        marketplaceStatus: marketplaceOrder ? marketplaceOrder.status : '',
+        marketplaceStatus: marketplaceStatus ? marketplaceStatus : '',
         marketplaceOrder: marketplaceOrder ? marketplaceOrder : ''
       },
       worksheetDetailInfos: worksheet.worksheetDetails.map(async (packingWSD: WorksheetDetail) => {

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

@@ -31,7 +31,11 @@ export const pendingCancellationReleaseOrder = {
     let pickingOIs: OrderInventory[]
 
     // 1. Check RO status
-    if (foundRO.status === ORDER_STATUS.LOADING) {
+    if (
+      foundRO.status === ORDER_STATUS.LOADING ||
+      foundRO.status === ORDER_STATUS.PACKING ||
+      foundRO.status === ORDER_STATUS.SORTING
+    ) {
       // 1a. Case 1: RO is done or loading, pending cancel order, worksheet, worksheet detail, order inventory
       // update status of order inventory to PENDING_CANCEL
       pickedOIs = targetOIs.map((orderInv: OrderInventory) => {

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

@@ -1,8 +1,12 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
+import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
+import { ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { EntityManager } from 'typeorm'
-import { EcommerceController, PickingWorksheetController } from '../../../../controllers'
+
+import { EcommerceController, PickingWorksheetController, SellercraftController } from '../../../../controllers'
 import { Worksheet } from '../../../../entities'
 
 export const activateBatchPickingResolver = {
@@ -20,15 +24,41 @@ export async function activateBatchPicking(
 ): Promise<Worksheet> {
   const worksheetController: PickingWorksheetController = new PickingWorksheetController(tx, domain, user)
   const worksheet = await worksheetController.activateBatchPicking(worksheetNo)
+  const worksheetDetails = worksheet.worksheetDetails
   const companyDomain: Domain = worksheet?.bizplace.company.domain
 
+  const sellercraft: Sellercraft = await tx
+    .getRepository(Sellercraft)
+    .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+  if (sellercraft) {
+    const releaseGoods: ReleaseGood[] = worksheetDetails.map(
+      worksheetDetail => worksheetDetail.targetInventory && worksheetDetail.targetInventory.releaseGood
+    )
+    const uniqueReleaseGoods: ReleaseGood[] = []
+    const map = new Map()
+    for (const releaseGood of releaseGoods) {
+      if (!map.has(releaseGood.id)) {
+        map.set(releaseGood.id, true)
+        uniqueReleaseGoods.push({ ...releaseGood })
+      }
+    }
+
+    await Promise.all(
+      uniqueReleaseGoods.map(async releaseGood => {
+        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+        await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
+      })
+    )
+  }
+
   // find for any existing marketplace store connections
   const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
-    where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true }
+    where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
+    relations: ['marketplaceDistributors']
   })
 
   if (marketplaceStores?.length && marketplaceStores.some(store => store.isAutoUpdateStockQty)) {
-    const worksheetDetails = worksheet.worksheetDetails
     let orderInventories: any[] = worksheetDetails.map(wsd => wsd.targetInventory)
     const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
     await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain)