Merge remote-tracking branch 'origin/master'

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("当前替代不存在！");
-        }
     }
 
     /**

src/main/java/com/spring/modules/part/vo/PartInformationVo.java

@@ -128,6 +128,10 @@ public class PartInformationVo extends PartInformationEntity {
      * 规划方法名称
      **/
     private String planningMethodDesc;
+    /**
+     * 最终物料编码
+     **/
+    private String finalPartNo;
     /**
      * 复制物料
      */

src/main/resources/mapper/part/PartInformationMapper.xml

@@ -1328,7 +1328,8 @@
             c.part_no,
             c.part_desc,
             a.bu_no,
-            dbo.plm_get_bu_desc(a.site,a.bu_no) buDesc
+            dbo.plm_get_bu_desc(a.site,a.bu_no) buDesc,
+            c.ifs_part_no as finalPartNo
         FROM (select
                   prp1.site,
                   prp1.test_part_no,
@@ -1377,7 +1378,8 @@
         SELECT
             a.site,
             a.part_no,
-            a.part_desc
+            a.part_desc,
+            a.ifs_part_no as finalPartNo
         FROM part as a
         left join plm_project_part as b on a.site = b.site and a.part_no = b.test_part_no
         where a.site = #{query.site}
@@ -1398,9 +1400,9 @@
     <!-- 新增项目物料 -->
     <insert id="addProjectPart">
         insert into plm_project_part
-        (site, project_id, test_part_no, create_date, create_by, part_no_source, bu_no) VALUES
+        (site, project_id, test_part_no, create_date, create_by, part_no_source, bu_no, final_part_no) VALUES
         <foreach collection="list" item="item" index="index" separator=",">
-            (#{item.site}, #{item.projectId}, #{item.partNo}, getDate(), #{item.createBy}, #{item.partNoSource}, #{item.buNo})
+            (#{item.site}, #{item.projectId}, #{item.partNo}, getDate(), #{item.createBy}, #{item.partNoSource}, #{item.buNo}, #{item.finalPartNo})
         </foreach>
     </insert>