@things-factory/worksheet-base 4.3.77 → 4.3.79-alpha.1

package/dist-server/utils/worksheet-util.js.map

@@ -1 +1 @@
-{"version":3,"file":"worksheet-util.js","sourceRoot":"","sources":["../../server/utils/worksheet-util.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"worksheet-util.js","sourceRoot":"","sources":["../../server/utils/worksheet-util.ts"],"names":[],"mappings":"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"}

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.77",
+  "version": "4.3.79-alpha.1",
   "main": "dist-server/index.js",
   "browser": "client/index.js",
   "things-factory": true,
@@ -24,21 +24,21 @@
     "migration:create": "node ../../node_modules/typeorm/cli.js migration:create -d ./server/migrations"
   },
   "dependencies": {
-    "@things-factory/auth-base": "^4.3.76",
-    "@things-factory/biz-base": "^4.3.76",
-    "@things-factory/document-template-base": "^4.3.76",
-    "@things-factory/id-rule-base": "^4.3.76",
-    "@things-factory/integration-lmd": "^4.3.76",
-    "@things-factory/integration-marketplace": "^4.3.76",
-    "@things-factory/integration-sellercraft": "^4.3.76",
-    "@things-factory/integration-sftp": "^4.3.76",
-    "@things-factory/marketplace-base": "^4.3.76",
-    "@things-factory/notification": "^4.3.76",
-    "@things-factory/sales-base": "^4.3.76",
-    "@things-factory/setting-base": "^4.3.76",
-    "@things-factory/shell": "^4.3.76",
-    "@things-factory/transport-base": "^4.3.76",
-    "@things-factory/warehouse-base": "^4.3.76"
+    "@things-factory/auth-base": "^4.3.79-alpha.0",
+    "@things-factory/biz-base": "^4.3.79-alpha.0",
+    "@things-factory/document-template-base": "^4.3.79-alpha.0",
+    "@things-factory/id-rule-base": "^4.3.79-alpha.0",
+    "@things-factory/integration-lmd": "^4.3.79-alpha.0",
+    "@things-factory/integration-marketplace": "^4.3.79-alpha.0",
+    "@things-factory/integration-sellercraft": "^4.3.79-alpha.0",
+    "@things-factory/integration-sftp": "^4.3.79-alpha.0",
+    "@things-factory/marketplace-base": "^4.3.79-alpha.1",
+    "@things-factory/notification": "^4.3.79-alpha.0",
+    "@things-factory/sales-base": "^4.3.79-alpha.1",
+    "@things-factory/setting-base": "^4.3.79-alpha.0",
+    "@things-factory/shell": "^4.3.79-alpha.0",
+    "@things-factory/transport-base": "^4.3.79-alpha.0",
+    "@things-factory/warehouse-base": "^4.3.79-alpha.1"
   },
-  "gitHead": "365b598107863f454289eda70828ae7ac171f0c9"
+  "gitHead": "781aa433ce81cb1cd08d6a3c4abb2934f0a192c1"
 }

package/server/controllers/inbound/unloading-worksheet-controller.ts

@@ -31,12 +31,13 @@ import {
   InventoryNoGenerator,
   Location,
   Pallet,
-  Warehouse
+  Warehouse,
+  generateInventoryHistory
 } from '@things-factory/warehouse-base'
 
 import { RULE_TYPE, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
-import { DateGenerator, generateInventoryHistory } from '../../utils'
+import { DateGenerator } from '../../utils'
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export type UnloadingWorksheetDetail = Partial<WorksheetDetail> & {
@@ -177,7 +178,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
         } else {
           uom = orderProductDetail.uom
         }
-        qty = (await this.getChildQty(productDetails, productBarcode, orderProductDetail)) * qty
+        qty = (await this.getChildQty(productDetails, productBarcode, orderProductDetail, orderProductDetail)) * qty
       } else {
         uom = foundProductDetail.uom
         qty
@@ -520,7 +521,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       } else {
         uom = orderProductDetail.uom
       }
