From 0bc2c552b180afa16e4aae3c8c12746b15ba6fc8 Mon Sep 17 00:00:00 2001
From: yuan <123@>
Date: 星期四, 02 四月 2026 17:35:42 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_长治_健齿齿科器材' into dev_长治_健齿齿科器材
---
src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml | 9 ++++++---
1 files changed, 6 insertions(+), 3 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
index d1c013d..ccef890 100644
--- a/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
+++ b/src/main/resources/mapper/production/ProductProcessRouteItemMapper.xml
@@ -15,13 +15,16 @@
pp.name as process_name,
pm.model,
pm.unit,
- p.product_name
+ pm.uid_no,
+ 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 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