遗传算法-优化

src/main/java/com/aps/service/Algorithm/GeneticDecoder.java

@@ -470,6 +470,7 @@ if(finishedOrder==null||finishedOrder.size()==0)
 
             machineCalculator.AddMachineAvailable(machine,geneDetails);
 
+            /// 时间安排
             geneDetails = machineCalculator.getNextAvailableTime(machine, conflictEarliestStartTime, -1,
                     processingTimeTotal, chromosome.getResult(), false, true,processingTime, operation.getQuantity(), true);
 
@@ -622,7 +623,13 @@ if(finishedOrder==null||finishedOrder.size()==0)
                                 .filter(t -> t.getGroupId() == orderid)
                                 .collect(Collectors.toList());
                         if (!oe.isEmpty()) {
-                            sfTime1 = oe.stream().mapToInt(GAScheduleResult::getEndTime).max().orElse(0)+(int) (sf.getCkeckLeadTime()*24*60);
+                            int CkeckLeadTime=0;
+                            if(sf.getCkeckLeadTime()!=null)
+                            {
+                                CkeckLeadTime=(int) (sf.getCkeckLeadTime()*24*60);
+                            }
+                            sfTime1 = oe.stream().mapToInt(GAScheduleResult::getEndTime).max().orElse(0)
+                                    +CkeckLeadTime;
 
                             sf.setUseTime(baseTime.plusSeconds(sfTime1));
                         }