From 5cb362d364fa8582b2090e0d81585f4a7e9f19a1 Mon Sep 17 00:00:00 2001
From: zss <zss@example.com>
Date: 星期五, 06 二月 2026 13:33:46 +0800
Subject: [PATCH] Merge branch 'dev_New' into jtwy
---
src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml | 20 ++++++++++++++------
1 files changed, 14 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
index b552627..f62a1e8 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
@@ -13,14 +13,22 @@
<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,
+ pm.drawing_number,
+ p.product_name,
+ ppr.process_route_Code,
+ pb.bom_no,
+ case when pwo.complete_quantity>0 then true else false end as is_complete
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_route ppr on ppr.id = ppri.product_route_id
+ left join product_bom pb on pb.id = ppr.bom_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