From fc1092564b04f5c7d7d09a57d82db03393102c4c Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Tue, 5 Aug 2025 15:30:44 +0800
Subject: [PATCH] =?UTF-8?q?2025-08-05=20=E5=88=A0=E9=99=A4=E7=BB=9F?=
 =?UTF-8?q?=E4=B8=80=E4=BB=A3=E5=8A=9E=E6=B6=88=E6=81=AF=E7=9A=84=E6=8E=A5?=
 =?UTF-8?q?=E5=8F=A3=20=E4=B8=8D=E6=8A=9B=E5=BC=82=E5=B8=B8=E4=BF=A1?=
 =?UTF-8?q?=E6=81=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../impl/ChangeManagementServiceImpl.java     | 30 +++++++++----------
 .../impl/RequestManageServiceImpl.java        |  6 ++--
 .../TechnicalSpecificationServiceImpl.java    |  9 ++++--
 3 files changed, 24 insertions(+), 21 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 1d5531dc..5cc42cd2 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
@@ -1561,9 +1561,9 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                 deleteUserRequestInfoParam.setUserId(oaUser.getId());
                 String deleteUserRequestInfoURL = apiUrlOa + "/oa/interface/deleteUserRequestInfo";
                 ResponseData deleteUserRequestInfoResponses = HttpClientUtil.doPostByRawWithOA(deleteUserRequestInfoURL, deleteUserRequestInfoParam);
-                if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
-                    throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
-                }
+//                if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
+//                    throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
+//                }
             }
         } else { // 未结束
             // 调用获取最新节点ID的接口
@@ -1585,9 +1585,9 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                     deleteUserRequestInfoParam.setUserId(oaUser.getId());
                     String deleteUserRequestInfoURL = apiUrlOa + "/oa/interface/deleteUserRequestInfo";
                     ResponseData deleteUserRequestInfoResponses = HttpClientUtil.doPostByRawWithOA(deleteUserRequestInfoURL, deleteUserRequestInfoParam);
-                    if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
-                        throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
-                    }
+//                    if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
+//                        throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
+//                    }
                 }
 
                 // 发送代办
@@ -1692,9 +1692,9 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                 deleteUserRequestInfoParam.setUserId(oaUser.getId());
                 String deleteUserRequestInfoURL = apiUrlOa + "/oa/interface/deleteUserRequestInfo";
                 ResponseData deleteUserRequestInfoResponses = HttpClientUtil.doPostByRawWithOA(deleteUserRequestInfoURL, deleteUserRequestInfoParam);
-                if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
-                    throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
-                }
+//                if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
+//                    throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
+//                }
             }
 
             // 9、统一待办接口
@@ -1800,9 +1800,9 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                 deleteUserRequestInfoParam.setUserId(oaUser.getId());
                 String deleteUserRequestInfoURL = apiUrlOa + "/oa/interface/deleteUserRequestInfo";
                 ResponseData deleteUserRequestInfoResponses = HttpClientUtil.doPostByRawWithOA(deleteUserRequestInfoURL, deleteUserRequestInfoParam);
-                if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
-                    throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
-                }
+//                if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
+//                    throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
+//                }
             }
         } else { // 未结束
             // 存放isRemark为0的域控账号
@@ -1857,9 +1857,9 @@ public class ChangeManagementServiceImpl extends ServiceImpl<ChangeManagementMap
                 deleteUserRequestInfoParam.setUserId(oaUser.getId());
                 String deleteUserRequestInfoURL = apiUrlOa + "/oa/interface/deleteUserRequestInfo";
                 ResponseData deleteUserRequestInfoResponses = HttpClientUtil.doPostByRawWithOA(deleteUserRequestInfoURL, deleteUserRequestInfoParam);
-                if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
-                    throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
-                }
+//                if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
+//                    throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
+//                }
             }
 
             // 9、统一待办接口
diff --git a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
index 11881295..d4e9d8dd 100644
--- a/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
+++ b/src/main/java/com/spring/modules/request/service/impl/RequestManageServiceImpl.java
@@ -428,9 +428,9 @@ public class RequestManageServiceImpl extends ServiceImpl<RequestManageMapper, P
             deleteUserRequestInfoParam.setSyscode("PLM");
             String deleteUserRequestInfoURL = apiUrlOa + "/oa/interface/deleteUserRequestInfo";
             ResponseData deleteUserRequestInfoResponses = HttpClientUtil.doPostByRawWithOA(deleteUserRequestInfoURL, deleteUserRequestInfoParam);
-            if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
-                throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
-            }
+//            if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
+//                throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
+//            }
 
             // 更新PLM的节点状态、节点
             // 修改原节点的流程干预标识为Y
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 2f18fd2d..d437f27e 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
@@ -2079,9 +2079,9 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
             deleteUserRequestInfoParam.setUserId(oaUser.getId());
             String deleteUserRequestInfoURL = apiUrlOa + "/oa/interface/deleteUserRequestInfo";
             ResponseData deleteUserRequestInfoResponses = HttpClientUtil.doPostByRawWithOA(deleteUserRequestInfoURL, deleteUserRequestInfoParam);
-            if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
-                throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
-            }
+//            if (!"0".equals(deleteUserRequestInfoResponses.getCode())) {
+//                throw new RuntimeException("删除异构系统指定人员待办流程异常信息：" + deleteUserRequestInfoResponses.getMsg());
+//            }
         }
 
         // 将技术参数卡的状态改为"Dead"
@@ -2326,6 +2326,9 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         // 删除再批量插入
         technicalSpecificationMapper.deleteBMPrepressToolByCodeNo(data);
         technicalSpecificationMapper.saveBMToolBatch(tools);
+
+        // 印版号从Routing的工艺指导中导入（类型是"Plate no"）
+
     }
 
     /**