Преглед на файлове

[rough schedule] minor logic update

create_edit_user
jason.lam преди 3 месеца
родител
ревизия
9f6165b1c9
променени са 2 файла, в които са добавени 12 реда и са изтрити 7 реда
  1. +2
    -1
      src/main/java/com/ffii/fpsms/modules/master/service/SchedulingService.kt
  2. +10
    -6
      src/main/java/com/ffii/fpsms/modules/master/web/UomConversionController.kt

+ 2
- 1
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


+ 10
- 6
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)
}
}
}

Зареждане…
Отказ
Запис