@things-factory/worksheet-base 4.3.106 → 4.3.108

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@things-factory/worksheet-base",
-  "version": "4.3.106",
+  "version": "4.3.108",
   "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.99",
-    "@things-factory/biz-base": "^4.3.99",
-    "@things-factory/document-template-base": "^4.3.99",
-    "@things-factory/id-rule-base": "^4.3.99",
-    "@things-factory/integration-lmd": "^4.3.99",
-    "@things-factory/integration-marketplace": "^4.3.101",
-    "@things-factory/integration-sellercraft": "^4.3.101",
-    "@things-factory/integration-sftp": "^4.3.99",
-    "@things-factory/marketplace-base": "^4.3.101",
-    "@things-factory/notification": "^4.3.99",
-    "@things-factory/sales-base": "^4.3.106",
-    "@things-factory/setting-base": "^4.3.99",
-    "@things-factory/shell": "^4.3.99",
-    "@things-factory/transport-base": "^4.3.99",
-    "@things-factory/warehouse-base": "^4.3.106"
+    "@things-factory/auth-base": "^4.3.108",
+    "@things-factory/biz-base": "^4.3.108",
+    "@things-factory/document-template-base": "^4.3.108",
+    "@things-factory/id-rule-base": "^4.3.108",
+    "@things-factory/integration-lmd": "^4.3.108",
+    "@things-factory/integration-marketplace": "^4.3.108",
+    "@things-factory/integration-sellercraft": "^4.3.108",
+    "@things-factory/integration-sftp": "^4.3.108",
+    "@things-factory/marketplace-base": "^4.3.108",
+    "@things-factory/notification": "^4.3.108",
+    "@things-factory/sales-base": "^4.3.108",
+    "@things-factory/setting-base": "^4.3.108",
+    "@things-factory/shell": "^4.3.108",
+    "@things-factory/transport-base": "^4.3.108",
+    "@things-factory/warehouse-base": "^4.3.108"
   },
-  "gitHead": "0bbfb21a08ef01d28176936d9f04392215e5d84d"
+  "gitHead": "8aa8811dd0ebb1f4c1d9bc50fc221766d855c553"
 }

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

@@ -19,8 +19,8 @@ import {
   VAS_TARGET_TYPES,
   VAS_TYPES
 } from '@things-factory/sales-base'
-import { Domain } from '@things-factory/shell'
 import { PartnerSetting, Setting } from '@things-factory/setting-base'
