Teams/kunshan-bzfm-mes-backend
3
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

质量大屏

Browse Source
This commit is contained in:
卢江海
2025-03-27 16:32:17 +08:00
parent 246e4b69b7
commit 7b34d7bbd6
2 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
DOAN.Service/MES/SmartScreen/Quality/IService/IQualitySmartService.cs
View File

@@ -1,5 +1,6 @@
using DOAN.Model.MES.order;
using DOAN.Model.MES.quality.FQC;
using DOAN.Model.MES.SmartScreen;
using DOAN.Model.MES.SmartScreen.Quality.Dto;
using System;
using System.Collections.Generic;
@@ -13,7 +14,7 @@ namespace DOAN.Service.MES.SmartScreen.Quality.IService
{
QualityScreenHeadDto GetQualityScreenHead();
List<QualitySmartScreenDto> GetQualitySmartScreenForWeek();
List<QualitySmartScreenDto> GetQualitySmartScreenForMonth();
List<EchartsSeriesData> GetQualitySmartScreenForWeek();
List<EchartsSeriesData> GetQualitySmartScreenForMonth();
}
}

24
DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs
View File

@@ -1,6 +1,7 @@
using DOAN.Model.MES.order;
using DOAN.Model.MES.product;
using DOAN.Model.MES.quality.FQC;
using DOAN.Model.MES.SmartScreen;
using DOAN.Model.MES.SmartScreen.Quality.Dto;
using DOAN.Service.MES.SmartScreen.Order.IService;
using DOAN.Service.MES.SmartScreen.Quality.IService;
@@ -46,11 +47,10 @@ namespace DOAN.Service.MES.SmartScreen.Quality
return qualityScreenHeadDto;
}
public List<QualitySmartScreenDto> GetQualitySmartScreenForWeek()
public List<EchartsSeriesData> GetQualitySmartScreenForWeek()
{
// 获取当前日期
DateTime now = DateTime.Now;
// 计算本周周一（第一天）
int daysUntilMonday = ((int)now.DayOfWeek - (int)DayOfWeek.Monday + 7) % 7;
DateTime startOfWeek = now.AddDays(-daysUntilMonday);
@@ -66,18 +66,21 @@ namespace DOAN.Service.MES.SmartScreen.Quality
.LeftJoin<ProWorkorder>((defect, work) => defect.Workorder == work.Workorder)
.Where((defect, work) => defect.CheckDatetime >= startOfWeek && defect.CheckDatetime <= endOfWeek)
.GroupBy((defect, work) => new { work.StoveCode, defect.DefectName })
.Select((defect, work) => new QualitySmartScreenDto
.Select((defect, work) => new EchartsSeriesData
{
StoveCode = work.StoveCode,
DefectName = defect.DefectName,
Number = SqlFunc.AggregateSum(defect.Number)
Name = defect.DefectName,
Value =Convert.ToDecimal(defect.Number)
})
.ToList();
return result;
}
public List<QualitySmartScreenDto> GetQualitySmartScreenForMonth()
public List<EchartsSeriesData> GetQualitySmartScreenForMonth()
{
// 获取当前日期
DateTime now = DateTime.Now;
@@ -94,11 +97,10 @@ namespace DOAN.Service.MES.SmartScreen.Quality
.LeftJoin<ProWorkorder>((defect, work) => defect.Workorder == work.Workorder)
.Where((defect, work) => defect.CheckDatetime >= firstDayOfMonth && defect.CheckDatetime <= lastDayOfMonth)
.GroupBy((defect, work) => new { work.StoveCode, defect.DefectName })
.Select((defect, work) => new QualitySmartScreenDto
.Select((defect, work) => new EchartsSeriesData
{
StoveCode = work.StoveCode,
DefectName = defect.DefectName,
Number = SqlFunc.AggregateSum(defect.Number)
Name = defect.DefectName,
Value = Convert.ToDecimal(defect.Number)
})
.ToList();