From 72b92217f0f440498b9ddd235820b9ad89638c10 Mon Sep 17 00:00:00 2001
From: "cyril.tsui" <cyril.tsui@2fi-solutions.com.hk>
Date: Tue, 29 Jul 2025 12:22:36 +0800
Subject: [PATCH] update proportion

---
 .../master/entity/ProductionScheduleLineRepository.kt       | 2 +-
 .../modules/master/entity/ProductionScheduleRepository.kt   | 2 +-
 .../modules/master/service/ProductionScheduleService.kt     | 6 +++---
 3 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/src/main/java/com/ffii/fpsms/modules/master/entity/ProductionScheduleLineRepository.kt b/src/main/java/com/ffii/fpsms/modules/master/entity/ProductionScheduleLineRepository.kt
index 19afb68..e87758d 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/entity/ProductionScheduleLineRepository.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/entity/ProductionScheduleLineRepository.kt
@@ -14,7 +14,7 @@ interface ProductionScheduleLineRepository : AbstractRepository<ProductionSchedu
             with prod_prop as (
                 select 
                     psl.id as pslId,
-                    round(coalesce(psl.prodQty, 0) / coalesce(b.outputQty, 1), 2) as proportion
+                    round(coalesce(psl.prodQty, 0) / coalesce(b.outputQty, 1), 5) as proportion
                 from production_schedule_line psl
                 left join bom b on b.itemId = psl.itemId
                 where psl.id = :id and b.id is not null
diff --git a/src/main/java/com/ffii/fpsms/modules/master/entity/ProductionScheduleRepository.kt b/src/main/java/com/ffii/fpsms/modules/master/entity/ProductionScheduleRepository.kt
index c4cfdac..8664f2d 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/entity/ProductionScheduleRepository.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/entity/ProductionScheduleRepository.kt
@@ -83,7 +83,7 @@ interface ProductionScheduleRepository : AbstractRepository<ProductionSchedule,
             with prod_prop as (
                 select 
                     psl.id as pslId,
-                    round(coalesce(psl.prodQty, 0) / coalesce(b.outputQty, 1), 2) as proportion
+                    round(coalesce(psl.prodQty, 0) / coalesce(b.outputQty, 1), 5) as proportion
                 from production_schedule ps
                 left join production_schedule_line psl on psl.prodScheduleId = ps.id
                 left join bom b on b.itemId = psl.itemId
diff --git a/src/main/java/com/ffii/fpsms/modules/master/service/ProductionScheduleService.kt b/src/main/java/com/ffii/fpsms/modules/master/service/ProductionScheduleService.kt
index 2822d1f..26afa45 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/service/ProductionScheduleService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/service/ProductionScheduleService.kt
@@ -102,7 +102,7 @@ open class ProductionScheduleService(
 //                            BigDecimal.ONE
 //                        }
 
-                    val proportion = BigDecimal(line.prodQty).divide(bm.bom?.outputQty ?: BigDecimal.ONE, 2, RoundingMode.HALF_UP)
+                    val proportion = BigDecimal(line.prodQty).divide(bm.bom?.outputQty ?: BigDecimal.ONE, 5, RoundingMode.HALF_UP)
                     val demandQty = bm.qty?.times(proportion) ?: zero
                     val saleUnit = bm.item?.id?.let { itemUomService.findSalesUnitByItemId(it) }
 
@@ -189,7 +189,7 @@ open class ProductionScheduleService(
 //                        BigDecimal.ONE
 //                    }
 
-                val proportion = BigDecimal(line.prodQty).divide(bm.bom?.outputQty ?: BigDecimal.ONE, 2, RoundingMode.HALF_UP)
+                val proportion = BigDecimal(line.prodQty).divide(bm.bom?.outputQty ?: BigDecimal.ONE, 5, RoundingMode.HALF_UP)
                 val demandQty = bm.qty?.times(proportion) ?: zero
                 val saleUnit = bm.item?.id?.let { itemUomService.findSalesUnitByItemId(it) }
 
@@ -314,7 +314,7 @@ open class ProductionScheduleService(
         val prodScheduleLine = request.id.let { productionScheduleLineRepository.findById(it).getOrNull() } ?: throw NoSuchElementException()
         val bom = prodScheduleLine.item.id?.let { bomService.findByItemId(it) }
         val approver = SecurityUtils.getUser().getOrNull()
-        val proportion = request.demandQty.divide(bom?.outputQty ?: BigDecimal.ONE, 2, RoundingMode.HALF_UP)
+        val proportion = request.demandQty.divide(bom?.outputQty ?: BigDecimal.ONE, 5, RoundingMode.HALF_UP)
 
         // Update Prod Schedule Line Prod qty
         prodScheduleLine.apply {