From 352ea6a79d6d1e470d53b4a4f3800d183d0f40d4 Mon Sep 17 00:00:00 2001
From: guoyuji <guoyujie@ng.com>
Date: 星期二, 16 七月 2024 10:18:39 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override

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

diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
index 297c536..d79c469 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -173,4 +173,20 @@
         group by child_width,child_height) as c
     </select>
 
+    <select id="getOrderGlassDetailByProductIdGlassChild" >
+        select a.glass_child
+        from sd.order_glass_detail as a
+        where a.order_id = #{orderId}
+          and a.order_number = #{orderNumber}
+        group by a.glass_child
+    </select>
+
+    <select id="getOrderGlassDetailByProductId" >
+        select *
+        from sd.order_detail od
+                 LEFT join sd.order_glass_detail  ogd on ogd.order_id=od.order_id and ogd.order_number=od.order_number
+        where od.order_id = #{orderId} and od.product_id=#{productId}
+          and  ogd.glass_child=#{glassChild}
+    </select>
+
 </mapper>
\ No newline at end of file

--
Gitblit v1.8.0