From b8fed13b2db09ba79b21bb792ce5161bac62e29b Mon Sep 17 00:00:00 2001
From: sfd <sun.sunshine@163.com>
Date: 星期五, 23 五月 2025 15:15:35 +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/ApsPlate/ApsPlateProcessShopStatMapper.xml | 9 +++++++++
1 files changed, 9 insertions(+), 0 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessShopStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessShopStatMapper.xml
index fe180ee..cd5fdee 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessShopStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsPlate/ApsPlateProcessShopStatMapper.xml
@@ -141,9 +141,16 @@
left join aps_process_route as pr on ap.document_number=pr.work_order_no
where cast(pr.process_number as numeric) > cast(ap.process_number as numeric)
group by ap.document_number
+ ),
+ b as (
+ select app.doc_no, string_agg( app.require_track_id ,',') as require_track_id
+ from aps_plate_standard_require_bom_order_detail as app
+ where del_flag='0'
+ group by app.doc_no
)
select
app.id,
+ b.require_track_id,
app.main_part_number,
app.customer,
app.business_type,
@@ -164,9 +171,11 @@
app.order_create_time,
app.start_work_date,
app.production_base,
+ app.plan_end_day,
a.remained_process
from aps_plate_plan as app
left join a on app.document_number=a.document_number
+ left join b on app.document_number=b.doc_no
where app.del_flag='0';
</select>
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3