调度排程优化

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

@@ -104,10 +104,14 @@ public class ApsUtils {
             if(productionProcesses.getOptionalEquipments().size()>1){
                 int aaa = 0;
             }
+            List<String> optionalEquipments = productionProcesses.getOptionalEquipments();
             String equids = CollUtil.join(productionProcesses.getOptionalEquipments(), ",");
             // 存在历史排程设备则按照历史排程设备排产
             if(StrUtil.isNotBlank(productionProcesses.getLastHistoryEquipmentId())){
                 equids = productionProcesses.getLastHistoryEquipmentId();
+
+                optionalEquipments.clear();
+                optionalEquipments.add(productionProcesses.getLastHistoryEquipmentId());
             }
             if(equPros.size() == 0){
                 List<ProductionProcessesTa> pps = new ArrayList<>();
@@ -118,8 +122,9 @@ public class ApsUtils {
                 List<String> haskey = new ArrayList<>();
                 Set<String> keys = equPros.keySet();
                 for (String key : keys) {
-                    for (String optionalEquipment : productionProcesses.getOptionalEquipments()) {
-                        if(key.contains(optionalEquipment)){
+                    List<String> keyStrs = new ArrayList<>(Arrays.asList(key.split(",")));
+                    for (String optionalEquipment : optionalEquipments) {
+                        if(keyStrs.contains(optionalEquipment)){
                             hasSameKeys = true;
                             haskey.add(key);
                         }
@@ -144,7 +149,7 @@ public class ApsUtils {
                     mergePros.add(productionProcesses);
                     String keyIdStrs = CollUtil.join(keyIds, ",");
 
-                    for (String optionalEquipment : productionProcesses.getOptionalEquipments()) {
+                    for (String optionalEquipment : optionalEquipments) {
                         if(!keyIdStrs.contains(optionalEquipment)){
                             keyIdStrs = keyIdStrs + "," + optionalEquipment;
                         }