@things-factory/worksheet-base 4.3.94-alpha.1 → 4.3.96

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

@@ -28,13 +28,12 @@ import {
   Location,
   LOCATION_TYPE,
   Tote,
-  TOTE_STATUS,
-  generateInventoryHistory
+  TOTE_STATUS
 } from '@things-factory/warehouse-base'
 
 import { TASK_NUMBER_RULE_TYPE, TASK_NUMBER_SETTING_KEY, WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
 import { Worksheet, WorksheetDetail } from '../../entities'
-import { WorksheetNoGenerator } from '../../utils'
+import { generateInventoryHistory, WorksheetNoGenerator } from '../../utils'
 import { VasWorksheetController } from '../vas/vas-worksheet-controller'
 
 export class PickingWorksheetController extends VasWorksheetController {
@@ -214,7 +213,7 @@ export class PickingWorksheetController extends VasWorksheetController {
       if (vasWorksheet) {
         await this.activateVAS(vasWorksheet.name, vasWorksheet.worksheetDetails)
       }
-    } catch (e) {}
+    } catch (e) { }
 
     const pendingSplitOIs: OrderInventory[] = await this.trxMgr.getRepository(OrderInventory).find({
       where: { domain: this.domain, releaseGood, status: ORDER_INVENTORY_STATUS.PENDING_SPLIT }
@@ -431,7 +430,11 @@ export class PickingWorksheetController extends VasWorksheetController {
         .innerJoinAndSelect('oi.inventory', 'inv')
         .leftJoinAndSelect('oi.orderProduct', 'op')
         .innerJoinAndSelect('oi.product', 'prd')
-        .innerJoinAndSelect('oi.productDetail', 'pd')
+        .leftJoinAndSelect(
+          'prd.productDetails',
+          'pd',
+          'pd.product_id = oi.product_id AND pd.deleted_at is null AND pd.packing_type = oi.packing_type AND pd.packing_size = oi.packing_size AND pd.uom = oi.uom'
+        )
         .where('wd.name = :name', { name: worksheetDetailName })
         .andWhere('wd.domain_id = :domainId', { domainId: this.domain.id })
         .andWhere('wd.type = :type', { type: worksheetType })
@@ -440,41 +443,27 @@ export class PickingWorksheetController extends VasWorksheetController {
         .getOne()
 
       //validation to check matching worksheet detail based on name
-      if (!worksheetDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName))
-
-      const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
-      let targetInventory: OrderInventory = worksheetDetail.targetInventory
-      let targetProduct: OrderProduct = targetInventory.orderProduct
-      const product: Product = targetInventory.product
-      const productDetail: ProductDetail = targetInventory.productDetail
-      let inventory: Inventory = targetInventory.inventory
-      let bizplace: Bizplace = worksheetDetail.worksheet.bizplace
-      let pickedUomValue = pickedQty * productDetail.uomValue
-      let matchingProduct
+      if (!worksheetDetail || !worksheetDetail.targetInventory)
+        throw new Error(this.ERROR_MSG.FIND.NO_RESULT(worksheetDetailName))
 
       //validation to prevent duplicated picking
-      if (targetInventory?.status != ORDER_INVENTORY_STATUS.PICKING)
+      if (worksheetDetail?.targetInventory?.status != ORDER_INVENTORY_STATUS.PICKING)
         throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `is done`))
 
-      if (productBarcode !== productDetail.gtin) {
-        if (product?.isRequireSerialNumberScanningOutbound)
-          throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
-
-        matchingProduct = await this.getDirectQty(
-          {
-            ...productDetail,
-            product: targetInventory?.product
-          },
-          productBarcode,
-          pickedQty
-        )
+      let matchingProduct = await this.getDirectQty(
+        {
+          ...worksheetDetail?.targetInventory?.product?.productDetails[0],
+          product: worksheetDetail?.targetInventory?.product
+        },
+        productBarcode,
+        pickedQty
+      )
 
-        //validate matching product details based on scanned barcode
-        if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+      //validate matching product details based on scanned barcode
+      if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
 
-        pickedQty = matchingProduct.qty
-        pickedUomValue = matchingProduct.uomValue
-      }
+      pickedQty = matchingProduct.qty
+      let pickedUomValue = matchingProduct.uomValue
 
       //validation to prevent over release
       if (
@@ -484,24 +473,15 @@ export class PickingWorksheetController extends VasWorksheetController {
       )
         throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
 
-      targetInventory = await this.checkAndSetBinPicking(targetInventory, binLocation)
-
-      // // search for matching product barcode
-      // const productDetails: ProductDetail[] = product?.productDetails.filter(detail => !detail.deletedAt)
-      // // scannedProductDetail can be child or gtin
-      // const scannedProductDetail: ProductDetail = productDetails.find(detail => detail.gtin == productBarcode)
-      // if (!scannedProductDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+      const releaseGood: ReleaseGood = worksheetDetail.targetInventory.releaseGood
 
-      // // case for scanning parent packing type, packing size
-      // // when scannedProductDetail id is not the same as productDetail id, then it's not child gtin, proceed to get child qty
-      // if (scannedProductDetail.id !== productDetail.id && !product?.isRequireSerialNumberScanningOutbound) {
-      //   let childQty = await this.getChildQty(productDetails, productBarcode, productDetail, scannedProductDetail)
-      //   pickedQty *= childQty
-      // }
+      let targetInventory: OrderInventory = worksheetDetail.targetInventory
+      let targetProduct: OrderProduct = targetInventory.orderProduct
+      let inventory: Inventory = targetInventory.inventory
+      let bizplace: Bizplace = worksheetDetail.worksheet.bizplace
+      const product: Product = targetInventory.product
 
-      // if (pickedQty + targetInventory.pickedQty > releaseQty) {
-      //   throw new Error(this.ERROR_MSG.VALIDITY.CANT_PROCEED_STEP_BY('picking', `over release`))
-      // }
+      targetInventory = await this.checkAndSetBinPicking(targetInventory, binLocation)
 
       // for required outbound serial number scanning
       if (product?.isRequireSerialNumberScanningOutbound) {
@@ -549,7 +529,6 @@ 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
 
@@ -715,15 +694,13 @@ export class PickingWorksheetController extends VasWorksheetController {
           'targetInventory.orderProduct',
           'targetInventory.inventory',
           'targetInventory.inventory.location',
-          'targetInventory.product',
-          'targetInventory.productDetail'
+          'targetInventory.product'
         ]
       )
 
       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
@@ -753,13 +730,13 @@ export class PickingWorksheetController extends VasWorksheetController {
         })
 
         let foundSerialNumber: InventoryItem = await this.trxMgr.getRepository(InventoryItem).findOne({
-          where: { domain: this.domain, serialNumber: serialNumber, productDetail },
-          relations: ['product', 'productDetail', 'inventory']
+          where: { domain: this.domain, serialNumber: serialNumber, product },
+          relations: ['product', 'inventory']
         })
 
         let scannedPalletIdInventory: Inventory = await this.trxMgr
           .getRepository(Inventory)
-          .findOne({ where: { domain: this.domain, palletId }, relations: ['productDetail'] })
+          .findOne({ where: { domain: this.domain, palletId }, relations: ['product'] })
 
         if (foundSerialNumber) {
           if (foundSerialNumber.outboundOrderId) {
@@ -786,7 +763,6 @@ 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
 
@@ -812,7 +788,8 @@ export class PickingWorksheetController extends VasWorksheetController {
             )
           } else if (
             scannedPalletIdInventory.batchId == inventory.batchId &&
-            scannedPalletIdInventory.productDetail.id == productDetail.id
+            scannedPalletIdInventory.product.id == product.id &&
+            scannedPalletIdInventory.product.packingType == product.packingType
           ) {
             //if replacement order inventory does not exist
             await this.serialNumberReplacement(
@@ -820,7 +797,6 @@ export class PickingWorksheetController extends VasWorksheetController {
               scannedPalletIdInventory,
               releaseGood,
               product,
-              productDetail,
               worksheetDetail,
               foundSerialNumber
             )
@@ -996,8 +972,6 @@ export class PickingWorksheetController extends VasWorksheetController {
         'worksheetDetails.targetInventory.releaseGood',
         'worksheetDetails.targetInventory.inventory',
         'worksheetDetails.targetInventory.inventory.location',
-        'worksheetDetails.targetInventory.productDetail',
-        'worksheetDetails.targetInventory.productDetail.product',
         'worksheetDetails.targetInventory.product',
         'worksheetDetails.targetInventory.product.productDetails',
         'worksheetDetails.targetInventory.product.productDetails.childProductDetail'
@@ -1005,53 +979,49 @@ export class PickingWorksheetController extends VasWorksheetController {
     })
 
     const worksheetDetails: WorksheetDetail[] = worksheet.worksheetDetails
-    const productDetail: ProductDetail = worksheetDetails
-      .map(wsd => wsd.targetInventory.productDetail)
-      .find(productDetail => productDetail.id === inventory.productDetail.id)
-
-    const product: Product = productDetail.product
+    const product: Product = worksheetDetails
+      .map((wsd: WorksheetDetail) => wsd.targetInventory.product)
+      .find((product: Product) => product.id === inventory.product.id)
 
     const batchId: string = inventory.batchId
+    const packingType: string = inventory.packingType
+    const packingSize: number = inventory.packingSize
     let pickedQty: number = pickingQty ? pickingQty : 1
-    let matchingProduct
 
     const targetInventories: OrderInventory[] = worksheetDetails
       .map((wsd: WorksheetDetail) => wsd.targetInventory)
       .filter(
         (targetInventory: OrderInventory) =>
           targetInventory.batchId === batchId &&
+          targetInventory.packingType === packingType &&
           targetInventory.inventory.cartonId === cartonId &&
-          targetInventory.productDetail.id === productDetail.id
-      )
-
-    if (productBarcode !== productDetail.gtin) {
-      matchingProduct = await this.getDirectQty(
-        {
-          ...productDetail,
-          product
-        },
-        productBarcode,
-        pickedQty
+          targetInventory.product.id === product.id
       )
 
-      //validate matching product details based on scanned barcode
-      if (!matchingProduct) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+    // 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})`))
 
-      pickedQty = matchingProduct.qty
-    }
+    // case for scanning parent packing type, packing size
+    const foundProductDetail: ProductDetail = productDetails.find(
+      (detail: ProductDetail) =>
+        detail.gtin === productBarcode && detail.packingType === packingType && detail.packingSize == packingSize
+    )
 
-    // // search for matching product barcode
-    // const productDetails: ProductDetail[] = product?.productDetails.filter(detail => !detail.deletedAt)
-    // // scannedProductDetail can be child or gtin
-    // const scannedProductDetail: ProductDetail = productDetails.find(detail => detail.gtin == productBarcode)
-    // if (!scannedProductDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+    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})`)
+        )
 
-    // // case for scanning parent packing type, packing size
-    // // when scannedProductDetail id is not the same as productDetail id, then it's not child gtin, proceed to get child qty
-    // if (scannedProductDetail.id !== productDetail.id) {
-    //   let childQty = await this.getChildQty(productDetails, productBarcode, productDetail, scannedProductDetail)
-    //   pickedQty *= childQty
-    // }
+      let childQty = await this.getChildQty(productDetails, productBarcode, roProductDetail)
+      pickedQty *= childQty
+    }
 
     const sumOfReleaseQty: number = targetInventories
       .map((oi: OrderInventory) => oi.releaseQty)
@@ -1436,7 +1406,7 @@ export class PickingWorksheetController extends VasWorksheetController {
         await this.trxMgr.getRepository(WorksheetDetail).delete(worksheetDetail.ild)
         await this.trxMgr.getRepository(OrderInventory).delete(targetInventory.id)
       }
-    } catch (e) {}
+    } catch (e) { }
   }
 
   private async serialNumberReplacement(
@@ -1444,7 +1414,6 @@ export class PickingWorksheetController extends VasWorksheetController {
     scannedPalletIdInventory,
     releaseGood,
     product,
-    productDetail,
     worksheetDetail,
     foundSerialNumber
   ) {
@@ -1509,7 +1478,6 @@ export class PickingWorksheetController extends VasWorksheetController {
         releaseUomValue: newOrderInventoryReleaseUomValue,
         pickedQty: 1,
         product,
-        productDetail,
         inventory: scannedPalletIdInventory,
         creator: this.user,
         updater: this.user
@@ -1553,7 +1521,7 @@ export class PickingWorksheetController extends VasWorksheetController {
         await this.trxMgr.getRepository(WorksheetDetail).delete(worksheetDetail.id)
         await this.trxMgr.getRepository(OrderInventory).delete(targetInventory.id)
       }
-    } catch (e) {}
+    } catch (e) { }
   }
 
   private async toteScanning(toteNo, targetProduct, targetInventory, pickedQty, releaseGood, bizplace) {

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

@@ -95,8 +95,7 @@ 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.productDetail'
+        'worksheetDetails.targetInventory.releaseGood'
       ]
     })
 
