From 638e6b6fae683bddb2bbd3bbd52195dd53aed428 Mon Sep 17 00:00:00 2001 From: Fai Luk Date: Fri, 18 Sep 2026 01:11:38 +0800 Subject: [PATCH] added unit description for the number before submit in PO stock in --- .../purchaseOrder/entity/projections/PurchaseOrderLineInfo.kt | 1 + .../fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt | 1 + 2 files changed, 2 insertions(+) diff --git a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/projections/PurchaseOrderLineInfo.kt b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/projections/PurchaseOrderLineInfo.kt index 342791e..0828c75 100644 --- a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/projections/PurchaseOrderLineInfo.kt +++ b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/entity/projections/PurchaseOrderLineInfo.kt @@ -57,6 +57,7 @@ data class StockUomForPoLine ( val id: Long? = null, val stockUomCode: String? = null, val stockUomDesc: String? = null, + val stockUomShortDesc: String? = null, val stockQty: BigDecimal? = null, val stockRatioN: BigDecimal? = null, val stockRatioD: BigDecimal? = null, diff --git a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt index 1d5b655..52a14a9 100644 --- a/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt +++ b/src/main/java/com/ffii/fpsms/modules/purchaseOrder/service/PurchaseOrderService.kt @@ -303,6 +303,7 @@ open fun getPoSummariesByIds(ids: List): List { id = iu?.id, stockUomCode = iu?.uom?.code, stockUomDesc = iu?.uom?.udfudesc, + stockUomShortDesc = iu?.uom?.udfShortDesc, stockQty = if (stockQtyFromM18 > BigDecimal.ZERO) stockQtyFromM18 else { // fallback to legacy behavior when M18 fields are missing iu?.item?.id?.let { iId -> itemUomService.convertPurchaseQtyToStockQtyPrecise(iId, (thisPol.qty ?: BigDecimal.ZERO)) } ?: BigDecimal.ZERO