@things-factory/worksheet-base 4.3.137 → 4.3.139

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

@@ -2,7 +2,7 @@ import { Equal, Not } from 'typeorm'
 
 import { ApplicationType } from '@things-factory/auth-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
-import { Product, ProductDetail } from '@things-factory/product-base'
+import { Product, ProductDetail, ProductBarcode } from '@things-factory/product-base'
 import { logger } from '@things-factory/env'
 import { ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory, ReleaseGood } from '@things-factory/sales-base'
 import { Setting } from '@things-factory/setting-base'
@@ -141,13 +141,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) {
@@ -162,8 +164,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) {
@@ -187,6 +188,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
 
@@ -233,47 +235,39 @@ 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')
+      .innerJoinAndSelect('pd.productBarcodes', 'pb')
       .where('wd.id = :id', { id: worksheetDetailName })
-      .andWhere('wd.type = :type', { type: WORKSHEET_TYPE.PACKING })
       .getOne()
 
-    const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
-    const product: Product = worksheetDetail.targetInventory.inventory.product
-    const filterProductDetails: ProductDetail[] = product?.productDetails.filter(detail => !detail.deletedAt)
     let targetInventory: OrderInventory = worksheetDetail.targetInventory
     let inventory: Inventory = targetInventory.inventory
     let packedQty: number = 1
     let pickedQty: number = targetInventory.releaseQty
+    const releaseGood: ReleaseGood = targetInventory.releaseGood
+    const product: Product = targetInventory.product
+    const productDetail: ProductDetail = targetInventory.productDetail
+    const productBarcodes: [ProductBarcode] = productDetail.productBarcodes
+    let matchingProduct
 
-    // 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 (!productBarcodes.find(itm => itm.gtin == productBarcode) && product?.isRequireSerialNumberScanningOutbound) {
+      throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+    }
 
