From ba6b8c6be389e1c76f15f85e43f2d55ff5d34caf Mon Sep 17 00:00:00 2001
From: wuyouming666 <2265557248@qq.com>
Date: 星期一, 07 四月 2025 10:33:14 +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 | 4 ++--
1 files changed, 2 insertions(+), 2 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 1e9753c..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,14 +167,14 @@
</update>
<select id="getDifferentSizeNumber">
- select if(count(id)>1,1,0) from (select
+ 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}
- and a.child_width != b.width
+ and(a.child_width != b.width or a.child_height != b.height)
) as c
</select>
--
Gitblit v1.8.0