From 9f6165b1c998cec25d4388821de57abee7e3f445 Mon Sep 17 00:00:00 2001
From: "jason.lam" <jason.lam@2fi-solutions.com.hk>
Date: Mon, 12 May 2025 18:45:23 +0800
Subject: [PATCH] [rough schedule] minor logic update

---
 .../modules/master/service/SchedulingService.kt  |  3 ++-
 .../master/web/UomConversionController.kt        | 16 ++++++++++------
 2 files changed, 12 insertions(+), 7 deletions(-)

diff --git a/src/main/java/com/ffii/fpsms/modules/master/service/SchedulingService.kt b/src/main/java/com/ffii/fpsms/modules/master/service/SchedulingService.kt
index 34038c6..7058e7f 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/service/SchedulingService.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/service/SchedulingService.kt
@@ -89,8 +89,9 @@ open class SchedulingService(
                     roughScheduleOutput[roughScheduleRecord] = roughScheduleRecord.totalDifference
                 }
 
-                kotlin.io.println("========================================");
             }
+            kotlin.io.println("========================================");
+
         }
 
         return roughScheduleOutput
diff --git a/src/main/java/com/ffii/fpsms/modules/master/web/UomConversionController.kt b/src/main/java/com/ffii/fpsms/modules/master/web/UomConversionController.kt
index 3087b02..5860421 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/web/UomConversionController.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/web/UomConversionController.kt
@@ -38,7 +38,7 @@ class UomConversionController(
     }
 
     @RequestMapping(value = ["/testRoughSchedule"], method = [RequestMethod.GET])
-    fun generateRoughSchedule(request: HttpServletRequest?): HashMap<RoughScheduleObj, Double> {
+    fun generateRoughSchedule(request: HttpServletRequest?): List<HashMap<RoughScheduleObj, Double>> {
         try {
             val demoFGList = arrayListOf<FinishedGood>(
                 FinishedGood(
@@ -67,15 +67,19 @@ class UomConversionController(
                 ),
             );
 
-            val result: HashMap<RoughScheduleObj, Double> = schedulingService.generateRoughScheduleByWeek(demoFGList);
+            val result: HashMap<RoughScheduleObj, Double> = schedulingService.generateRoughScheduleByWeek(demoFGList)
             val sortedEntries = result.entries.sortedBy { it.value }
 
-            for ((roughScheduleRecord, totalDifference) in result) {
-                println("[totalDifference:" + sortedEntries + "] - " + sortedEntries.toString())
+            for ((roughScheduleRecord, totalDifference) in sortedEntries) {
+                println("[totalDifference:" + totalDifference + "] - " + roughScheduleRecord.toString())
+            }
+
+            // Convert to List<HashMap<RoughScheduleObj, Double>>
+            return sortedEntries.map { entry ->
+                hashMapOf(entry.key to entry.value)
             }
-            return result;
         } catch (e: Exception) {
-            throw RuntimeException("Error genereate schedule: ${e.message}", e)
+            throw RuntimeException("Error generate schedule: ${e.message}", e)
         }
     }
 }
\ No newline at end of file