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 539bfcd..1b8f30b 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
@@ -512,8 +512,8 @@ open class ProductionScheduleService(
         tempObj.scheduleAt = LocalDateTime.now()
         tempObj.totalFGType = fgCount;
         tempObj.totalEstProdCount = accProdCount;
-        tempObj.id = saveProductionScheduleToDatabase(tempObj);
         tempObj.type = "detailed"
+        tempObj.id = saveProductionScheduleToDatabase(tempObj);
 
         for (detailedScheduleRecord in sortedEntries) {
             saveDetailedScheduleLineToDatabase(tempObj.id ?: -1, detailedScheduleRecord)
diff --git a/src/main/java/com/ffii/fpsms/modules/master/web/ProductionScheduleController.kt b/src/main/java/com/ffii/fpsms/modules/master/web/ProductionScheduleController.kt
index 0691de2..1349d78 100644
--- a/src/main/java/com/ffii/fpsms/modules/master/web/ProductionScheduleController.kt
+++ b/src/main/java/com/ffii/fpsms/modules/master/web/ProductionScheduleController.kt
@@ -76,7 +76,7 @@ class ProductionScheduleController(
     fun generateDetailSchedule(request: HttpServletRequest?): Int {
         try {
             // For test
-            val genDate = request?.getParameter("genDate").let { LocalDateTime.parse(it) }
+            val genDate = request?.getParameter("genDate")?.let { LocalDateTime.parse(it) }
 
             val today = LocalDateTime.now()
             val latestRoughScheduleAt = productionScheduleService.getLatestScheduleAt("rough")