From 1bbe6f787d58b768dce5370aa4e0d242c5e4b62d Mon Sep 17 00:00:00 2001
From: chenhj <1263187585@qq.com>
Date: 星期二, 21 四月 2026 17:26:53 +0800
Subject: [PATCH] Merge branch 'dev_New_pro' of http://114.132.189.42:9002/r/product-inventory-management-after into dev_New_pro
---
src/main/resources/mapper/production/ProcessRouteItemMapper.xml | 12 ++++++++----
1 files changed, 8 insertions(+), 4 deletions(-)
diff --git a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
index 0ec8393..e060f4e 100644
--- a/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProcessRouteItemMapper.xml
@@ -2,7 +2,7 @@
"http://mybatis.org/dtd/mybatis-3-mapper.dtd">
<mapper namespace="com.ruoyi.production.mapper.ProcessRouteItemMapper">
- <resultMap id="basicMap" type="com.ruoyi.production.pojo.ProcessRouteItem">
+ <resultMap id="basicMap" type="com.ruoyi.production2.pojo.ProcessRouteItem">
<id property="id" column="id"/>
<result property="routeId" column="route_id"/>
<result property="processId" column="process_id"/>
@@ -10,24 +10,28 @@
<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 id="listProcessRouteItemDto" resultType="com.ruoyi.production2.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,
- pm.product_name,
+ p.product_name,
pm.unit
from
process_route_item pri
left join product_model pm on pri.product_model_id = pm.id
left join product_process pp on pp.id = pri.process_id
+ left join product p on p.id = pm.product_id
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