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; } } ///