From da55613d556ddd9407fd9c97b1be7df51815ecf8 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Wed, 20 Aug 2025 17:09:50 +0800
Subject: [PATCH] quick update

---
 .../modules/stock/entity/projection/InventoryInfo.kt      | 4 ++--
 .../stock/entity/projection/InventoryLotLineInfo.kt       | 8 ++++----
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/InventoryInfo.kt b/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/InventoryInfo.kt
index 7af8bea..464bcc4 100644
--- a/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/InventoryInfo.kt
+++ b/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/InventoryInfo.kt
@@ -22,9 +22,9 @@ interface InventoryInfo{
     val unavailableQty: BigDecimal?
     @get:Value("#{(target.onHandQty - target.onHoldQty - target.unavailableQty) / (target.item.itemUoms.^[stockUnit == true && deleted == false]?.ratioN / target.item.itemUoms.^[stockUnit == true && deleted == false]?.ratioD)}")
     val availableQty: BigDecimal?
-    @get:Value("#{target.item.itemUoms.^[purchaseUnit == true && deleted == false]?.uom.code}")
+    @get:Value("#{target.item.itemUoms.^[stockUnit == true && deleted == false]?.uom.code}")
     val uomCode: String?
-    @get:Value("#{target.item.itemUoms.^[purchaseUnit == true && deleted == false]?.uom.udfudesc}")
+    @get:Value("#{target.item.itemUoms.^[stockUnit == true && deleted == false]?.uom.udfudesc}")
     val uomUdfudesc: String?
     //    @get:Value("#{target.qty * target.uom.gramPerSmallestUnit}")
 //    val germPerSmallestUnit: BigDecimal?
diff --git a/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/InventoryLotLineInfo.kt b/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/InventoryLotLineInfo.kt
index 38d159e..6e7f58a 100644
--- a/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/InventoryLotLineInfo.kt
+++ b/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/InventoryLotLineInfo.kt
@@ -26,13 +26,13 @@ interface InventoryLotLineInfo {
     @get:Value("#{target.inventoryLot.item}")
     val item: InventoryLotLineItemInfo?
     val warehouse: InventoryLotLineWarehouseInfo?
-    @get:Value("#{((target.inQty ?: 0) - (target.outQty ?: 0) - (target.holdQty ?: 0)) / (target.inventoryLot.item.itemUoms.^[salesUnit == true && deleted == false]?.ratioN / target.inventoryLot.item.itemUoms.^[salesUnit == true && deleted == false]?.ratioD)}")
+    @get:Value("#{((target.inQty ?: 0) - (target.outQty ?: 0) - (target.holdQty ?: 0)) / (target.inventoryLot.item.itemUoms.^[stockUnit == true && deleted == false]?.ratioN / target.inventoryLot.item.itemUoms.^[stockUnit == true && deleted == false]?.ratioD)}")
     var availableQty: BigDecimal?
-    @get:Value("#{(target.inQty ?: 0)/ (target.inventoryLot.item.itemUoms.^[salesUnit == true && deleted == false]?.ratioN / target.inventoryLot.item.itemUoms.^[salesUnit == true && deleted == false]?.ratioD)}")
+    @get:Value("#{(target.inQty ?: 0)/ (target.inventoryLot.item.itemUoms.^[stockUnit == true && deleted == false]?.ratioN / target.inventoryLot.item.itemUoms.^[stockUnit == true && deleted == false]?.ratioD)}")
     var inQty: BigDecimal?
-    @get:Value("#{(target.outQty ?: 0)/ (target.inventoryLot.item.itemUoms.^[salesUnit == true && deleted == false]?.ratioN / target.inventoryLot.item.itemUoms.^[salesUnit == true && deleted == false]?.ratioD)}")
+    @get:Value("#{(target.outQty ?: 0)/ (target.inventoryLot.item.itemUoms.^[stockUnit == true && deleted == false]?.ratioN / target.inventoryLot.item.itemUoms.^[stockUnit == true && deleted == false]?.ratioD)}")
     var outQty: BigDecimal?
-    @get:Value("#{(target.holdQty ?: 0)/ (target.inventoryLot.item.itemUoms.^[salesUnit == true && deleted == false]?.ratioN / target.inventoryLot.item.itemUoms.^[salesUnit == true && deleted == false]?.ratioD)}")
+    @get:Value("#{(target.holdQty ?: 0)/ (target.inventoryLot.item.itemUoms.^[stockUnit == true && deleted == false]?.ratioN / target.inventoryLot.item.itemUoms.^[stockUnit == true && deleted == false]?.ratioD)}")
     var holdQty: BigDecimal?
     @get:Value("#{(target.inQty ?: 0) - (target.outQty ?: 0) - (target.holdQty ?: 0)}")
     val qtyPerSmallestUnit: BigDecimal?