From fa70c6932f6357061ccc6bdd03cf94fb0a8092eb Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期一, 01 十二月 2025 16:21:08 +0800
Subject: [PATCH] Merge branch 'master' of http://10.153.19.25:10101/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 38 ++++++++++++++++++++++++++++++++++++--
1 files changed, 36 insertions(+), 2 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 ac3f054..57bd80a 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -845,6 +845,12 @@
<if test="damageReportDTO.reportingWorkId != null and damageReportDTO.reportingWorkId != ''">
and rw.reporting_work_id like concat('%', #{damageReportDTO.reportingWorkId}, '%')
</if>
+ <if test="damageReportDTO.childWidth != null and damageReportDTO.childWidth != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{damageReportDTO.childWidth},'\\.0+$','')
+ </if>
+ <if test="damageReportDTO.childHeight != null and damageReportDTO.childHeight != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{damageReportDTO.childHeight},'\\.0+$','')
+ </if>
GROUP BY
dd.id
limit #{offset},#{pageSize};
@@ -910,6 +916,12 @@
</if>
<if test="damageReportDTO.reportingWorkId != null and damageReportDTO.reportingWorkId != ''">
and rw.reporting_work_id like concat('%', #{damageReportDTO.reportingWorkId}, '%')
+ </if>
+ <if test="damageReportDTO.childWidth != null and damageReportDTO.childWidth != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{damageReportDTO.childWidth},'\\.0+$','')
+ </if>
+ <if test="damageReportDTO.childHeight != null and damageReportDTO.childHeight != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{damageReportDTO.childHeight},'\\.0+$','')
</if>
limit #{offset},#{pageSize};
</select>
@@ -1792,7 +1804,12 @@
<if test="teamOutputDTO.batch != null and teamOutputDTO.batch != ''">
AND o.batch REGEXP #{teamOutputDTO.batch}
</if>
-
+ <if test="teamOutputDTO.width != null and teamOutputDTO.width != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{teamOutputDTO.width},'\\.0+$','')
+ </if>
+ <if test="teamOutputDTO.height != null and teamOutputDTO.height != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{teamOutputDTO.height},'\\.0+$','')
+ </if>
<choose>
<when test="laminating == ''">
GROUP BY
@@ -2009,7 +2026,12 @@
<if test="teamOutputDTO.batch != null and teamOutputDTO.batch != ''">
AND o.batch REGEXP #{teamOutputDTO.batch}
</if>
-
+ <if test="teamOutputDTO.width != null and teamOutputDTO.width != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{teamOutputDTO.width},'\\.0+$','')
+ </if>
+ <if test="teamOutputDTO.height != null and teamOutputDTO.height != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{teamOutputDTO.height},'\\.0+$','')
+ </if>
<choose>
<when test="laminating == ''">
GROUP BY
@@ -2646,6 +2668,12 @@
<if test="damageReportDTO.reportingWorkId != null and damageReportDTO.reportingWorkId != ''">
and rw.reporting_work_id like concat('%', #{damageReportDTO.reportingWorkId}, '%')
</if>
+ <if test="damageReportDTO.childWidth != null and damageReportDTO.childWidth != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{damageReportDTO.childWidth},'\\.0+$','')
+ </if>
+ <if test="damageReportDTO.childHeight != null and damageReportDTO.childHeight != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{damageReportDTO.childHeight},'\\.0+$','')
+ </if>
</select>
<select id="teamOutputFootSum">
@@ -2764,6 +2792,12 @@
<if test="teamOutputDTO.batch != null and teamOutputDTO.batch != ''">
AND o.batch REGEXP #{teamOutputDTO.batch}
</if>
+ <if test="teamOutputDTO.width != null and teamOutputDTO.width != ''">
+ and ogd.child_width regexp REGEXP_REPLACE(#{teamOutputDTO.width},'\\.0+$','')
+ </if>
+ <if test="teamOutputDTO.height != null and teamOutputDTO.height != ''">
+ and ogd.child_height regexp REGEXP_REPLACE(#{teamOutputDTO.height},'\\.0+$','')
+ </if>
<choose>
<when test="laminating == ''">
GROUP BY
--
Gitblit v1.8.0