From acffdf4d14de237f90cbb1501d37102d599b22fc Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 02 七月 2025 16:22:23 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/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..89b7247 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 or a.child_height != b.height)
+ ) as c
</select>
<select id="getOrderGlassDetailByProductIdGlassChild" >
--
Gitblit v1.8.0