From aece48b253b2e0b814bbdf5ee3d474e8cf697122 Mon Sep 17 00:00:00 2001
From: chenlu <1320612696@qq.com>
Date: 星期四, 18 十二月 2025 16:39:48 +0800
Subject: [PATCH] Merge branch 'master' of http://bore.pub:10439/r/ERP_override
---
north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml | 6 ++++--
1 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
index 7490e80..23f89ed 100644
--- a/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
+++ b/north-glass-erp/src/main/resources/mapper/pp/ReportingWork.xml
@@ -37,6 +37,7 @@
<association property="flowCard" javaType="com.example.erp.entity.pp.FlowCard">
<result property="orderId" column="order_id"/>
<result property="productionId" column="production_id"/>
+ <result property="processId" column="processIdFirst"/>
</association>
<association property="reportingWorkDetail" javaType="com.example.erp.entity.pp.ReportingWorkDetail">
<result property="completedQuantity" column="completed_quantity"/>
@@ -69,6 +70,7 @@
<select id="AddSelectLastWorkMp" resultMap="reportingWorkMap">
select o.order_id,
fc.production_id,
+ fc.process_id as 'processIdFirst',
o.customer_id,
o.customer_name,
o.project,
@@ -1064,7 +1066,7 @@
and o.order_id regexp #{reportingWork.orderId}
</if>
<if test="reportingWork.processId != null and reportingWork.processId != ''">
- and rw.process_id regexp #{reportingWork.processId}
+ and CONCAT(rw.process_id,'/',rwd.goup) LIKE CONCAT('%', #{reportingWork.processId}, '%')
</if>
<if test="reportingWork.order.project != null and reportingWork.order.project != ''">
and o.project regexp #{reportingWork.order.project}
@@ -1079,7 +1081,7 @@
and rw.device_name regexp #{reportingWork.deviceName}
</if>
<if test="reportingWork.teamsGroupsName != null and reportingWork.teamsGroupsName != ''">
- and rw.teams_groups_name regexp #{reportingWork.teamsGroupsName}
+ and rw.teams_groups_name like concat('%', #{reportingWork.teamsGroupsName}, '%')
</if>
</select>
--
Gitblit v1.8.0