冲突

Shuxia Ning

2025-01-08 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs

@@ -1,11 +1,4 @@
using HStation.CAL;
using HStation.WinFrmUI.PhartRelation;
using Swashbuckle.AspNetCore.SwaggerGen;
using System.Linq;
using System.Windows.Input;
using Yw.WinFrmUI.Q3d;

namespace HStation.WinFrmUI
namespace HStation.WinFrmUI
{
    public class AssetsMatchingHelper
    {
@@ -424,8 +417,8 @@
            {
                input.MatchingValveSetting = valve.ValveSetting;
            }
            input.MatchingValveType = (Yw.WinFrmUI. eValveType)(int )valve.ValveType;
             if (input.CurveDbId == null)
            input.MatchingValveType = (Yw.WinFrmUI.eValveType)(int)valve.ValveType;
            if (input.CurveDbId == null)
            {
                var list = Task.Run(async () =>
                    await new BLL.PhartDiagramRelation().GetExByObjectTypeAndObjectID(HStation.Assets.DataType.ValveMain, valve.ID)).Result;
@@ -924,7 +917,7 @@
            }
            if (input.MinorLoss <= 0)
            {
                input.MatchingMinorLoss = sprinkler.MinorLoss;
                input.MatchingMinorLoss = sprinkler.FlowMinorLoss;
            }

            return true;