@things-factory/worksheet-base 4.3.88 → 4.3.94-alpha.1

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

@@ -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, getMyBizplace } from '@things-factory/biz-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { OrderInventory, ReleaseGood } from '@things-factory/sales-base'
@@ -46,48 +46,54 @@ export async function completeBatchPicking(
     .filter(wsd => wsd.status != 'MISSING')
     .map((wsd: WorksheetDetail) => wsd.targetInventory)
 
-  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 })
-      }
+  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)
-
-        let foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
-          where: { id: releaseGood.id },
-          relations: ['orderProducts', 'orderProducts.product', 'orderProducts.product.productDetails']
-        })
-
-        if (!foundReleaseGood?.packageId) {
-          foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood)
-          if (foundReleaseGood?.packageId) {
-            await tx
-              .getRepository(ReleaseGood)
-              .update(
-                { id: foundReleaseGood.id },
-                { packageId: foundReleaseGood.packageId, updater: foundReleaseGood.updater }
-              )
+  await Promise.all(
+    uniqueReleaseGoods.map(async releaseGood => {
+      let foundReleaseGood: ReleaseGood = await tx.getRepository(ReleaseGood).findOne({
+        where: { id: releaseGood.id },
+        relations: ['orderProducts', 'orderProducts.product']
+      })
+      const orderSource: string = foundReleaseGood.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)
+            if (!foundReleaseGood?.packageId) {
+              foundReleaseGood = await sellercraftCtrl.packOrder(sellercraft, foundReleaseGood)
+              if (foundReleaseGood?.packageId) {
+                await tx
+                  .getRepository(ReleaseGood)
+                  .update(
+                    { id: foundReleaseGood.id },
+                    { packageId: foundReleaseGood.packageId, updater: foundReleaseGood.updater }
+                  )
+              }
+            }
+
+            sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood)
           }
-        }
+          break
 
-        sellercraftCtrl.initiateOrderShipment(sellercraft, foundReleaseGood)
-      })
-    )
-  }
+        default:
+          break
+      }
+    })
+  )
 
   const pickPackTargetInventories: OrderInventory[] = targetInventories
     .filter(targetInventory => targetInventory.releaseGood.packingOption)
@@ -112,7 +118,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)

package/server/graphql/resolvers/worksheet/picking/complete-picking.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 { Bizplace, ContactPoint, getMyBizplace } from '@things-factory/biz-base'
 import { LastMileAPI, LastMileDelivery } from '@things-factory/integration-lmd'
 import { MarketplaceStore, MarketplaceTransporter } from '@things-factory/integration-marketplace'
@@ -18,7 +18,6 @@ import {
   OrderProduct,
   ReleaseGood
 } from '@things-factory/sales-base'
-import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'
@@ -81,147 +80,159 @@ export async function completePicking(
 
   await pickingWSCtrl.completePicking(releaseGoodNo)
 
-  if (releaseGood.type == 'b2c') {
-
-    const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({ domain: releaseGood.bizplace.domain, status: SellercraftStatus.ACTIVE })
-    const initSCOrderShipment = async (sellercraft) => {
-      if (sellercraft) {
-
-        await getManager().transaction(async txMgr => {
-          const sellercraftCtrl: SellercraftController = new SellercraftController(txMgr, domain, user)
-
-          if (!releaseGood?.packageId) {
-            const orderProducts: OrderProduct[] = await tx.getRepository(OrderProduct).find({
-              where: { releaseGood },
-              relations: ['product', 'product.productDetails']
-            })
-            releaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })
-
-            if (releaseGood?.packageId) {
-              await txMgr.getRepository(ReleaseGood).update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater })
+  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 })
+      const initSCOrderShipment = async sellercraft => {
+        if (sellercraft) {
+          await getManager().transaction(async txMgr => {
+            const sellercraftCtrl: SellercraftController = new SellercraftController(txMgr, domain, user)
+
+            if (!releaseGood?.packageId) {
+              const orderProducts: OrderProduct[] = await tx.getRepository(OrderProduct).find({
+                where: { releaseGood },
+                relations: ['product', 'product.productDetails']
+              })
+              releaseGood = await sellercraftCtrl.packOrder(sellercraft, { ...releaseGood, orderProducts })
+
+              if (releaseGood?.packageId) {
+                await txMgr
+                  .getRepository(ReleaseGood)
+                  .update({ id: releaseGood.id }, { packageId: releaseGood.packageId, updater: releaseGood.updater })
+              }
             }
-          }
 
-          await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
-        })
+            await sellercraftCtrl.initiateOrderShipment(sellercraft, releaseGood)
+          })
+        }
       }