@@ -119,12 +118,17 @@ export class SortingWorksheetController extends VasWorksheetController {
       const matchingProductDetail: ProductDetail = productDetails.find(
         (productDetail: ProductDetail) => productDetail.gtin === productBarcode
       )
-      if (!matchingProductDetail) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+      if (!matchingProductDetail) throw new Error('Unable to find product barcode.')
       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.productDetail.id === matchingProductDetail.id
+        (oi: OrderInventory) =>
+          oi.packingType === packingType &&
+          oi.packingSize === packingSize &&
+          oi.product?.id === matchingProductDetail.product?.id
       )
 
       let sortedQty: number = 1
@@ -138,7 +142,6 @@ 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
@@ -150,7 +153,7 @@ export class SortingWorksheetController extends VasWorksheetController {
 
                   let foundSerialNumber: InventoryItem = await this.trxMgr
                     .getRepository(InventoryItem)
-                    .findOne({ where: { domain: this.domain, serialNumber: serialNumber, productDetail } })
+                    .findOne({ where: { domain: this.domain, serialNumber: serialNumber, product } })
 
                   if (foundSerialNumber) {
                     if (foundSerialNumber.inventoryId !== inventory.id) {
@@ -177,7 +180,6 @@ 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
 
@@ -261,8 +263,7 @@ 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.productDetail'
+        'worksheetDetails.targetInventory.releaseGood'
       ]
     })
 
