From fda672b4fd0ef3bd4f0759e5c58fdca8f243e550 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期五, 31 五月 2024 14:58:31 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index e59aff1..98403f5 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -418,7 +418,7 @@
right join flow_card as c
on c.process_id = b.process_id
- left join reporting_work_detail as a
+ right join reporting_work_detail as a
on a.reporting_work_id = b.reporting_work_id
and c.order_number=a.order_number
and c.technology_number = a.technology_number
@@ -741,4 +741,9 @@
GROUP BY rwd.order_number, ogd.glass_child, rwd.technology_number, dd.id
ORDER BY rwd.order_number
</select>
+
+ <select id="selectLayerByReportingWorkId">
+ select REPLACE(GROUP_CONCAT(DISTINCT rwd.technology_number),',','') from reporting_work_detail as rwd
+ where rwd.reporting_work_id=#{reportingWorkId}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0