From 174cc2a8aa52f00334e0e9a3a0ea91b2e3e7acd3 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 30 十月 2025 16:20:41 +0800
Subject: [PATCH] 修改次破报表翻页汇总不正确问题

---
 north-glass-erp/src/main/resources/mapper/pp/Report.xml |    4 ++--
 1 files changed, 2 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 cc80b7a..ddce89e 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -425,7 +425,7 @@
           and date(rw.reporting_work_time) &lt;= #{endDate}
           and rw.this_worn_quantity > 0
           and dd.available = 0
-          and reviewed_state != 2
+          and rw.reviewed_state>=0
           and rw.this_process != dd.responsible_process
         <if test="crossProcessBreakingDTO.code != null and crossProcessBreakingDTO.code != ''">
             and JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) regexp #{crossProcessBreakingDTO.code}
@@ -852,7 +852,7 @@
         WHERE
         rw.reporting_work_time >= #{selectTime1}
         AND rw.reporting_work_time &lt;  #{selectTime2}
-        AND dd.available = 0
+        AND dd.available = 0 and rw.reviewed_state>=0
         <if test="damageReportDTO.orderId != null and damageReportDTO.orderId != ''">
             and o.order_id regexp #{damageReportDTO.orderId}
         </if>

--
Gitblit v1.8.0