diff --git a/src/main/java/com/ffii/fpsms/modules/stock/service/InventoryLotLineService.kt b/src/main/java/com/ffii/fpsms/modules/stock/service/InventoryLotLineService.kt
index 3eb2a75..0413eea 100644
--- a/src/main/java/com/ffii/fpsms/modules/stock/service/InventoryLotLineService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/stock/service/InventoryLotLineService.kt
@@ -201,8 +201,15 @@ open class InventoryLotLineService(
             field["itemNo"] = info.itemNo
             field["poCode"] = info.poCode ?: "N/A"
             field["itemType"] = info.itemType ?: "N/A"
-            field["acceptedQty"] = info.acceptedQty.toString()
-            field["uom"] = info.uom?.udfudesc.toString() ?: "N/A"
+            val stockItemUom = itemUomRespository.findBaseUnitByItemIdAndStockUnitIsTrueAndDeletedIsFalse(info.itemId)
+            val purchaseItemUom = itemUomRespository.findByItemIdAndPurchaseUnitIsTrueAndDeletedIsFalse(info.itemId)
+            val stockQty = if (stockItemUom != null && purchaseItemUom != null) {
+                (info.acceptedQty) * (purchaseItemUom.ratioN!! / purchaseItemUom.ratioD!!) / (stockItemUom.ratioN!! / stockItemUom.ratioD!!)
+            } else {
+                info.acceptedQty
+            }
+            field["acceptedQty"] = "%.2f".format(stockQty)
+            field["uom"] = inventoryLotLine.stockUom?.uom?.udfudesc ?: stockItemUom?.uom?.udfudesc ?: info.uom?.udfudesc?.toString() ?: "N/A"
             field["productionDate"] = info.productionDate?.format(DateTimeFormatter.ISO_LOCAL_DATE) ?: ""
             field["expiryDate"] = info.expiryDate?.format(DateTimeFormatter.ISO_LOCAL_DATE) ?: ""
             field["lotNo"] = info.lotNo!!
diff --git a/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt b/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt
index be826e8..0a67655 100644
--- a/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/stock/service/StockInLineService.kt
@@ -608,7 +608,7 @@ open class StockInLineService(
             field["poCode"] = info.poCode ?: "N/A"
             field["itemType"] = info.itemType ?: "N/A"
             field["acceptedQty"] = "%.2f".format(acceptedQty)
-            field["uom"] = info.uom?.udfudesc.toString() ?: "N/A"
+            field["uom"] = stockItemUom?.uom?.udfudesc ?: info.uom?.udfudesc?.toString() ?: "N/A"
             field["productionDate"] = info.productionDate?.format(DateTimeFormatter.ISO_LOCAL_DATE) ?: ""
             field["expiryDate"] = info.expiryDate?.format(DateTimeFormatter.ISO_LOCAL_DATE) ?: ""
             field["lotNo"] = info.lotNo ?: "N/A"