From 97ee5904ad00373cd60e1e12d26bad6b5cdb6b66 Mon Sep 17 00:00:00 2001
From: zhanghl <253316343@qq.com>
Date: 星期五, 23 五月 2025 13:12:31 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev' into dev
---
aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml | 22 ++++++++++++++++++----
1 files changed, 18 insertions(+), 4 deletions(-)
diff --git a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml
index 4b097a5..4789ec5 100644
--- a/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml
+++ b/aps-modules/aps-core/src/main/resources/mapper/core/ApsGasPipingRouteStatMapper.xml
@@ -261,13 +261,14 @@
l.route_name as process_name,
l.route_num as process_number,
l.standard_time,
- m.domain,
- s.work_shop as workshop
+ string_agg(DISTINCT m.domain, ';') as domain,
+ string_agg(DISTINCT s.work_shop, ';') as workshop
FROM aps_gas_pipeline_prediction p
JOIN aps_standard_process_route_header h ON p.material_code = h.item_code AND p.factory = h.org_code
JOIN aps_standard_process_route_line l ON h.route_id = l.route_id
LEFT JOIN aps_material_product_group_management m ON p.material_code = m.material_code AND p.factory = m.factory
LEFT JOIN aps_standard_process s ON l.route_name = s.process_name
+ GROUP BY p.id, p.material_code, p.factory, p.predict_quantity, p.predict_date, h.route_id, l.route_name, l.route_num, l.standard_time
ORDER BY p.material_code, l.route_num
</select>
@@ -283,12 +284,13 @@
r.process_name,
r.process_number,
r.standard_time,
- m.domain,
- s.work_shop as workshop
+ string_agg(DISTINCT m.domain, ';') as domain,
+ string_agg(DISTINCT s.work_shop, ';') as workshop
FROM aps_gas_pipeline_mo mo
JOIN aps_process_route r ON mo.mo = r.work_order_no
LEFT JOIN aps_material_product_group_management m ON mo.material_code = m.material_code AND mo.factory = m.factory
LEFT JOIN aps_standard_process s ON r.process_name = s.process_name
+ GROUP BY mo.id, mo.mo, mo.material_code, mo.factory, mo.quantity, mo.plan_end, r.process_name, r.process_number, r.standard_time
ORDER BY mo.mo, r.process_number
</select>
@@ -399,4 +401,16 @@
process_plan_start_day
</select>
+ <!-- 鏌ヨ鎵�鏈夋墜宸ユ皵浣撳伐鍗曟暟鎹� -->
+ <select id="selectAllMoData" resultType="java.util.Map">
+ SELECT
+ id,
+ mo,
+ factory,
+ material_code,
+ plan_end,
+ quantity
+ FROM aps_gas_pipeline_mo
+ </select>
+
</mapper>
\ No newline at end of file
--
Gitblit v1.9.3