From 67fda7b2dfbfc9e6a8d8b9472499a67906d2bad1 Mon Sep 17 00:00:00 2001
From: liyong <18434998025@163.com>
Date: 星期六, 09 五月 2026 18:05:22 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_浪潮_pro' into dev_浪潮_pro
---
src/main/resources/mapper/production/ProductionOperationTaskMapper.xml | 5 ++++-
1 files changed, 4 insertions(+), 1 deletions(-)
diff --git a/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml b/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
index 6db5455..aa2a99d 100644
--- a/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
@@ -35,7 +35,9 @@
CASE
WHEN pot.work_order_no LIKE 'FG%' THEN '杩斿伐杩斾慨'
ELSE '姝ｅ父'
- END AS work_order_type
+ END AS work_order_type,
+ t8.id as workshop_id,
+ t8.name as workshop_name
from production_operation_task pot
left join production_order po on pot.production_order_id = po.id
left join production_order_routing_operation poro on pot.production_order_routing_operation_id = poro.id
@@ -48,6 +50,7 @@
left join production_product_output ppo on ppo.production_product_main_id = ppm.id
group by ppm.production_operation_task_id
) scrapStat on scrapStat.taskId = pot.id
+ left join workshop as t8 on po.workshop_id = t8.id
<where>
<if test="c != null and c.id != null">
and pot.id = #{c.id}
--
Gitblit v1.9.3