From 12f2fafc574afb4c534ab59244f2b954d1876e9f Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期一, 22 九月 2025 19:37:20 +0800
Subject: [PATCH] 解决回传工控网记录无法撤销的问题

---
 blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml |    6 ++++--
 1 files changed, 4 insertions(+), 2 deletions(-)

diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
index 3f8a509..b879b5a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/DncBackFileMapper.xml
@@ -13,9 +13,10 @@
 
     <!--DNC鍥炰紶绋嬪簭澶勭悊鍒嗛〉-->
     <select id="pageQuery" resultType="org.springblade.mdm.program.vo.DncBackFileVO">
-        select f.id,n.name name,m.code machine_code, m.name machine_name,f.create_time
+        select f.id,n.name name,m.code machine_code, m.name machine_name,f.create_time,currnode.process_instance_id
         from mdm_dnc_back_file f
-        join mdm_nc_node n on f.nc_node_id=n.id
+        join mdm_nc_node_his n on f.nc_node_id=n.id
+        left join mdm_nc_node currnode on f.nc_node_id=currnode.id
         left join mdm_machine m on n.machine_code=m.code
 
        <where>
@@ -33,6 +34,7 @@
            and f.create_time &lt;= #{query.createTimeEnd}
        </if>
       </where>
+        order by f.id desc
     </select>
 
 

--
Gitblit v1.9.3