From 7adf74b9d446ba759438ae9b24d33806594aa8b9 Mon Sep 17 00:00:00 2001 From: fengyuan_yang <1976974459@qq.com> Date: Sat, 31 May 2025 12:56:42 +0800 Subject: [PATCH] =?UTF-8?q?2025-05-31=20Dead=E7=8A=B6=E6=80=81=E6=97=B6?= =?UTF-8?q?=E5=92=8C=E5=B7=B2=E5=AE=8C=E6=88=90=E7=9A=84=E7=8A=B6=E6=80=81?= =?UTF-8?q?=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4=EF=BC=8C=E4=B8=8D=E5=85=81?= =?UTF-8?q?=E8=AE=B8=E7=BC=96=E8=BE=91=E5=8D=95=E6=8D=AE=E4=BF=A1=E6=81=AF?= =?UTF-8?q?=20-=20=E4=BF=AE=E6=94=B9=E6=8C=89=E9=92=AE=20=E5=B0=86?= =?UTF-8?q?=E4=B8=9A=E5=8A=A1=E8=A1=A8=E7=9A=84step=5Fid=E6=94=B9=E4=B8=BA?= =?UTF-8?q?NULL=20=E6=8F=90=E4=BA=A4=E3=80=81=E9=A9=B3=E5=9B=9E=E6=97=B6?= =?UTF-8?q?=E9=9C=80=E6=A0=A1=E9=AA=8C=E5=8D=95=E6=8D=AE=E7=9A=84=E7=8A=B6?= =?UTF-8?q?=E6=80=81=E5=BF=85=E9=A1=BB=E6=98=AF=E5=AE=A1=E6=89=B9=E4=B8=AD?= =?UTF-8?q?=EF=BC=88Dead=E4=B9=8B=E5=90=8E=E8=BF=98=E8=83=BD=E5=A4=9F?= =?UTF-8?q?=E6=8F=90=E4=BA=A4=EF=BC=89=20=E8=8F=9C=E5=8D=95=EF=BC=9AInvent?= =?UTF-8?q?ory=20part=20=E3=80=81Bom=20=E3=80=81Routing=20=E8=AF=A6?= =?UTF-8?q?=E6=83=85=E6=8C=89=E9=92=AE=E9=9C=80=E8=A6=81=E6=8C=89=E7=85=A7?= =?UTF-8?q?=E8=A7=92=E8=89=B2=E6=8E=88=E6=9D=83=EF=BC=8C=E7=9B=B8=E5=85=B3?= =?UTF-8?q?=E4=BF=A1=E6=81=AF=E5=85=A8=E9=83=A8=E7=BD=AE=E7=81=B0?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../impl/ChangeManagementServiceImpl.java | 7 +++++++ .../part/entity/BomMultiLevelStructureData.java | 3 +++ .../part/entity/RecipeAllFieldEntity.java | 2 ++ .../Impl/TechnicalSpecificationServiceImpl.java | 16 +++++++++++++--- .../mapper/change/ChangeManagementMapper.xml | 9 ++++++--- 5 files changed, 31 insertions(+), 6 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 f0d36e3b..a1331194 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 @@ -1405,6 +1405,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl pfs = changeManagementMapper.getProcessFormByIsRemark(paramData.getSite(), paramData.getBu(), paramData.getDocNo(), "0"); // 修改单据的节点结论和驳回意见 + // 2025-05-30 会签节点时，其中一个人驳回就算驳回 同意的话不变 sql和驳回分开 changeManagementMapper.updateProcessNode(paramData.getSite(), paramData.getBu() == null ? "" : paramData.getBu(), paramData.getRequestId(), paramData.getClassificationNo(), paramData.getNodeId(), paramData.getNodeConclusion(), paramData.getRejectOpinion(), paramData.getDomainControlAccount()); // 2025-05-12 使用 process_form 根据 site documentNo isRemark = 0 来获取人员 可能有多个 循环调用 DeleteUserRequestInfoParam deleteUserRequestInfoParam = new DeleteUserRequestInfoParam(); @@ -1419,6 +1420,7 @@ public class ChangeManagementServiceImpl extends ServiceImpl operatorList = technicalSpecificationMapper.selectTechnicalSpecificationTeam(data.getSite(), data.getCodeNo()); List engineers = operatorList.stream().filter(a -> "engineer".equals(a.getType())).collect(Collectors.toList()); @@ -1459,10 +1465,10 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification @Override public String getBMStatusDesc(PlmTechnicalSpecificationSheetData data){ - PlmTechnicalSpecificationSheetData result= technicalSpecificationMapper.getBMStatusDesc(data.getSite(),data.getCodeNo()); - if(result==null){ + PlmTechnicalSpecificationSheetData result = technicalSpecificationMapper.getBMStatusDesc(data.getSite(),data.getCodeNo()); + if (result == null) { return "已完成"; - }else { + } else { return result.getStatusDesc(); } } @@ -1710,6 +1716,10 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification // 将技术参数卡的状态改为"Dead" data.setStatus("dead"); technicalSpecificationMapper.updateStatus(data); + + // 2025-05-31 将业务表的step_id改为NULL + data.setStepId(null); + technicalSpecificationMapper.updateBMStepId(data); } /** diff --git a/src/main/resources/mapper/change/ChangeManagementMapper.xml b/src/main/resources/mapper/change/ChangeManagementMapper.xml index 4d0f6e93..53313aa9 100644 --- a/src/main/resources/mapper/change/ChangeManagementMapper.xml +++ b/src/main/resources/mapper/change/ChangeManagementMapper.xml @@ -1080,9 +1080,10 @@ set A.is_remark = 1, A.update_date = getDate(), A.update_by = #{userName} - from plm_process_form a + from plm_process_form a left join sys_user b on a.domain_control_account = B.domain_control_account - where A.site = #{site} and document_no = #{docNo} and is_remark = 0 AND B.username = #{userName} + where A.site = #{site} and document_no = #{docNo} and is_remark = 0 + @@ -1154,7 +1155,9 @@ update plm_process_form set node_conclusion = #{nodeConclusion}, reject_opinion = #{rejectOpinion} - where site = #{site} and bu = #{bu} and request_id = #{requestId} and classification_no = #{classificationNo} and node_id = #{nodeId} and domain_control_account = #{domainControlAccount} and (node_conclusion is null or node_conclusion = '') + where site = #{site} and bu = #{bu} and request_id = #{requestId} + and classification_no = #{classificationNo} and node_id = #{nodeId} and (node_conclusion is null or node_conclusion = '') +