From 7aac0b821663de152ef665a030ebbef1d34b41f2 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期三, 16 四月 2025 11:31:20 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml | 6 +++---
1 files changed, 3 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 1685b1b..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
- a.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
- and a.child_width != b.width
where a.order_id = #{orderId}
and a.order_number = #{orderNumber}
+ and(a.child_width != b.width or a.child_height != b.height)
) as c
</select>
--
Gitblit v1.8.0