调度排程优化

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/taskassigning/service/impl/ProductionScheduleTaServiceImpl.java

@@ -256,10 +256,12 @@ public class ProductionScheduleTaServiceImpl implements ProductionScheduleTaServ
             equPros.forEach((kk,vv)->{
                 String equDes = "";
                 List<EquipmentTa> equipments = new ArrayList<>();
+                List<String> kkeqs = new ArrayList<>(Arrays.asList(kk.split(",")));
+
                 for (ProductionProcessesTa productionProcesses : vv) {
                     for (EquipmentTa optionalProviderEquipment : productionProcesses.getOptionalProviderEquipments()) {
                         List<EquipmentTa> esss = equipments.stream().filter(v -> v.getId().equals(optionalProviderEquipment.getId())).collect(Collectors.toList());
-                        if(esss == null || esss.size() == 0){
+                        if(kkeqs.contains(optionalProviderEquipment.getId()) && (esss == null || esss.size() == 0)){
                             optionalProviderEquipment.setTasks(new ArrayList<>());
                             equipments.add(optionalProviderEquipment);
                             equDes = equDes + " " + optionalProviderEquipment.getEquipmentName()+"("+optionalProviderEquipment.getId()+")";

rw-aps-server/src/main/java/com/rongwei/rwapsserver/aps/util/ApsUtils.java

@@ -104,7 +104,8 @@ public class ApsUtils {
             if(productionProcesses.getOptionalEquipments().size()>1){
                 int aaa = 0;
             }
-            List<String> optionalEquipments = productionProcesses.getOptionalEquipments();
+            List<String> optionalEquipments = new ArrayList<>();
+            optionalEquipments.addAll(productionProcesses.getOptionalEquipments());
             String equids = CollUtil.join(productionProcesses.getOptionalEquipments(), ",");
             // 存在历史排程设备则按照历史排程设备排产
             if(StrUtil.isNotBlank(productionProcesses.getLastHistoryEquipmentId())){