-    if (!productDetail && !product?.isRequireSerialNumberScanningOutbound) {
-      let roProductDetail: ProductDetail = product?.productDetails.find(
-        (parentDetail: ProductDetail) =>
-          parentDetail.packingType === inventory.packingType && parentDetail.packingSize == inventory.packingSize
-      )
+    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) {
       throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
@@ -288,7 +282,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) {
@@ -315,6 +309,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

@@ -2,7 +2,7 @@ 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 { Product, ProductDetail, ProductBarcode } from '@things-factory/product-base'
 import {
   GenerateBatchPickInfo,
   ORDER_INVENTORY_STATUS,
@@ -28,12 +28,14 @@ import {
   Location,
   LOCATION_TYPE,
   Tote,
-  TOTE_STATUS
+  TOTE_STATUS,
+  generateInventoryHistory
 } from '@things-factory/warehouse-base'
+import { logger } from '@things-factory/env'
 
 import { TASK_NUMBER_RULE_TYPE, TASK_NUMBER_SETTING_KEY, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
-import { generateInventoryHistory, WorksheetNoGenerator } from '../../utils'
+import { WorksheetNoGenerator } from '../../utils'
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export class PickingWorksheetController extends VasWorksheetController {
@@ -213,7 +215,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       if (vasWorksheet) {
         await this.activateVAS(vasWorksheet.name, vasWorksheet.worksheetDetails)
       }
-    } catch (e) { }
+    } catch (e) {}
 
     const pendingSplitOIs: OrderInventory[] = await this.trxMgr.getRepository(OrderInventory).find({
       where: { domain: this.domain, releaseGood, status: ORDER_INVENTORY_STATUS.PENDING_SPLIT }
@@ -428,11 +430,8 @@ export class PickingWorksheetController extends VasWorksheetController {
         .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'
-        )
+        .innerJoinAndSelect('oi.productDetail', 'pd')
+        .innerJoinAndSelect('pd.productBarcodes', 'pb')
         .where('wd.name = :name', { name: worksheetDetailName })
         .andWhere('wd.domain_id = :domainId', { domainId: this.domain.id })
         .andWhere('wd.type = :type', { type: worksheetType })
@@ -441,17 +440,35 @@ export class PickingWorksheetController extends VasWorksheetController {
         .getOne()
 
       //validation to check matching worksheet detail based on name
-      if (!worksheetDetail || !worksheetDetail.targetInventory)
-        throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName))
+      if (!worksheetDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName))
+
+      const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
+      let targetInventory: OrderInventory = worksheetDetail.targetInventory
+      let targetProduct: OrderProduct = targetInventory.orderProduct
+      const product: Product = targetInventory.product
+      const matchProductBarcode: ProductBarcode = await this.trxMgr.getRepository(ProductBarcode).findOne({
+        where: { gtin: productBarcode },
+        relations: ['productDetail']
+      })
+      const productDetail: ProductDetail = targetInventory.productDetail
+      const productBarcodes: [ProductBarcode] = productDetail.productBarcodes
+      let inventory: Inventory = targetInventory.inventory
+      let bizplace: Bizplace = worksheetDetail.worksheet.bizplace
+      let pickedUomValue = pickedQty * productDetail.uomValue
+      let matchingProduct
 
       //validation to prevent duplicated picking
-      if (worksheetDetail?.targetInventory?.status != ORDER_INVENTORY_STATUS.PICKING)
+      if (targetInventory?.status != ORDER_INVENTORY_STATUS.PICKING)
         throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`))
 
-      let matchingProduct = await this.getDirectQty(
+      if (!productBarcodes.find(itm => itm.gtin == productBarcode) && product?.isRequireSerialNumberScanningOutbound) {
+        throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+      }
+
+      matchingProduct = await this.getDirectQty(
         {
-          ...worksheetDetail?.targetInventory?.product?.productDetails[0],
-          product: worksheetDetail?.targetInventory?.product
+          ...productDetail,
+          product: targetInventory?.product
         },
         productBarcode,
         pickedQty
@@ -461,7 +478,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
 
       pickedQty = matchingProduct.qty
-      let pickedUomValue = matchingProduct.uomValue
+      pickedUomValue = matchingProduct.uomValue
 
       //validation to prevent over release
       if (
@@ -471,15 +488,24 @@ export class PickingWorksheetController extends VasWorksheetController {
       )
         throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
 
-      const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
+      targetInventory = await this.checkAndSetBinPicking(targetInventory, binLocation)
 
-      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
+      // // 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))
 
-      targetInventory = await this.checkAndSetBinPicking(targetInventory, binLocation)
+      // // 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
+      // }
+
+      // if (pickedQty + targetInventory.pickedQty > releaseQty) {
+      //   throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
+      // }
 
       // for required outbound serial number scanning
       if (product?.isRequireSerialNumberScanningOutbound) {
@@ -527,6 +553,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
 
@@ -692,13 +719,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
@@ -728,13 +757,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) {
@@ -761,6 +790,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
 
@@ -786,8 +816,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(
@@ -795,6 +824,7 @@ export class PickingWorksheetController extends VasWorksheetController {
               scannedPalletIdInventory,
               releaseGood,
               product,
+              productDetail,
               worksheetDetail,
               foundSerialNumber
             )
@@ -962,144 +992,144 @@ export class PickingWorksheetController extends VasWorksheetController {
     binLocationName: string,
     pickingQty: number
   ): Promise<void> {
-    const worksheet: Worksheet = await this.trxMgr.getRepository(Worksheet).findOne({
-      where: { domain: this.domain, taskNo, type: worksheetType, status: WORKSHEET_STATUS.EXECUTING },
-      relations: [
-        'worksheetDetails',
-        'worksheetDetails.targetInventory',
-        'worksheetDetails.targetInventory.releaseGood',
-        'worksheetDetails.targetInventory.inventory',
-        'worksheetDetails.targetInventory.inventory.location',
-        'worksheetDetails.targetInventory.product',
-        'worksheetDetails.targetInventory.product.productDetails',
-        'worksheetDetails.targetInventory.product.productDetails.childProductDetail'
-      ]
-    })
+    try {
+      console.time(`scanProductBatchPicking:${taskNo}`)
+      const worksheet: Worksheet = await this.trxMgr
+        .getRepository(Worksheet)
+        .createQueryBuilder('worksheet')
+        .innerJoinAndSelect('worksheet.worksheetDetails', 'worksheetDetails')
+        .innerJoinAndSelect('worksheetDetails.targetInventory', 'targetInventory')
+        .innerJoinAndSelect('targetInventory.product', 'product')
+        .leftJoinAndSelect('targetInventory.productDetail', 'productDetail')
+        .leftJoinAndSelect('targetInventory.inventory', 'inventory')
+        .leftJoinAndSelect('inventory.location', 'location')
+        .leftJoinAndSelect('targetInventory.releaseGood', 'releaseGood')
+        .where('worksheet.domain_id = :domainId', { domainId: this.domain.id })
+        .andWhere('worksheet.task_no = :taskNo', { taskNo })
+        .andWhere('worksheet.type = :type', { type: worksheetType })
+        .andWhere('worksheet.status = :status', { status: WORKSHEET_STATUS.EXECUTING })
+        .getOne()
+      const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
+      const productDetail: ProductDetail = worksheetDetails
+        .map(wsd => wsd.targetInventory.productDetail)
+        .find(productDetail => productDetail.id === inventory.productDetail.id)
+
+      const product: Product = productDetail.product
+
+      const batchId: string = inventory.batchId
+      let pickedQty: number = pickingQty ? pickingQty : 1
+      let matchingProduct
+
+      const targetInventories: OrderInventory[] = worksheetDetails
+        .map((wsd: WorksheetDetail) => wsd.targetInventory)
+        .filter(
+          (targetInventory: OrderInventory) =>
+            targetInventory.batchId === batchId &&
+            targetInventory.inventory.cartonId === cartonId &&
+            targetInventory.productDetail.id === productDetail.id
+        )
 
-    const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
-    const product: Product = worksheetDetails
-      .map((wsd: WorksheetDetail) => wsd.targetInventory.product)
-      .find((product: Product) => product.id === inventory.product.id)
-
-    const batchId: string = inventory.batchId
-    const packingType: string = inventory.packingType
-    const packingSize: number = inventory.packingSize
-    let pickedQty: number = pickingQty ? pickingQty : 1
-
-    const targetInventories: OrderInventory[] = worksheetDetails
-      .map((wsd: WorksheetDetail) => wsd.targetInventory)
-      .filter(
-        (targetInventory: OrderInventory) =>
-          targetInventory.batchId === batchId &&
-          targetInventory.packingType === packingType &&
-          targetInventory.inventory.cartonId === cartonId &&
-          targetInventory.product.id === product.id
+      matchingProduct = await this.getDirectQty(
+        {
+          ...productDetail,
+          product
+        },
+        productBarcode,
+        pickedQty
       )
 
-    // 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})`))
-
-    // 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})`)
-        )
+      //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(productDetails, productBarcode, roProductDetail)
-      pickedQty *= childQty
-    }
+      pickedQty = matchingProduct.qty
 