-      qty = await this.getChildQty(productDetails, productBarcode, orderProductDetail)
+      qty = await this.getChildQty(productDetails, productBarcode, orderProductDetail, orderProductDetail)
     } else {
       uom = foundProductDetail.uom
       qty++

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

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

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

@@ -12,11 +12,10 @@ import {
   OrderToteItem,
   OrderTote
 } from '@things-factory/sales-base'
-import { Inventory, INVENTORY_TRANSACTION_TYPE, Tote, TOTE_STATUS } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_TRANSACTION_TYPE, Tote, TOTE_STATUS, generateInventoryHistory } 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 {
@@ -112,7 +111,13 @@ export class LoadingWorksheetController extends VasWorksheetController {
       let worksheetDetail = await this.findExecutableWorksheetDetailByName(
         worksheetDetails[i].name,
         WORKSHEET_TYPE.LOADING,
-        ['worksheet', 'targetInventory', 'targetInventory.inventory', 'targetInventory.product']
+        [
+          'worksheet',
+          'targetInventory',
+          'targetInventory.inventory',
+          'targetInventory.product',
+          'targetInventory.productDetail'
+        ]
       )
 
       const worksheet: Worksheet = worksheetDetail.worksheet
@@ -170,6 +175,7 @@ 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,13 +93,15 @@ export class PackingWorksheetController extends VasWorksheetController {
         'targetInventory.releaseGood',
         'targetInventory.inventory',
         'targetInventory.inventory.location',
-        'targetInventory.product'
+        'targetInventory.product',
+        'targetInventory.productDetail'
       ]
     )
-    const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
     let targetInventory: OrderInventory = worksheetDetail.targetInventory
-    const product: Product = targetInventory.product
     let inventory: Inventory = targetInventory.inventory
+    const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
+    const product: Product = targetInventory.product
+    const productDetail: ProductDetail = targetInventory.productDetail
     const pickedQty: number = targetInventory.releaseQty
 
     if (packedQty > pickedQty) {
@@ -114,8 +116,7 @@ export class PackingWorksheetController extends VasWorksheetController {
         }
 
         let foundSerialNumber: InventoryItem = await this.trxMgr.getRepository(InventoryItem).findOne({
-          where: { domain: this.domain, serialNumber: serialNumber, product },
-          relations: ['product', 'inventory']
+          where: { domain: this.domain, serialNumber: serialNumber, productDetail }
         })
 
         if (foundSerialNumber) {
@@ -139,6 +140,7 @@ 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
 
@@ -193,26 +195,34 @@ export class PackingWorksheetController extends VasWorksheetController {
         'targetInventory.inventory',
         'targetInventory.inventory.product',
         'targetInventory.inventory.product.productDetails',
-        'targetInventory.inventory.location'
+        'targetInventory.inventory.product.productDetails.childProductDetail',
+        'targetInventory.inventory.location',
+        'targetInventory.productDetail'
       ]
     )
-    const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
-    const product: Product = worksheetDetail.targetInventory.inventory.product
     let targetInventory: OrderInventory = worksheetDetail.targetInventory
     let inventory: Inventory = targetInventory.inventory
     let packedQty: number = 1
-    const pickedQty: number = targetInventory.releaseQty
+    let pickedQty: number = targetInventory.releaseQty
+    const releaseGood: ReleaseGood = targetInventory.releaseGood
+    const product: Product = targetInventory.inventory.product
+    const productDetail: ProductDetail = targetInventory.productDetail
 
     // 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) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+    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)
+      pickedQty *= childQty
+    }
+
+    if (packedQty + targetInventory.packedQty > pickedQty) {
+      throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
+    }
 
     // Serial Number scanning for batch picking
     if (targetInventory?.refWorksheetId) {
@@ -223,7 +233,7 @@ export class PackingWorksheetController extends VasWorksheetController {
 
         let foundSerialNumber: InventoryItem = await this.trxMgr
           .getRepository(InventoryItem)
-          .findOne({ where: { domain: this.domain, serialNumber: serialNumber, product } })
+          .findOne({ where: { domain: this.domain, serialNumber: serialNumber, productDetail } })
 
         if (foundSerialNumber) {
           if (foundSerialNumber.inventoryId !== inventory.id) {
@@ -250,6 +260,7 @@ 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

@@ -40,7 +40,7 @@ import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 import { SellercraftController } from '../../controllers'
 
 export class PickingWorksheetController extends VasWorksheetController {
-  async generatePickingWorksheet(releaseGoodNo: string): Promise<Worksheet> {
+  async generatePickingWorksheet(releaseGoodNo: string, currentStatus: string = null): Promise<Worksheet> {
     let releaseGood: ReleaseGood = await this.findRefOrder(
       ReleaseGood,
       {
@@ -78,7 +78,7 @@ export class PickingWorksheetController extends VasWorksheetController {
 
     releaseGood.status = ORDER_STATUS.READY_TO_PICK
     releaseGood.updater = this.user
-    await this.updateRefOrder(releaseGood)
+    await this.updateRefOrder(releaseGood, null, currentStatus)
 
     return worksheet
   }
@@ -254,12 +254,13 @@ export class PickingWorksheetController extends VasWorksheetController {
 
     worksheet = await this.activateWorksheet(worksheet, worksheetDetails, [])
 
-    const completeSplitOIs: OrderInventory[] = await this.trxMgr.getRepository(OrderInventory).find({
-      where: { domain: this.domain, refWorksheetId: worksheet.id, status: ORDER_INVENTORY_STATUS.COMPLETE_SPLIT },
+    // retrieve order inventory
+    const pickingOrderInventory: OrderInventory[] = await this.trxMgr.getRepository(OrderInventory).find({
+      where: { domain: this.domain, refWorksheetId: worksheet.id, status: ORDER_STATUS.PICKING },
       relations: ['releaseGood']
     })
 
-    let releaseGoods: ReleaseGood[] = completeSplitOIs.map((oi: OrderInventory) => oi.releaseGood)
+    let releaseGoods: ReleaseGood[] = pickingOrderInventory.map((oi: OrderInventory) => oi.releaseGood)
 
     if (releaseGoods?.length) {
       releaseGoods = releaseGoods.map((rg: ReleaseGood) => {
@@ -272,11 +273,6 @@ export class PickingWorksheetController extends VasWorksheetController {
       await this.trxMgr.getRepository(ReleaseGood).save(releaseGoods)
     }
 
-    if (completeSplitOIs?.length) {
-      const ids: string[] = completeSplitOIs.map((oi: OrderInventory) => oi.id)
-      await this.trxMgr.getRepository(OrderInventory).delete(ids)
-    }
-
     return worksheet
   }
 
@@ -439,7 +435,8 @@ export class PickingWorksheetController extends VasWorksheetController {
           'targetInventory.orderProduct',
           'targetInventory.product.productDetails',
           'targetInventory.product.productDetails.product',
-          'targetInventory.product.productDetails.childProductDetail'
+          'targetInventory.product.productDetails.childProductDetail',
+          'targetInventory.productDetail'
         ]
       )
 
@@ -447,6 +444,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       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
 
@@ -462,9 +460,6 @@ export class PickingWorksheetController extends VasWorksheetController {
       if (inventory.cartonId !== cartonId)
         throw new Error(this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('Carton ID', cartonId, inventory.cartonId))
 
-      const packingType: string = inventory.packingType
-      const packingSize: number = inventory.packingSize
-
       let pickedQty: number = pickingQty ? pickingQty : 1
       const releaseQty: number = targetInventory.releaseQty
 
@@ -472,28 +467,15 @@ export class PickingWorksheetController extends VasWorksheetController {
 
       // 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(productBarcode))
+      // 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))
 
       // case for scanning parent packing type, packing size
-      const foundProductDetail: ProductDetail = productDetails.find(
-        (detail: ProductDetail) =>
-          detail.gtin === productBarcode &&
-          detail.packingType === packingType &&
-          detail.packingSize == packingSize &&
-          detail.product?.id === product.id
-      )
-
-      if (!foundProductDetail && !product?.isRequireSerialNumberScanningOutbound) {
-        const roProductDetail: ProductDetail = productDetails.find(
-          (parentDetail: ProductDetail) =>
-            parentDetail.packingType === packingType && parentDetail.packingSize == packingSize
-        )
-
-        let childQty = await this.getChildQty(productDetails, productBarcode, roProductDetail)
+      // 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
-      } else if (!foundProductDetail) {
-        throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
       }
 
       if (pickedQty + targetInventory.pickedQty > releaseQty) {
@@ -545,6 +527,7 @@ 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
 
@@ -584,13 +567,15 @@ export class PickingWorksheetController extends VasWorksheetController {
           'targetInventory.orderProduct',
           'targetInventory.inventory',
           'targetInventory.inventory.location',
-          'targetInventory.product'
+          'targetInventory.product',
+          'targetInventory.productDetail'
         ]
       )
 
       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
@@ -620,13 +605,13 @@ export class PickingWorksheetController extends VasWorksheetController {
         })
 
         let foundSerialNumber: InventoryItem = await this.trxMgr.getRepository(InventoryItem).findOne({
-          where: { domain: this.domain, serialNumber: serialNumber, product },
-          relations: ['product', 'inventory']
+          where: { domain: this.domain, serialNumber: serialNumber, productDetail },
+          relations: ['product', 'productDetail', 'inventory']
         })
 
         let scannedPalletIdInventory: Inventory = await this.trxMgr
           .getRepository(Inventory)
-          .findOne({ where: { domain: this.domain, palletId }, relations: ['product'] })
+          .findOne({ where: { domain: this.domain, palletId }, relations: ['productDetail'] })
 
         if (foundSerialNumber) {
           if (foundSerialNumber.outboundOrderId) {
@@ -653,6 +638,7 @@ 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
 
@@ -678,8 +664,7 @@ export class PickingWorksheetController extends VasWorksheetController {
             )
           } else if (
             scannedPalletIdInventory.batchId == inventory.batchId &&
-            scannedPalletIdInventory.product.id == product.id &&
-            scannedPalletIdInventory.product.packingType == product.packingType
+            scannedPalletIdInventory.productDetail.id == productDetail.id
           ) {
             //if replacement order inventory does not exist
             await this.serialNumberReplacement(
@@ -687,6 +672,7 @@ export class PickingWorksheetController extends VasWorksheetController {
               scannedPalletIdInventory,
               releaseGood,
               product,
+              productDetail,
               worksheetDetail,
               foundSerialNumber
             )
@@ -862,16 +848,19 @@ export class PickingWorksheetController extends VasWorksheetController {
         'worksheetDetails.targetInventory.releaseGood',
         'worksheetDetails.targetInventory.inventory',
         'worksheetDetails.targetInventory.inventory.location',
-        'worksheetDetails.targetInventory.product',
+        'worksheetDetails.targetInventory.productDetail',
+        'worksheetDetails.targetInventory.productDetail.product',
         'worksheetDetails.targetInventory.product.productDetails',
         'worksheetDetails.targetInventory.product.productDetails.childProductDetail'
       ]
     })
 
     const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
-    const product: Product = worksheetDetails
+    const productDetail: ProductDetail = worksheetDetails
       .map((wsd: WorksheetDetail) => wsd.targetInventory.product)
-      .find((product: Product) => product.id === inventory.product.id)
+      .find((productDetail: ProductDetail) => productDetail.id === inventory.productDetail.id)
+
+    const product: Product = productDetail.product
 
     const batchId: string = inventory.batchId
     const packingType: string = inventory.packingType
@@ -890,26 +879,14 @@ export class PickingWorksheetController extends VasWorksheetController {
 
     // 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})`))
+    // 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))
 
     // case for scanning parent packing type, packing size
-    const foundProductDetail: ProductDetail = productDetails.find(
-      (detail: ProductDetail) =>
-        detail.gtin === productBarcode && detail.packingType === packingType && detail.packingSize == packingSize
-    )
-
-    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})`)
-        )
-
-      let childQty = await this.getChildQty(productDetails, productBarcode, roProductDetail)
+    // 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
     }
 
@@ -1304,6 +1281,7 @@ export class PickingWorksheetController extends VasWorksheetController {
     scannedPalletIdInventory,
     releaseGood,
     product,
+    productDetail,
     worksheetDetail,
     foundSerialNumber
   ) {
@@ -1368,6 +1346,7 @@ export class PickingWorksheetController extends VasWorksheetController {
         releaseUomValue: newOrderInventoryReleaseUomValue,
         pickedQty: 1,
         product,
+        productDetail,
         inventory: scannedPalletIdInventory,
         creator: this.user,
         updater: this.user

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

@@ -95,7 +95,8 @@ 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.releaseGood',
+        'worksheetDetails.targetInventory.productDetail'
       ]
     })
 
@@ -118,17 +119,12 @@ export class SortingWorksheetController extends VasWorksheetController {
       const matchingProductDetail: ProductDetail = productDetails.find(
         (productDetail: ProductDetail) => productDetail.gtin === productBarcode
       )
-      if (!matchingProductDetail) throw new Error('Unable to find product barcode.')
+      if (!matchingProductDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
       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.packingType === packingType &&
-          oi.packingSize === packingSize &&
-          oi.product?.id === matchingProductDetail.product?.id
+        (oi: OrderInventory) => oi.productDetail.id === matchingProductDetail.id
       )
 
       let sortedQty: number = 1
@@ -142,6 +138,7 @@ 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
@@ -153,7 +150,7 @@ export class SortingWorksheetController extends VasWorksheetController {
 
                   let foundSerialNumber: InventoryItem = await this.trxMgr
                     .getRepository(InventoryItem)
-                    .findOne({ where: { domain: this.domain, serialNumber: serialNumber, product } })
+                    .findOne({ where: { domain: this.domain, serialNumber: serialNumber, productDetail } })
 
                   if (foundSerialNumber) {
                     if (foundSerialNumber.inventoryId !== inventory.id) {
@@ -180,6 +177,7 @@ 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
 
@@ -263,7 +261,8 @@ 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.releaseGood',
+        'worksheetDetails.targetInventory.productDetail'
       ]
     })
 
@@ -283,6 +282,7 @@ 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,8 +292,7 @@ export class SortingWorksheetController extends VasWorksheetController {
             }
 
             let foundSerialNumber: InventoryItem = await this.trxMgr.getRepository(InventoryItem).findOne({
-              where: { domain: this.domain, serialNumber: serialNumber, product },
-              relations: ['product', 'inventory']
+              where: { domain: this.domain, serialNumber: serialNumber, productDetail }
             })
 
             if (foundSerialNumber) {
@@ -317,6 +316,7 @@ 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/vas/vas-worksheet-controller.ts

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