From 2e16ebb9d30f0bc93792da815d67ba58fa843a80 Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Thu, 2 Apr 2026 15:47:47 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E7=84=8A=E6=8E=A5=E4=BB=BB=E5=8A=A1?= =?UTF-8?q?=E5=8D=95=E6=89=93=E5=8D=B0=E6=9D=90=E6=96=99=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=E7=8E=87=E6=98=BE=E7=A4=BA=E9=97=AE=E9=A2=98=E4=BF=AE=E6=94=B9?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/CLGL/TwArrivalStatisticsService.cs | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) 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; } }