@things-factory/worksheet-base 4.3.103 → 4.3.105-alpha.0

package/server/entities/warehouse-bizplace-onhand-inventory.ts

@@ -2,55 +2,23 @@ import { ViewColumn, ViewEntity } from 'typeorm'
 
 @ViewEntity({
   expression: `  
-  select d.name as "domainName", b.name as "bizplaceName", src.* from (
-    WITH oi as (
-      select
-        oi.domain_id,
-        oi.bizplace_id,
-        SUM(oi.release_qty) AS release_qty,
-        SUM(oi.release_uom_value) AS release_uom_value,
-        oi.batch_id,
-        oi.batch_id_ref,
-        oi.product_id,
-        oi.packing_type,
-        oi.packing_size,
-        oi.uom
-      FROM
-        order_inventories oi
-      WHERE
-        (oi.status = 'PENDING' or oi.status = 'PENDING_RECEIVE' or oi.status = 'PENDING_WORKSHEET' or oi.status = 'PENDING_SPLIT')
-        AND oi.batch_id NOTNULL
-        AND oi.product_id NOTNULL
-        AND oi.packing_type NOTNULL
-        AND oi.packing_size NOTNULL
-        AND oi.inventory_id IS NULL
-      GROUP BY
-        oi.domain_id,
-        oi.bizplace_id,
-        oi.batch_id,
-        oi.batch_id_ref,
-        oi.product_id,
-        oi.packing_type,
-        oi.packing_size,
-        oi.uom
-    ) 
+  select d.name as "domain_name", b.name as "bizplace_name", src.* from (
     -- SINGLE ITEM INVENTORY QUERY
     select
-    i.domain_id as "domainId",
-    i.bizplace_id as "bizplaceId",
-    i.packing_type as "packingType",
-    i.packing_size as "packingSize",
+    i.domain_id as "domain_id",
+    i.bizplace_id as "bizplace_id",
+    i.packing_type as "packing_type",
+    i.packing_size as "packing_size",
     i.uom,
-    i.product_id as "productId",
-    null as "productBundleId",
-    COALESCE(SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0))) AS "remainQty",
-    COALESCE(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0)), 0) AS "remainUomValue",
+    i.product_id as "product_id",
+    null as "product_bundle_id",
+    COALESCE(SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0))) AS "remain_qty",
+    COALESCE(SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0))) AS "remain_uom_value",
     COALESCE(sum(COALESCE(i.qty, 0::double precision))) AS "qty",
-    COALESCE(sum(COALESCE(i.uom_value, 0::double precision))) AS "uomValue",
-    'SINGLE' AS "groupType"
+    COALESCE(sum(COALESCE(i.uom_value, 0::double precision))) AS "uom_value",
+    'SINGLE' AS "group_type"
     FROM inventories i
     INNER JOIN locations l2 ON i.location_id = l2.id AND i.domain_id = l2.domain_id AND l2.type NOT IN ('QUARANTINE', 'RESERVE')
-    LEFT JOIN oi ON i.batch_id = oi.batch_id AND i.product_id = oi.product_id AND i.packing_type = oi.packing_type AND i.packing_size = oi.packing_size AND i.uom = oi.uom
     WHERE i.status = 'STORED'
     GROUP by
       i.domain_id,
@@ -62,29 +30,28 @@ import { ViewColumn, ViewEntity } from 'typeorm'
     union all
     -- BUNDLE ITEM INVENTORY QUERY
     SELECT 
-    pbs.domain_id as "domainId",
-    pbs.bizplace_id as "bizplaceId",
-    pb.packing_type as "packingType", 
-    pb.packing_size as "packingSize",
+    pbs.domain_id as "domain_id",
+    pbs.bizplace_id as "bizplace_id",
+    pb.packing_type as "packing_type", 
+    pb.packing_size as "packing_size",
     'UNIT' AS "uom", 
-    null as "productId",
-    pb.id AS "productBundleId",
-    COALESCE(MIN(FLOOR(pbs."availableQty")),0) AS "remainQty", 
-    COALESCE(MIN(FLOOR(pbs."availableUomValue")),0) AS "remainUomValue",
+    null as "product_id",
+    pb.id AS "product_bundle_id",
+    COALESCE(MIN(FLOOR(pbs."available_qty")),0) AS "remain_qty", 
+    COALESCE(MIN(FLOOR(pbs."available_uom_value")),0) AS "remain_uom_value",
     COALESCE(MIN(FLOOR(pbs."qty")), 0::double precision) AS "qty",
-    COALESCE(MIN(FLOOR(pbs."uomValue")), 0::double precision) AS "uomValue",
-    'BUNDLE' AS "groupType"
+    COALESCE(MIN(FLOOR(pbs."uom_value")), 0::double precision) AS "uom_value",
+    'BUNDLE' AS "group_type"
     FROM product_bundles pb
     INNER JOIN (
       SELECT i.domain_id, i.bizplace_id, pbs.product_id, pbs.product_bundle_id, min(pbs.bundle_qty),
-      (SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0)) - MAX(COALESCE(oi.release_qty, 0))) / min(pbs.bundle_qty) AS "availableQty",
-      (SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0)) - MAX(COALESCE(oi.release_uom_value, 0))) / min(pbs.bundle_qty)  AS "availableUomValue",
+      (SUM(COALESCE(i.qty, 0)) - SUM(COALESCE(i.locked_qty, 0))) / min(pbs.bundle_qty) AS "available_qty",
+      (SUM(COALESCE(i.uom_value, 0)) - SUM(COALESCE(i.locked_uom_value, 0))) / min(pbs.bundle_qty)  AS "available_uom_value",
       (sum(COALESCE(i.qty, 0::double precision))) / min(pbs.bundle_qty)::double precision AS "qty",
-      (sum(COALESCE(i.uom_value, 0::double precision))) / min(pbs.bundle_qty)::double precision AS "uomValue"
+      (sum(COALESCE(i.uom_value, 0::double precision))) / min(pbs.bundle_qty)::double precision AS "uom_value"
       FROM product_bundle_settings pbs 
       LEFT JOIN inventories i ON i.product_id = pbs.product_id AND i.status = 'STORED'
-      INNER JOIN locations l ON i.location_id = l.id AND i.domain_id = l.domain_id AND l.type NOT IN ('QUARANTINE', 'RESERVE')    
-      LEFT JOIN oi ON oi.product_id = i.product_id
+      INNER JOIN locations l ON i.location_id = l.id AND i.domain_id = l.domain_id AND l.type NOT IN ('QUARANTINE', 'RESERVE') 
       GROUP by
         i.domain_id, 
         i.bizplace_id,
@@ -101,14 +68,13 @@ import { ViewColumn, ViewEntity } from 'typeorm'
     pb.id
   )
   AS src 
-  inner join domains d on d.id = src."domainId"
-  inner join bizplaces b on b.id = src."bizplaceId"
-  where src."remainQty" >= 0
+  inner join domains d on d.id = src."domain_id"
+  inner join bizplaces b on b.id = src."bizplace_id"
+  where src."remain_qty" >= 0
   and src."qty" > 0
-  order by src."domainId"
+  order by src."domain_id"
   `
 })
