连续生产工序约束调整

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/score/ApsConstraintProvider.java

@@ -854,17 +854,6 @@ public class ApsConstraintProvider implements ConstraintProvider {
                     Equipment equipment = null;
                     if(processes != null && processes.size()>0){
                         equipment = processes.get(0).getEquipment();
-                        /*List<ProductionProcesses> plist = new ArrayList<>();
-                        for (ProductionProcesses process : processes) {
-                            ProductionProcesses pro = new ProductionProcesses();
-                            pro.setId(process.getId());
-                            pro.setEquipmentId(process.getEquipmentId());
-                            pro.setProduceTime(process.getProduceTime());
-                            pro.setStartTime(process.getStartTime());
-                            pro.setEndTime(process.getEndTime());
-                            plist.add(pro);
-                        }
-                        equipment.setProcessesList(plist);*/
                     }
                     List<ProductionProcesses> hasStartTimeProcess = processes.stream().filter(v -> v.getStartTime() != null).collect(Collectors.toList());
                     // 设备占用时间参与连续生产排程
@@ -910,7 +899,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
                                             try{
                                                 Integer i1 = Integer.parseInt(s1);
                                                 Integer i2 = Integer.parseInt(s2);
-                                                if(i1<i2 || (i1-i2)>30){
+                                                if(i1<i2){
                                                     a = true;
                                                     break;
                                                 }
@@ -971,7 +960,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
                                         try{
                                             Integer i1 = Integer.parseInt(s1);
                                             Integer i2 = Integer.parseInt(s2);
-                                            if(i1<i2 || (i1-i2)>30){
+                                            if(i1<i2){
                                                 b++;
                                             }
                                         }catch (Exception e){