From 62dd4557ea2b6b7ff423d8c8962211cf88872e37 Mon Sep 17 00:00:00 2001 From: "kelvin.yau" Date: Mon, 9 Feb 2026 14:49:06 +0800 Subject: [PATCH] QR code adaptation update --- .../modules/stock/service/InventoryLotLineService.kt | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) 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 818d051..2e7d8a1 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 @@ -217,11 +217,11 @@ open class InventoryLotLineService( // .minus(inventoryLotLine.outQty ?: zero) // .minus(inventoryLotLine.holdQty ?: zero) - // 4. 使用 inventory_lot_line 的剩余数量（已经是库存单位，无需转换） - field["acceptedQty"] = "%.2f".format(onHandQty) + // Accepted qty at stock-in, no conversion (stays e.g. 50000 even after stock out) + field["acceptedQty"] = "%.2f".format(info.acceptedQty) - // 5. 使用 inventory_lot_line.stockUom 获取 UOM（通过 stockItemUomId） - field["uom"] = inventoryLotLine.stockUom?.uom?.udfudesc ?: "N/A" + val stockItemUom = itemUomRespository.findBaseUnitByItemIdAndStockUnitIsTrueAndDeletedIsFalse(info.itemId) + 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) ?: ""