From 661d3c6bd42733aeb0ca83aee72f6b83bef4de36 Mon Sep 17 00:00:00 2001
From: buhuazhen <hua100783@gmail.com>
Date: 星期三, 18 三月 2026 16:30:56 +0800
Subject: [PATCH] fix(sales): 修复导出合同文件名编码及空指针问题
---
src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml | 15 +++++++++------
1 files changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
index b552627..302a0fb 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
@@ -13,14 +13,17 @@
<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,
+ 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 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