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 } /// - /// 日生产完成率 + /// 实时产出 /// /// [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 DevicePoweronRate(DeviceReportDto param); List DeviceDowntimeRate(DeviceReportDto param); - List ProductionCompletionRate(DateTime dateTime); + List ProductionCompletionRate(string groupName, DateTime dateTime); List 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(DateTime dateTime) + public List ProductionCompletionRate(string groupName, DateTime dateTime) { List list = new List(); @@ -156,7 +156,9 @@ namespace DOAN.Service.MES.report .LeftJoin((a, b) => a.GroupCode == b.GroupCode) .LeftJoin((a, b, c) => b.FkShift == c.Id) .LeftJoin((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 {