From 0cd48df8ccca96a8a0117a508c342a90dc2eacb8 Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期五, 08 十一月 2024 13:07:43 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/08-nozzle/02-main/SprinklerViewModel.cs |   59 +++++++++++++++++++++++++----------------------------------
 1 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/NozzleViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-nozzle/02-main/SprinklerViewModel.cs
similarity index 68%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/NozzleViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/08-nozzle/02-main/SprinklerViewModel.cs
index 7e72d42..f1f058b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-Nozzle/02-main/NozzleViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/08-nozzle/02-main/SprinklerViewModel.cs
@@ -2,13 +2,13 @@
 
 namespace HStation.WinFrmUI.Assets
 {
-    public class NozzleViewModel
+    public class SprinklerViewModel
     {
-        public NozzleViewModel()
+        public SprinklerViewModel()
         {
         }
 
-        public NozzleViewModel(Vmo.AssetsNozzleMainVmo rhs)
+        public SprinklerViewModel(Vmo.AssetsSprinklerMainVmo rhs)
         {
             this.ID = rhs.ID;
             this.Description = rhs.Description;
@@ -20,24 +20,23 @@
             {
                 this.Caliber = rhs.Caliber.ToString();
             }
-            if (rhs.MaterialName == null)
+            if (rhs.Material == null)
             {
-                this.MaterialName = "榛樿";
+                this.Material = "榛樿";
             }
             else
             {
-                this.MaterialName = rhs.MaterialName.ToString();
+                this.Material = rhs.Material.ToString();
             }
             this.Name = rhs.Name;
             this.SortCode = rhs.SortCode;
             this.KeyWord = rhs.KeyWord;
-            this.IsDefault = rhs.IsDefault;
-            this.Coefficient = rhs.Coefficient;
+            this.MinorLoss = rhs.MinorLoss;
             this.Angle = rhs.Angle;
-            this.Flowcoefficient = rhs.Flowcoefficient;
+            this.FlowMinorLoss = rhs.FlowMinorLoss;
         }
 
-        public void Reset(Vmo.AssetsNozzleMainVmo rhs)
+        public void Reset(Vmo.AssetsSprinklerMainVmo rhs)
         {
             this.ID = rhs.ID;
             if (rhs.Caliber == null)
@@ -48,22 +47,21 @@
             {
                 this.Caliber = rhs.Caliber.ToString();
             }
-            if (rhs.MaterialName == null)
+            if (rhs.Material == null)
             {
-                this.MaterialName = "榛樿";
+                this.Material = "榛樿";
             }
             else
             {
-                this.MaterialName = rhs.MaterialName.ToString();
+                this.Material = rhs.Material.ToString();
             }
             this.Description = rhs.Description;
             this.Name = rhs.Name;
             this.KeyWord = rhs.KeyWord;
-            this.IsDefault = rhs.IsDefault;
             this.SortCode = rhs.SortCode;
-            this.Coefficient = rhs.Coefficient;
+            this.MinorLoss = rhs.MinorLoss;
             this.Angle = rhs.Angle;
-            this.Flowcoefficient = rhs.Flowcoefficient;
+            this.FlowMinorLoss = rhs.FlowMinorLoss;
         }
 
         /// <summary>
@@ -90,28 +88,35 @@
         /// </summary>
         [DisplayName("鏉愭枡")]
         [Browsable(true)]
-        public string MaterialName { get; set; }
+        public string Material { get; set; }
 
         /// <summary>
         /// 鍠疯
         /// </summary>
         [DisplayName("鍠疯")]
         [Browsable(true)]
-        public string Angle { get; set; }
+        public int? Angle { get; set; }
 
         /// <summary>
         /// 绯绘暟
         /// </summary>
         [DisplayName("鍠峰皠绯绘暟")]
         [Browsable(true)]
-        public double? Coefficient { get; set; }
+        public double MinorLoss { get; set; }
 
         /// <summary>
         /// 娴侀噺绯绘暟
         /// </summary>
         [DisplayName("娴侀噺绯绘暟")]
         [Browsable(true)]
-        private double? Flowcoefficient { get; set; }
+        private double? FlowMinorLoss { get; set; }
+
+        /// <summary>
+        /// 璇嗗埆鍏抽敭瀛�
+        /// </summary>
+        [DisplayName("鍏抽敭瀛�")]
+        [Browsable(true)]
+        public List<string> KeyWord { get; set; }
 
         /// <summary>
         /// 鎺掑簭鐮�
@@ -119,20 +124,6 @@
         [DisplayName("鎺掑簭鐮�")]
         [Browsable(true)]
         public int SortCode { get; set; }
-
-        /// <summary>
-        /// 璇嗗埆鍏抽敭瀛�
-        /// </summary>
-        [DisplayName("鍏抽敭瀛�")]
-        [Browsable(true)]
-        public string KeyWord { get; set; }
-
-        /// <summary>
-        /// 鏄惁榛樿
-        /// </summary>
-        [DisplayName("鏄惁榛樿")]
-        [Browsable(true)]
-        public bool IsDefault { get; set; }
 
         /// <summary>
         /// 璇存槑

--
Gitblit v1.9.3