RIZO/zhuangpei-mesbackend
7
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

实时产出增加小组查询

Browse Source
This commit is contained in:
chenlin 2026-01-26 17:11:29 +08:00
parent cba0d7d86e
commit 2b2c84e8a8
3 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
DOAN.Admin.WebApi/Controllers/MES/report/ReportController.cs
View File

@ -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);
}

2
DOAN.Service/MES/report/IService/IReportService.cs
View File

@ -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);

6
DOAN.Service/MES/report/ReportService.cs
View File

@ -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
{