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

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/domain/ApsSolution.java

@@ -63,7 +63,7 @@ public class ApsSolution extends ApsAbstractPersistable{
         }
         Long incrementUnit = this.incrementUnitAmount;
         if(incrementUnit == null){
-            incrementUnit = 10L;
+            incrementUnit = 5L;
         }
 
         long sy = produceTimeTotal % incrementUnit;

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

@@ -317,7 +317,7 @@ public class ApsConstraintProvider implements ConstraintProvider {
                              */
 
                             if(preProcess.getMaxWaitTime() != null){
-                                lastFirstMaxWaitTime = startTime.plusMinutes(preProcess.getMaxWaitTime());
+                                lastFirstMaxWaitTime = startTime.plusMinutes(preProcess.getUnitProduceTime()).plusMinutes(preProcess.getMaxWaitTime());
                             }
                             if(productionProcesses.getUnitProduceTime()>=maxUnitProduceTime){
                                 if(productionProcesses.getStartTime().compareTo(startTime.plusMinutes(preProcess.getUnitProduceTime()).plusMinutes(lzTimes))<0){