-    }
-
-    // asynchronouly call to initiate sellercraft order shipment/ RTS
-    initSCOrderShipment(sellercraft)
-
-    const companyDomain: Domain = releaseGood.bizplace.company.domain
-    let marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-      where: { orderNo: releaseGood.refNo, domain: companyDomain },
-      relations: [
-        'marketplaceStore',
-        'marketplaceOrderItems',
-        'marketplaceOrderItems.marketplaceOrderShippingItems',
-        'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
-      ]
-    })
 
-    if (!sellercraft && marketplaceOrder) {
-      const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
-      let eTraxOption: boolean
+      // asynchronouly call to initiate sellercraft order shipment/ RTS
+      initSCOrderShipment(sellercraft)
+      break
+
+    case ApplicationType.MMS:
+      const companyDomain: Domain = releaseGood.bizplace.company.domain
+      let marketplaceOrder: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+        where: { orderNo: releaseGood.refNo, domain: companyDomain },
+        relations: [
+          'marketplaceStore',
+          'marketplaceOrderItems',
+          'marketplaceOrderItems.marketplaceOrderShippingItems',
+          'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
+        ]
+      })
+
+      if (marketplaceOrder) {
+        const marketplaceStore: MarketplaceStore = marketplaceOrder.marketplaceStore
+        let eTraxOption: boolean
+
+        if (marketplaceStore.isAutoUpdateShipment) {
+          const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
+          await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PACKING)
+        }
 
-      if (marketplaceStore.isAutoUpdateShipment) {
-        const ecommerceCtrl: EcommerceController = new EcommerceController(tx, domain, user)
-        await ecommerceCtrl.createOrderComment(marketplaceStore, marketplaceOrder, ORDER_STATUS.PACKING)
-      }
+        if (!marketplaceOrder)
+          throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue')
+        eTraxOption = marketplaceOrder?.marketplaceStore.eTrax
+
+        // if eTrax option is true
+        if (eTraxOption) {
+          const marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
+
+          // access every marketplaceOrderItems for shipping information you need
+          // trigger the controller from integration-lmd that trigger the API, build the parameters needed
+          // for etrax didn't support multi awb per order
+          const marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] =
+            marketplaceOrderItems[0].marketplaceOrderShippingItems
+          const marketplaceOrderShipping: MarketplaceOrderShipping =
+            marketplaceOrderShippingItems[0].marketplaceOrderShipping
+          const lmd: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
+            where: {
+              domain,
+              platform: 'eTrax'
+            }
+          })
+
+          //Get which transporter to use
+          const marketplaceTransporter: MarketplaceTransporter = await tx
+            .getRepository(MarketplaceTransporter)
+            .findOne({
+              where: { marketplaceStore: marketplaceOrder.marketplaceStore },
+              relations: ['pickupTransporter', 'deliveryTransporter']
+            })
 
