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 | 87 +++++++++++++++++++++++++++++++++----------
1 files changed, 67 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 f3c6ec7..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
@@ -1337,7 +1337,11 @@
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
rw.reviewed,
rw.examine_time,
- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
+-- GROUP_CONCAT(ogd.glass_child SEPARATOR '+') as workProcessName
+ CASE
+ WHEN LOCATE('step',#{laminating})>0 THEN GROUP_CONCAT(ogd.glass_child SEPARATOR '+')
+ ELSE MAX( ogd.glass_child )
+ END AS workProcessName
FROM
reporting_work as rw left join reporting_work_detail as rwd on rwd.reporting_work_id=rw.reporting_work_id
left join flow_card as fc on fc.order_id=rw.order_id and fc.process_id=rw.process_id and fc.order_number=rwd.order_number and fc.technology_number=rwd.technology_number
@@ -1364,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,
@@ -1464,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,
@@ -2066,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,
@@ -2080,4 +2123,8 @@
rw.teams_groups_name
) as subquery
</select>
+
+ <select id="getLaminating">
+ select IFNULL(nickname,'') from sd.basic_data where basic_category='process' and basic_name=#{selectProcesses}
+ </select>
</mapper>
\ No newline at end of file
--
Gitblit v1.8.0