diff --git a/DOAN.Model/MES/SmartScreen/Quality/Dto/QualityScreenHeadDto.cs b/DOAN.Model/MES/SmartScreen/Quality/Dto/QualityScreenHeadDto.cs index 6ee5388..7ffc575 100644 --- a/DOAN.Model/MES/SmartScreen/Quality/Dto/QualityScreenHeadDto.cs +++ b/DOAN.Model/MES/SmartScreen/Quality/Dto/QualityScreenHeadDto.cs @@ -8,16 +8,46 @@ namespace DOAN.Model.MES.SmartScreen.Quality.Dto { public class QualityScreenHeadDto { + + /// + /// 本月异常数 + /// public int? MonthFQC { get; set; } + /// + /// 本周异常数 + /// public int? WeekFQC { get; set; } + /// + /// 本月合格率 + /// public string MonthPassRate { get; set; } + + /// + /// 本周合格率 + /// public string WeekPassRate { get; set; } - + /// + /// 本月同比上涨 + /// public string OnYearMonthPassRate { get; set; } + + /// + /// 本周同比上涨 + /// public string OnYearWeekPassRate { get; set; } + /// + /// 本月总数 + /// + public double MonthTotalNum { get; set; } + + /// + /// 本周总数 + /// + public double WeekTotalNum { get; set; } + } } diff --git a/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs b/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs index 523e9fa..1a07cd3 100644 --- a/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs +++ b/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs @@ -85,6 +85,10 @@ namespace DOAN.Service.MES.SmartScreen.Quality qualityScreenHeadDto.OnYearMonthPassRate = (ratioMonth - ratioUpperMonth).ToString("P2"); qualityScreenHeadDto.OnYearWeekPassRate = (ratioWeek - ratioUpperWeek).ToString("P2"); + + qualityScreenHeadDto.MonthTotalNum = planSumMonth; + qualityScreenHeadDto.WeekTotalNum = planSumWeek; + return qualityScreenHeadDto; } @@ -106,6 +110,7 @@ namespace DOAN.Service.MES.SmartScreen.Quality var result = Context.Queryable() .Where(defect => defect.CheckDatetime >= startOfWeek && defect.CheckDatetime <= endOfWeek) .GroupBy(defect => new { defect.DefectCode }) + .OrderBy(defect => new { defect.DefectCode }) .Select(defect => new EchartsSeriesData { @@ -133,6 +138,7 @@ namespace DOAN.Service.MES.SmartScreen.Quality var result = Context.Queryable() .Where(defect => defect.CheckDatetime >= firstDayOfMonth && defect.CheckDatetime <= lastDayOfMonth) .GroupBy(defect => new { defect.DefectCode }) + .OrderBy(defect => new { defect.DefectCode }) .Select(defect => new EchartsSeriesData { @@ -185,7 +191,7 @@ namespace DOAN.Service.MES.SmartScreen.Quality .Where(defect => defect.CheckDatetime >= firstDayOfMonth && defect.CheckDatetime <= lastDayOfMonth).ToList(); - List classname = qcFinishedproductDefectCollections.Select(o => o.DefectName).Distinct().ToList(); + List classname = qcFinishedproductDefectCollections.OrderBy(o=>o.DefectCode).Select(o => o.DefectName).Distinct().ToList(); foreach (var classitem in classname) { @@ -250,7 +256,7 @@ namespace DOAN.Service.MES.SmartScreen.Quality .Where(defect => defect.CheckDatetime >= firstDayOfMonth && defect.CheckDatetime <= lastDayOfMonth).ToList(); - List classname = qcFinishedproductDefectCollections.Select(o => o.DefectName).Distinct().ToList(); + List classname = qcFinishedproductDefectCollections.OrderBy(o => o.DefectCode).Select(o => o.DefectName).Distinct().ToList(); foreach (var classitem in classname) {