2025-01-14

src/main/java/com/spring/modules/part/service/impl/BomManagementServiceImpl.java

@@ -475,9 +475,17 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
         HashMap<String, Object> map = new HashMap<>();
         // 查出Bom替代的当前状态
         List<BomDetailEntity> checkList = bomManagementMapper.checkBomDetailOnlyOne(data);
-        if (!checkList.isEmpty()) { // 判断替代是否存在
-            if (StringUtils.isNotBlank(data.getStatus()) && StringUtils.isNotBlank(checkList.get(0).getStatus())) { // 判断状态是否为null
-                if (data.getStatus().equals(checkList.get(0).getStatus())) { // 判断状态是否已改变
+        if (checkList.isEmpty()) { // 判断替代是否存在
+            throw new RuntimeException("当前替代不存在，请刷新数据！");
+        }
+        // 判断状态是否为null
+        if (StringUtils.isBlank(data.getStatus()) || StringUtils.isBlank(checkList.get(0).getStatus())) {
+            throw new RuntimeException("当前替代状态为空！");
+        }
+        // 判断状态是否已改变
+        if (!data.getStatus().equals(checkList.get(0).getStatus())) {
+            throw new RuntimeException("当前替代状态已改变，请刷新数据！");
+        }
         if ("Tentative".equals(checkList.get(0).getStatus()) || "Obsolete".equals(checkList.get(0).getStatus())) {
             data.setStatus("Buildable");
         } else if ("Buildable".equals(checkList.get(0).getStatus())) {
@@ -530,15 +538,6 @@ public class BomManagementServiceImpl extends ServiceImpl<BomManagementMapper, B
         map.put("detailDataList",detailDataList);
         map.put("subDetailList",subDetailList);
         return map;
-                } else {
-                    throw new RuntimeException("当前替代状态已改变，请刷新数据！");
-                }
-            } else {
-                throw new RuntimeException("当前替代状态为空！");
-            }
-        } else {
-            throw new RuntimeException("当前替代不存在，请刷新数据！");
-        }
     }
 
     /**

src/main/java/com/spring/modules/part/service/impl/RoutingManagementServiceImpl.java

@@ -443,9 +443,18 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
         HashMap<String, Object> map = new HashMap<>();
         // 查出Bom替代的当前状态
         List<RoutingDetailEntity> checkList = routingManagementMapper.checkRoutingDetailOnlyOne(data);
-        if (!checkList.isEmpty()) { // 判断替代是否存在
-            if (StringUtils.isNotBlank(data.getStatus()) && StringUtils.isNotBlank(checkList.get(0).getStatus())) { // 判断状态是否为null
-                if (data.getStatus().equals(checkList.get(0).getStatus())) { // 判断状态是否已改变
+        // 判断替代是否存在
+        if (checkList.isEmpty()) {
+            throw new RuntimeException("当前替代不存在！");
+        }
+        // 判断状态是否为null
+        if (StringUtils.isBlank(data.getStatus()) || StringUtils.isBlank(checkList.get(0).getStatus())) {
+            throw new RuntimeException("当前替代状态为空！");
+        }
+        // 判断状态是否已改变
+        if (!data.getStatus().equals(checkList.get(0).getStatus())) {
+            throw new RuntimeException("当前替代状态已改变！");
+        }
         if ("Tentative".equals(checkList.get(0).getStatus()) || "Obsolete".equals(checkList.get(0).getStatus())) {
             data.setStatus("Buildable");
         } else if ("Buildable".equals(checkList.get(0).getStatus())) {
@@ -504,15 +513,6 @@ public class RoutingManagementServiceImpl extends ServiceImpl<RoutingManagementM
 //                        throw new RuntimeException("ifs Routing异常信息：" + responseData1.getMsg());
 //                    }
         return map;
-                } else {
-                    throw new RuntimeException("当前替代状态已改变！");
-                }
-            } else {
-                throw new RuntimeException("当前替代状态为空！");
-            }
-        } else {
-            throw new RuntimeException("当前替代不存在！");
-        }
     }
 
     /**