|
@@ -2489,6 +2489,13 @@ public class ApsServiceImpl implements ApsService {
|
|
|
hasSeries = true;
|
|
|
lzbzMerges.get(seriesKey).add(rootPro);
|
|
|
commonEqus = commonEqusNext;
|
|
|
+ // 设置连轧公共设备
|
|
|
+ ProductionProcesses lzMergePro = lzbzMerges.get(seriesKey).get(0);
|
|
|
+ lzMergePro.getOptionalEquipments().clear();
|
|
|
+ lzMergePro.getOptionalEquipments().addAll(commonEqus);
|
|
|
+ List<Equipment> opeqs = lzMergePro.getOptionalProviderEquipments().stream().filter(v -> lzMergePro.getOptionalEquipments().contains(v.getId())).collect(Collectors.toList());
|
|
|
+ lzMergePro.getOptionalProviderEquipments().clear();
|
|
|
+ lzMergePro.getOptionalProviderEquipments().addAll(opeqs);
|
|
|
}
|
|
|
}
|
|
|
}
|