From 6ea53009c4d2809a7a20ca943e0d1e79939dff0a Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 25 Dec 2025 13:14:52 +0800 Subject: [PATCH] =?UTF-8?q?2025-12-25=20=E5=A6=82=E6=9E=9C=E6=98=AF?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=E7=B1=BB=E5=9E=8B=EF=BC=8C=E8=B0=83=E7=94=A8?= =?UTF-8?q?=E5=BD=92=E6=A1=A3=E5=AD=98=E5=82=A8=E8=BF=87=E7=A8=8B?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../Impl/TechnicalSpecificationServiceImpl.java | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) 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());