From 7e372698c42c047d3b4e629dafe4e7b689990b9d Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 12 五月 2025 19:34:16 +0800
Subject: [PATCH] 钣金计划：从Redis中读取库存信息
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml | 21 ++++++++++++---------
1 files changed, 12 insertions(+), 9 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 99f4e68..0575604 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
@@ -48,6 +48,7 @@
<result property="orderCreateTime" column="order_create_time" />
<result property="professionalAffiliation" column="professional_affiliation" />
<result property="requireId" column="require_id" />
+ <result property="version" column="version" />
</resultMap>
<sql id="selectApsPlatePlanVo">
@@ -57,8 +58,8 @@
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
- , production_base, order_create_time
+ has_turnback, has_risk, std_op, op_status, next_op_name ,unmatched_quantity,professional_affiliation,
+ require_id, version,production_base, order_create_time
from aps_plate_plan
</sql>
@@ -269,7 +270,8 @@
</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,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,require_id,
+ unmatched_quantity,version, production_base,plan_end_day
from aps_plate_plan
<where>
<if test="plant != null "> and plant = #{plant}</if>
@@ -281,10 +283,11 @@
<select id="selectUnMatchPlateSubPlan" parameterType="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>
@@ -292,12 +295,12 @@
<update id="updatePlanUnMatchQtyByVersion" parameterType="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="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!='0'
+ from aps_plate_plan where unmatched_quantity>0 and professional_affiliation!='0' and del_flag='0'
<if test="documentNumber != null and documentNumber != ''">
and document_number like '%' || #{documentNumber} || '%'
</if>
@@ -308,7 +311,7 @@
<update id="initUnMatchQty" >
update aps_plate_plan
- set unmatched_quantity=production_quantity, version=0
+ 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