From fcbce36f8734813b13c8f9c5b26b4bd192274534 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 17 十一月 2025 16:30:28 +0800
Subject: [PATCH] 工程打印明细新增玻璃编号显示

---
 north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml |   40 ++++++++++++++++++++++++++++++++++++++++
 1 files changed, 40 insertions(+), 0 deletions(-)

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
index 5ea4259..8cea4e5 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderProcessDetailMapper.xml
@@ -265,4 +265,44 @@
                   and b.process = #{thisProcess}
                 )
     </select>
+
+    <select id="selectProcessCardProgressSv">
+        select a.*,(b.quantity-b.termination_quantity) as 'quantity'
+        from order_process_detail as a
+        inner join pp.flow_card as b
+            on a.order_id = b.order_id
+            and a.process_id = b.process_id
+            and a.order_number = b.order_number
+            and a.technology_number = b.technology_number
+        where termination_status = 0
+          <if test="orderId != null and orderId != ''">
+            and a.order_id=#{orderId}
+          </if>
+          <if test="processId != null and processId != ''">
+            and a.process_id=#{processId}
+          </if>
+          <if test="orderNumber != null and orderNumber != ''">
+            and a.order_number=#{orderNumber}
+          </if>
+          <if test="technologyNumber != null and technologyNumber != ''">
+            and a.technology_number=#{technologyNumber}
+          </if>
+          <if test="process != null and process != ''">
+            and a.process=#{process}
+          </if>
+
+    </select>
+    
+    <select id="selectProcessSort">
+        select a.process,
+               ROW_NUMBER() OVER (ORDER BY (SELECT NULL)) AS sort,
+               ifnull(b.nickname,"") as recombination
+        from sd.order_process_detail as a
+        inner join sd.basic_data as b
+                on a.process = b.basic_name and b.basic_category = 'process'
+                where a.order_id = #{orderId}
+                and a.process_id = #{processId}
+                and a.order_number =#{orderNumber}
+                and a.technology_number =#{technologyNumber}
+    </select>
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0