From 82679d724d5cdbd775ebf5239b10c16e07aa7815 Mon Sep 17 00:00:00 2001 From: kelvinsuen Date: Tue, 9 Sep 2025 18:58:05 +0800 Subject: [PATCH] update putaway --- .../fpsms/modules/stock/entity/projection/StockInLineInfo.kt | 4 ++++ .../ffii/fpsms/modules/stock/service/StockInLineService.kt | 2 +- 2 files changed, 5 insertions(+), 1 deletion(-) diff --git a/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/StockInLineInfo.kt b/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/StockInLineInfo.kt index 58ff0f4..40c6205 100644 --- a/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/StockInLineInfo.kt +++ b/src/main/java/com/ffii/fpsms/modules/stock/entity/projection/StockInLineInfo.kt @@ -65,4 +65,8 @@ interface PutAwayLineForSil { val warehouseCode: String?; @get:Value("#{target.warehouse?.name}") val warehouseName: String?; + @get:Value("#{target.created}") + val putawayDate: LocalDateTime?; + @get:Value("#{target.createdBy}") + val putawayUser: String?; } \ No newline at end of file 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 40a32b5..4b90c05 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 @@ -373,7 +373,7 @@ open class StockInLineService( val purchaseItemUom = itemUomRespository.findByItemIdAndPurchaseUnitIsTrueAndDeletedIsFalse(request.itemId) val stockItemUom = itemUomRespository.findByItemIdAndStockUnitIsTrueAndDeletedIsFalse(request.itemId) val ratio = if (stockItemUom != null && purchaseItemUom != null) { - BigDecimal.ONE // (purchaseItemUom.ratioN!! / purchaseItemUom.ratioD!!) / (stockItemUom.ratioN!! / stockItemUom.ratioD!!) + (purchaseItemUom.ratioN!! / purchaseItemUom.ratioD!!) / (stockItemUom.ratioN!! / stockItemUom.ratioD!!) } else { BigDecimal.ONE }