@things-factory/worksheet-base 4.3.137 → 4.3.139

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

@@ -1,6 +1,6 @@
 import { In, IsNull } from 'typeorm'
 
-import { Product, ProductDetail } from '@things-factory/product-base'
+import { Product, ProductDetail, ProductBarcode } from '@things-factory/product-base'
 import {
   ORDER_INVENTORY_STATUS,
   ORDER_STATUS,
@@ -85,9 +85,8 @@ export class SortingWorksheetController extends VasWorksheetController {
       .innerJoinAndSelect('worksheet.worksheetDetails', 'worksheetDetails')
       .innerJoinAndSelect('worksheetDetails.targetInventory', 'targetInventory')
       .innerJoinAndSelect('targetInventory.product', 'product')
-      .innerJoinAndSelect('product.productDetails', 'productDetails')
-      .leftJoinAndSelect('productDetails.childProductDetail', 'childProductDetail')
       .leftJoinAndSelect('targetInventory.orderProduct', 'orderProduct')
+      .leftJoinAndSelect('targetInventory.productDetail', 'productDetail')
       .leftJoinAndSelect('targetInventory.bizplace', 'bizplace')
       .leftJoinAndSelect('targetInventory.inventory', 'inventory')
       .leftJoinAndSelect('targetInventory.releaseGood', 'releaseGood')
@@ -96,7 +95,6 @@ export class SortingWorksheetController extends VasWorksheetController {
       .andWhere('worksheet.type = :type', { type: WORKSHEET_TYPE.SORTING })
       .andWhere('worksheet.status = :status', { status: WORKSHEET_STATUS.EXECUTING })
       .andWhere('releaseGood.name = :rg', { rg: releaseGoodNo })
-      .andWhere('productDetails.gtin = :gtin', { gtin: productBarcode })
       .getOne()
 
     if (!worksheet) {
@@ -105,17 +103,15 @@ export class SortingWorksheetController extends VasWorksheetController {
 
     const worksheetDetails = worksheet.worksheetDetails
     const orderInventories: OrderInventory[] = worksheetDetails.map((wsd: WorksheetDetail) => wsd.targetInventory)
-    const productDetails: ProductDetail[] = orderInventories[0].product.productDetails
-    const scannedProductDetail: ProductDetail = productDetails.find(itm => itm.gtin == productBarcode)
+    const scanProductBarcode: ProductBarcode = await this.trxMgr.getRepository(ProductBarcode).findOne({
+      where: { gtin: productBarcode },
+      relations: ['productDetail', 'productDetail.childProductDetail']
+    })
+    const scannedProductDetail: ProductDetail = scanProductBarcode.productDetail
     const scannedChildProductDetail: ProductDetail = scannedProductDetail.childProductDetail
 
     //find matching order inventories based on scanned product detail
-    let matchingOIs = orderInventories.filter(
-      oi =>
-        oi.packingType == scannedProductDetail.packingType &&
-        oi.packingSize == scannedProductDetail.packingSize &&
-        oi.uom == scannedProductDetail.uom
-    )
+    let matchingOIs = orderInventories.filter(oi => oi.productDetail.id == scannedProductDetail.id)
 
     let productDetail = scannedProductDetail
 
@@ -125,12 +121,7 @@ export class SortingWorksheetController extends VasWorksheetController {
       if (!scannedChildProductDetail) {
         throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
       }
-      matchingOIs = orderInventories.filter(
-        oi =>
-          oi.packingType == scannedChildProductDetail.packingType &&
-          oi.packingSize == scannedChildProductDetail.packingSize &&
-          oi.uom == scannedChildProductDetail.uom
-      )
+      matchingOIs = orderInventories.filter(oi => oi.productDetail.id == scannedChildProductDetail.id)
 
       productDetail = scannedChildProductDetail
 
@@ -295,7 +286,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'
       ]
     })
 
@@ -315,6 +307,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
 
@@ -324,8 +317,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) {
@@ -349,6 +341,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,17 @@ 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
@@ -590,8 +596,7 @@ export class WorksheetController {
     return worksheet
   }
 
-  // @chernhaoee I think the naming of this function is not proper. Seems like it should be something like "updateLoadingWorksheet" since the logic targets only Loading Order Target
-  async updateWorksheet(
+  async updateLoadWorksheet(
     worksheetType: string,
     refOrder: ReferenceOrderType,
     worksheet: Worksheet,
@@ -1006,11 +1011,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
@@ -1061,16 +1064,18 @@ export class WorksheetController {
         WITH RECURSIVE cte as (
         select * from (
           select pd2.product_id as "productId", pd2.id, pd2.packing_size as "packingSize",
-          pd2.packing_type as "packingType", pd2.uom as "uom", (pd2.uom_value * $2::float) as "uomValue", $2::float as "qty", pd2.gtin            
+          pd2.packing_type as "packingType", pd2.uom as "uom", (pd2.uom_value * $2::float) as "uomValue", $2::float as "qty", pb.gtin            
           from product_details pd 
           inner join product_details pd2 on pd.product_id = pd2.product_id and pd.packing_type = pd2.packing_type and pd.packing_size = pd2.packing_size and pd.uom = pd2.uom
+          inner join product_barcodes pb on pb.product_detail_id = pd2.id
           where pd.id = $1
           ) as dt
           union all
           select pd.product_id as "productId", pd.id, pd.packing_size as "packingSize",
           pd.packing_type as "packingType", pd.uom,
-          dt1.qty * pd.packing_size * pd.uom_value as "uomValue", dt1.qty * pd.packing_size as "qty", pd.gtin
+          dt1.qty * pd.packing_size * pd.uom_value as "uomValue", dt1.qty * pd.packing_size as "qty", pb.gtin
           from product_details pd
+          inner join product_barcodes pb on pb.product_detail_id = pd.id
           inner join cte dt1 on dt1.id = pd.child_product_detail_id 
           where pd.deleted_at is null
         )

package/server/entities/index.ts

@@ -1,8 +1,8 @@
+import { WarehouseBizplaceOnhandInventory } from './warehouse-bizplace-onhand-inventory'
 import { Worksheet } from './worksheet'
 import { WorksheetDetail } from './worksheet-detail'
 import { WorksheetMovement } from './worksheet-movement'
-import { WarehouseBizplaceOnhandInventory } from './warehouse-bizplace-onhand-inventory'
 
 export const entities = [Worksheet, WorksheetDetail, WorksheetMovement, WarehouseBizplaceOnhandInventory]
 
-export { Worksheet, WorksheetDetail, WorksheetMovement }
+export { WarehouseBizplaceOnhandInventory, Worksheet, WorksheetDetail, WorksheetMovement }

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

@@ -13,10 +13,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/find-sorting-release-orders-by-task-no.ts

@@ -19,7 +19,7 @@ export const findSortingReleaseOrdersByTaskNoResolver = {
   async findSortingReleaseOrdersByTaskNo(_: any, { taskNo }, context: any) {
     const { domain, tx, user }: { domain: Domain; tx: EntityManager; user: User } = context.state
     let task = await tx.getRepository(WorksheetEntity).findOne({
-      where: { taskNo, type: WORKSHEET_TYPE.SORTING },
+      where: { taskNo, type: WORKSHEET_TYPE.SORTING, domain },
       relations: ['bizplace', 'bizplace.domain', 'worksheetDetails']
     })
 
@@ -51,7 +51,7 @@ export const findSortingReleaseOrdersByTaskNoResolver = {
       if (orderInventoryByBin?.releaseGood_id) {
         taskNo = orderInventoryByBin.ws_task_no
         task = await tx.getRepository(WorksheetEntity).findOne({
-          where: { taskNo, status: WORKSHEET_STATUS.DEACTIVATED, type: WORKSHEET_TYPE.SORTING }
+          where: { taskNo, status: WORKSHEET_STATUS.DEACTIVATED, type: WORKSHEET_TYPE.SORTING, domain }
         })
       } else {
         throw new Error(`Bin do not have any batch picking order.`)

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-worksheet.ts

@@ -14,7 +14,7 @@ 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'
 
@@ -104,7 +104,9 @@ export const packingWorksheetResolver = {
 
       if (!worksheet) throw new Error('Worksheet does not exist')
 
-      if (worksheet.status === 'DEACTIVATED') {
+      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({

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-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!