From 6fac4cbed12a84473e8eab217abacc221dedca9f Mon Sep 17 00:00:00 2001
From: 于杰 <1210123631@qq.com>
Date: 星期一, 28 七月 2025 14:40:34 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/master'
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 7 ++++++-
1 files changed, 6 insertions(+), 1 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 abb0462..21d10d7 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -178,6 +178,7 @@
# c.quantity,
c.quantity as thisQuantity,/*鐢ㄤ簬鍒ゆ柇鏄惁鏀瑰彉棰滆壊*/
e.reportWorkQuantity,
+ e.reportWorkQuantityShow,
e.reportWorkQuantityCount,
e.reportWorkTime,
e.broken_num,
@@ -219,6 +220,10 @@
GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' || bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),
'}'
) as reportWorkQuantity,
+ concat('{',
+ GROUP_CONCAT(concat("\"", process, "\":\"", if(technology_number!=1 and (bd.nickname='stepD' || bd.nickname='stepB' ) ,0,reporting_work_num), "\"")),
+ '}'
+ ) as reportWorkQuantityShow,
concat('{',
GROUP_CONCAT(concat("\"", process, "\":\"", reporting_work_num_count, "\"")),
'}'
@@ -2113,7 +2118,7 @@
WHERE
rw.reporting_work_time >= #{selectTime1}
AND rw.reporting_work_time < #{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