-    const sumOfReleaseQty: number = targetInventories
-      .map((oi: OrderInventory) => oi.releaseQty)
-      .reduce((a, b) => a + b, 0)
+      const sumOfReleaseQty: number = targetInventories
+        .map((oi: OrderInventory) => oi.releaseQty)
+        .reduce((a, b) => a + b, 0)
 
-    const sumOfPickedQty: number =
-      targetInventories.map((oi: OrderInventory) => oi.pickedQty).reduce((a, b) => a + b, 0) + pickedQty
+      const sumOfPickedQty: number =
+        targetInventories.map((oi: OrderInventory) => oi.pickedQty).reduce((a, b) => a + b, 0) + pickedQty
 
-    if (sumOfPickedQty > sumOfReleaseQty)
-      throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `quantity can't exceed limitation`))
+      if (sumOfPickedQty > sumOfReleaseQty)
+        throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `quantity can't exceed limitation`))
 
-    for (var i = 0; i < targetInventories.length; i++) {
-      let targetInventory: OrderInventory = targetInventories[i]
-      let inventory: Inventory = targetInventory.inventory
-      const targetReleaseQty: number = targetInventory.releaseQty
-      const targetPickedQty: number = targetInventory.pickedQty
-      const releaseGood: ReleaseGood = targetInventory.releaseGood
-      if (pickedQty <= 0) break
+      for (var i = 0; i < targetInventories.length; i++) {
+        let targetInventory: OrderInventory = targetInventories[i]
+        let inventory: Inventory = targetInventory.inventory
+        const targetReleaseQty: number = targetInventory.releaseQty
+        const targetPickedQty: number = targetInventory.pickedQty
+        const releaseGood: ReleaseGood = targetInventory.releaseGood
+        if (pickedQty <= 0) break
+
+        if (
+          targetInventory.status === ORDER_INVENTORY_STATUS.PICKING &&
+          targetReleaseQty > targetPickedQty &&
+          pickedQty > 0
+        ) {
+          let remainingAssignedQty: number = pickedQty - (targetReleaseQty - targetPickedQty) // -1, 0, 1
+          const gapQtyRemaining: number = targetReleaseQty - targetPickedQty // > 0
+
+          if (binLocationName && !targetInventory?.binLocation) {
+            const binLocation: Location = await this.trxMgr.getRepository(Location).findOne({
+              where: { domain: this.domain, name: binLocationName, type: LOCATION_TYPE.BIN }
+            })
 
-      if (
-        targetInventory.status === ORDER_INVENTORY_STATUS.PICKING &&
-        targetReleaseQty > targetPickedQty &&
-        pickedQty > 0
-      ) {
-        let remainingAssignedQty: number = pickedQty - (targetReleaseQty - targetPickedQty) // -1, 0, 1
-        const gapQtyRemaining: number = targetReleaseQty - targetPickedQty // > 0
-
-        if (binLocationName && !targetInventory?.binLocation) {
-          const binLocation: Location = await this.trxMgr.getRepository(Location).findOne({
-            where: { domain: this.domain, name: binLocationName, type: LOCATION_TYPE.BIN }
-          })
+            if (!binLocation)
+              throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `invalid bin location id`))
 
-          if (!binLocation)
-            throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `invalid bin location id`))
+            targetInventory.binLocation = binLocation
+          }
 
-          targetInventory.binLocation = binLocation
-        }
+          //  pickedQty = 1, gap = 5 || pickedQty = 12, gap = 5 || pickedQty = 5, gap = 5
+          targetInventory.pickedQty += pickedQty > gapQtyRemaining ? gapQtyRemaining : pickedQty
+          remainingAssignedQty = remainingAssignedQty < 0 ? 0 : remainingAssignedQty
 
