@things-factory/worksheet-base 4.3.82 → 4.3.83

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
 
@@ -196,28 +194,39 @@ export class PackingWorksheetController extends VasWorksheetController {
         'targetInventory.inventory.product',
         'targetInventory.inventory.product.productDetails',
         'targetInventory.inventory.product.productDetails.childProductDetail',
-        'targetInventory.inventory.location',
-        'targetInventory.productDetail'
+        'targetInventory.inventory.location'
       ]
     )
+    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
 
     // 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)
-      pickedQty *= childQty
+    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
+      )
+
+      roProductDetail.product = product
+
+      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) {
@@ -233,7 +242,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) {
@@ -260,7 +269,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

@@ -1,11 +1,10 @@
-import { Equal, In, IsNull, Not, getRepository, getConnection } from 'typeorm'
+import { EntityManager, Equal, getConnection, In, IsNull, Not } from 'typeorm'
 
 import { Bizplace } from '@things-factory/biz-base'
 import { generateId } from '@things-factory/id-rule-base'
 import { Product, ProductDetail } from '@things-factory/product-base'
-import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { logger } from '@things-factory/env'
 import {
+  GenerateBatchPickInfo,
   ORDER_INVENTORY_STATUS,
   ORDER_PRODUCT_STATUS,
   ORDER_STATUS,
@@ -16,8 +15,7 @@ import {
   OrderToteItem,
   OrderToteSeal,
   OrderVas,
-  ReleaseGood,
-  GenerateBatchPickInfo
+  ReleaseGood
 } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
 import {
@@ -35,9 +33,8 @@ import {
 
 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'
-import { SellercraftController } from '../../controllers'
 
 export class PickingWorksheetController extends VasWorksheetController {
   async generatePickingWorksheet(releaseGoodNo: string, currentStatus: string = null): Promise<Worksheet> {
@@ -419,69 +416,74 @@ export class PickingWorksheetController extends VasWorksheetController {
     binLocation?: string,
     serialNumber?: string,
     toteNo?: string,
-    pickingQty?: number
-  ): Promise<OrderInventory> {
+    pickedQty: number = 1
+  ): Promise<WorksheetDetail> {
     try {
-      let worksheetDetail: WorksheetDetail = await this.findExecutableWorksheetDetailByName(
-        worksheetDetailName,
-        worksheetType,
-        [
-          'worksheet',
-          'worksheet.bizplace',
-          'targetInventory',
-          'targetInventory.releaseGood',
-          'targetInventory.inventory',
-          'targetInventory.product',
-          'targetInventory.orderProduct',
-          'targetInventory.product.productDetails',
-          'targetInventory.product.productDetails.product',
-          'targetInventory.product.productDetails.childProductDetail',
-          'targetInventory.productDetail'
-        ]
-      )
+      //find existing worksheet detail
+      let worksheetDetail: WorksheetDetail = await this.trxMgr
+        .getRepository(WorksheetDetail)
+        .createQueryBuilder('wd')
+        .innerJoinAndSelect('wd.worksheet', 'ws')
+        .innerJoinAndSelect('ws.bizplace', 'bz')
+        .innerJoinAndSelect('wd.targetInventory', 'oi')
+        .innerJoinAndSelect('oi.releaseGood', 'rg')
+        .innerJoinAndSelect('oi.inventory', 'inv')
+        .leftJoinAndSelect('oi.orderProduct', 'op')
+        .innerJoinAndSelect('oi.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.name = :name', { name: worksheetDetailName })
+        .andWhere('wd.domain_id = :domainId', { domainId: this.domain.id })
+        .andWhere('wd.type = :type', { type: worksheetType })
+        .andWhere('wd.status = :status', { status: WORKSHEET_STATUS.EXECUTING })
+        .andWhere('inv.carton_id = :cartonId', { cartonId: cartonId })
+        .getOne()
 
-      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
+      //validation to check matching worksheet detail based on name
+      if (!worksheetDetail || !worksheetDetail.targetInventory)
+        throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName))
 
       //validation to prevent duplicated picking
-      let oiValidate: OrderInventory = await this.trxMgr.getRepository(OrderInventory).findOne({
-        where: { domain: this.domain, id: targetInventory.id, status: ORDER_INVENTORY_STATUS.PICKING }
-      })
-      if (!oiValidate) throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`))
+      if (worksheetDetail?.targetInventory?.status != ORDER_INVENTORY_STATUS.PICKING)
+        throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`))
 
-      //validation to prevent over release
-      if (inventory.qty <= 0) throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
+      let matchingProduct = await this.getDirectQty(
+        {
+          ...worksheetDetail?.targetInventory?.product?.productDetails[0],
+          product: worksheetDetail?.targetInventory?.product
+        },
+        productBarcode,
+        pickedQty
+      )
 
-      if (inventory.cartonId !== cartonId)
-        throw new Error(this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('Carton ID', cartonId, inventory.cartonId))
+      //validate matching product details based on scanned barcode
+      if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
 
-      let pickedQty: number = pickingQty ? pickingQty : 1
-      const releaseQty: number = targetInventory.releaseQty
+      pickedQty = matchingProduct.qty
+      let pickedUomValue = matchingProduct.uomValue
 
-      targetInventory = await this.checkAndSetBinPicking(targetInventory, binLocation)
+      //validation to prevent over release
+      if (
+        !worksheetDetail?.targetInventory ||
+        worksheetDetail?.targetInventory.inventory.qty < 1 ||
+        pickedQty + (worksheetDetail.targetInventory?.pickedQty || 0) > worksheetDetail.targetInventory.releaseQty
+      )
+        throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
 
-      // 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))
-
-      // 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
-      }
+      const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
 
-      if (pickedQty + targetInventory.pickedQty > releaseQty) {
-        throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
-      }
+      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
+
+      targetInventory = await this.checkAndSetBinPicking(targetInventory, binLocation)
 
+      // for required outbound serial number scanning
       if (product?.isRequireSerialNumberScanningOutbound) {
         if (!serialNumber || serialNumber == '') {
           throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `require serial number`))
@@ -527,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
 
@@ -535,11 +536,133 @@ export class PickingWorksheetController extends VasWorksheetController {
         }
       }
 
+      // for tote scanning
       if (toteNo) {
         await this.toteScanning(toteNo, targetProduct, targetInventory, pickedQty, releaseGood, bizplace)
       }
 
-      await this.updatePickingTransaction(releaseGood, targetInventory, worksheetDetail, inventory, pickedQty)
+      // temporarily override with separate logic to handle transaction to speed up function
+      // await this.updatePickingTransaction(releaseGood, targetInventory, worksheetDetail, inventory, pickedQty)
+
+      const releaseQty: number = targetInventory.releaseQty
+
+      targetInventory.pickedQty = (targetInventory?.pickedQty || 0) + pickedQty
+
+      let updateOiObj = {
+        pickedQty: () => `"picked_qty" + ${pickedQty}`,
+        updatedAt: new Date(),
+        updater: this.user,
+        pickedBy: this.user.name,
+        pickedByUser: this.user,
+        pickedAt: new Date()
+      }
+
+      if (targetInventory.pickedQty == releaseQty) {
+        updateOiObj['status'] = ORDER_INVENTORY_STATUS.PICKED
+      }
+
+      await this.trxMgr
+        .getRepository(OrderInventory)
+        .createQueryBuilder()
+        .update(OrderInventory)
+        .set(updateOiObj)
+        .where({ id: targetInventory.id })
+        .andWhere(`picked_qty + :pickedQty <= release_qty`, { pickedQty })
+        .execute()
+
+      if (targetInventory.pickedQty == releaseQty) {
+        //update worksheet details only when line item picking complete
+        await this.trxMgr
+          .getRepository(WorksheetDetail)
+          .createQueryBuilder()
+          .update(WorksheetDetail)
+          .set({
+            status: WORKSHEET_STATUS.DONE,
+            updater: this.user,
+            updatedAt: new Date()
+          })
+          .where('id = :id', { id: worksheetDetail.id })
+          .execute()
+
+        getConnection().transaction(async (tx: EntityManager) => {
+          let releaseUomValue = Math.round((pickedUomValue / pickedQty) * releaseQty * 100) / 100
+
+          let updateInvObj = {
+            qty: () => `"qty" - ${releaseQty}`,
+            lockedQty: () => `"locked_qty" - ${releaseQty}`,
+            uomValue: () => `"uom_value" - ${releaseUomValue}`,
+            lockedUomValue: () => `"locked_uom_value" - ${releaseUomValue}`,
+            updater: this.user,
+            updatedAt: new Date()
+          }
+
+          let remainingQty = await tx
+            .getRepository(Inventory)
+            .createQueryBuilder()
+            .update(Inventory)
+            .set(updateInvObj)
+            .where('id = :id', { id: targetInventory.inventory.id })
+            .returning(['qty'])
+            .execute()
+            .then(dt => {
+              return dt.raw[0].qty
+            })
+
+          await generateInventoryHistory(
+            inventory,
+            releaseGood,
+            INVENTORY_TRANSACTION_TYPE.PICKING,
+            -releaseQty,
+            -releaseUomValue,
+            this.user,
+            tx
+          )
+
+          let inventoryItems: InventoryItem = await tx
+            .getRepository(InventoryItem)
+            .find({ where: { outboundOrderId: releaseGood.id } })
+
+          if (inventoryItems.length > 0) {
+            inventoryItems.forEach((itm: InventoryItem) => {
+              itm.status = INVENTORY_STATUS.PICKED
+              itm.updater = this.user
+            })
+
+            await tx.getRepository(InventoryItem).save(inventoryItems)
+          }
+
+          if (remainingQty === 0) {
+            await tx
+              .getRepository(Inventory)
+              .createQueryBuilder()
+              .update(Inventory)
+              .set({ status: INVENTORY_STATUS.TERMINATED })
+              .where('id = :id', { id: targetInventory.inventory.id })
+              .execute()
+
+            await generateInventoryHistory(
+              inventory,
+              releaseGood,
+              INVENTORY_TRANSACTION_TYPE.TERMINATED,
+              0,
+              0,
+              this.user,
+              tx
+            )
+          }
+        })
+      }
+
+      // return worksheet details
+      worksheetDetail = await this.trxMgr
+        .getRepository(WorksheetDetail)
+        .createQueryBuilder('wd')
+        .innerJoin('wd.targetInventory', 'oi')
+        .innerJoinAndSelect('oi.releaseGood', 'rg')
+        .where('wd.id = :id', { id: worksheetDetail.id })
+        .getOne()
+
+      return worksheetDetail
     } catch (error) {
       throw error
     }
@@ -567,15 +690,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
@@ -605,13 +726,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) {
@@ -638,7 +759,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
 
@@ -664,7 +784,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(
@@ -672,7 +793,6 @@ export class PickingWorksheetController extends VasWorksheetController {
               scannedPalletIdInventory,
               releaseGood,
               product,
-              productDetail,
               worksheetDetail,
               foundSerialNumber
             )
@@ -848,19 +968,16 @@ 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'
       ]
     })
 
     const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
