From f379dade90ec59e08c037cba4917308e3dfdb928 Mon Sep 17 00:00:00 2001
From: yangys <y_ys79@sina.com>
Date: 星期二, 08 七月 2025 17:02:06 +0800
Subject: [PATCH] 调整审批记录的保存方式
---
blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml | 15 +++++----------
1 files changed, 5 insertions(+), 10 deletions(-)
diff --git a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml
index c99c185..b77475a 100644
--- a/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml
+++ b/blade-service/blade-mdm/src/main/java/org/springblade/mdm/program/mapper/NcProgramMapper.xml
@@ -8,7 +8,7 @@
<result column="package_name" property="packageName"/>
<result column="machine_code" property="machineCode"/>
- <result column="part_no" property="partNo"/>
+ <result column="drawing_no" property="drawingNo"/>
<result column="is_cured" property="isCured"/>
<result column="expire_date" property="expireDate"/>
<result column="process_edition" property="processEdition"/>
@@ -34,17 +34,17 @@
<!-- <select id="parentTree" resultMap="treeNodeResultMap">-->
<!-- select id, parent_id, dict_value as title, id as "value", id as "key" from blade_dict where is_deleted = 0 and parent_id = 0-->
<!-- </select>-->
- <sql id="all_columns">id,tenant_id,nc_node_id,code,name,machine_code,part_no,is_cured,
+ <sql id="all_columns">id,tenant_id,nc_node_id,code,name,machine_code,drawing_no,is_cured,
expire_date,process_edition,is_last_edition,is_locked,task_assign_time,status,create_dept,is_deleted,create_time,create_user,update_time,update_user</sql>
<select id="getCuredNcProgram" resultMap="BaseResultMap">
select <include refid="all_columns"/> from mdm_nc_program
- where is_deleted=0 and is_cured=1 and part_no=#{partNo} and is_last_edition=1
+ where is_deleted=0 and is_cured=1 and drawing_no=#{drawingNo} and is_last_edition=1
and machine_code in (select code from mdm_machine where machine_group_code=#{machineGroupCode})
order by create_time desc
</select>
<select id="pageQuery" resultType="org.springblade.mdm.program.vo.NcProgramVO">
- select id,nc_node_id,name,machine_code,part_no,part_no_edition,process_name,craft_edition from mdm_nc_program p
+ select id,nc_node_id,name,machine_code,drawing_no,drawing_no_edition,process_name,craft_edition from mdm_nc_program p
where is_deleted=0 and is_last_edition=1 and (category='program' or category='subprogram')
<where>
@@ -53,10 +53,5 @@
</if>
</where>
</select>
- <!--
- <select id="getLastNcProgram" resultType="org.springblade.mdm.program.entity.NcProgram">
- select <include refid="all_columns"/> from mdm_nc_program
- where is_deleted=0 and is_last_edition=1 order by create_time desc limit 1
- </select>
- -->
+
</mapper>
--
Gitblit v1.9.3