Merge remote-tracking branch 'origin/master'

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

@@ -1535,7 +1535,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
         if (isRemarks.isEmpty()) { // 已结束
             // 如果是BM 并且流程已结束 往plm_bm_bom、plm_bm_routing中插入数据
             if (Constant.BM.equals(type)) {
-                List<BomComponentVo> bomList = technicalSpecificationServiceImpl.fetchBomComponentDetails(paramData.getSite(), paramData.getDocNo());
+                List<BomComponentVo> bomList = technicalSpecificationServiceImpl.fetchBomComponentDetails(paramData.getSite(), paramData.getDocNo(), "search");
                 // 插入到plm_bm_bom表中 先删除再新增
                 technicalSpecificationMapper.deleteBmBom(paramData.getSite(), paramData.getDocNo());
                 for (BomComponentVo vo : bomList) {

src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java

@@ -531,7 +531,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
 //        }
 
         // 调用存储过程
-        List<BomComponentVo> list = fetchBomComponentDetails(inData.getSite(), inData.getCodeNo());
+        List<BomComponentVo> list = fetchBomComponentDetails(inData.getSite(), inData.getCodeNo(), "search");
         //List<BomComponentVo> list = bomManagementMapper.queryBomComponent(bomDetailEntity.get(0));
         map.put("rows", list);
         if (list.isEmpty()) {
@@ -542,11 +542,17 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         return map;
     }
 
-    public List<BomComponentVo> fetchBomComponentDetails(String site, String codeNo) {
+    public List<BomComponentVo> fetchBomComponentDetails(String site, String codeNo, String type) {
         List<Object> params = new ArrayList<>();
         params.add(site);
         params.add(codeNo);
-        List<Map<String, Object>> resultList = procedureDao.getProcedureData("get_BM_BOMDetail", params);
+        List<Map<String, Object>> resultList;
+        // 2025-12-25 如果是归档类型，调用归档存储过程
+        if ("archiving".equals(type)) {
+            resultList = procedureDao.getProcedureData("get_BM_BOMDetailArchiving", params);
+        } else {
+            resultList = procedureDao.getProcedureData("get_BM_BOMDetail", params);
+        }
 
         if (resultList.isEmpty()) {
             return new ArrayList<>();
@@ -2161,7 +2167,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
     public void bmStatusToFinish(PlmTechnicalSpecificationSheetData data) {
 
         // 2025-07-17 修改技术参数卡的状态为已完成后，重新获取bom和工艺路线
-        List<BomComponentVo> bomList = fetchBomComponentDetails(data.getSite(), data.getCodeNo());
+        List<BomComponentVo> bomList = fetchBomComponentDetails(data.getSite(), data.getCodeNo(), "archiving");
         if (!bomList.isEmpty()) {
             // 插入到plm_bm_bom表中 先删除再新增
             technicalSpecificationMapper.deleteBmBom(data.getSite(), data.getCodeNo());