退火调度模型设备占用时间合并优化

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/service/impl/ApsServiceImpl.java

@@ -266,6 +266,10 @@ public class ApsServiceImpl implements ApsService {
                                 if (equipmentRunTime.getMaxSinglerollweight().compareTo(runTime.getMaxSinglerollweight()) > 0) {
                                     runTime.setMaxSinglerollweight(equipmentRunTime.getMaxSinglerollweight());
                                 }
+                                // 退火结束时间取最大时间
+                                if(runTime.getEndRunTime().compareTo(equipmentRunTime.getEndRunTime())<0){
+                                    runTime.setEndRunTime(equipmentRunTime.getEndRunTime());
+                                }
                                 runTime.getMinThGroupNames().addAll(minThGroupNames);
                                 isMerged = true;
                                 break;