From 54101307f069a3dd1edccccf26ad0364978363f2 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Thu, 26 Feb 2026 13:41:34 +0800 Subject: [PATCH] =?UTF-8?q?2026-02-26=20=E5=8D=87=E7=89=88=E6=94=BE?= =?UTF-8?q?=E5=9C=A8=E7=BB=9F=E4=B8=80=E4=BB=A3=E5=8A=9E=E6=B6=88=E6=81=AF?= =?UTF-8?q?=E4=B9=8B=E5=89=8D=E4=B8=80=E6=AD=A5=EF=BC=8C=E5=A6=82=E6=9E=9C?= =?UTF-8?q?=E6=98=AF=E6=9C=80=E5=90=8E=E4=B8=80=E4=B8=AA=E8=8A=82=E7=82=B9?= =?UTF-8?q?=EF=BC=8C=E5=B0=B1=E5=88=A0=E9=99=A4=E4=BB=A3=E5=8A=9E=E5=90=8E?= =?UTF-8?q?=E5=88=A4=E6=96=AD=E5=8D=87=E7=89=88?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ChangeManagementServiceImpl.java | 149 ++++++++++++------ 1 file changed, 100 insertions(+), 49 deletions(-) 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 53dbbf40..0cd78809 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 @@ -1602,6 +1602,56 @@ public class ChangeManagementServiceImpl extends ServiceImpl codelist = changeManagementMapper.requestDetailSearch(changeRequestEntity); + for (ChangeRequestDetailEntity detail : codelist) { + List params = new ArrayList<>(); + List> resultList; + // 判断有没有填写新物料编码 + if (StringUtils.isNotBlank(detail.getNewPartNo())) { // 选择了新物料 + params.add(detail.getSite()); + params.add(detail.getCodeNo()); + params.add(detail.getNewPartNo()); + params.add(paramData.getUserName()); + params.add(paramData.getDocNo()); + params.add(paramData.getNodeId()); + // 执行复制方法 + resultList = procedureDao.getProcedureData("plm_copy_bm", params); + // 如果有新物料编码，则停用之前的物料 + changeManagementMapper.updatePartActive(detail.getSite(), detail.getPartNo()); + } else { + // 查出BM版本号 + PlmTechnicalSpecificationSheetData ptssd = changeManagementMapper.getTechnicalSpecification(detail.getSite(), detail.getCodeNo()); + int revNo; + try { + revNo = Integer.parseInt(ptssd.getRevNo()) + 1; + } catch (NumberFormatException e) { + throw new RuntimeException("转换错误: 版本号不是一个有效的整数!"); + } + params.add(detail.getSite()); + params.add(detail.getCodeNo()); + params.add(ptssd.getRevNo()); + params.add(ptssd.getOriCodeNo()); + params.add(revNo); + params.add(paramData.getUserName()); + params.add(paramData.getDocNo()); + params.add(paramData.getNodeId()); + // 执行升版方法 + resultList = procedureDao.getProcedureData("plm_bm_upRevNo", params); + } + //判断是否成功 + String code = String.valueOf(resultList.get(0).get("resultCode")); + if ("400".equalsIgnoreCase(code)) { + String msg = String.valueOf(resultList.get(0).get("resultMsg")); + throw new RuntimeException(msg); + } + } + } } else { // 未结束 // 调用获取最新节点ID的接口 String getWorkflowRequestURL = apiUrlOa + "/oa/interface/getWorkflowRequest"; @@ -1737,6 +1787,56 @@ public class ChangeManagementServiceImpl extends ServiceImpl codelist = changeManagementMapper.requestDetailSearch(changeRequestEntity); + for (ChangeRequestDetailEntity detail : codelist) { + List params = new ArrayList<>(); + List> resultList; + // 判断有没有填写新物料编码 + if (StringUtils.isNotBlank(detail.getNewPartNo())) { // 选择了新物料 + params.add(detail.getSite()); + params.add(detail.getCodeNo()); + params.add(detail.getNewPartNo()); + params.add(paramData.getUserName()); + params.add(paramData.getDocNo()); + params.add(paramData.getNodeId()); + // 执行复制方法 + resultList = procedureDao.getProcedureData("plm_copy_bm", params); + // 如果有新物料编码，则停用之前的物料 + changeManagementMapper.updatePartActive(detail.getSite(), detail.getPartNo()); + } else { + // 查出BM版本号 + PlmTechnicalSpecificationSheetData ptssd = changeManagementMapper.getTechnicalSpecification(detail.getSite(), detail.getCodeNo()); + int revNo; + try { + revNo = Integer.parseInt(ptssd.getRevNo()) + 1; + } catch (NumberFormatException e) { + throw new RuntimeException("转换错误: 版本号不是一个有效的整数!"); + } + params.add(detail.getSite()); + params.add(detail.getCodeNo()); + params.add(ptssd.getRevNo()); + params.add(ptssd.getOriCodeNo()); + params.add(revNo); + params.add(paramData.getUserName()); + params.add(paramData.getDocNo()); + params.add(paramData.getNodeId()); + // 执行升版方法 + resultList = procedureDao.getProcedureData("plm_bm_upRevNo", params); + } + //判断是否成功 + String code = String.valueOf(resultList.get(0).get("resultCode")); + if ("400".equalsIgnoreCase(code)) { + String msg = String.valueOf(resultList.get(0).get("resultMsg")); + throw new RuntimeException(msg); + } + } + } + // 9、统一待办接口 for (String key : dcas.keySet()) { // 创建单点登录地址 @@ -1764,55 +1864,6 @@ public class ChangeManagementServiceImpl extends ServiceImpl codelist = changeManagementMapper.requestDetailSearch(changeRequestEntity); - for (ChangeRequestDetailEntity detail : codelist) { - List params = new ArrayList<>(); - List> resultList; - // 判断有没有填写新物料编码 - if (StringUtils.isNotBlank(detail.getNewPartNo())) { // 选择了新物料 - params.add(detail.getSite()); - params.add(detail.getCodeNo()); - params.add(detail.getNewPartNo()); - params.add(paramData.getUserName()); - params.add(paramData.getDocNo()); - params.add(paramData.getNodeId()); - // 执行复制方法 - resultList = procedureDao.getProcedureData("plm_copy_bm", params); - // 如果有新物料编码，则停用之前的物料 - changeManagementMapper.updatePartActive(detail.getSite(), detail.getPartNo()); - } else { - // 查出BM版本号 - PlmTechnicalSpecificationSheetData ptssd = changeManagementMapper.getTechnicalSpecification(detail.getSite(), detail.getCodeNo()); - int revNo; - try { - revNo = Integer.parseInt(ptssd.getRevNo()) + 1; - } catch (NumberFormatException e) { - throw new RuntimeException("转换错误: 版本号不是一个有效的整数!"); - } - params.add(detail.getSite()); - params.add(detail.getCodeNo()); - params.add(ptssd.getRevNo()); - params.add(ptssd.getOriCodeNo()); - params.add(revNo); - params.add(paramData.getUserName()); - params.add(paramData.getDocNo()); - params.add(paramData.getNodeId()); - // 执行升版方法 - resultList = procedureDao.getProcedureData("plm_bm_upRevNo", params); - } - //判断是否成功 - String code = String.valueOf(resultList.get(0).get("resultCode")); - if ("400".equalsIgnoreCase(code)) { - String msg = String.valueOf(resultList.get(0).get("resultMsg")); - throw new RuntimeException(msg); - } - } - } } /**