From e3b3fd13ae3afcfbe5c03ef7249a92a093bd1831 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期三, 27 五月 2026 15:34:23 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_天津_阳光彩印' into dev_天津_阳光彩印
---
src/main/resources/mapper/production/ProductWorkOrderMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
index 6ed0d27..3a92a65 100644
--- a/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
+++ b/src/main/resources/mapper/production/ProductWorkOrderMapper.xml
@@ -67,7 +67,8 @@
ROUND(pwo.complete_quantity / pwo.plan_quantity * 100, 2) AS completionStatus,
sum(ppo.scrap_qty) scrapQty,
pp.device_id,
- pp.device_name
+ pp.device_name,
+ t8.product_name as final_product_model
FROM
product_work_order pwo
LEFT JOIN product_process_route_item ppri ON ppri.id = pwo.product_process_route_item_id
@@ -77,6 +78,8 @@
LEFT JOIN product_process pp ON pp.id = ppri.process_id
LEFT JOIN product_model pm ON pm.id = ppri.product_model_id
LEFT JOIN product p ON p.id = pm.product_id
+ left join product_model t7 on t7.id = po.product_model_id
+ left join product as t8 on t7.product_id = t8.id
WHERE pwo.id = #{id}
GROUP BY pwo.id, pwo.product_process_route_item_id, pwo.create_time, pwo.update_time, pwo.work_order_no, pwo.plan_start_time, pwo.plan_end_time, pwo.actual_start_time, pwo.actual_end_time, pwo.status, pwo.tenant_id, pwo.plan_quantity, pwo.product_order_id, pwo.complete_quantity,
pp.device_id,
--
Gitblit v1.9.3