From 51aeb12b0bd3030931b22c666b9c83e7ee51c800 Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 09 五月 2025 17:18:33 +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 | 5 ++---
1 files changed, 2 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 7d407f4..b53581e 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,7 @@
<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,
- (case when custom_time is null then plan_end_day else custom_time end ) as plan_end_day
+ unmatched_quantity,version, production_base,plan_end_day
from aps_plate_plan
<where>
<if test="plant != null "> and plant = #{plant}</if>
@@ -286,7 +285,7 @@
select id,document_number,main_part_number,item_number,plant,professional_affiliation,production_quantity,
unmatched_quantity,version
from aps_plate_plan
- where del_flag='0' and professional_affiliation !='0' and unmatched_quantity > 0
+ 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
--
Gitblit v1.9.3