@things-factory/worksheet-base 4.3.113-alpha.0 → 4.3.118

package/server/controllers/inspect/cycle-count-worksheet-controller.ts

@@ -103,14 +103,16 @@ export class CycleCountWorksheetController extends WorksheetController {
         let keyval = {
           batchId: 'batch_id',
           batchIdRef: 'batch_id_ref',
-          productDetailId: 'product_detail_id'
+          packingType: 'packing_type',
+          packingSize: 'packing_size',
+          productId: 'product_id'
         }
 
         qb.andWhere(
           new Brackets(qb => {
             orderInventory.forEach((itm, idx) => {
               // sample itm value
-              // batchId: 'WO00019730', batchIdRef: null, productDetailId: '1d679587-c713-42d6-bd0a-74e587e39cc7'
+              // batchId: 'WO00019730', batchIdRef: null, packingType: 'CARBOY', packingSize: 1, productId: '1d679587-c713-42d6-bd0a-74e587e39cc7'
               qb.orWhere(
                 new Brackets(qb2 => {
                   let first = true

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

@@ -12,10 +12,11 @@ import {
   OrderToteItem,
   OrderTote
 } from '@things-factory/sales-base'
-import { Inventory, INVENTORY_TRANSACTION_TYPE, Tote, TOTE_STATUS, generateInventoryHistory } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_TRANSACTION_TYPE, Tote, TOTE_STATUS } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
+import { generateInventoryHistory } from '../../utils'
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export class LoadingWorksheetController extends VasWorksheetController {
@@ -111,13 +112,7 @@ export class LoadingWorksheetController extends VasWorksheetController {
       let worksheetDetail = await this.findExecutableWorksheetDetailByName(
         worksheetDetails[i].name,
         WORKSHEET_TYPE.LOADING,
-        [
-          'worksheet',
-          'targetInventory',
-          'targetInventory.inventory',
-          'targetInventory.product',
-          'targetInventory.productDetail'
-        ]
+        ['worksheet', 'targetInventory', 'targetInventory.inventory', 'targetInventory.product']
       )
 
       const worksheet: Worksheet = worksheetDetail.worksheet
@@ -175,7 +170,6 @@ export class LoadingWorksheetController extends VasWorksheetController {
         newTargetInventory.releaseQty = remainQty
         newTargetInventory.releaseUomValue = remainUomValue
         newTargetInventory.product = targetInventory.product
-        newTargetInventory.productDetail = targetInventory.productDetail
         newTargetInventory.packingType = targetInventory.packingType
         newTargetInventory.batchId = targetInventory.batchId
         newTargetInventory.creator = this.user

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

@@ -93,15 +93,13 @@ export class PackingWorksheetController extends VasWorksheetController {
         'targetInventory.releaseGood',
         'targetInventory.inventory',
         'targetInventory.inventory.location',
-        'targetInventory.product',
-        'targetInventory.productDetail'
+        'targetInventory.product'
       ]
     )
-    let targetInventory: OrderInventory = worksheetDetail.targetInventory
-    let inventory: Inventory = targetInventory.inventory
     const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
+    let targetInventory: OrderInventory = worksheetDetail.targetInventory
     const product: Product = targetInventory.product
-    const productDetail: ProductDetail = targetInventory.productDetail
+    let inventory: Inventory = targetInventory.inventory
     const pickedQty: number = targetInventory.releaseQty
 
     if (packedQty > pickedQty) {
@@ -116,7 +114,8 @@ export class PackingWorksheetController extends VasWorksheetController {
         }
 
         let foundSerialNumber: InventoryItem = await this.trxMgr.getRepository(InventoryItem).findOne({
-          where: { domain: this.domain, serialNumber: serialNumber, productDetail }
+          where: { domain: this.domain, serialNumber: serialNumber, product },
+          relations: ['product', 'inventory']
         })
 
         if (foundSerialNumber) {
@@ -140,7 +139,6 @@ export class PackingWorksheetController extends VasWorksheetController {
           inventoryItem.source = INVENTORY_ITEM_SOURCE.OUTBOUND
           inventoryItem.outboundOrderId = releaseGood.id
           inventoryItem.product = product
-          inventoryItem.productDetail = productDetail
           inventoryItem.inventory = inventory
           inventoryItem.domain = this.domain
 
@@ -187,48 +185,46 @@ export class PackingWorksheetController extends VasWorksheetController {
       .innerJoinAndSelect('oi.releaseGood', 'rg')
       .innerJoinAndSelect('oi.inventory', 'inv')
       .leftJoinAndSelect('oi.orderProduct', 'op')
-      .innerJoinAndSelect('oi.product', 'prd')
-      .innerJoinAndSelect('oi.productDetail', 'pd')
+      .innerJoinAndSelect('inv.product', 'prd')
+      .leftJoinAndSelect(
+        'prd.productDetails',
+        'pd',
+        'pd.product_id = oi.product_id AND pd.deleted_at is null AND pd.packing_type = oi.packing_type AND pd.packing_size = oi.packing_size AND pd.uom = oi.uom'
+      )
       .where('wd.id = :id', { id: worksheetDetailName })
+      .andWhere('wd.type = :type', { type: WORKSHEET_TYPE.PACKING })
       .getOne()
 
+    const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
+    const product: Product = worksheetDetail.targetInventory.inventory.product
+    const filterProductDetails: ProductDetail[] = product?.productDetails.filter(detail => !detail.deletedAt)
     let targetInventory: OrderInventory = worksheetDetail.targetInventory
     let inventory: Inventory = targetInventory.inventory
     let packedQty: number = 1
     let pickedQty: number = targetInventory.releaseQty
-    const releaseGood: ReleaseGood = targetInventory.releaseGood
-    const product: Product = targetInventory.inventory.product
-    const productDetail: ProductDetail = targetInventory.productDetail
-    let matchingProduct
-
-    // // search for matching product barcode
-    // const filterProductDetails: ProductDetail[] = product?.productDetails.filter(detail => !detail.deletedAt)
-    // const scannedProductDetail: ProductDetail = filterProductDetails.find(detail => detail.gtin == productBarcode)
-    // if (!scannedProductDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
-
-    // // case for scanning parent packing type, packing size
-    // // when scannedProductDetail id is not the same as productDetail id, then it's not child gtin, proceed to get child qty
-    // if (scannedProductDetail.id !== productDetail.id && !product?.isRequireSerialNumberScanningOutbound) {
-    //   let childQty = await this.getChildQty(filterProductDetails, productBarcode, productDetail, scannedProductDetail)
-    //   packedQty *= childQty
-    // }
-
-    if (productBarcode !== productDetail.gtin) {
-      if (product?.isRequireSerialNumberScanningOutbound) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
-
-      matchingProduct = await this.getDirectQty(
-        {
-          ...productDetail,
-          product: targetInventory?.product
-        },
-        productBarcode,
-        packedQty
+
+    // search for matching product barcode
+    const productDetail: ProductDetail = product?.productDetails
+      .filter(detail => !detail.deletedAt)
+      .find(
+        detail =>
+          detail.gtin === productBarcode &&
+          detail.packingType === inventory.packingType &&
+          detail.packingSize === inventory.packingSize
+      )
+
+    if (!productDetail && !product?.isRequireSerialNumberScanningOutbound) {
+      let roProductDetail: ProductDetail = product?.productDetails.find(
+        (parentDetail: ProductDetail) =>
+          parentDetail.packingType === inventory.packingType && parentDetail.packingSize == inventory.packingSize
       )
 
-      //validate matching product details based on scanned barcode
-      if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+      roProductDetail.product = product
 
-      packedQty = matchingProduct.qty
+      let childQty = await this.getChildQty(filterProductDetails, productBarcode, roProductDetail)
+      packedQty *= childQty
+    } else if (!productDetail) {
+      throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
     }
 
     if (packedQty + targetInventory.packedQty > pickedQty) {
@@ -244,7 +240,7 @@ export class PackingWorksheetController extends VasWorksheetController {
 
         let foundSerialNumber: InventoryItem = await this.trxMgr
           .getRepository(InventoryItem)
-          .findOne({ where: { domain: this.domain, serialNumber: serialNumber, productDetail } })
+          .findOne({ where: { domain: this.domain, serialNumber: serialNumber, product } })
 
         if (foundSerialNumber) {
           if (foundSerialNumber.inventoryId !== inventory.id) {
@@ -271,7 +267,6 @@ export class PackingWorksheetController extends VasWorksheetController {
           inventoryItem.outboundOrderId = releaseGood.id
           inventoryItem.source = INVENTORY_ITEM_SOURCE.OUTBOUND
           inventoryItem.product = product
-          inventoryItem.productDetail = productDetail
           inventoryItem.inventory = inventory
           inventoryItem.domain = this.domain
 

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

@@ -28,13 +28,12 @@ import {
   Location,
   LOCATION_TYPE,
   Tote,
-  TOTE_STATUS,
-  generateInventoryHistory
+  TOTE_STATUS
 } from '@things-factory/warehouse-base'
 
 import { TASK_NUMBER_RULE_TYPE, TASK_NUMBER_SETTING_KEY, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
-import { WorksheetNoGenerator } from '../../utils'
+import { generateInventoryHistory, WorksheetNoGenerator } from '../../utils'
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export class PickingWorksheetController extends VasWorksheetController {
@@ -214,7 +213,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       if (vasWorksheet) {
         await this.activateVAS(vasWorksheet.name, vasWorksheet.worksheetDetails)
       }
-    } catch (e) {}
+    } catch (e) { }
 
     const pendingSplitOIs: OrderInventory[] = await this.trxMgr.getRepository(OrderInventory).find({
       where: { domain: this.domain, releaseGood, status: ORDER_INVENTORY_STATUS.PENDING_SPLIT }
@@ -431,7 +430,11 @@ export class PickingWorksheetController extends VasWorksheetController {
         .innerJoinAndSelect('oi.inventory', 'inv')
         .leftJoinAndSelect('oi.orderProduct', 'op')
         .innerJoinAndSelect('oi.product', 'prd')
-        .innerJoinAndSelect('oi.productDetail', 'pd')
+        .leftJoinAndSelect(
+          'prd.productDetails',
+          'pd',
+          'pd.product_id = oi.product_id AND pd.deleted_at is null AND pd.packing_type = oi.packing_type AND pd.packing_size = oi.packing_size AND pd.uom = oi.uom'
+        )
         .where('wd.name = :name', { name: worksheetDetailName })
         .andWhere('wd.domain_id = :domainId', { domainId: this.domain.id })
         .andWhere('wd.type = :type', { type: worksheetType })
@@ -440,41 +443,27 @@ export class PickingWorksheetController extends VasWorksheetController {
         .getOne()
 
       //validation to check matching worksheet detail based on name
-      if (!worksheetDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName))
-
-      const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
-      let targetInventory: OrderInventory = worksheetDetail.targetInventory
-      let targetProduct: OrderProduct = targetInventory.orderProduct
-      const product: Product = targetInventory.product
-      const productDetail: ProductDetail = targetInventory.productDetail
-      let inventory: Inventory = targetInventory.inventory
-      let bizplace: Bizplace = worksheetDetail.worksheet.bizplace
-      let pickedUomValue = pickedQty * productDetail.uomValue
-      let matchingProduct
+      if (!worksheetDetail || !worksheetDetail.targetInventory)
+        throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName))
 
       //validation to prevent duplicated picking
-      if (targetInventory?.status != ORDER_INVENTORY_STATUS.PICKING)
+      if (worksheetDetail?.targetInventory?.status != ORDER_INVENTORY_STATUS.PICKING)
         throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`))
 
-      if (productBarcode !== productDetail.gtin) {
-        if (product?.isRequireSerialNumberScanningOutbound)
-          throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
-
-        matchingProduct = await this.getDirectQty(
-          {
-            ...productDetail,
-            product: targetInventory?.product
-          },
-          productBarcode,
-          pickedQty
-        )
+      let matchingProduct = await this.getDirectQty(
+        {
+          ...worksheetDetail?.targetInventory?.product?.productDetails[0],
+          product: worksheetDetail?.targetInventory?.product
+        },
+        productBarcode,
+        pickedQty
+      )
 
-        //validate matching product details based on scanned barcode
-        if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+      //validate matching product details based on scanned barcode
+      if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
 
-        pickedQty = matchingProduct.qty
-        pickedUomValue = matchingProduct.uomValue
-      }
+      pickedQty = matchingProduct.qty
+      let pickedUomValue = matchingProduct.uomValue
 
       //validation to prevent over release
       if (
@@ -484,24 +473,15 @@ export class PickingWorksheetController extends VasWorksheetController {
       )
         throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
 
-      targetInventory = await this.checkAndSetBinPicking(targetInventory, binLocation)
-
-      // // search for matching product barcode
-      // const productDetails: ProductDetail[] = product?.productDetails.filter(detail => !detail.deletedAt)
-      // // scannedProductDetail can be child or gtin
-      // const scannedProductDetail: ProductDetail = productDetails.find(detail => detail.gtin == productBarcode)
-      // if (!scannedProductDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+      const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
 
-      // // case for scanning parent packing type, packing size
-      // // when scannedProductDetail id is not the same as productDetail id, then it's not child gtin, proceed to get child qty
-      // if (scannedProductDetail.id !== productDetail.id && !product?.isRequireSerialNumberScanningOutbound) {
-      //   let childQty = await this.getChildQty(productDetails, productBarcode, productDetail, scannedProductDetail)
-      //   pickedQty *= childQty
-      // }
+      let targetInventory: OrderInventory = worksheetDetail.targetInventory
+      let targetProduct: OrderProduct = targetInventory.orderProduct
+      let inventory: Inventory = targetInventory.inventory
+      let bizplace: Bizplace = worksheetDetail.worksheet.bizplace
+      const product: Product = targetInventory.product
 
-      // if (pickedQty + targetInventory.pickedQty > releaseQty) {
-      //   throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
-      // }
+      targetInventory = await this.checkAndSetBinPicking(targetInventory, binLocation)
 
       // for required outbound serial number scanning
       if (product?.isRequireSerialNumberScanningOutbound) {
@@ -549,7 +529,6 @@ export class PickingWorksheetController extends VasWorksheetController {
           inventoryItem.outboundOrderId = releaseGood.id
           inventoryItem.source = INVENTORY_ITEM_SOURCE.OUTBOUND
           inventoryItem.product = product
-          inventoryItem.productDetail = productDetail
           inventoryItem.inventory = inventory
           inventoryItem.domain = this.domain
 
@@ -715,15 +694,13 @@ export class PickingWorksheetController extends VasWorksheetController {
           'targetInventory.orderProduct',
           'targetInventory.inventory',
           'targetInventory.inventory.location',
-          'targetInventory.product',
-          'targetInventory.productDetail'
+          'targetInventory.product'
         ]
       )
 
       const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
       let targetInventory: OrderInventory = worksheetDetail.targetInventory
       const product: Product = targetInventory.product
-      const productDetail: ProductDetail = targetInventory.productDetail
       let inventory: Inventory = targetInventory.inventory
       let targetProduct: OrderProduct = targetInventory.orderProduct
       let bizplace: Bizplace = worksheetDetail.worksheet.bizplace
@@ -753,13 +730,13 @@ export class PickingWorksheetController extends VasWorksheetController {
         })
 
         let foundSerialNumber: InventoryItem = await this.trxMgr.getRepository(InventoryItem).findOne({
-          where: { domain: this.domain, serialNumber: serialNumber, productDetail },
-          relations: ['product', 'productDetail', 'inventory']
+          where: { domain: this.domain, serialNumber: serialNumber, product },
+          relations: ['product', 'inventory']
         })
 
         let scannedPalletIdInventory: Inventory = await this.trxMgr
           .getRepository(Inventory)
-          .findOne({ where: { domain: this.domain, palletId }, relations: ['productDetail'] })
+          .findOne({ where: { domain: this.domain, palletId }, relations: ['product'] })
 
         if (foundSerialNumber) {
           if (foundSerialNumber.outboundOrderId) {
@@ -786,7 +763,6 @@ export class PickingWorksheetController extends VasWorksheetController {
           inventoryItem.source = INVENTORY_ITEM_SOURCE.OUTBOUND
           inventoryItem.outboundOrderId = releaseGood.id
           inventoryItem.product = product
-          inventoryItem.productDetail = productDetail
           inventoryItem.inventory = scannedPalletIdInventory
           inventoryItem.domain = this.domain
 
@@ -812,7 +788,8 @@ export class PickingWorksheetController extends VasWorksheetController {
             )
           } else if (
             scannedPalletIdInventory.batchId == inventory.batchId &&
-            scannedPalletIdInventory.productDetail.id == productDetail.id
+            scannedPalletIdInventory.product.id == product.id &&
+            scannedPalletIdInventory.product.packingType == product.packingType
           ) {
             //if replacement order inventory does not exist
             await this.serialNumberReplacement(
@@ -820,7 +797,6 @@ export class PickingWorksheetController extends VasWorksheetController {
               scannedPalletIdInventory,
               releaseGood,
               product,
-              productDetail,
               worksheetDetail,
               foundSerialNumber
             )
@@ -996,8 +972,6 @@ export class PickingWorksheetController extends VasWorksheetController {
         'worksheetDetails.targetInventory.releaseGood',
         'worksheetDetails.targetInventory.inventory',
         'worksheetDetails.targetInventory.inventory.location',
-        'worksheetDetails.targetInventory.productDetail',
-        'worksheetDetails.targetInventory.productDetail.product',
         'worksheetDetails.targetInventory.product',
         'worksheetDetails.targetInventory.product.productDetails',
         'worksheetDetails.targetInventory.product.productDetails.childProductDetail'
@@ -1005,53 +979,49 @@ export class PickingWorksheetController extends VasWorksheetController {
     })
 
     const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
-    const productDetail: ProductDetail = worksheetDetails
-      .map(wsd => wsd.targetInventory.productDetail)
-      .find(productDetail => productDetail.id === inventory.productDetail.id)
-
-    const product: Product = productDetail.product
+    const product: Product = worksheetDetails
+      .map((wsd: WorksheetDetail) => wsd.targetInventory.product)
+      .find((product: Product) => product.id === inventory.product.id)
 
     const batchId: string = inventory.batchId
+    const packingType: string = inventory.packingType
+    const packingSize: number = inventory.packingSize
     let pickedQty: number = pickingQty ? pickingQty : 1
-    let matchingProduct
 
     const targetInventories: OrderInventory[] = worksheetDetails
       .map((wsd: WorksheetDetail) => wsd.targetInventory)
       .filter(
         (targetInventory: OrderInventory) =>
           targetInventory.batchId === batchId &&
+          targetInventory.packingType === packingType &&
           targetInventory.inventory.cartonId === cartonId &&
-          targetInventory.productDetail.id === productDetail.id
-      )
-
-    if (productBarcode !== productDetail.gtin) {
-      matchingProduct = await this.getDirectQty(
-        {
-          ...productDetail,
-          product
-        },
-        productBarcode,
-        pickedQty
+          targetInventory.product.id === product.id
       )
 
-      //validate matching product details based on scanned barcode
-      if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+    // search for matching product barcode
+    const productDetails: ProductDetail[] = product?.productDetails.filter(detail => !detail.deletedAt)
+    const isMatchingBarcode: boolean = productDetails.map(detail => detail.gtin).includes(productBarcode)
+    if (!isMatchingBarcode) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(`GTIN (${productBarcode})`))
 
-      pickedQty = matchingProduct.qty
-    }
+    // case for scanning parent packing type, packing size
+    const foundProductDetail: ProductDetail = productDetails.find(
+      (detail: ProductDetail) =>
+        detail.gtin === productBarcode && detail.packingType === packingType && detail.packingSize == packingSize
+    )
 
-    // // search for matching product barcode
-    // const productDetails: ProductDetail[] = product?.productDetails.filter(detail => !detail.deletedAt)
-    // // scannedProductDetail can be child or gtin
-    // const scannedProductDetail: ProductDetail = productDetails.find(detail => detail.gtin == productBarcode)
-    // if (!scannedProductDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+    if (!foundProductDetail) {
+      const roProductDetail: ProductDetail = productDetails.find(
+        (parentDetail: ProductDetail) =>
+          parentDetail.packingType === packingType && parentDetail.packingSize == packingSize
+      )
+      if (!roProductDetail)
+        throw new Error(
+          this.ERROR_MSG.FIND.NO_RESULT(`Packing Type ( ${packingType}) or Packing Size (${packingSize})`)
+        )
 
-    // // case for scanning parent packing type, packing size
-    // // when scannedProductDetail id is not the same as productDetail id, then it's not child gtin, proceed to get child qty
-    // if (scannedProductDetail.id !== productDetail.id) {
-    //   let childQty = await this.getChildQty(productDetails, productBarcode, productDetail, scannedProductDetail)
-    //   pickedQty *= childQty
-    // }
+      let childQty = await this.getChildQty(productDetails, productBarcode, roProductDetail)
+      pickedQty *= childQty
+    }
 
     const sumOfReleaseQty: number = targetInventories
       .map((oi: OrderInventory) => oi.releaseQty)
@@ -1436,7 +1406,7 @@ export class PickingWorksheetController extends VasWorksheetController {
         await this.trxMgr.getRepository(WorksheetDetail).delete(worksheetDetail.ild)
         await this.trxMgr.getRepository(OrderInventory).delete(targetInventory.id)
       }
-    } catch (e) {}
+    } catch (e) { }
   }
 
   private async serialNumberReplacement(
@@ -1444,7 +1414,6 @@ export class PickingWorksheetController extends VasWorksheetController {
     scannedPalletIdInventory,
     releaseGood,
     product,
-    productDetail,
     worksheetDetail,
     foundSerialNumber
   ) {
@@ -1509,7 +1478,6 @@ export class PickingWorksheetController extends VasWorksheetController {
         releaseUomValue: newOrderInventoryReleaseUomValue,
         pickedQty: 1,
         product,
-        productDetail,
         inventory: scannedPalletIdInventory,
         creator: this.user,
         updater: this.user
@@ -1553,7 +1521,7 @@ export class PickingWorksheetController extends VasWorksheetController {
         await this.trxMgr.getRepository(WorksheetDetail).delete(worksheetDetail.id)
         await this.trxMgr.getRepository(OrderInventory).delete(targetInventory.id)
       }
-    } catch (e) {}
+    } catch (e) { }
   }
 
   private async toteScanning(toteNo, targetProduct, targetInventory, pickedQty, releaseGood, bizplace) {

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

@@ -95,8 +95,7 @@ export class SortingWorksheetController extends VasWorksheetController {
         'worksheetDetails.targetInventory.inventory.product',
         'worksheetDetails.targetInventory.inventory.product.productDetails',
         'worksheetDetails.targetInventory.inventory.product.productDetails.product',
-        'worksheetDetails.targetInventory.releaseGood',
-        'worksheetDetails.targetInventory.productDetail'
+        'worksheetDetails.targetInventory.releaseGood'
       ]
     })
 
@@ -119,12 +118,17 @@ export class SortingWorksheetController extends VasWorksheetController {
       const matchingProductDetail: ProductDetail = productDetails.find(
         (productDetail: ProductDetail) => productDetail.gtin === productBarcode
       )
-      if (!matchingProductDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+      if (!matchingProductDetail) throw new Error('Unable to find product barcode.')
       const packingType: string = matchingProductDetail.packingType
       const packingSize: number = matchingProductDetail.packingSize
+      if (!matchingProductDetail)
+        throw new Error(this.ERROR_MSG.PRODUCT.BARCODE_NOT_EXIST(productBarcode, packingType, packingSize))
 
       let matchingOIs: OrderInventory[] = orderInventories.filter(
-        (oi: OrderInventory) => oi.productDetail.id === matchingProductDetail.id
+        (oi: OrderInventory) =>
+          oi.packingType === packingType &&
+          oi.packingSize === packingSize &&
+          oi.product?.id === matchingProductDetail.product?.id
       )
 
       let sortedQty: number = 1
@@ -138,7 +142,6 @@ export class SortingWorksheetController extends VasWorksheetController {
             const inventory: Inventory = matchingOI.inventory
             const releaseGood: ReleaseGood = matchingOI.releaseGood
             const product: Product = inventory.product
-            const productDetail: ProductDetail = matchingOI.productDetail
 
             if (releaseQty != matchingOI?.sortedQty && sortedQty == 1) {
               // Serial Number scanning for batch picking
@@ -150,7 +153,7 @@ export class SortingWorksheetController extends VasWorksheetController {
 
                   let foundSerialNumber: InventoryItem = await this.trxMgr
                     .getRepository(InventoryItem)
-                    .findOne({ where: { domain: this.domain, serialNumber: serialNumber, productDetail } })
+                    .findOne({ where: { domain: this.domain, serialNumber: serialNumber, product } })
 
                   if (foundSerialNumber) {
                     if (foundSerialNumber.inventoryId !== inventory.id) {
@@ -177,7 +180,6 @@ export class SortingWorksheetController extends VasWorksheetController {
                     inventoryItem.outboundOrderId = releaseGood.id
                     inventoryItem.source = INVENTORY_ITEM_SOURCE.OUTBOUND
                     inventoryItem.product = product
-                    inventoryItem.productDetail = productDetail
                     inventoryItem.inventory = inventory
                     inventoryItem.domain = this.domain
 
@@ -261,8 +263,7 @@ export class SortingWorksheetController extends VasWorksheetController {
         'worksheetDetails.targetInventory.inventory.product',
         'worksheetDetails.targetInventory.inventory.product.productDetails',
         'worksheetDetails.targetInventory.inventory.product.productDetails.product',
-        'worksheetDetails.targetInventory.releaseGood',
-        'worksheetDetails.targetInventory.productDetail'
+        'worksheetDetails.targetInventory.releaseGood'
       ]
     })
 
@@ -282,7 +283,6 @@ export class SortingWorksheetController extends VasWorksheetController {
           const inventory: Inventory = matchingOI.inventory
           const releaseGood: ReleaseGood = matchingOI.releaseGood
           const product: Product = matchingOI.inventory.product
-          const productDetail: ProductDetail = matchingOI.productDetail
           const packingType: string = matchingOI.packingType
           const packingSize: number = matchingOI.packingSize
 
@@ -292,7 +292,8 @@ export class SortingWorksheetController extends VasWorksheetController {
             }
 
             let foundSerialNumber: InventoryItem = await this.trxMgr.getRepository(InventoryItem).findOne({
-              where: { domain: this.domain, serialNumber: serialNumber, productDetail }
+              where: { domain: this.domain, serialNumber: serialNumber, product },
+              relations: ['product', 'inventory']
             })
 
             if (foundSerialNumber) {
@@ -316,7 +317,6 @@ export class SortingWorksheetController extends VasWorksheetController {
               inventoryItem.source = INVENTORY_ITEM_SOURCE.OUTBOUND
               inventoryItem.outboundOrderId = releaseGood.id
               inventoryItem.product = product
-              inventoryItem.productDetail = productDetail
               inventoryItem.inventory = inventory
               inventoryItem.domain = this.domain
 

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

@@ -51,7 +51,7 @@ export async function renderOrientageDO({ doNo }, context: any) {
   const ownRefNo3 = foundRO.refNo3
 
   const partnerDomain: Partner = await getRepository(Partner).findOne({
-    where: { partnerDomain: partnerBiz.domain },
+    where: { domain, partnerDomain: partnerBiz.domain },
     relations: ['domain']
   })