From 2b2c84e8a89080a94b492b650f58ba5810df7c79 Mon Sep 17 00:00:00 2001
From: chenlin <lin.chen@ruizhiao.cn>
Date: Mon, 26 Jan 2026 17:11:29 +0800
Subject: [PATCH] =?UTF-8?q?=E5=AE=9E=E6=97=B6=E4=BA=A7=E5=87=BA=E5=A2=9E?=
 =?UTF-8?q?=E5=8A=A0=E5=B0=8F=E7=BB=84=E6=9F=A5=E8=AF=A2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Controllers/MES/report/ReportController.cs              | 6 +++---
 DOAN.Service/MES/report/IService/IReportService.cs          | 2 +-
 DOAN.Service/MES/report/ReportService.cs                    | 6 ++++--
 3 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/DOAN.Admin.WebApi/Controllers/MES/report/ReportController.cs b/DOAN.Admin.WebApi/Controllers/MES/report/ReportController.cs
index bfc7d69..19ad876 100644
--- a/DOAN.Admin.WebApi/Controllers/MES/report/ReportController.cs
+++ b/DOAN.Admin.WebApi/Controllers/MES/report/ReportController.cs
@@ -59,13 +59,13 @@ namespace DOAN.WebApi.Controllers
         }
 
         /// <summary>
-        /// 日生产完成率
+        /// 实时产出
         /// </summary>
         /// <returns></returns>
         [HttpGet("productionCompletionRate")]
-        public IActionResult ProductionCompletionRate()
+        public IActionResult ProductionCompletionRate(string groupName)
         {
-            var response = _ReportService.ProductionCompletionRate(DateTime.Today);
+            var response = _ReportService.ProductionCompletionRate(groupName, DateTime.Today);
             return SUCCESS(response);
         }
 
diff --git a/DOAN.Service/MES/report/IService/IReportService.cs b/DOAN.Service/MES/report/IService/IReportService.cs
index ce31853..18cef3f 100644
--- a/DOAN.Service/MES/report/IService/IReportService.cs
+++ b/DOAN.Service/MES/report/IService/IReportService.cs
@@ -17,7 +17,7 @@ namespace DOAN.Service.MES.report.IService
         List<DevicePoweronRateModel> DevicePoweronRate(DeviceReportDto param);
         List<DeviceDowntimeRateModel> DeviceDowntimeRate(DeviceReportDto param);
 
-        List<ProductionCompletionRate> ProductionCompletionRate(DateTime dateTime);
+        List<ProductionCompletionRate> ProductionCompletionRate(string groupName, DateTime dateTime);
 
         List<ProductionCompletionRate> MonthlyProductionCompletionRate(DateTime dateTime);
 
diff --git a/DOAN.Service/MES/report/ReportService.cs b/DOAN.Service/MES/report/ReportService.cs
index d082c4f..0becf0f 100644
--- a/DOAN.Service/MES/report/ReportService.cs
+++ b/DOAN.Service/MES/report/ReportService.cs
@@ -146,7 +146,7 @@ namespace DOAN.Service.MES.report
             return result;
         }
 
-        public List<ProductionCompletionRate> ProductionCompletionRate(DateTime dateTime)
+        public List<ProductionCompletionRate> ProductionCompletionRate(string groupName, DateTime dateTime)
         {
             List<ProductionCompletionRate> list = new List<ProductionCompletionRate>();
             
@@ -156,7 +156,9 @@ namespace DOAN.Service.MES.report
                   .LeftJoin<GroupSchedule>((a, b) => a.GroupCode == b.GroupCode)
                   .LeftJoin<GroupShift>((a, b, c) => b.FkShift == c.Id)
                   .LeftJoin<BaseGroup>((a, b, c, d) => a.GroupCode == d.GroupCode)
-                  .Where((a, b, c, d) => a.WorkorderDate.Value.ToString("yyyy-MM-dd") == dt && b.ScheduleDate.Value.ToString("yyyy-MM-dd") == dt)
+                  .Where((a, b, c, d) => a.WorkorderDate.Value.ToString("yyyy-MM-dd") == dt 
+                    && b.ScheduleDate.Value.ToString("yyyy-MM-dd") == dt
+                    && (string.IsNullOrEmpty(groupName) || d.GroupName.Contains(groupName)))
                   .Select((a, b, c, d) =>
                   new
                   {