From 4ee53f8b43e850d2b35d5b1eb979d7b0bc2fbcd4 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 30 五月 2024 10:52:26 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override

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

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
index 57479f7..15d84cf 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -744,5 +744,23 @@
         group by b.order_id,a.product_id
         order by b.order_id desc
     </select>
+    
+    <select id="getOrderProductDetailTag">
+        select c.customer_name,c.order_id,b.remarks,c.project,
+               if(a.child_width &lt; a.child_height,a.child_width,a.child_height ),
+               if(a.child_width &lt; a.child_height,a.child_height,a.child_width ),
+               sum(b.quantity),
+               a.glass_child,
+               b.processing_note
+        from order_glass_detail as a
+        left join order_detail as b
+        on a.order_id = b.order_id
+        and a.order_number = b.order_number
+        left join `order` as c
+        on c.order_id = a.order_id
+        where a.order_id = #{orderId}
+        group by a.glass_child,a.child_width,a.child_height
+    </select>
+
 
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0