From e490a85c14e9147f424b5c971b1d0d04928eb613 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期四, 10 七月 2025 18:16:21 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml | 2 +-
1 files changed, 1 insertions(+), 1 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 3ed5884..89b7247 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderGlassDetailMapper.xml
@@ -174,7 +174,7 @@
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