From 877504ede165b8c965b6cf6599708e7e48778034 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期四, 08 一月 2026 15:33:40 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/jtwy' into jtwy
---
src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml | 11 ++++++-----
1 files changed, 6 insertions(+), 5 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
index b552627..caa7890 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
@@ -13,14 +13,15 @@
<select id="listItem" resultType="com.ruoyi.production.dto.ProductProcessRouteItemDto">
select ppri.*,
pp.name as process_name,
- slp.specification_model,
- slp.unit,
- slp.product_category
+ pm.model,
+ pm.unit,
+ p.product_name
from product_process_route_item ppri
- left join sales_ledger_product slp on ppri.product_model_id = slp.id
+ left join product_model pm on ppri.product_model_id = pm.id
+ left join product p on pm.product_id = p.id
left join product_process pp on pp.id = ppri.process_id
where ppri.route_id = #{orderId}
- order by ppri.id
+ order by ppri.drag_sort
</select>
--
Gitblit v1.9.3