+import { Domain } from '@things-factory/shell'
 import {
   Inventory,
   INVENTORY_ITEM_SOURCE,
@@ -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> & {
@@ -95,11 +96,13 @@ export class UnloadingWorksheetController extends VasWorksheetController {
         'worksheet.bufferLocation.warehouse',
         'targetProduct',
         'targetProduct.product',
+        'targetProduct.productDetail',
         'targetProduct.product.productDetails',
         'targetProduct.product.productDetails.childProductDetail',
         'targetInventory',
         'targetInventory.inventory',
         'targetInventory.product',
+        'targetInventory.productDetail',
         'targetInventory.product.productDetails',
         'targetInventory.product.productDetails.childProductDetail'
       ]
@@ -121,6 +124,9 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     const batchId: string = Boolean(arrivalNotice) ? targetProduct.batchId : targetInventory.batchId
     const batchIdRef: string = Boolean(arrivalNotice) ? targetProduct.batchIdRef : null
     const product: Product = Boolean(arrivalNotice) ? targetProduct.product : targetInventory.product
+    const productDetail: ProductDetail = Boolean(arrivalNotice)
+      ? targetProduct.productDetail
+      : targetInventory.productDetail
     const packingType: string = Boolean(arrivalNotice) ? targetProduct.packingType : targetInventory.packingType
     const packingSize: number = Boolean(arrivalNotice) ? targetProduct.packingSize : targetInventory.packingSize
     const remark: string = Boolean(arrivalNotice) ? targetProduct.remark : targetInventory.remark
@@ -140,6 +146,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
 
     const palletId: string = inventory?.palletId
     const cartonId: string = inventory?.cartonId
+    let matchingProduct
 
     if (!inventory?.palletId) {
       inventory.palletId = await generateId({
@@ -153,35 +160,24 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     }
 
     if (productBarcode) {
-      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))
-
-      const foundProductDetail: ProductDetail = productDetails.find(
-        (detail: ProductDetail) =>
-          detail.gtin === productBarcode && detail.packingType === packingType && detail.packingSize == packingSize
+      matchingProduct = await this.getDirectQty(
+        {
+          ...productDetail,
+          product: targetInventory?.product
+        },
+        productBarcode,
+        qty
       )
 
-      if (!foundProductDetail) {
-        const orderProductDetail: ProductDetail = productDetails.find(
-          (parentDetail: ProductDetail) =>
-            parentDetail.packingType === packingType && parentDetail.packingSize == packingSize
-        )
-        if (!orderProductDetail)
-          throw new Error(
-            this.ERROR_MSG.FIND.NO_RESULT(`Packing Type ( ${packingType}) or Packing Size (${packingSize})`)
-          )
+      //validate matching product details based on scanned barcode
+      if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
 
-        if (arrivalNotice) {
-          uom = targetProduct.uom
-        } else {
-          uom = orderProductDetail.uom
-        }
-        qty = (await this.getChildQty(productDetails, productBarcode, orderProductDetail)) * qty
-      } else {
-        uom = foundProductDetail.uom
-        qty
-      }
+      qty = matchingProduct.qty
+      uom = arrivalNotice ? targetProduct.uom : matchingProduct.uom
+    }
+
+    if (!uom) {
+      uom = productDetail.uom
     }
 
     const uomValue: number =
@@ -200,6 +196,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     newInventory.cartonId = inventory.cartonId
     newInventory.batchId = batchId
     newInventory.product = product
+    newInventory.productDetail = productDetail
     newInventory.packingType = packingType
     newInventory.packingSize = packingSize
     newInventory.uom = uom
@@ -270,9 +267,11 @@ export class UnloadingWorksheetController extends VasWorksheetController {
         'worksheet.bufferLocation.warehouse',
         'targetProduct',
         'targetProduct.product',
+        'targetProduct.productDetail',
         'targetProduct.product.productDetails',
         'targetProduct.product.productDetails.childProductDetail',
         'targetInventory',
+        'targetInventory.productDetail',
         'targetInventory.product',
         'targetInventory.product.productDetails',
         'targetInventory.product.productDetails.childProductDetail'
@@ -289,7 +288,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
 
     const targetProduct: OrderProduct = worksheetDetail.targetProduct
 
-    if (targetProduct.status == ORDER_PRODUCT_STATUS.EDITED)
+    if (targetProduct?.status == ORDER_PRODUCT_STATUS.EDITED)
       throw new Error('this product is pending for changes approval')
 
     const bizplace: Bizplace = worksheetDetail.bizplace
@@ -298,6 +297,9 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     const returnOrder: ReturnOrder = worksheet.returnOrder
     const targetInventory: OrderInventory = worksheetDetail.targetInventory
     const product: Product = Boolean(arrivalNotice) ? targetProduct.product : targetInventory.product
+    const productDetail: ProductDetail = Boolean(arrivalNotice)
+      ? targetProduct.productDetail
+      : targetInventory.productDetail
     const packingType: string = Boolean(arrivalNotice) ? targetProduct.packingType : targetInventory.packingType
     const packingSize: number = Boolean(arrivalNotice) ? targetProduct.packingSize : targetInventory.packingSize
     const batchId: string = Boolean(arrivalNotice) ? targetProduct.batchId : targetInventory.batchId
@@ -309,15 +311,13 @@ export class UnloadingWorksheetController extends VasWorksheetController {
 
     qty++
 
-    const invQb: SelectQueryBuilder<Inventory> = await this.trxMgr
+    const invQb: SelectQueryBuilder<Inventory> = this.trxMgr
       .getRepository(Inventory)
       .createQueryBuilder('INV')
       .where('INV.domain_id = :domainId', { domainId: this.domain.id })
       .andWhere('INV.bizplace_id = :bizplaceId', { bizplaceId: bizplace.id })
-      .andWhere('INV.product_id = :productId', { productId: product.id })
+      .andWhere('INV.product_detail_id = :productDetailId', { productDetailId: productDetail.id })
       .andWhere('INV.batch_id = :batchId', { batchId: batchId })
-      .andWhere('INV.packing_type = :packingType', { packingType: packingType })
-      .andWhere('INV.packing_size = :packingSize', { packingSize: packingSize })
 
     if (arrivalNotice) invQb.andWhere('INV.ref_order_id = :arrivalNoticeId', { arrivalNoticeId: arrivalNotice.id })
     else if (returnOrder) invQb.andWhere('INV.ref_order_id = :returnOrderId', { returnOrderId: returnOrder.id })
@@ -357,6 +357,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       newInventory.batchId = batchId
       newInventory.batchIdRef = batchIdRef
       newInventory.product = product
+      newInventory.productDetail = productDetail
       newInventory.packingType = packingType
       newInventory.packingSize = packingSize
       newInventory.uom = uom
@@ -421,6 +422,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     inventoryItem.status = foundInventory.status
     inventoryItem.inboundOrderId = foundInventory.refOrderId
     inventoryItem.product = product
+    inventoryItem.productDetail = productDetail
     inventoryItem.inventory = foundInventory
     inventoryItem.source = INVENTORY_ITEM_SOURCE.INBOUND
     inventoryItem.domain = this.domain
@@ -457,10 +459,12 @@ export class UnloadingWorksheetController extends VasWorksheetController {
         'worksheet.bufferLocation.warehouse',
         'targetProduct',
         'targetProduct.product',
+        'targetProduct.productDetail',
         'targetProduct.product.productDetails',
         'targetProduct.product.productDetails.childProductDetail',
         'targetInventory',
         'targetInventory.product',
+        'targetInventory.productDetail',
         'targetInventory.product.productDetails',
         'targetInventory.product.productDetails.childProductDetail'
       ]
@@ -485,56 +489,43 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     const returnOrder: ReturnOrder = worksheet.returnOrder
     const targetInventory: OrderInventory = worksheetDetail.targetInventory
     const product: Product = Boolean(arrivalNotice) ? targetProduct.product : targetInventory.product
+    const productDetail: ProductDetail = Boolean(arrivalNotice)
+      ? targetProduct.productDetail
+      : targetInventory.productDetail
     const packingType: string = Boolean(arrivalNotice) ? targetProduct.packingType : targetInventory.packingType
     const packingSize: number = Boolean(arrivalNotice) ? targetProduct.packingSize : targetInventory.packingSize
     const batchId: string = Boolean(arrivalNotice) ? targetProduct.batchId : targetInventory.batchId
-    let qty: number = 0
+    let qty: number = 1
     let uom: string = Boolean(arrivalNotice) ? targetProduct.uom : targetInventory.uom
     const cartonId: string = inventory.cartonId
     const orderId: string = Boolean(arrivalNotice) ? arrivalNotice.id : returnOrder.id
     await this.checkCartonDuplication(cartonId, orderId)
+    let matchingProduct
 
-    // 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))
-
-    // 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 orderProductDetail: ProductDetail = productDetails.find(
-        (parentDetail: ProductDetail) =>
-          parentDetail.packingType === packingType && parentDetail.packingSize == packingSize
+    if (productBarcode !== productDetail.gtin) {
+      matchingProduct = await this.getDirectQty(
+        {
+          ...productDetail,
+          product: targetInventory?.product
+        },
+        productBarcode,
+        qty
       )
-      if (!orderProductDetail)
-        throw new Error(
-          this.ERROR_MSG.FIND.NO_RESULT(`Packing Type ( ${packingType}) or Packing Size (${packingSize})`)
-        )
 
-      if (arrivalNotice) {
-        uom = targetProduct.uom
-      } else {
-        uom = orderProductDetail.uom
-      }
-      qty = await this.getChildQty(productDetails, productBarcode, orderProductDetail)
-    } else {
-      uom = foundProductDetail.uom
-      qty++
+      //validate matching product details based on scanned barcode
+      if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+
+      qty = matchingProduct.qty
+      uom = arrivalNotice ? targetProduct.uom : matchingProduct.uom
     }
 
-    const invQb: SelectQueryBuilder<Inventory> = await this.trxMgr
+    const invQb: SelectQueryBuilder<Inventory> = this.trxMgr
       .getRepository(Inventory)
       .createQueryBuilder('INV')
       .where('INV.domain_id = :domainId', { domainId: this.domain.id })
       .andWhere('INV.bizplace_id = :bizplaceId', { bizplaceId: bizplace.id })
-      .andWhere('INV.product_id = :productId', { productId: product.id })
+      .andWhere('INV.product_detail_id = :productDetailId', { productDetailId: productDetail.id })
       .andWhere('INV.batch_id = :batchId', { batchId: batchId })
-      .andWhere('INV.packing_type = :packingType', { packingType: packingType })
-      .andWhere('INV.packing_size = :packingSize', { packingSize: packingSize })
 
     if (arrivalNotice) invQb.andWhere('INV.ref_order_id = :arrivalNoticeId', { arrivalNoticeId: arrivalNotice.id })
     else if (returnOrder) invQb.andWhere('INV.ref_order_id = :returnOrderId', { returnOrderId: returnOrder.id })
@@ -574,6 +565,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       newInventory.batchId = batchId
       newInventory.batchIdRef = batchIdRef
       newInventory.product = product
+      newInventory.productDetail = productDetail
       newInventory.packingType = packingType
       newInventory.packingSize = packingSize
       newInventory.uom = uom
@@ -656,8 +648,10 @@ export class UnloadingWorksheetController extends VasWorksheetController {
         'worksheet.bufferLocation.warehouse',
         'targetProduct',
         'targetProduct.product',
+        'targetProduct.productDetail',
         'targetInventory',
-        'targetInventory.product'
+        'targetInventory.product',
+        'targetInventory.productDetail'
       ]
     })
     if (!worksheetDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName))
@@ -668,9 +662,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
     const returnOrder: ReturnOrder = worksheet.returnOrder
     const targetProduct: OrderProduct = worksheetDetail.targetProduct
     const targetInventory: OrderInventory = worksheetDetail.targetInventory
-    const product: Product = Boolean(arrivalNotice) ? targetProduct.product : targetInventory.product
-    const packingType: string = Boolean(arrivalNotice) ? targetProduct.packingType : targetInventory.packingType
-    const packingSize: number = Boolean(arrivalNotice) ? targetProduct.packingSize : targetInventory.packingSize
+    const productDetail: Product = Boolean(arrivalNotice) ? targetProduct.productDetail : targetInventory.productDetail
     const batchId: string = Boolean(arrivalNotice) ? targetProduct.batchId : targetInventory.batchId
 
     const invQb: SelectQueryBuilder<Inventory> = await this.trxMgr
@@ -678,10 +670,8 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       .createQueryBuilder('INV')
       .where('INV.domain_id = :domainId', { domainId: this.domain.id })
       .andWhere('INV.bizplace_id = :bizplaceId', { bizplaceId: bizplace.id })
-      .andWhere('INV.product_id = :productId', { productId: product.id })
+      .andWhere('INV.product_detail_id = :productDetailId', { productDetailId: productDetail.id })
       .andWhere('INV.batch_id = :batchId', { batchId: batchId })
-      .andWhere('INV.packing_type = :packingType', { packingType: packingType })
-      .andWhere('INV.packing_size = :packingSize', { packingSize: packingSize })
 
     if (arrivalNotice) invQb.andWhere('INV.ref_order_id = :arrivalNoticeId', { arrivalNoticeId: arrivalNotice.id })
     else if (returnOrder) invQb.andWhere('INV.ref_order_id = :returnOrderId', { returnOrderId: returnOrder.id })
@@ -714,7 +704,7 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       const inventoryId: string = inventoryIds[i]
       let inventory: Inventory = await this.trxMgr.getRepository(Inventory).findOne({
         where: { domain: this.domain, id: inventoryId },
-        relations: ['location', 'product']
+        relations: ['location', 'product', 'productDetail']
       })
 
       this.checkRecordValidity(inventory, {
@@ -744,14 +734,11 @@ export class UnloadingWorksheetController extends VasWorksheetController {
       if (orderType === ORDER_TYPES.ARRIVAL_NOTICE) {
         arrivalNotice = await this.trxMgr.getRepository(ArrivalNotice).findOne({
           where: { domain: this.domain, name: orderNo },
-          relations: ['orderProducts', 'orderProducts.product']
+          relations: ['orderProducts', 'orderProducts.product', 'orderProducts.productDetail']
         })
 
         targetProduct = arrivalNotice.orderProducts.find(
-          op =>
-            op.batchId == inventory.batchId &&
-            op.packingType == inventory.packingType &&
-            op.product.id === inventory.product.id
+          op => op.batchId == inventory.batchId && op.productDetail.id == inventory.productDetail.id
         )
 
         if (inventory.status == INVENTORY_STATUS.UNLOADED) {
@@ -770,18 +757,17 @@ export class UnloadingWorksheetController extends VasWorksheetController {
         worksheetDetail = await this.trxMgr
           .getRepository(WorksheetDetail)
           .findOne({ where: { domain: this.domain, targetProduct } })
+
+        //remove all related serial numbers
+        await this.trxMgr.getRepository(InventoryItem).delete({ inventory: inventoryId })
       } else {
         returnOrder = await this.trxMgr.getRepository(ReturnOrder).findOne({
           where: { domain: this.domain, name: orderNo },
-          relations: ['orderInventories', 'orderInventories.inventory', 'orderInventories.product']
+          relations: ['orderInventories', 'orderInventories.inventory', 'orderInventories.productDetail']
         })
 
         targetInventory = returnOrder.orderInventories.find(
-          oi =>
-            oi.batchId == inventory.batchId &&
-            oi.packingType == inventory.packingType &&
-            oi.product.id == inventory.product.id &&
-            oi.packingSize === inventory.packingSize
+          oi => oi.batchId == inventory.batchId && oi.productDetail.id == inventory.productDetail.id
         )
         if (inventory.status == INVENTORY_STATUS.UNLOADED) {
           targetInventory.actualPackQty -= 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
@@ -309,7 +307,10 @@ export class CycleCountWorksheetController extends WorksheetController {
     targetInventory.updater = this.user
     await this.updateOrderTargets([targetInventory])
 
-    worksheetDetail.status = WORKSHEET_STATUS.EXECUTING
+    worksheetDetail.status =
+      targetInventory.status === ORDER_INVENTORY_STATUS.MISSING
+        ? WORKSHEET_STATUS.NOT_TALLY
+        : WORKSHEET_STATUS.EXECUTING
     worksheetDetail.updater = this.user
     await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
 
@@ -397,7 +398,7 @@ export class CycleCountWorksheetController extends WorksheetController {
     targetInventory.inspectedLocation = location
     targetInventory.creator = this.user
     targetInventory.updater = this.user
-    await this.updateOrderTargets([targetInventory])
+    await this.trxMgr.getRepository(OrderInventory).save(targetInventory)
 
     let worksheetDetail: WorksheetDetail = new WorksheetDetail()
     worksheetDetail.domain = this.domain

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
 
@@ -185,46 +187,48 @@ export class PackingWorksheetController extends VasWorksheetController {
       .innerJoinAndSelect('oi.releaseGood', 'rg')
       .innerJoinAndSelect('oi.inventory', 'inv')
       .leftJoinAndSelect('oi.orderProduct', 'op')
-      .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'
-      )
+      .innerJoinAndSelect('oi.product', 'prd')
+      .innerJoinAndSelect('oi.productDetail', 'pd')
       .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
-
-    // 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
+    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
       )
 
-      roProductDetail.product = product
+      //validate matching product details based on scanned barcode
+      if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
 
-      let childQty = await this.getChildQty(filterProductDetails, productBarcode, roProductDetail)
-      packedQty *= childQty
-    } else if (!productDetail) {
-      throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+      packedQty = matchingProduct.qty
     }
 
     if (packedQty + targetInventory.packedQty > pickedQty) {
@@ -240,7 +244,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) {
@@ -267,6 +271,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