diff --git a/DOAN.Service/MES/quality/Analysis/FinalAnalysisService.cs b/DOAN.Service/MES/quality/Analysis/FinalAnalysisService.cs index 6adbdb3..d4ee2e0 100644 --- a/DOAN.Service/MES/quality/Analysis/FinalAnalysisService.cs +++ b/DOAN.Service/MES/quality/Analysis/FinalAnalysisService.cs @@ -3,6 +3,7 @@ using DOAN.Model.MES.andon.Dto; using DOAN.Model.MES.product; using DOAN.Model.MES.quality.Analysis.Dto; using DOAN.Model.MES.quality.FQC; +using DOAN.Model.MES.quality.IQC; using DOAN.Repository; using DOAN.Service.MES.quality.Analysis.IService; using Infrastructure.Attribute; @@ -28,11 +29,13 @@ namespace DOAN.Service.MES.quality.Analysis - List SeriesData = Context.Queryable(proWorkorders).LeftJoin((p, q) => p.Workorder == q.Workorder) - .GroupBy((p, q) => q.DefectCode) - .Select((p, q) => new ValueName() + List SeriesData = Context.Queryable(proWorkorders) + .LeftJoin((p, q) => p.Workorder == q.Workorder) + .LeftJoin((p,q,c)=>q.DefectCode==c.Code) + .GroupBy((p, q, c) => q.DefectCode) + .Select((p, q, c) => new ValueName() { - Name = q.DefectCode, + Name =SqlFunc.AggregateMin(c.Name), Value = SqlFunc.AggregateSum(q.Number ?? 0) }).ToList();