bom

src/main/java/com/aps/entity/Algorithm/ScheduleResultDetail.java

@@ -43,6 +43,8 @@ public class ScheduleResultDetail {
         return EndTime;
     }
 
+    private boolean isChangeOverTime=false;
+
     public void setEndTime(int endTime) {
         this.EndTime = endTime;
     }

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

@@ -201,12 +201,13 @@ public class MachineCalculator {
                 ScheduleResultDetail time =new ScheduleResultDetail();
                 time.setStartTime((int) ChronoUnit.SECONDS.between(baseTime, effectiveStart));
                 time.setEndTime((int) ChronoUnit.SECONDS.between(baseTime, startTime));
+                time.setChangeOverTime(true);
+                if(islockMachineTime) {
+                    CopyOnWriteArrayList<TimeSegment> usedSegments1 = RemoveMachineAvailable(machine, time, shift, islockMachineTime);
 
-
-                    CopyOnWriteArrayList<TimeSegment> usedSegments1 = RemoveMachineAvailable(machine, time, shift,false);
-
-                if (usedSegments1 != null && usedSegments1.size() > 0) {
-                    usedSegments.addAll(usedSegments1);
+                    if (usedSegments1 != null && usedSegments1.size() > 0) {
+                        usedSegments.addAll(usedSegments1);
+                    }
                 }
 
                 if(processable>=availableSeconds)
@@ -219,7 +220,7 @@ public class MachineCalculator {
              ChangeOverTimenew =(int)ChronoUnit.SECONDS.between(ChangeOverstartTime, ChangeOverendTime);
 
 
-            processingTime=  processingTime-changeOvertTimeold;
+          //  processingTime=  processingTime-changeOvertTimeold;
             TimeSegment slot = timeSegments.get(i);
 
             LocalDateTime startCandidate = slot.getStart().isAfter(startTime)

src/main/java/com/aps/service/plan/PlanResultService.java

@@ -1961,12 +1961,12 @@ if(job.getGeneDetails()!=null)
 {
     for (ScheduleResultDetail d : job.getGeneDetails()) {
         sb.append(String.format(
-                "\n\t\t\t\t\t\t\t\t\t\t [%d-%d]:[%s-%s] %d",
+                "\n\t\t\t\t\t\t\t\t\t\t [%d-%d]:[%s-%s] %d---%d",
                 d.getStartTime(),
                 d.getEndTime(),
                 ConvertTime(d.getStartTime()),
                 ConvertTime(d.getEndTime()),
-                d.getEndTime() - d.getStartTime()
+                d.getEndTime() - d.getStartTime(),d.isChangeOverTime()?1:0
         ));
     }
 }

src/test/java/com/aps/demo/PlanResultServiceTest.java

@@ -41,7 +41,7 @@ public class PlanResultServiceTest {
      //  sortService.test1();
        // nsgaiiUtils.Test();
 
-          planResultService.execute2("A83368B01AEA45168A5202C16425E530");//2000
+          planResultService.execute2("64E64F6B68094AF38CEDC418630C3CC2");//2000
 
         //  planResultService.execute2("15210B13B88A453F8B84AAC7F16C7541");//2000