From 93e554de49b2b87c337df71ea9ece51dd4e1d31d Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期四, 22 五月 2025 15:31:24 +0800
Subject: [PATCH] 更新job计时功能，显示为分秒
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessStatMapper.xml | 26 ++++++++++++++++++++------
1 files changed, 20 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 ece5968..2db812a 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,
@@ -143,11 +145,17 @@
(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,
+ 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
- where pl.document_number is not null and rt.work_order_no is not null and pl.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}
@@ -165,10 +173,13 @@
production_quantity,
standard_time,
process_total_time,
+ process_plan_start_day,
process_plan_end_day,
+ order_plan_end_day,
batch_number,
create_by,
- del_flag
+ del_flag,
+ warning
)
values
<foreach collection="list" item="item" index="index" separator=",">
@@ -182,10 +193,13 @@
#{item.productionQuantity},
#{item.standardTime},
#{item.processTotalTime},
+ #{item.processPlanStartDay},
#{item.processPlanEndDay},
+ #{item.orderPlanEndDay},
#{item.batchNumber},
#{item.createBy},
- '0'
+ '0',
+ #{item.warning}
)
</foreach>
</insert>
--
Gitblit v1.9.3