From dc0d1431615cb1389237a49960ebfc9d18f6e725 Mon Sep 17 00:00:00 2001
From: Fancy <Fancy.fx@outlook.com>
Date: 星期一, 15 七月 2024 16:44:06 +0800
Subject: [PATCH] change table
---
pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml | 86 +++++++++++++++++++++++++++++++++++++++++--
1 files changed, 82 insertions(+), 4 deletions(-)
diff --git a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
index 8a0e8c7..09b9d4a 100644
--- a/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
+++ b/pms-parent/pms-global/src/main/resources/mapper/PrAssemblyPlanMapper.xml
@@ -18,6 +18,8 @@
<result property="endDate" column="end_date" jdbcType="VARCHAR"/>
<result property="deleted" column="deleted" jdbcType="TINYINT"/>
<result property="content" column="content" jdbcType="VARCHAR"/>
+ <result property="inputNumber" column="input_number" jdbcType="INTEGER"/>
+ <result property="outputNumber" column="output_number" jdbcType="INTEGER"/>
<association property="proName" column="pro_id" javaType="java.lang.Long"
select="com.dy.pmsGlobal.daoPlt.PltProductMapper.selectProNameById" fetchType="eager" />
<association property="creatorName" column="creator" javaType="java.lang.Long"
@@ -30,12 +32,32 @@
select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectByPrimaryKey" fetchType="eager" column="process_id" />
</resultMap>
+ <resultMap id="PlanResultMap" type="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
+ <id property="id" column="id" jdbcType="BIGINT"/>
+ <result property="proId" column="pro_id" jdbcType="BIGINT"/>
+ <result property="batchId" column="batch_id" jdbcType="BIGINT"/>
+ <result property="processId" column="process_id" jdbcType="BIGINT"/>
+ <result property="name" column="name" jdbcType="VARCHAR"/>
+ <result property="number" column="number" jdbcType="INTEGER"/>
+ <result property="status" column="status" jdbcType="TINYINT"/>
+ <result property="creator" column="creator" jdbcType="VARCHAR"/>
+ <result property="dt" column="dt" jdbcType="TIMESTAMP"/>
+ <result property="startDate" column="start_date" jdbcType="VARCHAR"/>
+ <result property="endDate" column="end_date" jdbcType="VARCHAR"/>
+ <result property="deleted" column="deleted" jdbcType="TINYINT"/>
+ <result property="content" column="content" jdbcType="VARCHAR"/>
+ <result property="inputNumber" column="input_number" jdbcType="INTEGER"/>
+ <result property="outputNumber" column="output_number" jdbcType="INTEGER"/>
+ <collection property="process" ofType="com.dy.pmsGlobal.pojoPr.PrProductionProcess"
+ select="com.dy.pmsGlobal.daoPr.PrProductionProcessMapper.selectByProcessId" fetchType="eager" column="process_id" />
+ </resultMap>
+
<sql id="Base_Column_List">
id,pro_id,batch_id,
process_id,name,number,
status,creator,
dt,start_date,end_date,
- deleted,content
+ deleted,content,input_number,output_number
</sql>
<select id="selectPlanNamesByProcessId" resultType="java.lang.String" >
@@ -64,6 +86,50 @@
select *
from pr_production_node
where process_id = #{processId,jdbcType=BIGINT}
+ </select>
+ <select id="selectAssyPlanSimplify" resultMap="PlanResultMap" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
+ select
+ <include refid="Base_Column_List" />
+ from pr_assembly_plan
+ <trim prefix="where" suffixOverrides="and">
+ <if test="proId != null">
+ pro_id = #{proId,jdbcType=BIGINT} and
+ </if>
+ <if test="batchId != null">
+ batch_id = #{batchId,jdbcType=BIGINT} and
+ </if>
+ <if test="processId != null">
+ process_id = #{processId,jdbcType=BIGINT} and
+ </if>
+ <if test="name != null">
+ name = #{name,jdbcType=VARCHAR} and
+ </if>
+ <if test="number != null">
+ number = #{number,jdbcType=INTEGER} and
+ </if>
+ <if test="status != null">
+ status = #{status,jdbcType=TINYINT} and
+ </if>
+ <if test="creator != null">
+ creator = #{creator,jdbcType=VARCHAR} and
+ </if>
+ <if test="dt != null">
+ dt = #{dt,jdbcType=TIMESTAMP} and
+ </if>
+ <if test="startDate != null">
+ start_date = #{startDate,jdbcType=VARCHAR} and
+ </if>
+ <if test="endDate != null">
+ end_date = #{endDate,jdbcType=VARCHAR} and
+ </if>
+ <if test="deleted != null">
+ deleted = #{deleted,jdbcType=TINYINT} and
+ </if>
+ <if test="content != null">
+ content = #{content,jdbcType=VARCHAR} and
+ </if>
+ </trim>
+ order by id desc
</select>
<select id="selectAssyPlanList" resultMap="BaseResultMap" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
select
@@ -120,12 +186,12 @@
,process_id,name,number
,status,creator
,dt,start_date,end_date
- ,deleted,content)
+ ,deleted,content,input_number,output_number)
values (#{id,jdbcType=BIGINT},#{proId,jdbcType=BIGINT},#{batchId,jdbcType=BIGINT}
,#{processId,jdbcType=BIGINT},#{name,jdbcType=VARCHAR},#{number,jdbcType=INTEGER}
,#{status,jdbcType=TINYINT},#{creator,jdbcType=VARCHAR}
,#{dt,jdbcType=TIMESTAMP},#{startDate,jdbcType=VARCHAR},#{endDate,jdbcType=VARCHAR}
- ,#{deleted,jdbcType=TINYINT},#{content,jdbcType=VARCHAR})
+ ,#{deleted,jdbcType=TINYINT},#{content,jdbcType=VARCHAR},#{inputNumber,jdbcType=INTEGER},#{outputNumber,jdbcType=INTEGER})
</insert>
<insert id="insertSelective" keyColumn="id" keyProperty="id" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan" useGeneratedKeys="true">
insert into pr_assembly_plan
@@ -143,6 +209,8 @@
<if test="endDate != null">end_date,</if>
<if test="deleted != null">deleted,</if>
<if test="content != null">content,</if>
+ <if test="inputNumber != null">input_number,</if>
+ <if test="outputNumber != null">output_number,</if>
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
<if test="id != null">#{id,jdbcType=BIGINT},</if>
@@ -158,6 +226,8 @@
<if test="endDate != null">#{endDate,jdbcType=VARCHAR},</if>
<if test="deleted != null">#{deleted,jdbcType=TINYINT},</if>
<if test="content != null">#{content,jdbcType=VARCHAR},</if>
+ <if test="inputNumber != null">#{intputNumber,jdbcType=INTEGER},</if>
+ <if test="outputNumber != null">#{outputNumber,jdbcType=INTEGER},</if>
</trim>
</insert>
<update id="updateByPrimaryKeySelective" parameterType="com.dy.pmsGlobal.pojoPr.PrAssemblyPlan">
@@ -199,6 +269,12 @@
<if test="content != null">
content = #{content,jdbcType=VARCHAR},
</if>
+ <if test="inputNumber != null">
+ input_number = #{inputNumber,jdbcType=INTEGER},
+ </if>
+ <if test="outputNumber != null">
+ output_number = #{outputNumber,jdbcType=INTEGER},
+ </if>
</set>
where id = #{id,jdbcType=BIGINT}
</update>
@@ -216,7 +292,9 @@
start_date = #{startDate,jdbcType=VARCHAR},
end_date = #{endDate,jdbcType=VARCHAR},
deleted = #{deleted,jdbcType=TINYINT},
- content = #{content,jdbcType=VARCHAR}
+ content = #{content,jdbcType=VARCHAR},
+ input_number = #{inputNumber,jdbcType=INTEGER},
+ output_number = #{outputNumber,jdbcType=INTEGER}
where id = #{id,jdbcType=BIGINT}
</update>
--
Gitblit v1.8.0