小卷退火预排程提前退火合并优化

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/listener/TaskStartTimeListener.java

@@ -419,7 +419,7 @@ public class TaskStartTimeListener implements VariableListener<ApsSolution, Prod
                         continue;
                     }
                     // 退火工序
-                    if(process.getProcessType().equals("成退") || process.getProcessType().equals("中退") || process.getProcessType().equals("小卷成退")){
+                    if(process.getProcessType().equals("成退") || process.getProcessType().equals("中退")){
                         // 没有交叉直接跳过
                         /*if(equipmentRunTime.getEndRunTime().compareTo(proStartTime)<=0 || equipmentRunTime.getStartRunTime().compareTo(proEndTime)>=0){
                             continue;
@@ -457,6 +457,8 @@ public class TaskStartTimeListener implements VariableListener<ApsSolution, Prod
                                 }
                             }
                         }
+                    } else if (process.getProcessType().equals("小卷成退")) {
+
                     }
                     // 冷轧工序
                     /*else if (process.getProcessType().equals("冷轧")) {