Commit a4664aaf authored by Tong Li's avatar Tong Li

遗传算法-优化编译逻辑

parent ba33b6b4
...@@ -438,6 +438,10 @@ public class RoutingDataService { ...@@ -438,6 +438,10 @@ public class RoutingDataService {
machine.setId(resource.getId()); machine.setId(resource.getId());
machine.setCode(resource.getReferenceCode()); machine.setCode(resource.getReferenceCode());
machine.setName(resource.getTitle()); machine.setName(resource.getTitle());
if(machine.getName().contains("铲车-2"))
{
int i=1+2;
}
if(!IsUseCalendar) if(!IsUseCalendar)
{ {
List<EquipCapacityDef> machineProdEquipSpecialCals = ProdEquipSpecialCals.stream() List<EquipCapacityDef> machineProdEquipSpecialCals = ProdEquipSpecialCals.stream()
...@@ -536,7 +540,7 @@ public class RoutingDataService { ...@@ -536,7 +540,7 @@ public class RoutingDataService {
List<MaintenanceWindow> maintenanceWindows=new ArrayList<>(); List<MaintenanceWindow> maintenanceWindows=new ArrayList<>();
List<EquipMaintainTask> EquipMaintainTasks1 = EquipMaintainTasks.stream() List<EquipMaintainTask> EquipMaintainTasks1 = EquipMaintainTasks.stream()
.filter(t -> t.getEquipId() == resource.getReferenceId() ) .filter(t -> t.getEquipId().equals(resource.getReferenceId()) )
.collect(Collectors.toList()); .collect(Collectors.toList());
for (EquipMaintainTask equipMaintainTask : EquipMaintainTasks1) { for (EquipMaintainTask equipMaintainTask : EquipMaintainTasks1) {
MaintenanceWindow maintenanceWindow=new MaintenanceWindow(); MaintenanceWindow maintenanceWindow=new MaintenanceWindow();
......
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