diff --git a/ZR.Service/MES/andon/AndonDataAnalysisServcie.cs b/ZR.Service/MES/andon/AndonDataAnalysisServcie.cs index 68a2ab7..8264649 100644 --- a/ZR.Service/MES/andon/AndonDataAnalysisServcie.cs +++ b/ZR.Service/MES/andon/AndonDataAnalysisServcie.cs @@ -11,6 +11,7 @@ using ZR.Model.MES.andon; using ZR.Model.MES.andon.Dto; using ZR.Model.MES.dev; using ZR.Service.MES.andon.IService; +using static System.Runtime.InteropServices.JavaScript.JSType; namespace ZR.Service.MES.andon { @@ -143,10 +144,14 @@ namespace ZR.Service.MES.andon { DateTime midnight = GetMidnightTime(xdata); DateTime noon = GetNoonTime(xdata); - Data[Xdata.IndexOf(xdata)] =InitData.Where(it => it.StartTime >= midnight && it.StartTime <= noon).Sum(it=>it.Duration); + var temp= InitData.Where(it => it.StartTime >= midnight && it.StartTime <= noon).Sum(it => it.Duration); + Data[Xdata.IndexOf(xdata)] = Math.Round(temp, 2); + + + exceptionDistributionResult.ExceptionTimeTotal = exceptionDistributionResult.ExceptionTimeTotal+ Data[Xdata.IndexOf(xdata)]; } - EveTIME.Data = Data; + EveTIME.Data = Dat } @@ -163,7 +168,9 @@ namespace ZR.Service.MES.andon { DateTime midnight = GetMidnightTime(xdata); DateTime noon = GetNoonTime(xdata); - Data[Xdata.IndexOf(xdata)] = InitData.Where(it => it.StartTime >= midnight && it.StartTime <= noon).Count(); + decimal temp= InitData.Where(it => it.StartTime >= midnight && it.StartTime <= noon).Count(); + Data[Xdata.IndexOf(xdata)] = temp; + exceptionDistributionResult.ExceptionNumTotal = exceptionDistributionResult.ExceptionNumTotal+Data[Xdata.IndexOf(xdata)]; } EveTNUM.Data = Data;