From d25b0270e0bb9266ed92c7c74ee1cb8fb24aa51a Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期二, 14 一月 2025 10:53:02 +0800
Subject: [PATCH] add input_number
---
pms-parent/pms-global/src/main/resources/mapper/PrProductionNodeMapper.xml | 32 ++++++++++++++++++++------------
1 files changed, 20 insertions(+), 12 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrProductionNodeMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrProductionNodeMapper.xml
index 3f4fd0e..39c17fd 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrProductionNodeMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrProductionNodeMapper.xml
@@ -18,6 +18,8 @@
<result property="remark" column="remark" jdbcType="VARCHAR"/>
<association property="instruction"
column="id" javaType="java.lang.Long" select="com.dy.pmsGlobal.daoPr.PrWorkingInstructionMapper.selectByNodeId" fetchType="eager" />
+ <association property="bill"
+ column="id" javaType="java.lang.Long" select="com.dy.pmsGlobal.daoPr.PrBillOfMaterialMapper.selectByNodeId" fetchType="eager" />
</resultMap>
<sql id="Base_Column_List">
@@ -37,6 +39,12 @@
<include refid="Base_Column_List" />
from pr_production_node
where id = #{id,jdbcType=BIGINT}
+ </select>
+ <select id="selectNodeBySort" resultMap="BaseResultMap">
+ select
+ <include refid="Base_Column_List" />
+ from pr_production_node
+ where process_id = #{processId,jdbcType=BIGINT} and sort = #{sort,jdbcType=INTEGER}
</select>
<select id="selectNameByNodeId" parameterType="java.lang.Long" resultType="String">
select content from pr_production_node where id = #{id}
@@ -60,29 +68,29 @@
insert into pr_production_node
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null">id,</if>
- <if test="processId != null">process_id,</if>
+ <if test="processId!= null">process_id,</if>
<if test="sort != null">sort,</if>
- <if test="content != null">content,</if>
+ <if test="content != null and content !=''">content,</if>
<if test="nodeType != null">node_type,</if>
<if test="isStart != null">is_start,</if>
<if test="isEnd != null">is_end,</if>
<if test="isRecord != null">is_record,</if>
- <if test="deviceCycleContent != null">device_cycle_content,</if>
+ <if test="deviceCycleContent != null and deviceCycleContent !=''">device_cycle_content,</if>
<if test="deleted != null">deleted,</if>
- <if test="remark != null">remark,</if>
+ <if test="remark != null and remark !=''">remark,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
- <if test="processId != null">#{processId,jdbcType=BIGINT},</if>
+ <if test="isEnd != null">#{processId,jdbcType=BIGINT},</if>
<if test="sort != null">#{sort,jdbcType=INTEGER},</if>
- <if test="content != null">#{content,jdbcType=VARCHAR},</if>
+ <if test="content != null and content !=''">#{content,jdbcType=VARCHAR},</if>
<if test="nodeType != null">#{nodeType,jdbcType=INTEGER},</if>
<if test="isStart != null">#{isStart,jdbcType=TINYINT},</if>
<if test="isEnd != null">#{isEnd,jdbcType=TINYINT},</if>
<if test="isRecord != null">#{isRecord,jdbcType=TINYINT},</if>
- <if test="deviceCycleContent != null">#{deviceCycleContent,jdbcType=VARCHAR},</if>
+ <if test="deviceCycleContent != null and deviceCycleContent !=''">#{deviceCycleContent,jdbcType=VARCHAR},</if>
<if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
- <if test="remark != null">#{remark,jdbcType=VARCHAR},</if>
+ <if test="remark != null and remark !=''">#{remark,jdbcType=VARCHAR},</if>
</trim>
</insert>
@@ -116,7 +124,7 @@
<if test="sort != null">
sort = #{sort,jdbcType=INTEGER},
</if>
- <if test="content != null">
+ <if test="content != null and content !=''">
content = #{content,jdbcType=VARCHAR},
</if>
<if test="nodeType != null">
@@ -131,13 +139,13 @@
<if test="isRecord != null">
is_record = #{isRecord,jdbcType=TINYINT},
</if>
- <if test="deviceCycleContent != null">
+ <if test="deviceCycleContent != null and deviceCycleContent !=''">
device_cycle_content = #{deviceCycleContent,jdbcType=VARCHAR},
</if>
<if test="deleted != null">
deleted = #{deleted,jdbcType=TINYINT},
</if>
- <if test="remark != null">
+ <if test="remark != null and remark !=''">
remark = #{remark,jdbcType=VARCHAR},
</if>
</set>
@@ -149,7 +157,7 @@
<include refid="Base_Column_List" />
from pr_production_node
<trim prefix="where" suffixOverrides="and">
- <if test="processId != null">
+ <if test="processId!= null">
process_id = #{processId,jdbcType=BIGINT} and
</if>
</trim>
--
Gitblit v1.8.0