-        //  pickedQty = 1, gap = 5 || pickedQty = 12, gap = 5 || pickedQty = 5, gap = 5
-        targetInventory.pickedQty += pickedQty > gapQtyRemaining ? gapQtyRemaining : pickedQty
-        remainingAssignedQty = remainingAssignedQty < 0 ? 0 : remainingAssignedQty
+          if (targetInventory.pickedQty == targetReleaseQty) {
+            const leftQty: number = inventory.qty - targetInventory.releaseQty
+            if (leftQty < 0) {
+              throw new Error(
+                this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `quantity can't exceed limitation`)
+              )
+            }
 
-        if (targetInventory.pickedQty == targetReleaseQty) {
-          const leftQty: number = inventory.qty - targetInventory.releaseQty
-          if (leftQty < 0) {
-            throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `quantity can't exceed limitation`))
-          }
+            targetInventory.status = ORDER_INVENTORY_STATUS.PICKED
+            await this.updateOrderTargets([targetInventory])
 
-          targetInventory.status = ORDER_INVENTORY_STATUS.PICKED
-          await this.updateOrderTargets([targetInventory])
+            inventory.qty -= targetInventory.releaseQty
+            inventory.uomValue = Math.round((inventory.uomValue - targetInventory.releaseUomValue) * 100) / 100
+            inventory.lockedQty = inventory.lockedQty - targetInventory.releaseQty
+            inventory.lockedUomValue =
+              Math.round((inventory.lockedUomValue - targetInventory.releaseUomValue) * 100) / 100
+            await this.transactionInventory(
+              inventory,
+              releaseGood,
+              -targetInventory.releaseQty,
+              -targetInventory.releaseUomValue,
+              INVENTORY_TRANSACTION_TYPE.PICKING
+            )
 
