排程优化-退火合并优化

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

@@ -252,6 +252,9 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
                     continue;
                 }
                 try{
+                    /*if(v.contains("a7be0cbf99764d00a1025e480ed8c89c")){
+                        int aa = 1/0;
+                    }*/
                     log.info("分批排程开始，当前批次坯料计划ID:"+v);
                     ApsSolution apsSolution1 = new ApsSolution();
                     apsSolution1.setStartTime(apsSolution.getStartTime());
@@ -348,6 +351,9 @@ public class ProductionScheduleServiceImpl implements ProductionScheduleService
             if(equass != null && equass.size()>0){
                 for(Map.Entry<String, List<ProductionProcesses>> entry : equass.entrySet()){
                     String k = entry.getKey();
+                    if(exOrderIds.contains(k)){
+                        continue;
+                    }
                     try{
                         log.info("剩余分批排程开始，当前批次坯料计划ID:"+k);
                         List<ProductionProcesses> processesList1 = entry.getValue();