From 43fbbf9c0f644c00e0aa220afb7a0c16404a2e88 Mon Sep 17 00:00:00 2001
From: fengyuan_yang <1976974459@qq.com>
Date: Wed, 28 May 2025 15:43:28 +0800
Subject: [PATCH] =?UTF-8?q?2025-05-28=20=E5=BD=92=E6=A1=A3=E6=93=8D?=
 =?UTF-8?q?=E4=BD=9C=E8=A6=81=E6=9B=B4=E6=94=B9step=5Fid=20=3D=20NULL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../TechnicalSpecificationServiceImpl.java    |  3 +++
 .../TechnicalSpecificationMapper.xml          | 21 +++++++++----------
 2 files changed, 13 insertions(+), 11 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 48f86b2a..18400968 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
@@ -1739,5 +1739,8 @@ public class TechnicalSpecificationServiceImpl implements TechnicalSpecification
         data.setStatus("已完成");
         // 更新单据状态和节点
         technicalSpecificationMapper.updateStatus(data);
+        // 2025-05-28 归档操作要更改step_id = NULL
+        data.setStepId(null);
+        technicalSpecificationMapper.updateBMStepId(data);
     }
 }
diff --git a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
index 2c258531..42d42e34 100644
--- a/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
+++ b/src/main/resources/mapper/sampleManagement/TechnicalSpecificationMapper.xml
@@ -2244,16 +2244,16 @@
     </select>
 
     <select id="getOADetailForBM" resultType="PlmTechnicalSpecificationSheetData">
-        select top 1 d.is_reject,
-                     d.node_id,
-                     d.node_name,
-                     dbo.get_plm_Approval_username(a.site, prh.workflow_id, d.node_id, a.code_no) as sp
+        select
+            top 1
+            d.is_reject,
+            d.node_id,
+            d.node_name,
+            dbo.get_plm_Approval_username(a.site, prh.workflow_id, d.node_id, a.code_no) as sp
         from plm_technical_specification_sheet a
-                 left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '103002'
-                 left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and
-                                                    prh.workflow_id = d.workflow_id and a.step_id = d.step_id
-        where a.site = #{site}
-          and a.code_no = #{codeNo}
+        left join plm_request_header as prh on a.site = prh.site and prh.menu_id = '103002'
+        left join plm_request_node as d on a.site = d.site and prh.classification_no = d.classification_no and prh.workflow_id = d.workflow_id and a.step_id = d.step_id
+        where a.site = #{site} and a.code_no = #{codeNo}
     </select>
 
 
@@ -2517,8 +2517,7 @@
         </where>
     </select>
 
-    <select id="queryTechnicalSpecificationList"
-            resultType="com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData">
+    <select id="queryTechnicalSpecificationList" resultType="com.spring.modules.sampleManagement.data.PlmTechnicalSpecificationSheetData">
         EXEC dbo.getTechnicalSpecificationPageWithSql #{sql}, #{page}, #{limit}
     </select>