-      if (!marketplaceOrder)
-        throw new Error('Failed to find ecommerce order, kindly contact our support team regarding this issue')
-      eTraxOption = marketplaceOrder?.marketplaceStore.eTrax
-
-      // if eTrax option is true
-      if (eTraxOption) {
-        const marketplaceOrderItems: MarketplaceOrderItem[] = marketplaceOrder.marketplaceOrderItems
-
-        // access every marketplaceOrderItems for shipping information you need
-        // trigger the controller from integration-lmd that trigger the API, build the parameters needed
-        // for etrax didn't support multi awb per order
-        const marketplaceOrderShippingItems: MarketplaceOrderShippingItem[] =
-          marketplaceOrderItems[0].marketplaceOrderShippingItems
-        const marketplaceOrderShipping: MarketplaceOrderShipping =
-          marketplaceOrderShippingItems[0].marketplaceOrderShipping
-        const lmd: LastMileDelivery = await tx.getRepository(LastMileDelivery).findOne({
-          where: {
-            domain,
-            platform: 'eTrax'
+          const resp = await LastMileAPI.createShipmentRequest(lmd, {
+            orderNo: marketplaceOrder.orderNo,
+            clientId: lmd.clientId,
+            clientType: lmd.clientType,
+            clientName: lmd.clientName,
+            transporterId: marketplaceTransporter.pickupTransporter.transporterId,
+            pickupName: warehouseContactPoint.name,
+            pickupAddress1: warehouseContactPoint.address,
+            pickupAddress2: warehouseContactPoint.address2,
+            pickupPostcode: warehouseContactPoint.postCode,
+            pickupState: warehouseContactPoint.state,
+            pickupCity: warehouseContactPoint.city,
+            pickupPhone: warehouseContactPoint.phone,
+            pickupEmail: warehouseContactPoint.email,
+            name: marketplaceOrderShipping?.attentionTo ? marketplaceOrderShipping.attentionTo.trim() : '',
+            address1: marketplaceOrderShipping?.address1 ? marketplaceOrderShipping?.address1.trim() : '-',
+            address2: marketplaceOrderShipping?.address2 ? marketplaceOrderShipping?.address2.trim() : '-',
+            postCode: marketplaceOrderShipping?.postCode ? marketplaceOrderShipping?.postCode.trim() : '',
+            city: marketplaceOrderShipping?.city ? marketplaceOrderShipping?.city.trim() : '',
+            state: marketplaceOrderShipping?.state ? marketplaceOrderShipping?.state.trim() : '',
+            phone: marketplaceOrderShipping.phone1 || '',
+            email: marketplaceOrderShipping.email || '',
+            attentionTo: marketplaceOrderShipping.attentionTo,
+            quantity: marketplaceOrderItems.length
+          })
+
+          const delay = (ms: number) => {
+            return new Promise(resolve => setTimeout(resolve, ms))
           }
-        })
-
-        //Get which transporter to use
-        const marketplaceTransporter: MarketplaceTransporter = await tx.getRepository(MarketplaceTransporter).findOne({
-          where: { marketplaceStore: marketplaceOrder.marketplaceStore },
-          relations: ['pickupTransporter', 'deliveryTransporter']
-        })
-
-        const resp = await LastMileAPI.createShipmentRequest(lmd, {
-          orderNo: marketplaceOrder.orderNo,
-          clientId: lmd.clientId,
-          clientType: lmd.clientType,
-          clientName: lmd.clientName,
-          transporterId: marketplaceTransporter.pickupTransporter.transporterId,
-          pickupName: warehouseContactPoint.name,
-          pickupAddress1: warehouseContactPoint.address,
-          pickupAddress2: warehouseContactPoint.address2,
-          pickupPostcode: warehouseContactPoint.postCode,
-          pickupState: warehouseContactPoint.state,
-          pickupCity: warehouseContactPoint.city,
-          pickupPhone: warehouseContactPoint.phone,
-          pickupEmail: warehouseContactPoint.email,
-          name: marketplaceOrderShipping?.attentionTo ? marketplaceOrderShipping.attentionTo.trim() : '',
-          address1: marketplaceOrderShipping?.address1 ? marketplaceOrderShipping?.address1.trim() : '-',
-          address2: marketplaceOrderShipping?.address2 ? marketplaceOrderShipping?.address2.trim() : '-',
-          postCode: marketplaceOrderShipping?.postCode ? marketplaceOrderShipping?.postCode.trim() : '',
-          city: marketplaceOrderShipping?.city ? marketplaceOrderShipping?.city.trim() : '',
-          state: marketplaceOrderShipping?.state ? marketplaceOrderShipping?.state.trim() : '',
-          phone: marketplaceOrderShipping.phone1 || '',
-          email: marketplaceOrderShipping.email || '',
-          attentionTo: marketplaceOrderShipping.attentionTo,
-          quantity: marketplaceOrderItems.length
-        })
-
-        const delay = (ms: number) => {
-          return new Promise(resolve => setTimeout(resolve, ms))
-        }
 
-        if (resp.Status === 'SUCCESS') {
-          //Success
-          let awbObtained = false
-          let retry = 0
-          while (!awbObtained) {
-            const marketplaceOrder2: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-              where: { releaseOrderId: releaseGood.id },
-              relations: [
-                'marketplaceStore',
-                'marketplaceOrderItems',
-                'marketplaceOrderItems.marketplaceOrderShippingItems',
-                'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
-              ]
-            })
-            const orderShipping =
-              marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShippingItems[0].marketplaceOrderShipping
-            if (orderShipping?.airwayBill) {
-              awbObtained = true
-            }
-            await delay(5000)
-            //Timeout after 15sec
-            if (++retry > 3) {
-              break
+          if (resp.Status === 'SUCCESS') {
+            //Success
+            let awbObtained = false
+            let retry = 0
+            while (!awbObtained) {
+              const marketplaceOrder2: MarketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
+                where: { releaseOrderId: releaseGood.id },
+                relations: [
+                  'marketplaceStore',
+                  'marketplaceOrderItems',
+                  'marketplaceOrderItems.marketplaceOrderShippingItems',
+                  'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
+                ]
+              })
+              const orderShipping =
+                marketplaceOrder2.marketplaceOrderItems[0].marketplaceOrderShippingItems[0].marketplaceOrderShipping
+              if (orderShipping?.airwayBill) {
+                awbObtained = true
+              }
+              await delay(5000)
+              //Timeout after 15sec
+              if (++retry > 3) {
+                break
+              }
             }
+          } else {
+            if (resp?.AWBurl && resp?.TrackingNo)
+              await tx
+                .getRepository(MarketplaceOrderShipping)
+                .update({ id: marketplaceOrderShipping.id }, { airwayBill: resp.AWBurl, trackingNo: resp.TrackingNo })
+            else throw resp
           }
-        } else {
-          if (resp?.AWBurl && resp?.TrackingNo)
-            await tx
-              .getRepository(MarketplaceOrderShipping)
-              .update({ id: marketplaceOrderShipping.id }, { airwayBill: resp.AWBurl, trackingNo: resp.TrackingNo })
-          else throw resp
         }
       }
