From e0c8edd1d949fae5883a60019d02a9c5f7cb7a29 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期三, 18 三月 2026 09:08:18 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_宁夏_中盛建材' into dev_宁夏_中盛建材
---
src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml | 17 ++++++++++-------
1 files changed, 10 insertions(+), 7 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
index d1c013d..f62140e 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
@@ -10,18 +10,21 @@
<result property="createTime" column="create_time"/>
<result property="updateTime" column="update_time"/>
</resultMap>
+
<select id="listItem" resultType="com.ruoyi.production.dto.ProductProcessRouteItemDto">
select ppri.*,
- pp.name as process_name,
- pm.model,
+ pp.name as process_name,
+ pms.model,
pm.unit,
- p.product_name
+ pm.product_name,
+ case when pwo.complete_quantity > 0 then true else false end as is_complete
from product_process_route_item ppri
- 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_material_sku pms on ppri.product_model_id = pms.id
+ left join product_material pm on pms.product_id = pm.id
left join product_process pp on pp.id = ppri.process_id
- where ppri.route_id = #{orderId}
- order by ppri.id
+ left join product_work_order pwo on pwo.product_process_route_item_id = ppri.id
+ where ppri.product_order_id = #{orderId}
+ order by ppri.drag_sort
</select>
--
Gitblit v1.9.3