diff --git a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java index e1f48805..70934dee 100644 --- a/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java +++ b/src/main/java/com/spring/modules/change/service/impl/ChangeManagementServiceImpl.java @@ -1535,7 +1535,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl bomList = technicalSpecificationServiceImpl.fetchBomComponentDetails(paramData.getSite(), paramData.getDocNo()); + List bomList = technicalSpecificationServiceImpl.fetchBomComponentDetails(paramData.getSite(), paramData.getDocNo(), "search"); // 插入到plm_bm_bom表中 先删除再新增 technicalSpecificationMapper.deleteBmBom(paramData.getSite(), paramData.getDocNo()); for (BomComponentVo vo : bomList) { diff --git a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java index c6458518..306e7441 100644 --- a/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java +++ b/src/main/java/com/spring/modules/sampleManagement/service/Impl/TechnicalSpecificationServiceImpl.java @@ -531,7 +531,7 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification // } // 调用存储过程 - List list = fetchBomComponentDetails(inData.getSite(), inData.getCodeNo()); + List list = fetchBomComponentDetails(inData.getSite(), inData.getCodeNo(), "search"); //List 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 fetchBomComponentDetails(String site, String codeNo) { + public List fetchBomComponentDetails(String site, String codeNo, String type) { List params = new ArrayList<>(); params.add(site); params.add(codeNo); - List> resultList = procedureDao.getProcedureData("get_BM_BOMDetail", params); + List> 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 bomList = fetchBomComponentDetails(data.getSite(), data.getCodeNo()); + List bomList = fetchBomComponentDetails(data.getSite(), data.getCodeNo(), "archiving"); if (!bomList.isEmpty()) { // 插入到plm_bm_bom表中 先删除再新增 technicalSpecificationMapper.deleteBmBom(data.getSite(), data.getCodeNo());