APS平台生产排程平台规划算法

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

@@ -267,9 +267,9 @@ public class ApsConstraintProvider implements ConstraintProvider {
                                 }
                             }
                             // 开始时间不小于最大的最小等待时间、不大于最小的最大等待时间
-                            if(productionProcesses.getStartTime().compareTo(lastMaxStartTime)<0){
+                            if(lastMaxStartTime != null && productionProcesses.getStartTime().compareTo(lastMaxStartTime)<0){
                                 bln = true;
-                            }else if(productionProcesses.getStartTime().compareTo(lastMinMaxWaitTime)>0){
+                            }else if(lastMinMaxWaitTime != null && productionProcesses.getStartTime().compareTo(lastMinMaxWaitTime)>0){
                                 bln = true;
                             }
                         }
@@ -461,6 +461,9 @@ public class ApsConstraintProvider implements ConstraintProvider {
                     boolean bol = false;
                     if(productionProcesses.getPreviousProcesses() != null && productionProcesses.getPreviousProcesses().size()>0){
                         for (ProductionProcesses previousProcess : productionProcesses.getPreviousProcesses()) {
+                            if(previousProcess.getEquipment() == null){
+                                continue;
+                            }
                             Integer lzTimes = 0;
                             if(previousProcess.getEquipment() == null){
                                 System.out.println("previousProcess.getEquipment() == null");