From 32d1bd8a3f94c67198e397aff76bc7b33a30a6b6 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 09 五月 2025 15:15:45 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlatePlanMapper.xml | 3 +--
1 files changed, 1 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 7d407f4..623bc32 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>
--
Gitblit v1.9.3