From 80c78fedb4a397f07109644b5088e71262f16638 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Fri, 5 Dec 2025 14:44:38 +0800 Subject: [PATCH] =?UTF-8?q?2025-12-05=20=E6=8A=80=E6=9C=AF=E5=8F=82?= =?UTF-8?q?=E6=95=B0=E5=8D=A1=E3=80=90=E6=90=9C=E7=B4=A2=E3=80=91=E4=BC=98?= =?UTF-8?q?=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ChangeManagementServiceImpl.java | 99 ++++++++++--------- .../TechnicalSpecificationMapper.xml | 6 +- 2 files changed, 53 insertions(+), 52 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 1f425028..6a8b723a 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 @@ -1522,55 +1522,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl controlList = requestManageMapper.getProcessSelect2(cData); - // 如果是ECN则执行升版操作且节点勾选了特殊管控 -- 2025-10-28 特殊权限改到存储过程判断 - if (Constant.ECN.equals(type)) { - ChangeRequestEntity changeRequestEntity = new ChangeRequestEntity(); - changeRequestEntity.setSite(paramData.getSite()); - changeRequestEntity.setChangeNo(paramData.getDocNo()); - List 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); - } - } - } + if (isRemarks.isEmpty()) { // 已结束 // 如果是BM 并且流程已结束 往plm_bm_bom、plm_bm_routing中插入数据 @@ -1775,7 +1727,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); + } + } } } diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml index 08772318..4d7fb2a2 100644 --- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml +++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml @@ -2862,8 +2862,8 @@ left join plm_customer_information as pci on pcpi.site = pci.site and pcpi.customer_no = pci.customer_no inner join plm_bm_prepress pbp on pbp.Site = a.site and pbp.code_no = a.code_no and - (plateNo like #{query.cutterNumber} or - cutterNumber like #{query.cutterNumber}) + (plateNo like #{cutterNumber} or + cutterNumber like #{cutterNumber}) WHERE ${whereClause} @@ -2965,7 +2965,7 @@ ORDER BY ${orderClause} - ORDER BY a.id + ORDER BY a.ori_code_no desc, a.rev_no desc