From 2cdc79aca46c13ead18a27b0270350a3d8665d53 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 13:55:35 +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, 4 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 8a96cd8..7d407f4 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
@@ -271,8 +271,9 @@
<select id="selectPlatePlanByPlantMajor" parameterType="ApsPlatePlan" resultMap="ApsPlatePlanResult">
select id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,require_id,
- unmatched_quantity,version, production_base
+ unmatched_quantity,version, production_base,
(case when custom_time is null then plan_end_day else custom_time end ) as plan_end_day
+ from aps_plate_plan
<where>
<if test="plant != null "> and plant = #{plant}</if>
<if test="professionalAffiliation != null "> and professional_affiliation = #{professionalAffiliation}</if>
@@ -286,7 +287,8 @@
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>
+ <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>
--
Gitblit v1.9.3