@things-factory/worksheet-base 4.3.79 → 4.3.80-alpha.3

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

@@ -1,6 +1,6 @@
 import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { ApplicationType, 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,42 +58,86 @@ export async function completeLoading(
   const warehouseCompanyBizplaces: Bizplace[] = warehouseBizplaces.filter(biz => biz.domain.extType == 'company')
   const warehouseCompanyDomain: Domain = warehouseCompanyBizplaces[0].domain
 
-  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
+  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 }
         })
-        customerAvailableSftp = await tx.getRepository(Sftp).save(snResult)
+        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)
+          }
+        }
       }
-    }
+      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 { User } from '@things-factory/auth-base'
+import { ApplicationType, 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,15 +38,32 @@ export async function activatePacking(
   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 })
+  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 (sellercraft) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
-    }
+      if (sellercraft) {
+        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+        sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
+      }
+      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 sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+  //     sellercraftCtrl.initiateOrderDocument(sellercraft, releaseGood)
+  //   }
+  // }
   return worksheet
 }

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

@@ -1,9 +1,8 @@
 import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { ApplicationType, 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'
@@ -29,12 +28,9 @@ export const completePackingResolver = {
       ]
     })
 
-    if (releaseGood.type === 'b2c') {
-      const sellercraft: Sellercraft = await tx
-        .getRepository(Sellercraft)
-        .findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
-
-      if (!sellercraft) {
+    const orderSource: string = releaseGood.source
+    switch (orderSource) {
+      case ApplicationType.MMS:
         const companyDomain: Domain = releaseGood.bizplace.company.domain
         const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
           where: { orderNo: releaseGood.refNo, domain: companyDomain },
@@ -52,9 +48,38 @@ 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 { User } from '@things-factory/auth-base'
+import { ApplicationType, 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,14 +29,31 @@ export async function packing(
   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 })
+  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) {
-      const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-      await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
-    }
+      if (sellercraft) {
+        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+        await sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
+      }
+      break
+
+    default:
+      break
   }
+
+  // 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 { User } from '@things-factory/auth-base'
+import { ApplicationType, 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,17 +34,36 @@ export async function scanProductPacking(
     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 })
+    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 (sellercraft) {
-        const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-        sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
-      }
+          if (sellercraft) {
+            const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
+            sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
+          }
+        }
+
+        break
+
+      default:
+        break
     }
 
+    // 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, SelectQueryBuilder, getManager } from 'typeorm'
+import { EntityManager, getManager, SelectQueryBuilder } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { ApplicationType, User } from '@things-factory/auth-base'
 import { logger } from '@things-factory/env'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import {
@@ -10,6 +10,7 @@ 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'
 
@@ -17,7 +18,6 @@ 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,16 +146,20 @@ export const packingWorksheetResolver = {
       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
-        })
+      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) {
-          // asynchronously get document from sellercraft
-          getSellercraftDocument(sellercraft, releaseGood, domain, user)
-        } else {
+          if (sellercraft) {
+            getSellercraftDocument(sellercraft, releaseGood, domain, user)
+          }
+          break
+
+        case ApplicationType.MMS:
           marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
             where: { orderNo: releaseGood.refNo },
             relations: [
@@ -191,9 +195,60 @@ 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,

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

@@ -1,8 +1,7 @@
 import { EntityManager } from 'typeorm'
 
-import { User } from '@things-factory/auth-base'
+import { ApplicationType, User } from '@things-factory/auth-base'
 import { MarketplaceStore } from '@things-factory/integration-marketplace'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { MarketplaceOrder } from '@things-factory/marketplace-base'
 import { ORDER_STATUS, ReleaseGood } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
@@ -27,42 +26,73 @@ export async function activatePicking(
   const worksheet = await worksheetController.activatePicking(worksheetNo)
   const companyDomain: Domain = worksheet?.bizplace.company.domain
 
-  // find for any existing marketplace store connections
-  const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
-    where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
-    relations: ['marketplaceDistributors']
-  })
-
   let releaseGood: ReleaseGood = worksheet.releaseGood
 
-  if (releaseGood.type === 'b2c') {
-    const sellercraft: Sellercraft = await tx
-      .getRepository(Sellercraft)
-      .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
-
-    if (marketplaceStores?.length && !sellercraft) {
-      if (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)
-      }
-
-      const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-        where: { orderNo: releaseGood.refNo, domain: companyDomain },
-        relations: ['marketplaceStore']
+  const orderSource: string = releaseGood.source
+  switch (orderSource) {
+    case ApplicationType.MMS:
+      // find for any existing marketplace store connections
+      const marketplaceStores: MarketplaceStore[] = await tx.getRepository(MarketplaceStore).find({
+        where: { domain: companyDomain, status: 'ACTIVE', isAutoUpdateStockQty: true },
+        relations: ['marketplaceDistributors']
       })
 
-      if (marketplaceOrder) {
-        const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
-
-        if (marketplaceStore.isAutoUpdateShipment) {
+      if (marketplaceStores?.length) {
+        if (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.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PICKING)
+          await ecommerceCtrl.updateProductVariationStock(marketplaceStores, orderInventories, companyDomain)
+        }
+
+        const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+          where: { orderNo: releaseGood.refNo, domain: companyDomain },
+          relations: ['marketplaceStore']
+        })
+
+        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)
+          }
         }
       }
-    }
+      break
+
+    default:
+      break
   }
 
+  // if (releaseGood.type === 'b2c') {
+  //   const sellercraft: Sellercraft = await tx
+  //     .getRepository(Sellercraft)
+  //     .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
+
+  //   if (marketplaceStores?.length && !sellercraft) {
+  //     if (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)
+  //     }
+
+  //     const marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+  //       where: { orderNo: releaseGood.refNo, domain: companyDomain },
+  //       relations: ['marketplaceStore']
+  //     })
+
+  //     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)
+  //       }
+  //     }
+  //   }
+  // }
+
   return worksheet
 }

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

@@ -69,7 +69,7 @@ export async function completeBatchPicking(
 
         let foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
           where: { id: releaseGood.id },
-          relations: ['orderProducts', 'orderProducts.product', 'orderProducts.product.productDetails']
+          relations: ['orderProducts', 'orderProducts.product']
         })
 
         if (!foundReleaseGood?.packageId) {
@@ -112,7 +112,7 @@ export async function completeBatchPicking(
     })
 
     // loop to generate packing worksheet
-    for (var i: number = 0; i < uniqueRoNo.length; i++) {
+    for (let i: number = 0; i < uniqueRoNo.length; i++) {
       const releaseGoodNo: string = uniqueRoNo[i]
       const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
       await packingWSCtrl.generatePackingWorksheet(releaseGoodNo)