2025-04-10

BOM Routing 相关排除已转正的临时物料

src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java

@@ -1157,6 +1157,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         }
         // 得到全部流转信息
         List<Map<String, Object>> res = JSON.parseObject(String.valueOf(getRequestOperatorInfoResponses.getObj()), new TypeReference<List<Map<String, Object>>>(){});
+        System.out.println("第一次调用返回值: " + res);
         // 如果节点isRemark=6，需要再次调用流程流转信息
         List<Map<String, Object>> irs = res.stream().filter(a -> convertToInt(a.get("isremark")) == 6).collect(Collectors.toList());
         if (!irs.isEmpty()) {
@@ -1166,6 +1167,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
             }
             // 得到全部流转信息
             res = JSON.parseObject(String.valueOf(getRequestOperatorInfoResponses.getObj()), new TypeReference<List<Map<String, Object>>>(){});
+            System.out.println("第二次调用返回值: " + res);
         }
         // 得到isRemark为0的流转信息
         List<Map<String, Object>> isRemarks = res.stream().filter(a -> convertToInt(a.get("isremark")) == 0).collect(Collectors.toList());

src/main/java/com/spring/modules/part/mapper/PartInformationMapper.java

@@ -329,4 +329,6 @@ public interface PartInformationMapper extends BaseMapper<PartInformationEntity>
     IPage<BomAllFieldEntity> queryOfficialPartList(Page<PartInformationVo> partInformationVoPage, @Param("query") PartInformationVo data);
 
     void updateFromPartStatusAndIfsPart(@Param("site") String site, @Param("partNo") String partNo, @Param("ifsPartNo") String partNo1);
+
+    void updateProjectFinalPart2(@Param("site") String site, @Param("partNo") String partNo, @Param("ifsPartNo") String partNo1, @Param("createBy") String createBy);
 }

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

@@ -2240,6 +2240,9 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         if ("Y".equals(inData.getCopyFlag())) {
             // 将原物料改为正式物料，并给 ifs_part_no 赋值
             partInformationMapper.updateFromPartStatusAndIfsPart(inData.getPreviousVersion().getSite(), inData.getPreviousVersion().getPartNo(), inData.getPartNo());
+            // 没有update项目料号表里的final part no
+            // 反刷项目物料的finalPartNo
+            partInformationMapper.updateProjectFinalPart2(inData.getPreviousVersion().getSite(), inData.getPreviousVersion().getPartNo(), inData.getPartNo(), inData.getCreateBy());
         }
     }
 
@@ -2249,6 +2252,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         toPart.setPartNo(inData.getPartNo());
         toPart.setPartDesc(inData.getPartDesc());
         toPart.setStatus(fromPart.getStatus());
+        toPart.setActive(fromPart.getActive());
 
         // General
         toPart.setPartType(fromPart.getPartType()); // 零件类型
@@ -2816,6 +2820,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
 
         // 编辑原物料
         UpdateWrapper<PartInformationEntity> updateInformationWrapper = new UpdateWrapper<>();
+        data.setStatus("Y");
         updateInformationWrapper.eq("site", data.getSite());
         updateInformationWrapper.eq("part_no", data.getPartNo());
         partInformationMapper.update(data, updateInformationWrapper);
@@ -2870,7 +2875,7 @@ public class PartInformationServiceImpl extends ServiceImpl<PartInformationMappe
         ifsPart.setPartNo(data.getIfsPartNo());
         ifsPart.setPlmPartNo(data.getPartNo());
         ifsPart.setCreateBy(data.getUpdateBy());
-        ifsPart.setStatus("Y");
+        //ifsPart.setStatus("Y");
         ifsPart.setIfsPartNo(data.getIfsPartNo());
         partInformationMapper.insert(ifsPart);
 

src/main/resources/mapper/change/ChangeManagementMapper.xml

@@ -1131,7 +1131,7 @@
                 CAST(c.create_date AS DATETIME2(0)) AS create_date,
                 ROW_NUMBER() OVER (
             PARTITION BY b.node_id, d.username
-            ORDER BY c.create_date ASC  -- ASC：保留最早；DESC：保留最新
+            ORDER BY c.create_date DESC  -- ASC：保留最早；DESC：保留最新
         ) AS rn
             FROM plm_request_header a
                      LEFT JOIN plm_request_node b

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

@@ -1109,6 +1109,14 @@
         WHERE site = #{site} and test_part_no = #{partNo}
     </update>
 
+    <update id="updateProjectFinalPart2">
+        UPDATE plm_project_part
+        SET final_part_no = #{ifsPartNo},
+            update_date = getDate(),
+            update_by = #{createBy}
+        WHERE site = #{site} and test_part_no = #{partNo}
+    </update>
+
     <!-- 查询编码对象 -->
     <select id="getTranNoData" resultType="TransNoControlData" parameterType="string">
         SELECT