-
 export class WarehouseBizplaceOnhandInventory {
   @ViewColumn()
   domainName: string

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/packing/scan-product-packing.ts

@@ -11,7 +11,7 @@ import { Worksheet } from '../../../../entities'
 export const scanProductPackingResolver = {
   async scanProductPacking(_: any, { worksheetDetailName, productBarcode, serialNumber }, context: any) {
     const { tx, domain, user }: { tx: EntityManager; domain: Domain; user: User } = context.state
-    await scanProductPacking(tx, domain, user, worksheetDetailName, productBarcode, serialNumber)
+    return await scanProductPacking(tx, domain, user, worksheetDetailName, productBarcode, serialNumber)
   }
 }
 
@@ -24,35 +24,16 @@ export async function scanProductPacking(
   serialNumber?: string
 ) {
   try {
+    console.time('execution time to scan for packing')
     const worksheetController: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
-    const worksheetDetail = await worksheetController.scanProductPacking(
+    const inventoryItems = await worksheetController.scanProductPacking(
       worksheetDetailName,
       productBarcode,
       serialNumber
     )
 
-    let releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
-    const worksheet: Worksheet = worksheetDetail.worksheet
-
-    const orderSource: string = releaseGood.source
-    switch (orderSource) {
-      case ApplicationType.SELLERCRAFT:
-        if (!releaseGood?.airwayBill) {
-          const sellercraft: Sellercraft = await tx
-            .getRepository(Sellercraft)
-            .findOne({ domain: worksheet.bizplace.domain, status: SellercraftStatus.ACTIVE })
-
-          if (sellercraft) {
-            const sellercraftCtrl: SellercraftController = new SellercraftController(tx, domain, user)
-            sellercraftCtrl.fetchOrderDocument(sellercraft, releaseGood)
-          }
-        }
-
-        break
-
-      default:
-        break
-    }
+    console.timeEnd('execution time to scan for packing')
+    return inventoryItems
 
     // if (releaseGood.type === 'b2c' && !releaseGood?.airwayBill) {
     //   const sellercraft: Sellercraft = await tx

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

@@ -14,10 +14,9 @@ import { PartnerSetting, Setting } from '@things-factory/setting-base'
 import { Domain } from '@things-factory/shell'
 import { Inventory, Location } from '@things-factory/warehouse-base'
 
-import { WORKSHEET_TYPE } from '../../../constants'
+import { WORKSHEET_TYPE, WORKSHEET_STATUS } from '../../../constants'
 import { PackingWorksheetController, SellercraftController } from '../../../controllers'
 import { Worksheet, WorksheetDetail } from '../../../entities'
-import { fetchExecutingWorksheet } from '../../../utils'
 
 export const packingWorksheetResolver = {
   async packingWorksheet(_: any, { releaseGoodNo }, context: any) {
@@ -86,28 +85,28 @@ export const packingWorksheetResolver = {
 
       if (!releaseGood) throw new Error(`Release good do not exist.`)
 
-      const worksheet: Worksheet = await fetchExecutingWorksheet(
-        domain,
-        releaseGood.bizplace,
-        [
-          'bizplace',
-          'bizplace.domain',
-          'releaseGood',
-          'releaseGood.domain',
-          'worksheetDetails',
-          'worksheetDetails.targetInventory',
-          'worksheetDetails.targetInventory.binLocation',
-          'worksheetDetails.targetInventory.inventory',
-          'worksheetDetails.targetInventory.inventory.location',
-          'worksheetDetails.targetInventory.inventory.product',
-          'worksheetDetails.targetInventory.inventory.product.productDetails',
-          'worksheetDetails.toLocation'
-        ],
-        WORKSHEET_TYPE.PACKING,
-        releaseGood
-      )
-
-      if (worksheet.status === 'DEACTIVATED') {
+      const worksheet: Worksheet = await tx
+        .getRepository(Worksheet)
+        .createQueryBuilder('w')
+        .innerJoinAndSelect('w.bizplace', 'b')
+        .innerJoinAndSelect('b.domain', 'd')
+        .innerJoinAndSelect('w.releaseGood', 'rg')
+        .innerJoinAndSelect('w.worksheetDetails', 'wd')
+        .innerJoinAndSelect('wd.targetInventory', 'oi')
+        .innerJoinAndSelect('oi.inventory', 'i')
+        .leftJoinAndSelect('oi.binLocation', 'l')
+        .innerJoinAndSelect('i.location', 'l2')
+        .innerJoinAndSelect('i.product', 'p')
+        .innerJoinAndSelect('p.productDetails', 'pd')
+        .where('rg.id = :id', { id: releaseGood.id })
+        .andWhere('w.type = :type', { type: WORKSHEET_TYPE.PACKING })
+        .getOne()
+
+      if (!worksheet) throw new Error('Worksheet does not exist')
+
+      if (worksheet.status === WORKSHEET_STATUS.DONE) {
+        throw new Error(`Worksheet is completed already`)
+      } else if (worksheet.status === WORKSHEET_STATUS.DEACTIVATED) {
         const packingWSCtrl: PackingWorksheetController = new PackingWorksheetController(tx, domain, user)
 
         const directActivatePackingWorksheet: Setting = await tx.getRepository(Setting).findOne({
@@ -202,54 +201,6 @@ export const packingWorksheetResolver = {
           break
       }
 
-      // if (releaseGood.type === 'b2c') {
-      //   const sellercraft: Sellercraft = await tx.getRepository(Sellercraft).findOne({
-      //     domain: worksheet.bizplace.domain,
-      //     status: SellercraftStatus.ACTIVE
-      //   })
-
-      //   if (sellercraft) {
-      //     // asynchronously get document from sellercraft
-      //     getSellercraftDocument(sellercraft, releaseGood, domain, user)
-      //   } else {
-      //     marketplaceOrder = await tx.getRepository(MarketplaceOrder).findOne({
-      //       where: { orderNo: releaseGood.refNo },
-      //       relations: [
-      //         'domain',
-      //         'marketplaceStore',
-      //         'marketplaceOrderItems',
-      //         'marketplaceOrderItems.marketplaceOrderShippingItems',
-      //         'marketplaceOrderItems.marketplaceOrderShippingItems.marketplaceOrderShipping'
-      //       ]
-      //     })
-
-      //     if (!marketplaceOrder) {
-      //       throw new Error('Failed to retrieve ecommerce information, kindly contact our support team for this issue.')
-      //     }
-
-      //     let marketplaceOrderShipping: MarketplaceOrderShipping
-      //     if (marketplaceOrder.isSplitted) {
-      //       marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
-      //         where: { subOrderNoRef: worksheet.releaseGood.refNo2 }
-      //       })
-      //     } else {
-      //       marketplaceOrderShipping = await tx.getRepository(MarketplaceOrderShipping).findOne({
-      //         where: { orderNoRef: worksheet.releaseGood.refNo }
-      //       })
-      //     }
-
-      //     trackingNo = marketplaceOrderShipping.ownTrackingNo
-      //       ? marketplaceOrderShipping.ownTrackingNo
-      //       : marketplaceOrderShipping.trackingNo
-      //     shippingProvider = marketplaceOrderShipping.ownTransporter
-      //       ? marketplaceOrderShipping.ownTransporter
-      //       : marketplaceOrderShipping.transporter
-
-      //     marketplaceStore = marketplaceOrder?.marketplaceStore
-      //     marketplaceStatus = marketplaceOrder?.status
-      //   }
-      // }
-
       return {
         worksheetInfo: {
           releaseGood,
@@ -269,29 +220,41 @@ export const packingWorksheetResolver = {
           marketplaceStatus: marketplaceStatus ? marketplaceStatus : '',
           marketplaceOrder: marketplaceOrder ? marketplaceOrder : ''
         },
-        worksheetDetailInfos: worksheet.worksheetDetails.map((packingWSD: WorksheetDetail) => {
-          const targetInventory: OrderInventory = packingWSD.targetInventory
-          const inventory: Inventory = targetInventory.inventory
-          return {
-            name: packingWSD.name,
-            palletId: inventory.palletId,
-            cartonId: inventory.cartonId,
-            batchId: inventory.batchId,
-            batchIdRef: inventory.batchIdRef,
-            product: inventory.product,
-            sku: inventory.product.sku,
-            releaseQty: targetInventory.releaseQty,
-            packedQty: targetInventory.packedQty,
-            status: packingWSD.status,
-            description: packingWSD.description,
-            targetName: targetInventory.name,
-            packingType: inventory.packingType,
-            packingSize: inventory.packingSize,
-            binLocation: targetInventory?.binLocation,
-            location: inventory.location,
-            relatedOrderInv: targetInventory
-          }
-        })
+        worksheetDetailInfos: worksheet.worksheetDetails
+          .map((packingWSD: WorksheetDetail) => {
+            const targetInventory: OrderInventory = packingWSD.targetInventory
+            const inventory: Inventory = targetInventory.inventory
+            return {
+              id: packingWSD.id,
+              name: packingWSD.name,
+              palletId: inventory.palletId,
+              cartonId: inventory.cartonId,
+              batchId: inventory.batchId,
+              batchIdRef: inventory.batchIdRef,
+              product: inventory.product,
+              sku: inventory.product.sku,
+              releaseQty: targetInventory.releaseQty,
+              packedQty: targetInventory.packedQty,
+              status: packingWSD.status,
+              description: packingWSD.description,
+              targetName: targetInventory.name,
+              packingType: inventory.packingType,
+              packingSize: inventory.packingSize,
+              binLocation: targetInventory?.binLocation,
+              location: inventory.location,
+              relatedOrderInv: targetInventory
+            }
+          })
+          .sort((a, b) => {
+            if (a?.binLocation && b?.binLocation) {
+              if (a.binLocation.name < b.binLocation.name) return -1
+              if (a.binLocation.name > b.binLocation.name) return 1
+            }
+
+            if (a.sku < b.sku) return -1
+            if (a.sku > b.sku) return 1
+            return 0
+          })
       }
     } catch (error) {
       console.error(error)

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/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/unloaded-inventories.ts

@@ -44,7 +44,7 @@ export const unloadedInventories = {
           orderProductId: In(foundWorksheetDetails.map(wsd => wsd.targetProduct.id)),
           status: In([INVENTORY_STATUS.UNLOADED, INVENTORY_STATUS.CHECKED])
         },
-        relations: ['reusablePallet', 'product', 'bizplace']
+        relations: ['reusablePallet', 'product', 'bizplace', 'inventoryItems']
       })
       const items = foundInv.map((inv: Inventory) => {
         const expirationDate: Date = inv.expirationDate ? new Date(inv.expirationDate) : null

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/worksheets.ts

@@ -242,7 +242,7 @@ export const worksheetsResolver = {
             params.filters.findIndex(item => item.name == 'executionDate'),
             1
           )
-          arrFilters.push({ ...releaseGoodRefNoParam, name: 'refNo' })
+          arrFilters.push({ ...executionDateParam, name: 'executionDate' })
         }
         const foundInventoryCheck: InventoryCheck[] = await getRepository(InventoryCheck).find({
           ...convertListParams({ filters: arrFilters })

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/index.ts

@@ -363,7 +363,7 @@ export const Mutation = /* GraphQL */ `
     worksheetDetailName: String!
     productBarcode: String!
     serialNumber: String
-  ): Boolean @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
+  ): ExecutingWorksheet @privilege(category: "worksheet_execute", privilege: "mutation") @transaction
 
   batchPicking (
     taskNo: String!