From ac11e0a1320b469a2a111ba3d6a4a54f424845b7 Mon Sep 17 00:00:00 2001
From: 云 <2163098428@qq.com>
Date: 星期五, 17 四月 2026 09:29:09 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New' into dev_New
---
src/main/resources/mapper/production/ProcessRouteItemMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
index 3814aeb..00000f6 100644
--- a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
@@ -10,12 +10,15 @@
<result property="tenantId" column="tenant_id"/>
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
+ <result property="dragSort" column="drag_sort"/>
</resultMap>
<select id="listProcessRouteItemDto" resultType="com.ruoyi.production.dto.ProcessRouteItemDto">
select pri.*,
pr.description ,
pp.name as process_name,
+ pp.is_inbound as inbound,
+ pp.is_report_work as reportWork,
pm.speculative_trading_name,
pm.product_id,
pm.model,
@@ -29,6 +32,6 @@
left join process_route pr on pr.id = pri.route_id
where
pri.route_id = #{c.routeId}
- order by pri.id
+ order by pri.drag_sort
</select>
</mapper>
--
Gitblit v1.9.3