-    }
+      break
+
+    default:
+      break
   }
 
   if (releaseGood.packingOption) {

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

@@ -76,6 +76,7 @@ export async function pickingWorksheet(
     .leftJoinAndSelect('T_INV.binLocation', 'BIN_LOC')
     .leftJoinAndSelect('T_INV.inventory', 'INV')
     .leftJoinAndSelect('T_INV.product', 'PROD')
+    .leftJoinAndSelect('T_INV.productDetail', 'PROD_DET')
     .leftJoinAndSelect('INV.location', 'LOC')
 
   if (locationSortingRules?.length > 0) {
@@ -114,8 +115,8 @@ export async function pickingWorksheet(
       const inventoryChangesCount: number = await tx.getRepository(InventoryChange).count({
         where: {
           inventory: inventory.id,
-          status: "PENDING",
-          transactionType: "MISSING"
+          status: 'PENDING',
+          transactionType: 'MISSING'
         },
         relations: ['inventory', 'product']
       })

package/server/graphql/resolvers/worksheet/proceed-extra-products.ts

@@ -73,7 +73,7 @@ export const proceedExtraProductsResolver = {
       if (editedApprovedProducts?.length > 0) {
         editedApprovedProducts.map((editedApprovedProd: OrderProduct) => {
           const selectedOrderProduct: OrderProduct = storedOrderProducts.find(
-            (op: OrderProduct) => op.id === editedApprovedProd.id
+            (op: OrderProduct) => op.productDetail.id === editedApprovedProd.productDetailId
           )
 
           updatedOrderProducts.push({
@@ -115,7 +115,7 @@ export const proceedExtraProductsResolver = {
       if (addedApprovedProducts?.length > 0) {
         addedApprovedProducts.map((addedApprovedProd: OrderProduct) => {
           const selectedOrderProduct: OrderProduct = storedOrderProducts.find(
-            (op: OrderProduct) => op.id === addedApprovedProd.id
+            (op: OrderProduct) => op.productDetailId === addedApprovedProd.productDetailId
           )
           updatedOrderProducts.push({
             ...selectedOrderProduct,
@@ -173,7 +173,7 @@ export const proceedExtraProductsResolver = {
       if (editedRejectedProducts?.length > 0) {
         editedRejectedProducts = editedRejectedProducts.map((editedRejectProduct: OrderProduct) => {
           const selectedOrderProduct: OrderProduct = storedOrderProducts.find(
-            (op: OrderProduct) => op.id === editedRejectProduct.id
+            (op: OrderProduct) => op.productDetail.id === editedRejectProduct.productDetailId
           )
 
           return {
@@ -194,7 +194,8 @@ export const proceedExtraProductsResolver = {
         let deleteOrderProducts: OrderProduct[] = []
         addedRejectedProducts.map(rejectedOp => {
           const selectedOrderProduct: OrderProduct[] = storedOrderProducts.find(
-            (op: OrderProduct) => op.id === rejectedOp.id
+            //(op: OrderProduct) => op.id === rejectedOp.id
+            (op: OrderProduct) => op.productDetailId === rejectedOp.productDetailId
           )
           deleteOrderProducts.push(selectedOrderProduct)
         })