遗传算法-初始话日历

src/main/java/com/aps/service/plan/PlanResultService.java

@@ -771,23 +771,25 @@ order.setDueDate(LocalDateTime.of(2025, 12, 1,0,0,0));
 
            return  _routingDataService.InitNoCalendarToAllMachines(machineScheduler,param.getBaseTime());
         }else {
+            ScheduleParams param = InitScheduleParams();
+            return  _routingDataService.InitCalendarToAllMachines( machineScheduler,param.getBaseTime());
 
             //  List<Machine> machines = _routingDataService.InitCalendarToAllMachines(SceneId, ProdEquipments, machineScheduler, IsUseCalendar);
-            List<Machine> machines = (List<Machine>) GlobalCacheUtil.get("machines");
-            if (machines == null || machines.size() == 0) {
-
-
-                machines = (List<Machine>) redisUtils.get("machines");
-                if (machines == null || machines.size() == 0) {
-
-                    machines = InitCalendarToAllMachines();
-
-                }
-            }
-
-            FileHelper.writeLogFile("初始化设备日历-----------结束-------");
-            GlobalCacheUtil.put("machines", machines, 10, TimeUnit.MINUTES);
-            return machines;
+//            List<Machine> machines = (List<Machine>) GlobalCacheUtil.get("machines");
+//            if (machines == null || machines.size() == 0) {
+//
+//
+//                machines = (List<Machine>) redisUtils.get("machines");
+//                if (machines == null || machines.size() == 0) {
+//
+//                    machines = InitCalendarToAllMachines();
+//
+//                }
+//            }
+//
+//            FileHelper.writeLogFile("初始化设备日历-----------结束-------");
+//            GlobalCacheUtil.put("machines", machines, 10, TimeUnit.MINUTES);
+//            return machines;
         }
 
     }