@things-factory/worksheet-base 4.3.79-alpha.0 → 4.3.80-alpha.0

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

@@ -261,7 +261,7 @@ export class PickingWorksheetController extends VasWorksheetController {
     })
 
     let releaseGoods: ReleaseGood[] = pickingOrderInventory.map((oi: OrderInventory) => oi.releaseGood)
-    
+
     if (releaseGoods?.length) {
       releaseGoods = releaseGoods.map((rg: ReleaseGood) => {
         return {
@@ -435,7 +435,8 @@ export class PickingWorksheetController extends VasWorksheetController {
           'targetInventory.orderProduct',
           'targetInventory.product.productDetails',
           'targetInventory.product.productDetails.product',
-          'targetInventory.product.productDetails.childProductDetail'
+          'targetInventory.product.productDetails.childProductDetail',
+          'targetInventory.productDetail'
         ]
       )
 
@@ -443,6 +444,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       let targetInventory: OrderInventory = worksheetDetail.targetInventory
       let targetProduct: OrderProduct = targetInventory.orderProduct
       const product: Product = targetInventory.product
+      const productDetail: ProductDetail = targetInventory.productDetail
       let inventory: Inventory = targetInventory.inventory
       let bizplace: Bizplace = worksheetDetail.worksheet.bizplace
 
@@ -458,9 +460,6 @@ export class PickingWorksheetController extends VasWorksheetController {
       if (inventory.cartonId !== cartonId)
         throw new Error(this.ERROR_MSG.VALIDITY.UNEXPECTED_FIELD_VALUE('Carton ID', cartonId, inventory.cartonId))
 
-      const packingType: string = inventory.packingType
-      const packingSize: number = inventory.packingSize
-
       let pickedQty: number = pickingQty ? pickingQty : 1
       const releaseQty: number = targetInventory.releaseQty
 
@@ -468,28 +467,15 @@ export class PickingWorksheetController extends VasWorksheetController {
 
       // search for matching product barcode
       const productDetails: ProductDetail[] = product?.productDetails.filter(detail => !detail.deletedAt)
-      const isMatchingBarcode: boolean = productDetails.map(detail => detail.gtin).includes(productBarcode)
-      if (!isMatchingBarcode) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+      // scannedProductDetail can be child or gtin
+      const scannedProductDetail: ProductDetail = productDetails.find(detail => detail.gtin == productBarcode)
+      if (!scannedProductDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
 
       // case for scanning parent packing type, packing size
-      const foundProductDetail: ProductDetail = productDetails.find(
-        (detail: ProductDetail) =>
-          detail.gtin === productBarcode &&
-          detail.packingType === packingType &&
-          detail.packingSize == packingSize &&
-          detail.product?.id === product.id
-      )
-
-      if (!foundProductDetail && !product?.isRequireSerialNumberScanningOutbound) {
-        const roProductDetail: ProductDetail = productDetails.find(
-          (parentDetail: ProductDetail) =>
-            parentDetail.packingType === packingType && parentDetail.packingSize == packingSize
-        )
-
-        let childQty = await this.getChildQty(productDetails, productBarcode, roProductDetail)
+      // when scannedProductDetail id is not the same as productDetail id, then it's not child gtin, proceed to get child qty
+      if (scannedProductDetail.id !== productDetail.id && !product?.isRequireSerialNumberScanningOutbound) {
+        let childQty = await this.getChildQty(productDetails, productBarcode, productDetail, scannedProductDetail)
         pickedQty *= childQty
-      } else if (!foundProductDetail) {
-        throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
       }
 
       if (pickedQty + targetInventory.pickedQty > releaseQty) {
@@ -541,6 +527,7 @@ export class PickingWorksheetController extends VasWorksheetController {
           inventoryItem.outboundOrderId = releaseGood.id
           inventoryItem.source = INVENTORY_ITEM_SOURCE.OUTBOUND
           inventoryItem.product = product
+          inventoryItem.productDetail = productDetail
           inventoryItem.inventory = inventory
           inventoryItem.domain = this.domain
 
@@ -580,13 +567,15 @@ export class PickingWorksheetController extends VasWorksheetController {
           'targetInventory.orderProduct',
           'targetInventory.inventory',
           'targetInventory.inventory.location',
-          'targetInventory.product'
+          'targetInventory.product',
+          'targetInventory.productDetail'
         ]
       )
 
       const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
       let targetInventory: OrderInventory = worksheetDetail.targetInventory
       const product: Product = targetInventory.product
+      const productDetail: ProductDetail = targetInventory.productDetail
       let inventory: Inventory = targetInventory.inventory
       let targetProduct: OrderProduct = targetInventory.orderProduct
       let bizplace: Bizplace = worksheetDetail.worksheet.bizplace
@@ -616,13 +605,13 @@ export class PickingWorksheetController extends VasWorksheetController {
         })
 
         let foundSerialNumber: InventoryItem = await this.trxMgr.getRepository(InventoryItem).findOne({
-          where: { domain: this.domain, serialNumber: serialNumber, product },
-          relations: ['product', 'inventory']
+          where: { domain: this.domain, serialNumber: serialNumber, productDetail },
+          relations: ['product', 'productDetail', 'inventory']
         })
 
         let scannedPalletIdInventory: Inventory = await this.trxMgr
           .getRepository(Inventory)
-          .findOne({ where: { domain: this.domain, palletId }, relations: ['product'] })
+          .findOne({ where: { domain: this.domain, palletId }, relations: ['productDetail'] })
 
         if (foundSerialNumber) {
           if (foundSerialNumber.outboundOrderId) {
@@ -649,6 +638,7 @@ export class PickingWorksheetController extends VasWorksheetController {
           inventoryItem.source = INVENTORY_ITEM_SOURCE.OUTBOUND
           inventoryItem.outboundOrderId = releaseGood.id
           inventoryItem.product = product
+          inventoryItem.productDetail = productDetail
           inventoryItem.inventory = scannedPalletIdInventory
           inventoryItem.domain = this.domain
 
@@ -674,8 +664,7 @@ export class PickingWorksheetController extends VasWorksheetController {
             )
           } else if (
             scannedPalletIdInventory.batchId == inventory.batchId &&
-            scannedPalletIdInventory.product.id == product.id &&
-            scannedPalletIdInventory.product.packingType == product.packingType
+            scannedPalletIdInventory.productDetail.id == productDetail.id
           ) {
             //if replacement order inventory does not exist
             await this.serialNumberReplacement(
@@ -683,6 +672,7 @@ export class PickingWorksheetController extends VasWorksheetController {
               scannedPalletIdInventory,
               releaseGood,
               product,
+              productDetail,
               worksheetDetail,
               foundSerialNumber
             )
@@ -858,16 +848,19 @@ export class PickingWorksheetController extends VasWorksheetController {
         'worksheetDetails.targetInventory.releaseGood',
         'worksheetDetails.targetInventory.inventory',
         'worksheetDetails.targetInventory.inventory.location',
-        'worksheetDetails.targetInventory.product',
+        'worksheetDetails.targetInventory.productDetail',
+        'worksheetDetails.targetInventory.productDetail.product',
         'worksheetDetails.targetInventory.product.productDetails',
         'worksheetDetails.targetInventory.product.productDetails.childProductDetail'
       ]
     })
 
     const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
-    const product: Product = worksheetDetails
+    const productDetail: ProductDetail = worksheetDetails
       .map((wsd: WorksheetDetail) => wsd.targetInventory.product)
-      .find((product: Product) => product.id === inventory.product.id)
+      .find((productDetail: ProductDetail) => productDetail.id === inventory.productDetail.id)
+
+    const product: Product = productDetail.product
 
     const batchId: string = inventory.batchId
     const packingType: string = inventory.packingType
@@ -886,26 +879,14 @@ export class PickingWorksheetController extends VasWorksheetController {
 
     // search for matching product barcode
     const productDetails: ProductDetail[] = product?.productDetails.filter(detail => !detail.deletedAt)
-    const isMatchingBarcode: boolean = productDetails.map(detail => detail.gtin).includes(productBarcode)
-    if (!isMatchingBarcode) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(`GTIN (${productBarcode})`))
+    // scannedProductDetail can be child or gtin
+    const scannedProductDetail: ProductDetail = productDetails.find(detail => detail.gtin == productBarcode)
+    if (!scannedProductDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
 
     // case for scanning parent packing type, packing size
-    const foundProductDetail: ProductDetail = productDetails.find(
-      (detail: ProductDetail) =>
-        detail.gtin === productBarcode && detail.packingType === packingType && detail.packingSize == packingSize
-    )
-
-    if (!foundProductDetail) {
-      const roProductDetail: ProductDetail = productDetails.find(
-        (parentDetail: ProductDetail) =>
-          parentDetail.packingType === packingType && parentDetail.packingSize == packingSize
-      )
-      if (!roProductDetail)
-        throw new Error(
-          this.ERROR_MSG.FIND.NO_RESULT(`Packing Type ( ${packingType}) or Packing Size (${packingSize})`)
-        )
-
-      let childQty = await this.getChildQty(productDetails, productBarcode, roProductDetail)
+    // when scannedProductDetail id is not the same as productDetail id, then it's not child gtin, proceed to get child qty
+    if (scannedProductDetail.id !== productDetail.id) {
+      let childQty = await this.getChildQty(productDetails, productBarcode, productDetail, scannedProductDetail)
       pickedQty *= childQty
     }
 
@@ -1300,6 +1281,7 @@ export class PickingWorksheetController extends VasWorksheetController {
     scannedPalletIdInventory,
     releaseGood,
     product,
+    productDetail,
     worksheetDetail,
     foundSerialNumber
   ) {
@@ -1364,6 +1346,7 @@ export class PickingWorksheetController extends VasWorksheetController {
         releaseUomValue: newOrderInventoryReleaseUomValue,
         pickedQty: 1,
         product,
+        productDetail,
         inventory: scannedPalletIdInventory,
         creator: this.user,
         updater: this.user

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

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

package/server/controllers/vas/vas-worksheet-controller.ts

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

package/server/controllers/worksheet-controller.ts

@@ -19,11 +19,11 @@ import {
   VasOrder
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, INVENTORY_STATUS, InventoryItem, Pallet } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, InventoryItem, Pallet, generateInventoryHistory } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
 import { Worksheet, WorksheetDetail } from '../entities'
-import { generateInventoryHistory, WorksheetNoGenerator } from '../utils'
+import { WorksheetNoGenerator } from '../utils'
 
 export type ReferenceOrderType = ArrivalNotice | ReleaseGood | VasOrder | InventoryCheck | DeliveryOrder | ReturnOrder
 export type OrderTargetTypes = OrderProduct | OrderInventory | OrderVas
@@ -1007,11 +1007,9 @@ export class WorksheetController {
   async getChildQty(
     productDetails: ProductDetail[],
     productBarcode: string,
-    orderProductDetail: ProductDetail
+    orderProductDetail: ProductDetail,
+    scannedProductDetail: ProductDetail
   ): Promise<number> {
-    const scannedProductDetail: ProductDetail = productDetails.find(
-      (productDetail: ProductDetail) => productDetail.gtin === productBarcode
-    )
     let hasChildRelation: boolean = Boolean(scannedProductDetail?.childProductDetail)
     let hasMatchingChild: boolean
     let childQty: number

package/server/graphql/resolvers/worksheet/batch-picking-worksheet.ts

@@ -32,6 +32,7 @@ export const batchPickingWorksheetResolver = {
       .addSelect('"PROD".name', 'productName')
       .addSelect('"PROD".sku', 'productSku')
       .addSelect('"PROD".description', 'productDescription')
+      .addSelect('"PROD_DET".id', 'productDetailId')
       .addSelect('"INV".qty', 'qty')
       .addSelect('"INV".packing_type', 'packingType')
       .addSelect('"INV".packing_size', 'packingSize')
@@ -47,6 +48,7 @@ export const batchPickingWorksheetResolver = {
       .leftJoin('WSD.targetInventory', 'T_INV')
       .leftJoin('T_INV.inventory', 'INV')
       .leftJoin('T_INV.product', 'PROD')
+      .leftJoin('T_INV.productDetail', 'PROD_DET')
       .leftJoin('T_INV.binLocation', 'BIN_LOC')
       .leftJoin('INV.location', 'LOC')
       .where('"WSD"."worksheet_id" = :worksheetId', { worksheetId: worksheet.id })
@@ -64,6 +66,7 @@ export const batchPickingWorksheetResolver = {
       .addGroupBy('"PROD".name')
       .addGroupBy('"PROD".sku')
       .addGroupBy('"PROD".description')
+      .addGroupBy('"PROD_DET".id')
       .addGroupBy('"T_INV".batch_id')
       .addGroupBy('"T_INV".packing_type')
       .addGroupBy('BIN_LOC.name')
@@ -126,6 +129,9 @@ export const batchPickingWorksheetResolver = {
               name: item?.productName,
               description: item?.productDescription,
               sku: item?.productSku
+            },
+            productDetail: {
+              id: item?.productDetailId
             }
           }
         }

package/server/graphql/resolvers/worksheet/confirm-cancellation-release-order.ts

@@ -11,10 +11,9 @@ import {
   ReleaseGood
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location, generateInventoryHistory } from '@things-factory/warehouse-base'
 
 import { Worksheet, WorksheetDetail } from '../../../entities'
-import { generateInventoryHistory } from '../../../utils'
 
 export const confirmCancellationReleaseOrder = {
   async confirmCancellationReleaseOrder(_: any, { name }, context: any) {

package/server/graphql/resolvers/worksheet/cycle-count-adjustment.ts

@@ -4,12 +4,12 @@ import { User } from '@things-factory/auth-base'
 import { Sellercraft, SellercraftStatus } from '@things-factory/integration-sellercraft'
 import { InventoryCheck, ORDER_INVENTORY_STATUS, ORDER_STATUS, OrderInventory } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location } from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, INVENTORY_TRANSACTION_TYPE, Location, generateInventoryHistory } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { SellercraftController } from '../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../entities'
-import { generateInventoryHistory, switchLocationStatus } from '../../../utils'
+import { switchLocationStatus } from '../../../utils'
 
 export const cycleCountAdjustmentResolver = {
   async cycleCountAdjustment(_: any, { cycleCountNo }, context: any) {

package/server/graphql/resolvers/worksheet/inventories-by-pallet.ts

@@ -40,6 +40,7 @@ export const inventoriesByPalletResolver = {
     qb.leftJoinAndSelect('iv.domain', 'domain')
       .leftJoinAndSelect('iv.bizplace', 'bizplace')
       .leftJoinAndSelect('iv.product', 'product')
+      .leftJoinAndSelect('iv.productDetail', 'productDetail')
       .leftJoinAndSelect('iv.warehouse', 'warehouse')
       .leftJoinAndSelect('iv.location', 'location')
       .leftJoinAndSelect('iv.creator', 'creator')
@@ -134,7 +135,8 @@ export const inventoriesByPalletResolver = {
           productName: item.product.name,
           productSKU: item.product.sku,
           productBrand: item.product.brand,
-          productId: item.product.id
+          productId: item.product.id,
+          productDetailId: item.productDetail.id
         }
       })
     )

package/server/graphql/resolvers/worksheet/picking-worksheet.ts

@@ -76,6 +76,7 @@ export async function pickingWorksheet(
     .leftJoinAndSelect('T_INV.binLocation', 'BIN_LOC')
     .leftJoinAndSelect('T_INV.inventory', 'INV')
     .leftJoinAndSelect('T_INV.product', 'PROD')
+    .leftJoinAndSelect('T_INV.productDetail', 'PROD_DET')
     .leftJoinAndSelect('INV.location', 'LOC')
 
   if (locationSortingRules?.length > 0) {
@@ -114,8 +115,8 @@ export async function pickingWorksheet(
       const inventoryChangesCount: number = await tx.getRepository(InventoryChange).count({
         where: {
           inventory: inventory.id,
-          status: "PENDING",
-          transactionType: "MISSING"
+          status: 'PENDING',
+          transactionType: 'MISSING'
         },
         relations: ['inventory', 'product']
       })

package/server/graphql/resolvers/worksheet/proceed-extra-products.ts

@@ -73,7 +73,7 @@ export const proceedExtraProductsResolver = {
       if (editedApprovedProducts?.length > 0) {
         editedApprovedProducts.map((editedApprovedProd: OrderProduct) => {
           const selectedOrderProduct: OrderProduct = storedOrderProducts.find(
-            (op: OrderProduct) => op.id === editedApprovedProd.id
+            (op: OrderProduct) => op.productDetail.id === editedApprovedProd.productDetailId
           )
 
           updatedOrderProducts.push({
@@ -115,7 +115,7 @@ export const proceedExtraProductsResolver = {
       if (addedApprovedProducts?.length > 0) {
         addedApprovedProducts.map((addedApprovedProd: OrderProduct) => {
           const selectedOrderProduct: OrderProduct = storedOrderProducts.find(
-            (op: OrderProduct) => op.id === addedApprovedProd.id
+            (op: OrderProduct) => op.productDetailId === addedApprovedProd.productDetailId
           )
           updatedOrderProducts.push({
             ...selectedOrderProduct,
@@ -173,7 +173,7 @@ export const proceedExtraProductsResolver = {
       if (editedRejectedProducts?.length > 0) {
         editedRejectedProducts = editedRejectedProducts.map((editedRejectProduct: OrderProduct) => {
           const selectedOrderProduct: OrderProduct = storedOrderProducts.find(
-            (op: OrderProduct) => op.id === editedRejectProduct.id
+            (op: OrderProduct) => op.productDetail.id === editedRejectProduct.productDetailId
           )
 
           return {
@@ -194,7 +194,8 @@ export const proceedExtraProductsResolver = {
         let deleteOrderProducts: OrderProduct[] = []
         addedRejectedProducts.map(rejectedOp => {
           const selectedOrderProduct: OrderProduct[] = storedOrderProducts.find(
-            (op: OrderProduct) => op.id === rejectedOp.id
+            //(op: OrderProduct) => op.id === rejectedOp.id
+            (op: OrderProduct) => op.productDetailId === rejectedOp.productDetailId
           )
           deleteOrderProducts.push(selectedOrderProduct)
         })

package/server/graphql/resolvers/worksheet/transfer.ts

@@ -1,38 +1,36 @@
+import { EntityManager } from 'typeorm'
+
 import { User } from '@things-factory/auth-base'
 import { Bizplace } from '@things-factory/biz-base'
+import { ORDER_PRODUCT_STATUS, OrderInventory } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import { OrderInventory, ORDER_PRODUCT_STATUS } from '@things-factory/sales-base'
 import {
   Inventory,
-  InventoryHistory,
-  InventoryNoGenerator,
   INVENTORY_STATUS,
-  INVENTORY_TRANSACTION_TYPE
+  INVENTORY_TRANSACTION_TYPE,
+  InventoryHistory,
+  InventoryNoGenerator
 } from '@things-factory/warehouse-base'
-import { EntityManager } from 'typeorm'
+
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../entities'
 
 export const transfer = {
   async transfer(_: any, { palletId, toPalletId, qty }, context: any) {
-    const {
-      tx,
-      domain,
-      bizplace,
-      user
-    }: { tx: EntityManager; domain: Domain; bizplace: Bizplace; user: User } = context.state
+    const { tx, domain, bizplace, user }: { tx: EntityManager; domain: Domain; bizplace: Bizplace; user: User } =
+      context.state
 
     // 1. get to inventory
     let toInventory: Inventory = await tx.getRepository(Inventory).findOne({
       where: { domain: domain, palletId: toPalletId },
-      relations: ['bizplace', 'product', 'warehouse', 'location']
+      relations: ['bizplace', 'product', 'productDetail', 'warehouse', 'location']
     })
     if (!toInventory) throw new Error(`to pallet doesn't exists`)
 
     // 2. get from inventory
     let fromInventory: Inventory = await tx.getRepository(Inventory).findOne({
       where: { domain: domain, palletId },
-      relations: ['bizplace', 'product', 'warehouse', 'location']
+      relations: ['bizplace', 'product', 'productDetail', 'warehouse', 'location']
     })
     if (!fromInventory) throw new Error(`from pallet doesn't exists`)
     if (toInventory.batchId !== fromInventory.batchId) throw new Error(`Can't transfer to different batch`)
@@ -74,6 +72,7 @@ export const transfer = {
         domain: domain,
         name: InventoryNoGenerator.inventoryHistoryName(),
         product: toInventory.product,
+        productDetail: toInventory.productDetail,
         warehouse: toInventory.warehouse,
         location: toInventory.location,
         seq: toInventory.lastSeq,
@@ -97,7 +96,7 @@ export const transfer = {
 
       fromInventory = await tx.getRepository(Inventory).findOne({
         where: { id: fromInventory.id },
-        relations: ['bizplace', 'product', 'warehouse', 'location']
+        relations: ['bizplace', 'product', 'productDetail', 'warehouse', 'location']
       })
 
       //    - add inventory history
@@ -105,6 +104,7 @@ export const transfer = {
         ...fromInventory,
         name: InventoryNoGenerator.inventoryHistoryName(),
         product: fromInventory.product,
+        productDetail: fromInventory.productDetail,
         warehouse: fromInventory.warehouse,
         location: fromInventory.location,
         seq: fromInventory.lastSeq,
@@ -131,7 +131,7 @@ export const transfer = {
 
       toInventory = await tx.getRepository(Inventory).findOne({
         where: { id: toInventory.id },
-        relations: ['bizplace', 'product', 'warehouse', 'location']
+        relations: ['bizplace', 'product', 'productDetail', 'warehouse', 'location']
       })
       //    - add inventory history
       delete toInventory.id
@@ -140,6 +140,7 @@ export const transfer = {
         domain,
         name: InventoryNoGenerator.inventoryHistoryName(),
         product: toInventory.product,
+        productDetail: toInventory.productDetail,
         warehouse: toInventory.warehouse,
         location: toInventory.location,
         seq: toInventory.lastSeq,
@@ -157,7 +158,7 @@ export const transfer = {
 
       fromInventory = await tx.getRepository(Inventory).findOne({
         where: { id: fromInventory.id },
-        relations: ['bizplace', 'product', 'warehouse', 'location']
+        relations: ['bizplace', 'product', 'productDetail', 'warehouse', 'location']
       })
 
       //    - add inventory history
@@ -165,6 +166,7 @@ export const transfer = {
         ...fromInventory,
         name: InventoryNoGenerator.inventoryHistoryName(),
         product: fromInventory.product,
+        productDetail: fromInventory.productDetail,
         warehouse: fromInventory.warehouse,
         location: fromInventory.location,
         seq: fromInventory.lastSeq,

package/server/graphql/resolvers/worksheet/vas-transactions/common-utils.ts

@@ -19,12 +19,13 @@ import {
   InventoryNoGenerator,
   Location,
   Pallet,
-  Warehouse
+  Warehouse,
+  generateInventoryHistory
 } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../../../constants'
 import { Worksheet, WorksheetDetail } from '../../../../entities'
-import { generateInventoryHistory, WorksheetNoGenerator } from '../../../../utils'
+import { WorksheetNoGenerator } from '../../../../utils'
 import {
   OperationGuideInterface,
   PackingUnits,

package/server/graphql/resolvers/worksheet-detail/regenerate-release-good-worksheet-details.ts

@@ -19,7 +19,7 @@ import { WorksheetNoGenerator } from '../../../utils'
 export const regenerateReleaseGoodWorksheetDetailsResolver = {
   async regenerateReleaseGoodWorksheetDetails(
     _: any,
-    { worksheetNo, batchId, productId, packingType, packingSize, orderProductId, worksheetDetails },
+    { worksheetNo, batchId, productId, productDetailId, packingType, packingSize, orderProductId, worksheetDetails },
     context: any
   ): Promise<void> {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
@@ -30,6 +30,7 @@ export const regenerateReleaseGoodWorksheetDetailsResolver = {
       worksheetNo,
       batchId,
       productId,
+      productDetailId,
       packingType,
       packingSize,
       orderProductId,
@@ -45,6 +46,7 @@ export async function regenerateReleaseGoodWorksheetDetails(
   worksheetNo: string,
   batchId: string,
   productId: string,
+  productDetailId: string,
   packingType: string,
   packingSize: number,
   orderProductId: string,
@@ -115,6 +117,7 @@ export async function regenerateReleaseGoodWorksheetDetails(
         batchIdRef: inventory.batchIdRef,
         status: ORDER_INVENTORY_STATUS.READY_TO_PICK,
         product: await tx.getRepository(Product).findOne(productId),
+        productDetail: productDetailId,
         packingType,
         packingSize,
         orderProduct: targetProduct,

package/server/graphql/types/worksheet-detail/index.ts

@@ -32,6 +32,7 @@ export const Mutation = /* GraphQL */ `
     worksheetNo: String!
     batchId: String!
     productId: String!
+    productDetailId: String!
     packingType: String!
     packingSize: Float!
     orderProductId: String!