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 | 79 +++++++++++++++++++++++++++++----------
1 files changed, 59 insertions(+), 20 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 44c091f..18c902f 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -701,7 +701,7 @@
LEFT JOIN sd.order_glass_detail AS ogd ON o.order_id = ogd.order_id
AND ogd.order_number = od.order_number
LEFT JOIN flow_card AS fc ON fc.order_id = ogd.order_id
- AND fc.order_number
+ AND fc.order_number = od.order_number
AND fc.technology_number = ogd.technology_number
WHERE fc.order_id = #{orderId}
GROUP BY fc.id
@@ -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
@@ -1368,12 +1368,25 @@
and od.edging_type regexp #{teamOutputDTO.edgingType}
</if>
- GROUP BY
- rw.reporting_work_id,
- rw.process_id,
- rw.this_process,
- rw.teams_groups_name,
- rwd.order_number
+ <choose>
+ <when test="laminating == ''">
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number,
+ rwd.technology_number
+ </when>
+ <otherwise>
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number
+ </otherwise>
+ </choose>
ORDER BY
rw.this_process,
rw.process_id,
@@ -1468,12 +1481,25 @@
and od.edging_type regexp #{teamOutputDTO.edgingType}
</if>
- GROUP BY
- rw.reporting_work_id,
- rw.process_id,
- rw.this_process,
- rw.teams_groups_name,
- rwd.order_number
+ <choose>
+ <when test="laminating == ''">
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number,
+ rwd.technology_number
+ </when>
+ <otherwise>
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number
+ </otherwise>
+ </choose>
ORDER BY
rw.this_process,
rw.process_id,
@@ -2070,12 +2096,25 @@
<if test="teamOutputDTO.edgingType != null and teamOutputDTO.edgingType != ''">
and od.edging_type regexp #{teamOutputDTO.edgingType}
</if>
- GROUP BY
- rw.reporting_work_id,
- rw.process_id,
- rw.this_process,
- rw.teams_groups_name,
- rwd.order_number
+ <choose>
+ <when test="laminating == ''">
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number,
+ rwd.technology_number
+ </when>
+ <otherwise>
+ GROUP BY
+ rw.reporting_work_id,
+ rw.process_id,
+ rw.this_process,
+ rw.teams_groups_name,
+ rwd.order_number
+ </otherwise>
+ </choose>
ORDER BY
rw.this_process,
rw.process_id,
--
Gitblit v1.8.0