From d111849e6e78ed02a63661e31c81dadd65f53104 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期一, 01 十二月 2025 13:28:45 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10105/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 8 ++++----
1 files changed, 4 insertions(+), 4 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/Report.xml b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
index dfcbfec..57bd80a 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -2792,11 +2792,11 @@
<if test="teamOutputDTO.batch != null and teamOutputDTO.batch != ''">
AND o.batch REGEXP #{teamOutputDTO.batch}
</if>
- <if test="damageReportDTO.childWidth != null and damageReportDTO.childWidth != ''">
- and ogd.child_width regexp REGEXP_REPLACE(#{damageReportDTO.childWidth},'\\.0+$','')
+ <if test="teamOutputDTO.width != null and teamOutputDTO.width != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{teamOutputDTO.width},'\\.0+$','')
</if>
- <if test="damageReportDTO.childHeight != null and damageReportDTO.childHeight != ''">
- and ogd.child_height regexp REGEXP_REPLACE(#{damageReportDTO.childHeight},'\\.0+$','')
+ <if test="teamOutputDTO.height != null and teamOutputDTO.height != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{teamOutputDTO.height},'\\.0+$','')
</if>
<choose>
<when test="laminating == ''">
--
Gitblit v1.8.0