From 3d191e81842cf3bcd6f841fbe2fc3d451c45ef99 Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期三, 14 五月 2025 13:54:40 +0800
Subject: [PATCH] 钣金计划大表增加“异常状态”字段
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml | 56 ++++++++++++++++++++++++++++++++++++++++----------------
1 files changed, 40 insertions(+), 16 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 84ab2b7..9cb4122 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
@@ -4,7 +4,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.aps.core.mapper.ApsPlatePlanMapper">
- <resultMap type="ApsPlatePlan" id="ApsPlatePlanResult">
+ <resultMap type="com.aps.core.domain.ApsPlatePlan" id="ApsPlatePlanResult">
<result property="id" column="id" />
<result property="masterPlanner" column="master_planner" />
<result property="weekDay" column="week_day" />
@@ -44,8 +44,13 @@
<result property="opStatus" column="op_status" />
<result property="nextOpName" column="next_op_name" />
<result property="unmatchedQuantity" column="unmatched_quantity" />
+ <result property="productionBase" column="production_base" />
+ <result property="orderCreateTime" column="order_create_time" />
<result property="professionalAffiliation" column="professional_affiliation" />
<result property="requireId" column="require_id" />
+ <result property="version" column="version" />
+ <result property="approveOn" column="approve_on" />
+ <result property="startWorkDate" column="start_work_date" />
</resultMap>
<sql id="selectApsPlatePlanVo">
@@ -55,11 +60,12 @@
work_center, department, plan_start_day, plan_end_day, standby_number, standby_name,
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
+ 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
from aps_plate_plan
</sql>
- <select id="selectApsPlatePlanList" parameterType="ApsPlatePlan" resultMap="ApsPlatePlanResult">
+ <select id="selectApsPlatePlanList" parameterType="com.aps.core.domain.ApsPlatePlan" resultMap="ApsPlatePlanResult">
<include refid="selectApsPlatePlanVo"/>
<where>
<if test="masterPlanner != null and masterPlanner != ''"> and master_planner like '%'|| #{masterPlanner}|| '%'</if>
@@ -109,7 +115,7 @@
where id = #{id}
</select>
- <insert id="insertApsPlatePlan" parameterType="ApsPlatePlan">
+ <insert id="insertApsPlatePlan" parameterType="com.aps.core.domain.ApsPlatePlan">
insert into aps_plate_plan
<trim prefix="(" suffix=")" suffixOverrides=",">
<if test="id != null and id != ''">id,</if>
@@ -197,7 +203,7 @@
</trim>
</insert>
- <update id="updateApsPlatePlan" parameterType="ApsPlatePlan">
+ <update id="updateApsPlatePlan" parameterType="com.aps.core.domain.ApsPlatePlan">
update aps_plate_plan
<trim prefix="SET" suffixOverrides=",">
<if test="masterPlanner != null">master_planner = #{masterPlanner},</if>
@@ -265,31 +271,49 @@
update aps_plate_plan set del_flag='1' where del_flag ='0'
</update>
- <select id="selectPlatePlanByPlantMajor" parameterType="ApsPlatePlan" resultMap="ApsPlatePlanResult">
- select id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,require_id
+ <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
from aps_plate_plan
<where>
- <if test="plant != null "> and plant = #{plant}</if>
- <if test="professionalAffiliation != null "> and professional_affiliation = #{professionalAffiliation}</if>
- and del_flag='0'
+ <if test="plant != null "> and plant = #{plant} </if>
+ <if test="professionalAffiliation != null "> and professional_affiliation = 'main' </if>
+ and del_flag='0'
</where>
order by document_number asc,id asc
</select>
- <select id="selectUnMatchPlateSubPlan" parameterType="ApsPlatePlan" resultMap="ApsPlatePlanResult">
+ <select id="selectUnMatchPlateSubPlan" parameterType="com.aps.core.domain.ApsPlatePlan" resultMap="ApsPlatePlanResult">
select id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,
- ,unmatched_quantity
+ unmatched_quantity,version
from aps_plate_plan
- where del_flag='0' and professional_affiliation !='0' and unmatched_quantity > 0
- <if test="plant != null and plan !='' "> and plant = #{plant}</if>
+ where del_flag='0' and professional_affiliation ='sub' and unmatched_quantity > 0
+ <if test="plant != null and plant !='' "> and plant = #{plant}</if>
+ <if test="itemNumber != null and itemNumber !='' "> and item_number = #{itemNumber}</if>
order by document_number asc,id asc
limit 1
</select>
- <update id="updatePlanUnMatchQtyByVersion" parameterType="ApsPlatePlan">
+ <update id="updatePlanUnMatchQtyByVersion" parameterType="com.aps.core.domain.ApsPlatePlan">
update aps_plate_plan
- set unmatched_quantity=#{unmatched_quantity},version=version+1
+ set unmatched_quantity=#{unmatchedQuantity},version=version+1
where id=#{id} and version=#{version}
</update>
+ <select id="selectPlateRedundantOrderList" parameterType="com.aps.core.domain.ApsPlatePlan" resultMap="ApsPlatePlanResult">
+ select document_number, item_number, production_quantity, unmatched_quantity, plant, production_base, plan_start_day, plan_end_day, order_create_time
+ from aps_plate_plan where unmatched_quantity>0 and professional_affiliation='sub' and del_flag='0'
+ <if test="documentNumber != null and documentNumber != ''">
+ and document_number like '%' || #{documentNumber} || '%'
+ </if>
+ <if test="itemNumber != null and itemNumber != ''">
+ and item_number like '%' || #{itemNumber} || '%'
+ </if>
+ </select>
+
+ <update id="initUnMatchQty" >
+ update aps_plate_plan
+ set unmatched_quantity=production_quantity, version=0,require_id=id
+ where del_flag='0' and professional_affiliation !='0'
+ </update>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3