From 5760485a689599e01d1df7c0faf47cb4e825b00e Mon Sep 17 00:00:00 2001 From: "CANCERYS\\kw093" Date: Tue, 9 Sep 2025 22:58:47 +0800 Subject: [PATCH] update --- .../ffii/fpsms/modules/pickOrder/service/PickOrderService.kt | 3 +-- .../ffii/fpsms/modules/stock/service/StockOutLineService.kt | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt index 1512942..e909d19 100644 --- a/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt +++ b/src/main/java/com/ffii/fpsms/modules/pickOrder/service/PickOrderService.kt @@ -441,7 +441,7 @@ open class PickOrderService( val salesUnit = inventoryLotLine?.inventoryLot?.item?.id?.let { _itemId -> itemUomService.findSalesUnitByItemId(_itemId) } - val ratio = (salesUnit?.ratioN ?: zero).divide(salesUnit?.ratioD ?: one) + val ratio = BigDecimal.ONE val remainingQty = (inventoryLotLine?.inQty ?: zero) .minus(inventoryLotLine?.outQty ?: zero) @@ -916,7 +916,6 @@ open class PickOrderService( stockOutLineStatus != "completed" || stockOutLineQty?.toDouble() != requiredQty?.toDouble() } - println("Final result count: ${filteredResult.size}") filteredResult.forEach { row -> println("Final Row: $row") diff --git a/src/main/java/com/ffii/fpsms/modules/stock/service/StockOutLineService.kt b/src/main/java/com/ffii/fpsms/modules/stock/service/StockOutLineService.kt index b535700..4ca62dd 100644 --- a/src/main/java/com/ffii/fpsms/modules/stock/service/StockOutLineService.kt +++ b/src/main/java/com/ffii/fpsms/modules/stock/service/StockOutLineService.kt @@ -142,7 +142,7 @@ fun handleQc(stockOutLine: StockOutLine, request: UpdateStockOutLineRequest): Li val one = BigDecimal.ONE val targetLotLine = inventoryLotLineRepository.findById(request.inventoryLotLineId!!).orElseThrow() val salesUnit = inventoryLotLine?.inventoryLot?.item?.id?.let {_itemId -> itemUomRespository.findByItemIdAndSalesUnitIsTrueAndDeletedIsFalse(_itemId) } - val ratio = (salesUnit?.ratioN ?: zero).divide(salesUnit?.ratioD ?: one).toDouble() + val ratio = 1.0 //(salesUnit?.ratioN ?: zero).divide(salesUnit?.ratioD ?: one).toDouble() val targetLotLineEntry = targetLotLine.apply { this.outQty = (this.outQty?: BigDecimal.ZERO) + (request.qty.div(ratio)).toBigDecimal()