Merge remote-tracking branch 'origin/master'

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

@@ -1500,7 +1500,7 @@ private  GlobalParam InitGlobalParam()
                         taskVO.setQuantity(gene.getQuantity());
                         taskVO.setStart(scheduleChromosome.getBaseTime().plusSeconds(gene.getStartTime()));
                         taskVO.setEnd(scheduleChromosome.getBaseTime().plusSeconds(gene.getEndTime()));
-                        taskVO.setSetup(0); // 默认值
+                        taskVO.setSetup(gene.getPreTime());
                         taskVO.setTeardown(gene.getTeardownTime()); // 默认值
                         taskVO.setEquipChange(gene.getChangeoverTime()); // 默认值
                         taskVO.setEquipCooling(0); // 默认值
@@ -1612,7 +1612,7 @@ private  GlobalParam InitGlobalParam()
                                 taskVO.setQuantity(gene.getQuantity());
                                 taskVO.setStart(scheduleChromosome.getBaseTime().plusSeconds(gene.getStartTime()));
                                 taskVO.setEnd(scheduleChromosome.getBaseTime().plusSeconds(gene.getEndTime()));
-                                taskVO.setSetup(0); // 默认值
+                                taskVO.setSetup(gene.getPreTime()); // 默认值
                                 taskVO.setTeardown(gene.getTeardownTime()); // 默认值
                                 taskVO.setEquipChange(gene.getChangeoverTime()); // 默认值
                                 taskVO.setEquipCooling(0); // 默认值
@@ -1700,6 +1700,14 @@ private  GlobalParam InitGlobalParam()
 
         for (Long id : MachineIds) {
             Machine machine = new Machine();
+            PlanResource PlanResource = PlanResources.stream()
+                    .filter(t -> t.getId() == id.intValue())
+                    .findFirst().orElse(null);
+            if (PlanResource != null){
+                machine.setCode(PlanResource.getReferenceCode());
+                machine.setName(PlanResource.getTitle());
+                machine.setDepartment(PlanResource.getDepartTitle());
+            }
             machine.setId(id);
             machines.add(machine);
         }