From 1e970359d9eb9455a369da40dc3078b682abfe02 Mon Sep 17 00:00:00 2001 From: "kelvin.yau" Date: Mon, 8 Dec 2025 19:19:36 +0800 Subject: [PATCH] update MPO stockin uom --- .../modules/stock/service/StockInLineService.kt | 12 +++++++++++- 1 file changed, 11 insertions(+), 1 deletion(-) 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 f776758..084b968 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 @@ -524,12 +524,22 @@ open class StockInLineService( val field = mutableMapOf() val qrContent = QrContent(info.itemId, info.id) val qrCodeContent = (Json.encodeToString(qrContent)) + + val stockItemUom = itemUomRepository.findBaseUnitByItemIdAndStockUnitIsTrueAndDeletedIsFalse( + info.itemId + ) + val purchaseItemUom = itemUomRepository.findByItemIdAndPurchaseUnitIsTrueAndDeletedIsFalse(info.itemId) + val acceptedQty = if (stockItemUom != null && purchaseItemUom != null) { + (info.acceptedQty) * (purchaseItemUom.ratioN!! / purchaseItemUom.ratioD!!) / (stockItemUom.ratioN!! / stockItemUom.ratioD!!) + } else { + (info.acceptedQty) + } // field["itemId"] = info.itemId field["itemName"] = info.itemName ?: "N/A" field["itemNo"] = info.itemNo field["poCode"] = info.poCode ?: "N/A" field["itemType"] = info.itemType ?: "N/A" - field["acceptedQty"] = info.acceptedQty.toString() + field["acceptedQty"] = "%.2f".format(acceptedQty) field["uom"] = info.uom?.udfudesc.toString() ?: "N/A" field["productionDate"] = info.productionDate?.format(DateTimeFormatter.ISO_LOCAL_DATE) ?: "" field["expiryDate"] = info.expiryDate?.format(DateTimeFormatter.ISO_LOCAL_DATE) ?: ""