设备名称排序

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderServiceImpl.java

@@ -366,11 +366,11 @@ public class ProOrderServiceImpl implements IProOrderService {
         }
 
         Map<String,CascaderDTO> equipMap = proOrderMapper.getEquipInfoByCodes(equipCods.substring(1));//设备字典
-        Set<String> keys = equipMap.keySet();
+        for (int c = 0; c < codeArray.size(); c++) {
-        for (String key : keys) {
+            String equipCode = codeArray.getJSONArray(c).getString(1);
-            prodLineName.append(equipMap.get(key).getLabel());
+            prodLineName.append(equipMap.get(equipCode).getLabel() + ",");
-            prodLineName.append(",");
         }
+
         proOrderWorkorder.setProdLineCode(prodLineName.toString());
 
         // 通过工单id查询批次号

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProOrderWorkorderServiceImpl.java

@@ -94,10 +94,15 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
             }
 
             Map<String, CascaderDTO> equipMap = proOrderMapper.getEquipInfoByCodes(equipCods.substring(1));//设备字典
-            Set<String> keys = equipMap.keySet();
+            for (int c = 0; c < codeArray.size(); c++) {
-            for (String key : keys) {
+                String equipCode = codeArray.getJSONArray(c).getString(1);
-                prodLineName += equipMap.get(key).getLabel() + ",";
+                prodLineName += equipMap.get(equipCode).getLabel() + ",";
             }
+//            Set<String> keys = equipMap.keySet();
+//            for (String key : keys) {
+//                prodLineName += equipMap.get(key).getLabel() + ",";
+//            }
+
             workorder.setProdLineName(prodLineName);
 //            // 通过设备code查询出机型名称
 //            workorder.setProdLineCode(proOrderMapper.selectProdLineName(workorder.getProdLineCode()));
@@ -946,11 +951,11 @@ public class ProOrderWorkorderServiceImpl implements IProOrderWorkorderService {
         }
 
         Map<String, CascaderDTO> equipMap = proOrderMapper.getEquipInfoByCodes(equipCods.substring(1));//设备字典
-        Set<String> keys = equipMap.keySet();
+        for (int c = 0; c < codeArray.size(); c++) {
-        for (String key : keys) {
+            String equipCode = codeArray.getJSONArray(c).getString(1);
-            prodLineName.append(equipMap.get(key).getLabel());
+            prodLineName.append(equipMap.get(equipCode).getLabel() + ",");
-            prodLineName.append(",");
         }
+
         proOrderWorkorder.setProdLineCode(prodLineName.toString());
 
         // 通过工单id查询批次号

op-modules/op-plan/src/main/java/com/op/plan/service/impl/ProWhiteOrderServiceImpl.java

@@ -317,10 +317,9 @@ public class ProWhiteOrderServiceImpl implements IProWhiteOrderService {
         }
 
         Map<String, CascaderDTO> equipMap = proOrderMapper.getEquipInfoByCodes(equipCods.substring(1));//设备字典
-        Set<String> keys = equipMap.keySet();
+        for (int c = 0; c < codeArray.size(); c++) {
-        for (String key : keys) {
+            String equipCode = codeArray.getJSONArray(c).getString(1);
-            prodLineName.append(equipMap.get(key).getLabel());
+            prodLineName.append(equipMap.get(equipCode).getLabel() + ",");
-            prodLineName.append(",");
         }
         proOrderWorkorder.setProdLineCode(prodLineName.toString());