From 533bccb991763a5c2db8a958fa5003b90b196cfc Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期三, 14 五月 2025 18:05:11 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev_lhj
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml | 9 +++++++--
1 files changed, 7 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
index 9cb4122..f60cecf 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml
@@ -51,6 +51,7 @@
<result property="version" column="version" />
<result property="approveOn" column="approve_on" />
<result property="startWorkDate" column="start_work_date" />
+ <result property="lowOrderCode" column="low_order_code" />
</resultMap>
<sql id="selectApsPlatePlanVo">
@@ -61,7 +62,7 @@
standby_stock, next_process_deparment, is_suspended, is_outsourcing, account, advanced_materials,
advanced_document_number, advanced_requirement_day, is_plan_complete, is_stock_complete,
has_turnback, has_risk, std_op, op_status, next_op_name ,unmatched_quantity,professional_affiliation,
- require_id, version,production_base, order_create_time, approve_on, start_work_date
+ require_id, version,production_base, order_create_time, approve_on, start_work_date, low_order_code
from aps_plate_plan
</sql>
@@ -106,6 +107,7 @@
<if test="stdOp != null "> and std_op = #{stdOp}</if>
<if test="opStatus != null and opStatus != ''"> and op_status = #{opStatus}</if>
<if test="nextOpName != null and nextOpName != ''"> and next_op_name = #{nextOpName}</if>
+ <if test="lowOrderCode != null and lowOrderCode != ''"> and low_order_code = #{lowOrderCode}</if>
and del_flag='0'
</where>
</select>
@@ -157,6 +159,7 @@
<if test="opStatus != null">op_status,</if>
<if test="nextOpName != null">next_op_name,</if>
<if test="unmatchedQuantity != null">unmatched_quantity,</if>
+ <if test="lowOrderCode != null">low_order_code,</if>
create_time,
</trim>
<trim prefix="values (" suffix=")" suffixOverrides=",">
@@ -199,6 +202,7 @@
<if test="opStatus != null">#{opStatus},</if>
<if test="nextOpName != null">#{nextOpName},</if>
<if test="unmatchedQuantity != null">#{unmatchedQuantity},</if>
+ <if test="lowOrderCode != null">#{lowOrderCode},</if>
#{createTime},
</trim>
</insert>
@@ -244,6 +248,7 @@
<if test="opStatus != null"> op_status= #{opStatus},</if>
<if test="nextOpName != null"> next_op_name= #{nextOpName},</if>
<if test="unmatchedQuantity != null"> unmatched_quantity = #{unmatchedQuantity},</if>
+ <if test="lowOrderCode != null"> low_order_code = #{lowOrderCode},</if>
</trim>
where id = #{id}
</update>
@@ -273,7 +278,7 @@
<select id="selectPlatePlanByPlantMajor" parameterType="com.aps.core.domain.ApsPlatePlan" resultMap="ApsPlatePlanResult">
select id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,require_id,
- unmatched_quantity,version, production_base,plan_end_day,order_create_time
+ unmatched_quantity,version, production_base,plan_end_day,order_create_time,low_order_code
from aps_plate_plan
<where>
<if test="plant != null "> and plant = #{plant} </if>
--
Gitblit v1.9.3