From ab65b0ac21e7fabfd8548538142d9a1b66a2ad3d Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 20 十二月 2024 13:14:49 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs |   44 +++++++++++++++++++++++++++++++-------------
 1 files changed, 31 insertions(+), 13 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs
index 57cb598..514d3e8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs
@@ -17,18 +17,20 @@
             {
                 this.Caliber = rhs.Caliber.ToString();
             }
-            if (rhs.MaterialName == null)
+            if (rhs.Material == null || rhs.Material == string.Empty)
             {
                 this.Material = "榛樿";
             }
             else
             {
-                this.Material = rhs.MaterialName.ToString();
+                this.Material = rhs.Material.ToString();
             }
-            this.Coefficient = rhs.Coefficient;
+            this.Coefficient = rhs.MinorLoss;
             this.SeriesID = rhs.SeriesID;
-            this.SeriesType = rhs.SeriesType;
+            this.ValveType = rhs.ValveType;
             this.SortCode = rhs.SortCode;
+            this.KeyWord = string.Join(",", rhs.KeyWords);
+            this.ValveSetting = rhs.ValveSetting;
         }
 
         public void Reset(Vmo.AssetsValveMainVmo rhs)
@@ -36,7 +38,7 @@
             this.ID = rhs.ID;
             this.Name = rhs.Name;
             this.Description = rhs.Description;
-            this.Material = rhs.MaterialName;
+            this.Material = rhs.Material;
             if (rhs.Caliber == null)
             {
                 this.Caliber = "榛樿";
@@ -45,18 +47,20 @@
             {
                 this.Caliber = rhs.Caliber.ToString();
             }
-            if (rhs.MaterialName == null)
+            if (rhs.Material == null || rhs.Material == string.Empty)
             {
                 this.Material = "榛樿";
             }
             else
             {
-                this.Material = rhs.MaterialName.ToString();
+                this.Material = rhs.Material.ToString();
             }
-            this.Coefficient = rhs.Coefficient;
+            this.Coefficient = rhs.MinorLoss;
             this.SeriesID = rhs.SeriesID;
-            this.SeriesType = rhs.SeriesType;
+            this.ValveType = rhs.ValveType;
             this.SortCode = rhs.SortCode;
+            this.KeyWord = string.Join(",", rhs.KeyWords);
+            this.ValveSetting = rhs.ValveSetting;
         }
 
         [DisplayName("ID")]
@@ -96,14 +100,14 @@
         /// </summary>
         [DisplayName("绫诲瀷")]
         [Browsable(true)]
-        public HStation.Assets.eAssetsValveSeriesType SeriesType { get; set; }
+        public HStation.Assets.eValveType ValveType { get; set; }
 
         /// <summary>
         /// 璇存槑
         /// </summary>
         [DisplayName("璇存槑")]
         [Browsable(true)]
-        public string? Description { get; set; }
+        public string Description { get; set; }
 
         /// <summary>
         /// 鎺掑簭鐮�
@@ -123,14 +127,28 @@
         /// 鍒涘缓浜�
         /// </summary>
         [DisplayName("鍒涘缓浜�")]
-        [Browsable(true)]
+        [Browsable(false)]
         public string CreateName { get; set; }
 
         /// <summary>
         /// 鍒涘缓鏃堕棿
         /// </summary>
         [DisplayName("鍒涘缓鏃堕棿")]
-        [Browsable(true)]
+        [Browsable(false)]
         public string CreateTime { get; set; }
+
+        /// <summary>
+        /// 璇嗗埆鍏抽敭瀛�
+        /// </summary>
+        [DisplayName("鍏抽敭瀛�")]
+        [Browsable(true)]
+        public string KeyWord { get; set; }
+
+        /// <summary>
+        /// 闃�闂ㄨ缃�
+        /// </summary>
+        [DisplayName("闃�闂ㄨ缃�")]
+        [Browsable(true)]
+        public string ValveSetting { get; set; }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3