From c12e4a831b4210ec886b2537824a464d74b59ff5 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期一, 10 三月 2025 14:46:28 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override

---
 north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml |    9 ++++++---
 1 files changed, 6 insertions(+), 3 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 81deef7..3ed5884 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -167,12 +167,15 @@
     </update>
 
     <select id="getDifferentSizeNumber">
-       select if(count(id)>1,1,0) from (select
-          id
+       select if(count(id)>0,1,0) from (select
+          a.id,a.child_width,b.width
         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
         where a.order_id = #{orderId}
           and a.order_number = #{orderNumber}
-        group by child_width,child_height) as c
+          and a.child_width != b.width
+        ) as c
     </select>
 
     <select id="getOrderGlassDetailByProductIdGlassChild" >

--
Gitblit v1.8.0