From 67e1e623bdd4b59ac5f1bdb16363a66a511ebdaa Mon Sep 17 00:00:00 2001
From: hongjli <3117313295@qq.com>
Date: 星期二, 20 五月 2025 12:31:41 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessStatMapper.xml | 17 +++++++++++------
1 files changed, 11 insertions(+), 6 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 b25cfcc..a7f7adc 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
@@ -133,8 +133,10 @@
</delete>
<select id="queryTempStat" resultMap="ApsPlateProcessStatResult">
+ with dt as ( select doc_no,require_date from aps_plate_require_date where del_flag=0),
+ rd as ( select doc_no,plan_end_day from aps_plate_standard_require_order_end_day where del_flag=0)
select row_number() over (partition by rt.work_order_no order by rt.process_number desc ) as num,
- rt.work_order_no,
+ rt.work_order_no,
rt.process_name,
cast(rt.process_number as numeric(18, 2)) as route_process_number,
cast(pl.process_number as numeric(18, 2)) as current_process_number,
@@ -144,13 +146,16 @@
rt.process_plan_start_day,
rt.process_plan_end_day,
pl.plan_end_day,
- COALESCE(rd.plan_end_day,pl.plan_end_day) as order_plan_end_day
+ rd.plan_end_day as modify_day,
+ dt.require_date,
+ COALESCE(rd.plan_end_day, COALESCE(dt.require_date, 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
- left join aps_plate_standard_require_order_end_day as rd on pl.document_number = rd.doc_no and rd.del_flag =0
- 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 )
- order by rt.work_order_no asc, rt.process_number desc
+ left join rd on pl.document_number = rd.doc_no
+ left join dt on pl.document_number=dt.doc_no
+ where pl.document_number is not null
+ and rt.work_order_no is not null
+ order by rt.work_order_no, rt.process_number desc
</select>
<update id="removeOtherStat" parameterType="String">
delete from aps_plate_process_stat where batch_number != #{batchNumber}
--
Gitblit v1.9.3