From df03507ed132eda9d46f95e8fc7046735d6c808e Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期一, 17 三月 2025 10:19:48 +0800
Subject: [PATCH] 增加pchart-relation的初始化数据库

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/03-equipment/EquipmentViewModel.cs |   36 +++++++++++++++++++++---------------
 1 files changed, 21 insertions(+), 15 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/03-equipment/EquipmentViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/03-equipment/EquipmentViewModel.cs
index bd7c48e..03ed8ad 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/03-equipment/EquipmentViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/12-package/03-equipment/EquipmentViewModel.cs
@@ -12,14 +12,17 @@
             this.KitID = kitID;
             this.PumpID = rhs.PumpMainID;
             this.Name = rhs.PumpOtherName;
-            this.OtherName = pump.Name;
-            this.RatedFlow = pump.RatedFlow;
-            this.RatedEfficiency = pump.RatedEfficiency;
-            this.RatedHead = pump.RatedHead;
-            this.RatedPower = pump.RatedPower;
-            this.Erosion = pump.Erosion;
-            this.RatedSpeed = pump.RatedSpeed;
-        }
+            if (pump != null)
+            {
+                this.OtherName = pump.Name;
+                this.RatedFlow = pump.RatedFlow;
+                this.RatedEfficiency = pump.RatedEfficiency;
+                this.RatedHead = pump.RatedHead;
+                this.RatedPower = pump.RatedPower;
+                this.Erosion = pump.Erosion;
+                this.RatedSpeed = pump.RatedSpeed;
+            }
+         }
 
         public void Reset(Vmo.AssetsPackagePumpMappingVmo rhs, Vmo.AssetsPumpMainVmo pump, long kitID)
 
@@ -28,13 +31,16 @@
             this.KitID = kitID;
             this.PumpID = rhs.PumpMainID;
             this.Name = rhs.PumpOtherName;
-            this.OtherName = pump.Name;
-            this.RatedFlow = pump.RatedFlow;
-            this.RatedEfficiency = pump.RatedEfficiency;
-            this.RatedHead = pump.RatedHead;
-            this.RatedPower = pump.RatedPower;
-            this.Erosion = pump.Erosion;
-            this.RatedSpeed = pump.RatedSpeed;
+            if (pump != null)
+            {
+                this.OtherName = pump.Name;
+                this.RatedFlow = pump.RatedFlow;
+                this.RatedEfficiency = pump.RatedEfficiency;
+                this.RatedHead = pump.RatedHead;
+                this.RatedPower = pump.RatedPower;
+                this.Erosion = pump.Erosion;
+                this.RatedSpeed = pump.RatedSpeed;
+            }
         }
 
         /// <summary>

--
Gitblit v1.9.3