From 72a549ca41cee86c4895bbd875af2a2f3b25c8d1 Mon Sep 17 00:00:00 2001
From: jenkins <jenkins@example.com>
Date: 星期四, 21 五月 2026 14:56:01 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/dev_New_pro' into dev_pro_河南鹤壁

---
 src/main/resources/mapper/production/ProductionOperationTaskMapper.xml |    1 +
 1 files changed, 1 insertions(+), 0 deletions(-)

diff --git a/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml b/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
index 6db5455..f029ef7 100644
--- a/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
+++ b/src/main/resources/mapper/production/ProductionOperationTaskMapper.xml
@@ -159,6 +159,7 @@
 
     <select id="getOperation" resultType="com.ruoyi.production.bean.vo.ProductionOperationTaskVo">
         select poro.operation_name as operationName,
+               max(poro.type) as type,
                count(pot.id) as productionTaskCount,
                sum(ifnull(pot.plan_quantity, 0)) as planQuantity,
                sum(ifnull(pot.complete_quantity, 0)) as completeQuantity,

--
Gitblit v1.9.3