From 413a7e27886bcc87bbd8aaf995f09dbe82cb17e7 Mon Sep 17 00:00:00 2001
From: guoyujie <guoyujie@ng.com>
Date: 星期二, 06 五月 2025 14:56:08 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 16 ++++++++++++++--
1 files changed, 14 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 e24d899..a1ed2a8 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -103,6 +103,8 @@
<result column="personnel" property="personnel"/>
<result column="glass_child" property="glassChild"/>
<result column="glassNumber" property="glassNumber"/>
+ <result column="child_width" property="childWidth"/>
+ <result column="child_height" property="childHeight"/>
</resultMap>
<resultMap id="teamOutputMap" type="com.example.erp.dto.pp.TeamOutputDTO">
@@ -574,6 +576,8 @@
round( ogd.child_width * ogd.child_height * dd.breakage_quantity / 1000000, 2 ) as area,
IFNULL(dd.responsible_personnel,'') as personnel,
ogd.glass_child,
+ ogd.child_width,
+ ogd.child_height,
ifnull(JSON_UNQUOTE(JSON_EXTRACT(od.other_columns, '$.S01')),'') AS glassNumber
FROM
sd.ORDER AS o
@@ -697,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
@@ -1333,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 #{laminating} = 'laminating' 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
@@ -2076,4 +2084,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