From 644c6b5f5808c49f59d27f2ed9400cc70c4dd22a Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 09:52:08 +0800
Subject: [PATCH] Merge branch 'dev' of http://192.168.50.149:8085/r/aps-backend into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml | 6 +++---
1 files changed, 3 insertions(+), 3 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..9e4b7ce 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
@@ -269,7 +269,7 @@
</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,plan_end_day, main_part_number,item_number,plant,professional_affiliation,production_quantity,require_id
from aps_plate_plan
<where>
<if test="plant != null "> and plant = #{plant}</if>
@@ -281,7 +281,7 @@
<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
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>
@@ -292,7 +292,7 @@
<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">
--
Gitblit v1.9.3