-          inventory.qty -= targetInventory.releaseQty
-          inventory.uomValue = Math.round((inventory.uomValue - targetInventory.releaseUomValue) * 100) / 100
-          inventory.lockedQty = inventory.lockedQty - targetInventory.releaseQty
-          inventory.lockedUomValue =
-            Math.round((inventory.lockedUomValue - targetInventory.releaseUomValue) * 100) / 100
-          await this.transactionInventory(
-            inventory,
-            releaseGood,
-            -targetInventory.releaseQty,
-            -targetInventory.releaseUomValue,
-            INVENTORY_TRANSACTION_TYPE.PICKING
-          )
+            if (leftQty === 0) {
+              inventory.status = INVENTORY_STATUS.TERMINATED
+              await this.transactionInventory(inventory, releaseGood, 0, 0, INVENTORY_TRANSACTION_TYPE.TERMINATED)
+            }
 
-          if (leftQty === 0) {
-            inventory.status = INVENTORY_STATUS.TERMINATED
-            await this.transactionInventory(inventory, releaseGood, 0, 0, INVENTORY_TRANSACTION_TYPE.TERMINATED)
+            let worksheetDetail: WorksheetDetail = worksheetDetails.find(
+              (wsd: WorksheetDetail) => wsd.targetInventory.id === targetInventory.id
+            )
+            worksheetDetail.status = WORKSHEET_STATUS.DONE
+            worksheetDetail.updater = this.user
+            await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
+          } else {
+            await this.updateOrderTargets([targetInventory])
           }
-
-          let worksheetDetail: WorksheetDetail = worksheetDetails.find(
-            (wsd: WorksheetDetail) => wsd.targetInventory.id === targetInventory.id
-          )
-          worksheetDetail.status = WORKSHEET_STATUS.DONE
-          worksheetDetail.updater = this.user
-          await this.trxMgr.getRepository(WorksheetDetail).save(worksheetDetail)
-        } else {
-          await this.updateOrderTargets([targetInventory])
+          pickedQty = pickedQty - (targetReleaseQty - targetPickedQty)
         }
-        pickedQty = pickedQty - (targetReleaseQty - targetPickedQty)
       }
+    } catch (error) {
+      logger.error(`picking-worksheet-controller[scanProductBatchPicking]: ${error}`)
+      throw new Error(error)
+    } finally {
+      console.timeEnd(`scanProductBatchPicking:${taskNo}`)
     }
   }
 
@@ -1404,7 +1434,9 @@ export class PickingWorksheetController extends VasWorksheetController {
         await this.trxMgr.getRepository(WorksheetDetail).delete(worksheetDetail.ild)
         await this.trxMgr.getRepository(OrderInventory).delete(targetInventory.id)
       }
-    } catch (e) { }
+    } catch (e) {
+      logger.error(`picking-worksheet-controller[serialNumberReplacementForExistingOrderInv]: ${e}`)
+    }
   }
 
   private async serialNumberReplacement(
@@ -1412,6 +1444,7 @@ export class PickingWorksheetController extends VasWorksheetController {
     scannedPalletIdInventory,
     releaseGood,
     product,
+    productDetail,
     worksheetDetail,
     foundSerialNumber
   ) {
@@ -1476,6 +1509,7 @@ export class PickingWorksheetController extends VasWorksheetController {
         releaseUomValue: newOrderInventoryReleaseUomValue,
         pickedQty: 1,
         product,
+        productDetail,
         inventory: scannedPalletIdInventory,
         creator: this.user,
         updater: this.user
@@ -1519,7 +1553,9 @@ export class PickingWorksheetController extends VasWorksheetController {
         await this.trxMgr.getRepository(WorksheetDetail).delete(worksheetDetail.id)
         await this.trxMgr.getRepository(OrderInventory).delete(targetInventory.id)
       }
-    } catch (e) { }
+    } catch (e) {
+      logger.error(`picking-worksheet-controller[serialNumberReplacement]: ${e}`)
+    }
   }
 
   private async toteScanning(toteNo, targetProduct, targetInventory, pickedQty, releaseGood, bizplace) {