-    const productDetail: ProductDetail = worksheetDetails
+    const product: Product = worksheetDetails
       .map((wsd: WorksheetDetail) => wsd.targetInventory.product)
-      .find((productDetail: ProductDetail) => productDetail.id === inventory.productDetail.id)
-
-    const product: Product = productDetail.product
+      .find((product: Product) => product.id === inventory.product.id)
 
     const batchId: string = inventory.batchId
     const packingType: string = inventory.packingType
@@ -879,14 +996,26 @@ export class PickingWorksheetController extends VasWorksheetController {
 
     // 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 isMatchingBarcode: boolean = productDetails.map(detail => detail.gtin).includes(productBarcode)
+    if (!isMatchingBarcode) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(`GTIN (${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) {
-      let childQty = await this.getChildQty(productDetails, productBarcode, productDetail, scannedProductDetail)
+    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)
       pickedQty *= childQty
     }
 
@@ -1121,7 +1250,7 @@ export class PickingWorksheetController extends VasWorksheetController {
   private async updatePickingTransaction(releaseGood, orderInventory, worksheetDetail, inventory, pickedQty) {
     const releaseQty: number = orderInventory.releaseQty
 
-    orderInventory.pickedQty = Boolean(orderInventory?.pickedQty) ? orderInventory.pickedQty + pickedQty : pickedQty
+    orderInventory.pickedQty = (orderInventory?.pickedQty || 0) + pickedQty
     if (orderInventory.pickedQty == releaseQty) {
       const leftQty: number = inventory.qty - releaseQty
       if (leftQty < 0) {
@@ -1281,7 +1410,6 @@ export class PickingWorksheetController extends VasWorksheetController {
     scannedPalletIdInventory,
     releaseGood,
     product,
-    productDetail,
     worksheetDetail,
     foundSerialNumber
   ) {
@@ -1346,7 +1474,6 @@ 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,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/vas/vas-worksheet-controller.ts

@@ -22,8 +22,7 @@ import {
   InventoryNoGenerator,
   Location,
   LOCATION_TYPE,
-  Warehouse,
-  generateInventoryHistory
+  Warehouse
 } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
@@ -37,6 +36,7 @@ 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>