@@ -282,7 +283,6 @@ 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,7 +292,8 @@ export class SortingWorksheetController extends VasWorksheetController {
             }
 
             let foundSerialNumber: InventoryItem = await this.trxMgr.getRepository(InventoryItem).findOne({
-              where: { domain: this.domain, serialNumber: serialNumber, productDetail }
+              where: { domain: this.domain, serialNumber: serialNumber, product },
+              relations: ['product', 'inventory']
             })
 
             if (foundSerialNumber) {
@@ -316,7 +317,6 @@ 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,8 +22,7 @@ import {
   InventoryNoGenerator,
   Location,
   LOCATION_TYPE,
-  Warehouse,
-  generateInventoryHistory
+  Warehouse
 } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../../constants'
@@ -37,6 +36,7 @@ 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,17 +19,11 @@ import {
   VasOrder
 } from '@things-factory/sales-base'
 import { Domain } from '@things-factory/shell'
-import {
-  Inventory,
-  INVENTORY_STATUS,
-  InventoryItem,
-  Pallet,
-  generateInventoryHistory
-} from '@things-factory/warehouse-base'
+import { Inventory, INVENTORY_STATUS, InventoryItem, Pallet } from '@things-factory/warehouse-base'
 
 import { WORKSHEET_STATUS, WORKSHEET_TYPE } from '../constants'
 import { Worksheet, WorksheetDetail } from '../entities'
-import { WorksheetNoGenerator } from '../utils'
+import { generateInventoryHistory, WorksheetNoGenerator } from '../utils'
 
 export type ReferenceOrderType = ArrivalNotice | ReleaseGood | VasOrder | InventoryCheck | DeliveryOrder | ReturnOrder
 export type OrderTargetTypes = OrderProduct | OrderInventory | OrderVas
@@ -399,7 +393,7 @@ export class WorksheetController {
     let existingWorksheet: Worksheet
     try {
       existingWorksheet = await this.findWorksheetByRefOrder(refOrder, type)
-    } catch (e) {}
+    } catch (e) { }
 
     if (existingWorksheet)
       throw new Error(
@@ -518,6 +512,7 @@ export class WorksheetController {
     if (!refOrder.updater?.id) refOrder = this.setStamp(refOrder)
 
     if (currentStatus && entitySchema == ReleaseGood) {
+
       let res = await getRepository(entitySchema).query(
         `
         update release_goods
@@ -1012,9 +1007,11 @@ export class WorksheetController {
   async getChildQty(
     productDetails: ProductDetail[],
     productBarcode: string,
-    orderProductDetail: ProductDetail,
-    scannedProductDetail: ProductDetail
+    orderProductDetail: 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
@@ -1057,11 +1054,14 @@ export class WorksheetController {
     return childQty
   }
 
-  public async getDirectQty(productDetail: ProductDetail, productBarcode: string, qty: number): Promise<any> {
+  public async getDirectQty(
+    productDetail: ProductDetail,
+    productBarcode: string,
+    qty: number
+  ): Promise<any> {
     try {
       console.time('getDirectQty')
-      let results = await this.trxMgr.query(
-        `
+      let results = await this.trxMgr.query(`
         WITH RECURSIVE cte as (
           select * from (
             select pd.product_id as "productId", id, pd.packing_size as "packingSize",
@@ -1078,11 +1078,14 @@ export class WorksheetController {
           where pd.deleted_at is null
         )
         select * from cte where gtin = $3
-      `,
-        [productDetail.id, qty, productBarcode]
-      )
+      `, [
+        productDetail.id,
+        qty,
+        productBarcode
+      ])
 
-      if (results.length <= 0) throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
+      if (results.length <= 0)
+        throw new Error(this.ERROR_MSG.FIND.NO_RESULT(productBarcode))
 
       console.timeEnd('getDirectQty')
       return results[0]
@@ -1091,6 +1094,8 @@ export class WorksheetController {
     }
   }
 
+
+
   /**
    * @summary Check for product child qty at any scanned level
    * @description It will check every level of product detail by comparing scanned level and GAN registered level.

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 { WarehouseBizplaceOnhandInventory, Worksheet, WorksheetDetail, WorksheetMovement }
+export { Worksheet, WorksheetDetail, WorksheetMovement }

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

@@ -2,23 +2,55 @@ import { ViewColumn, ViewEntity } from 'typeorm'
 
 @ViewEntity({
   expression: `  
-  select d.name as "domain_name", b.name as "bizplace_name", src.* from (
+  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
+    ) 
     -- SINGLE ITEM INVENTORY QUERY
     select
-    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.domain_id as "domainId",
+    i.bizplace_id as "bizplaceId",
+    i.packing_type as "packingType",
+    i.packing_size as "packingSize",
     i.uom,
-    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",
+    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",
     COALESCE(sum(COALESCE(i.qty, 0::double precision))) AS "qty",
-    COALESCE(sum(COALESCE(i.uom_value, 0::double precision))) AS "uom_value",
-    'SINGLE' AS "group_type"
+    COALESCE(sum(COALESCE(i.uom_value, 0::double precision))) AS "uomValue",
+    'SINGLE' AS "groupType"
     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,
@@ -30,28 +62,29 @@ import { ViewColumn, ViewEntity } from 'typeorm'
     union all
     -- BUNDLE ITEM INVENTORY QUERY
     SELECT 
-    pbs.domain_id as "domain_id",
-    pbs.bizplace_id as "bizplace_id",
-    pb.packing_type as "packing_type", 
-    pb.packing_size as "packing_size",
+    pbs.domain_id as "domainId",
+    pbs.bizplace_id as "bizplaceId",
+    pb.packing_type as "packingType", 
+    pb.packing_size as "packingSize",
     'UNIT' AS "uom", 
-    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",
+    null as "productId",
+    pb.id AS "productBundleId",
+    COALESCE(MIN(FLOOR(pbs."availableQty")),0) AS "remainQty", 
+    COALESCE(MIN(FLOOR(pbs."availableUomValue")),0) AS "remainUomValue",
     COALESCE(MIN(FLOOR(pbs."qty")), 0::double precision) AS "qty",
-    COALESCE(MIN(FLOOR(pbs."uom_value")), 0::double precision) AS "uom_value",
-    'BUNDLE' AS "group_type"
+    COALESCE(MIN(FLOOR(pbs."uomValue")), 0::double precision) AS "uomValue",
+    'BUNDLE' AS "groupType"
     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))) / 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)) - 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::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 "uom_value"
+      (sum(COALESCE(i.uom_value, 0::double precision))) / min(pbs.bundle_qty)::double precision AS "uomValue"
       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') 
+      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
       GROUP by
         i.domain_id, 
         i.bizplace_id,
@@ -68,13 +101,14 @@ import { ViewColumn, ViewEntity } from 'typeorm'
     pb.id
   )
   AS src 
-  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
+  inner join domains d on d.id = src."domainId"
+  inner join bizplaces b on b.id = src."bizplaceId"
+  where src."remainQty" >= 0
   and src."qty" > 0
-  order by src."domain_id"
+  order by src."domainId"
   `
 })
+
 export class WarehouseBizplaceOnhandInventory {
   @ViewColumn()
   domainName: string