From 30ed22732a7527f4e3416403151fc6be854b61de Mon Sep 17 00:00:00 2001 From: fei550 <1420031550@qq.com> Date: Fri, 17 Apr 2026 15:51:43 +0800 Subject: [PATCH] =?UTF-8?q?fix:=E6=9D=90=E6=96=99=E5=8C=B9=E9=85=8D?= =?UTF-8?q?=EF=BC=8C=E7=84=8A=E6=8E=A5=E4=BB=BB=E5=8A=A1=E5=8D=95=E5=8C=B9?= =?UTF-8?q?=E9=85=8D=E7=8E=87=E4=BF=9D=E6=8C=81=E4=B8=80=E8=87=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- SGGL/BLL/CLGL/TwArrivalStatisticsService.cs | 33 ++++----------------- 1 file changed, 5 insertions(+), 28 deletions(-) diff --git a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs index ef19aeb9..f55d890c 100644 --- a/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs +++ b/SGGL/BLL/CLGL/TwArrivalStatisticsService.cs @@ -153,36 +153,13 @@ var stockList = TwMaterialstockService.GetTw_MaterialStockByModle(twMaterialStoc using (Model.SGGLDB db = new Model.SGGLDB(Funs.ConnString)) { var twPipeMatMatchOutputs = new List(); + List pipelineIds = new List(); + pipelineIds.Add(pipelineId); var pipelineModel = PipelineService.GetPipelineByPipelineId(pipelineId); 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 - join z in db.HJGL_Pipeline on x.PipelineId equals z.PipelineId - join m in db.WBS_UnitWork on z.UnitWorkId equals m.UnitWorkId - where z.PipelineId == pipelineId && x.PrefabricatedComponents != "" //x.PrefabricatedComponents!="" 用于筛选非散件材料 - select new Tw_PipeMatMatchOutput - { - Id = Guid.NewGuid().ToString(), - PipelineId = x.PipelineId, - PipelineCode = z.PipelineCode, - UnitWorkId = z.UnitWorkId, - UnitWorkName = m.UnitWorkName, - PrefabricatedComponents = x.PrefabricatedComponents, - MaterialCode = x.MaterialCode, - MaterialName = y.MaterialName, - MaterialSpec = y.MaterialSpec, - MaterialUnit = y.MaterialUnit, - MaterialDef = y.MaterialDef, - NeedNum = x.Number, - } - ).ToList(); - - twPipeMatMatchOutputs = GetMatMatchOutput(requiredMaterials, warehouseCode, pipelineModel.ProjectId); - var result = twPipeMatMatchOutputs.Any() - ? twPipeMatMatchOutputs.Average(x => x.MatchRate) - : 0; - return result; + var PipeMatMatch = GetPipeMatMatch(pipelineModel.ProjectId, pipelineIds, warehouseCode); + var pipeMatchRate = GetPipeMatch(PipeMatMatch).FirstOrDefault(x => x.PipelineId == pipelineId); + return pipeMatchRate?.MatchRate; } } ///