质量大屏

DOAN.Model/MES/SmartScreen/Quality/Dto/QualityScreenHeadDto.cs

@@ -8,16 +8,46 @@ namespace DOAN.Model.MES.SmartScreen.Quality.Dto
 {
     public class QualityScreenHeadDto
     {
+
+		/// <summary>
+		/// 本月异常数
+		/// </summary>
         public int? MonthFQC { get; set; }
 
+		/// <summary>
+		/// 本周异常数
+		/// </summary>
 		public int? WeekFQC { get; set; }
 
+		/// <summary>
+		/// 本月合格率
+		/// </summary>
 		public string MonthPassRate { get; set; }
+
+		/// <summary>
+		/// 本周合格率
+		/// </summary>
 		public string WeekPassRate { get; set; }
 
-
+		/// <summary>
+		/// 本月同比上涨
+		/// </summary>
 		public string OnYearMonthPassRate { get; set; }
+
+		/// <summary>
+		/// 本周同比上涨
+		/// </summary>
 		public string OnYearWeekPassRate { get; set; }
 
+		/// <summary>
+		/// 本月总数
+		/// </summary>
+        public double MonthTotalNum { get; set; }
+
+		/// <summary>
+		/// 本周总数
+		/// </summary>
+		public double WeekTotalNum { get; set; }
+
 	}
 }

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<QcFinishedproductDefectCollection>()
 				.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<QcFinishedproductDefectCollection>()
 				.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<string> classname = qcFinishedproductDefectCollections.Select(o => o.DefectName).Distinct().ToList();
+			List<string> 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<string> classname = qcFinishedproductDefectCollections.Select(o => o.DefectName).Distinct().ToList();
+			List<string> classname = qcFinishedproductDefectCollections.OrderBy(o => o.DefectCode).Select(o => o.DefectName).Distinct().ToList();
 
 			foreach (var classitem in classname)
 			{