From b5a9dccccaf5bed064891a05ec8ff3f21de9cff0 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 25 九月 2024 16:31:14 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml |   28 ++++++++++++++++++++++++++++
 1 files changed, 28 insertions(+), 0 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 79f2ed6..7f8fbb5 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -886,4 +886,32 @@
         where reporting_work_id=#{reportingWorkId} and order_number = #{orderSort}
           and technology_number = #{technologyNumber}
     </update>
+
+    <select id="selectUserProcess">
+        select address from erp_user_info.user where login_name=#{userId}
+    </select>
+
+    <select id="getSelectProcessJiajiao">
+        SELECT * FROM (
+                          SELECT * FROM sd.basic_data
+                          WHERE basic_type='product' AND basic_category='process' AND basic_name='澶硅兌'
+
+                          UNION
+
+                          SELECT * FROM sd.basic_data
+                          WHERE basic_type='product' AND basic_category='process' AND basic_name='鍧囪川'
+                      ) AS combined_results;
+    </select>
+
+    <select id="getSelectProcessDuoqu">
+        SELECT * FROM (
+                          SELECT * FROM sd.basic_data
+                          WHERE basic_type='product' AND basic_category='process' AND basic_name='鎶�鏈儴澶氭洸'
+
+                          UNION
+
+                          SELECT * FROM sd.basic_data
+                          WHERE basic_type='product' AND basic_category='process' AND basic_name='閽㈠寲'
+                      ) AS combined_results;
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0