From 7b34d7bbd6ff7d0682098435bc02953c724a60c0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E5=8D=A2=E6=B1=9F=E6=B5=B7?= <18360817963@163.com>
Date: Thu, 27 Mar 2025 16:32:17 +0800
Subject: [PATCH] =?UTF-8?q?=E8=B4=A8=E9=87=8F=E5=A4=A7=E5=B1=8F?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../Quality/IService/IQualitySmartService.cs  |  5 ++--
 .../Quality/QualitySmartService.cs            | 24 ++++++++++---------
 2 files changed, 16 insertions(+), 13 deletions(-)

diff --git a/DOAN.Service/MES/SmartScreen/Quality/IService/IQualitySmartService.cs b/DOAN.Service/MES/SmartScreen/Quality/IService/IQualitySmartService.cs
index 80e42a1..142c80d 100644
--- a/DOAN.Service/MES/SmartScreen/Quality/IService/IQualitySmartService.cs
+++ b/DOAN.Service/MES/SmartScreen/Quality/IService/IQualitySmartService.cs
@@ -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();
 	}
 }
diff --git a/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs b/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs
index 2234d55..ad171b5 100644
--- a/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs
+++ b/DOAN.Service/MES/SmartScreen/Quality/QualitySmartService.cs
@@ -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();