From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs | 15 ++++-----------
1 files changed, 4 insertions(+), 11 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
index 9de923a..5509503 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
@@ -1,11 +1,4 @@
-锘縰sing HStation.CAL;
-using HStation.WinFrmUI.PhartRelation;
-using Swashbuckle.AspNetCore.SwaggerGen;
-using System.Linq;
-using System.Windows.Input;
-using Yw.WinFrmUI.Q3d;
-
-namespace HStation.WinFrmUI
+锘縩amespace 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;
--
Gitblit v1.9.3