Commit 236185e3 authored by Tong Li's avatar Tong Li

拖到

parent a1aaee69
...@@ -366,6 +366,12 @@ if(finishedOrder==null||finishedOrder.size()==0) ...@@ -366,6 +366,12 @@ if(finishedOrder==null||finishedOrder.size()==0)
int prevOperationEndTime, Chromosome chromosome) { int prevOperationEndTime, Chromosome chromosome) {
int processingTimeTotal =(int)(processingTime * operation.getQuantity()); int processingTimeTotal =(int)(processingTime * operation.getQuantity());
if(machine==null||operation.getMachineOptions()==null)
{
return 0;
}
MachineOption machineOption= operation.getMachineOptions().stream() MachineOption machineOption= operation.getMachineOptions().stream()
.filter(t->t.getMachineId()==machine.getId()) .filter(t->t.getMachineId()==machine.getId())
.findFirst().orElse(null); .findFirst().orElse(null);
...@@ -507,10 +513,7 @@ if(finishedOrder==null||finishedOrder.size()==0) ...@@ -507,10 +513,7 @@ if(finishedOrder==null||finishedOrder.size()==0)
result.setChangeOverTime(setupTime); result.setChangeOverTime(setupTime);
result.setPreTime(preTime); result.setPreTime(preTime);
result.setTeardownTime(teardownTime); result.setTeardownTime(teardownTime);
if(existingResult!=null) {
result.setDesignatedStartTime(existingResult.getDesignatedStartTime());
}
result.setProcessingTime(processingTimeTotal); result.setProcessingTime(processingTimeTotal);
......
...@@ -935,6 +935,7 @@ Integer newMachineId1=newMachineId.intValue(); ...@@ -935,6 +935,7 @@ Integer newMachineId1=newMachineId.intValue();
CopyOnWriteArrayList<GAScheduleResult> Resultlock= chromosome.getResult().stream() CopyOnWriteArrayList<GAScheduleResult> Resultlock= chromosome.getResult().stream()
.filter(o -> o.isIsLocked() == true) .filter(o -> o.isIsLocked() == true)
.collect(Collectors.toCollection(CopyOnWriteArrayList::new)); .collect(Collectors.toCollection(CopyOnWriteArrayList::new));
chromosome.setResult(ProductionDeepCopyUtil.deepCopyList(Resultlock,GAScheduleResult.class)); chromosome.setResult(ProductionDeepCopyUtil.deepCopyList(Resultlock,GAScheduleResult.class));
......
...@@ -39,7 +39,7 @@ public class PlanResultServiceTest { ...@@ -39,7 +39,7 @@ public class PlanResultServiceTest {
// nsgaiiUtils.Test(); // nsgaiiUtils.Test();
//planResultService.execute2("C5FB5EF2A7334A0A92F826F4937E1008"); //planResultService.execute2("C5FB5EF2A7334A0A92F826F4937E1008");
// planResultService.execute2("726D4C1A712B4B1393175BD44B775B66"); // planResultService.execute2("726D4C1A712B4B1393175BD44B775B66");
planResultService.execute2("E81EE93EFA564CEB8594C61CAEEBCD53"); planResultService.execute2("54476C9F81714EDC8597F5323015F58F");
// LocalDateTime t= LocalDateTime.of(2025, 11, 15, 6, 51, 11); // LocalDateTime t= LocalDateTime.of(2025, 11, 15, 6, 51, 11);
// List<Integer> opids=new ArrayList<>();BCA6FA43FFA444D3952CF8F6E1EA291B // List<Integer> opids=new ArrayList<>();BCA6FA43FFA444D3952CF8F6E1EA291B
// opids.add(1); // opids.add(1);
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment