From d6db1b52d9ca9ee17fd5f28ad2b7ac9570f5a2a0 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期三, 21 五月 2025 16:56:12 +0800
Subject: [PATCH] 提交扫码枪相关程序
---
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 01da256..18c902f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -1339,7 +1339,7 @@
rw.examine_time,
-- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
CASE
- WHEN #{laminating} = 'laminating' THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
+ WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
ELSE MAX( ogd.glass_child )
END AS workProcessName
FROM
@@ -1369,7 +1369,7 @@
</if>
<choose>
- <when test="laminating != 'laminating'">
+ <when test="laminating == ''">
GROUP BY
rw.reporting_work_id,
rw.process_id,
@@ -1482,7 +1482,7 @@
</if>
<choose>
- <when test="laminating != 'laminating'">
+ <when test="laminating == ''">
GROUP BY
rw.reporting_work_id,
rw.process_id,
@@ -2097,7 +2097,7 @@
and od.edging_type regexp #{teamOutputDTO.edgingType}
</if>
<choose>
- <when test="laminating != 'laminating'">
+ <when test="laminating == ''">
GROUP BY
rw.reporting_work_id,
rw.process_id,
--
Gitblit v1.8.0