From 083c4e47c7a59025f3348bd093693c6b3febb014 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 16 十月 2024 10:03:31 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 Hydro/HStation.Hydro.Core/TransferHelper.cs |    6 +++---
 1 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/Hydro/HStation.Hydro.Core/TransferHelper.cs b/Hydro/HStation.Hydro.Core/TransferHelper.cs
index 9205cb0..e956196 100644
--- a/Hydro/HStation.Hydro.Core/TransferHelper.cs
+++ b/Hydro/HStation.Hydro.Core/TransferHelper.cs
@@ -65,7 +65,7 @@
                     tank.InitLevel = revitTank.InitLevel;
                     tank.MinLevel = revitTank.MinLevel;
                     tank.MaxLevel = revitTank.MaxLevel;
-                    tank.Diameter = revitTank.Diameter;
+                    tank.Diameter = revitTank.DN;
                     tank.MinVol = revitTank.MinVol;
                     tank.VolCurve = revitTank.VolCurve;
                     tank.Position2d = new Yw.Model.Hydro.Position2d(revitTank.Position.X, revitTank.Position.Y);
@@ -97,7 +97,7 @@
                     waterbox.InitLevel = revitWaterbox.InitLevel;
                     waterbox.MinLevel = revitWaterbox.MinLevel;
                     waterbox.MaxLevel = revitWaterbox.MaxLevel;
-                    waterbox.Diameter = revitWaterbox.Diameter;
+                    waterbox.Diameter = revitWaterbox.DN;
                     waterbox.MinVol = revitWaterbox.MinVol;
                     waterbox.VolCurve = revitWaterbox.VolCurve;
                     waterbox.Position2d = new Yw.Model.Hydro.Position2d(revitWaterbox.Position.X, revitWaterbox.Position.Y);
@@ -409,7 +409,7 @@
                     pump.StartCode = revitPump.StartCode;
                     pump.EndCode = revitPump.EndCode;
                     pump.LinkStatus = revitPump.LinkStatus;
-                    pump.RatedP = revitPump.RatedPower;
+                    pump.RatedP = revitPump.RatedP;
                     pump.CurveQH = revitPump.CurveQH;
                     pump.Price = revitPump.Price;
                     pump.PricePattern = revitPump.PricePattern;

--
Gitblit v1.9.3