From cd8f015ef7ccda50f884c8a793032c04ddd14e23 Mon Sep 17 00:00:00 2001
From: 廖井涛 <2265517004@qq.com>
Date: 星期二, 08 四月 2025 10:46:39 +0800
Subject: [PATCH] erp优化部分修改
---
north-glass-erp/src/main/resources/mapper/pp/Report.xml | 4 +++-
1 files changed, 3 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 02f922f..e24d899 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/Report.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/Report.xml
@@ -123,6 +123,7 @@
<result column="code" property="code"/>
<result column="reviewed" property="reviewed"/>
<result column="examine_time" property="examineTime"/>
+ <result column="workProcessName" property="workProcessName"/>
</resultMap>
<resultMap id="scheduleProductionScheduleMap" type="com.example.erp.dto.pp.ScheduleProductionScheduleDTO">
@@ -1331,7 +1332,8 @@
od.product_name,
JSON_UNQUOTE( JSON_EXTRACT( od.other_columns, '$.S01' )) AS code,
rw.reviewed,
- rw.examine_time
+ rw.examine_time,
+ GROUP_CONCAT(ogd.glass_child SEPARATOR '+') 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
--
Gitblit v1.8.0