From a925836fa0ec4d3e5362a289995c5cb3a3942ed7 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期四, 26 十二月 2024 11:30:43 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml |   22 ++++++++++++++++++++++
 1 files changed, 22 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
index 7fc144f..8dda058 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/GlassOptimize.xml
@@ -89,6 +89,28 @@
             f.order_number;
     </select>
 
+    <!--宸ョ▼淇℃伅娴佺▼鍗�-->
+    <select id="getProcessCardMp">
+        SELECT
+            fc.process_id,
+            fc.order_number,
+            fc.quantity,
+            CONCAT(fc.technology_number, '/', COUNT(fc.technology_number)) AS layer,
+            so.project,
+            CONCAT(sd.child_width, ' 脳 ', sd.child_height) AS sizes
+        FROM
+            pp.flow_card AS fc
+                INNER JOIN sd.order AS so ON fc.order_id = so.order_id
+                INNER JOIN sd.order_glass_detail AS sd ON sd.order_id = so.order_id AND fc.order_id = sd.order_id
+                        AND fc.order_number = sd.order_number
+        WHERE
+            fc.project_no = #{projectNo}
+        GROUP BY
+            fc.order_id,
+            fc.technology_number,
+            fc.order_number
+    </select>
+
     <!--搴撳瓨淇℃伅-->
     <select id="materialStoreMp">
         SELECT

--
Gitblit v1.8.0