From b8202fa27280e1fc0ff962c874e94e625abeb7b8 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 03 七月 2025 16:22:57 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml | 20 ++++++++++++++++++--
1 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
index 3972ee5..d08023b 100644
--- a/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
+++ b/north-glass-erp/src/main/resources/mapper/sd/OrderDetailMapper.xml
@@ -316,14 +316,30 @@
and a.order_number like concat('%',#{orderDetail.orderNumber},'%')
</if>
- <if test="orderDetail.width != null and orderDetail.width != ''">
+ <if test="orderDetail.width != null and orderDetail.width != '' and model==0">
and a.width regexp REGEXP_REPLACE(#{orderDetail.width},'\\.0+$','')
</if>
- <if test="orderDetail.height != null and orderDetail.height != ''">
+ <if test="orderDetail.height != null and orderDetail.height != '' and model==0 ">
and a.height regexp REGEXP_REPLACE(#{orderDetail.height},'\\.0+$','')
</if>
+ <if test="orderDetail.width != null and orderDetail.width != '' and model==1">
+ and a.width >= REGEXP_REPLACE(#{orderDetail.width } - #{scope} ,'\\.0+$','')
+ and a.width <= REGEXP_REPLACE(#{orderDetail.width } + #{scope} ,'\\.0+$','')
+
+ </if>
+
+ <if test="orderDetail.height != null and orderDetail.height != '' and model==1 ">
+ and a.height > REGEXP_REPLACE(#{orderDetail.height } - #{scope} ,'\\.0+$','')
+ and a.height < REGEXP_REPLACE(#{orderDetail.height } + #{scope} ,'\\.0+$','')
+ </if>
+
+
+
+
+
+
<if test="orderDetail.quantity != null and orderDetail.quantity != ''">
and a.quantity like concat('%',#{orderDetail.quantity},'%')
</if>
--
Gitblit v1.8.0