diff --git a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs index 85306403..5ac03dab 100644 --- a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs +++ b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs @@ -1,5 +1,6 @@  using Model; +using Newtonsoft.Json; using System; using System.Collections.Generic; using System.Linq; @@ -125,9 +126,7 @@ namespace BLL { var twPipeMatMatchOutputs = new List(); var pipelineModel = PipelineService.GetPipelineByPipelineId(pipelineId); - string warehouseCode = PipelineService - .GetPipeArea().FirstOrDefault(x => x.Value == pipelineModel.PipeArea.ToString()) - ?.Text; + string warehouseCode = BLL.Base_WarehouseService.GetWarehouseByWarehouseId(PipelineService.GetPipelineByPipelineId(pipelineModel.PipelineId).WarehouseId).WarehouseName; // 获取所需材料列表 var requiredMaterials = (from x in db.HJGL_PipeLineMat join y in db.HJGL_MaterialCodeLib on x.MaterialCode equals y.MaterialCode @@ -152,7 +151,9 @@ namespace BLL ).ToList(); twPipeMatMatchOutputs = GetMatMatchOutput(requiredMaterials, warehouseCode, pipelineModel.ProjectId); - var result = twPipeMatMatchOutputs.Count == 0 ? 0 : twPipeMatMatchOutputs.Sum(x => x.MatchRate) / twPipeMatMatchOutputs.Count; + var result = twPipeMatMatchOutputs.Any() + ? twPipeMatMatchOutputs.Average(x => x.MatchRate) + : 0; return result; } }