From b236dad93f758ad87dacd9aeecad64b4b3a8775f Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期一, 19 五月 2025 14:27:18 +0800
Subject: [PATCH] 钣金详细计划：优先使用钣金工单计划中设置的计划完成日期
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessStatMapper.xml | 8 ++++++--
1 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessStatMapper.xml
index ece5968..9be9f13 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessStatMapper.xml
@@ -143,10 +143,14 @@
(rt.standard_time * pl.production_quantity) as process_total_time,
rt.process_plan_start_day,
rt.process_plan_end_day,
- pl.plan_end_day as order_plan_end_day
+ pl.plan_end_day,
+ COALESCE(rd.plan_end_day,pl.plan_end_day) as order_plan_end_day
from aps_plate_plan as pl
left join aps_process_route as rt on pl.document_number = rt.work_order_no
- where pl.document_number is not null and rt.work_order_no is not null and pl.plan_end_day is not null
+ left join aps_plate_standard_require_order_end_day as rd on pl.document_number = rd.doc_no
+ where pl.document_number is not null and rt.work_order_no is not null and
+ (pl.plan_end_day is not null or rd.plan_end_day is not null )
+ and rd.del_flag =0
order by rt.work_order_no asc, rt.process_number desc
</select>
<update id="removeOtherStat" parameterType="String">
--
Gitblit v1.9.3