From 53ca1ab0c4a3d35fea83e4dd3dcde40e93428df5 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 11 十一月 2024 17:21:12 +0800
Subject: [PATCH] 细化资产表

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs |   10 ++++------
 1 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs
index fec8ae4..1e05f7f 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs
@@ -20,13 +20,13 @@
             {
                 this.Caliber = rhs.Caliber.ToString();
             }
-            if (rhs.MaterialName == null)
+            if (rhs.Material == null)
             {
                 this.MaterialName = "榛樿";
             }
             else
             {
-                this.MaterialName = rhs.MaterialName.ToString();
+                this.MaterialName = rhs.Material.ToString();
             }
             this.Hazen = rhs.Hazen;
             this.Darcy = rhs.Darcy;
@@ -34,7 +34,6 @@
             this.Name = rhs.Name;
             this.SortCode = rhs.SortCode;
             this.KeyWord = rhs.KeyWord;
-            this.IsDefault = rhs.IsDefault;
         }
 
         public void Reset(Vmo.AssetsPipeMainVmo rhs)
@@ -51,11 +50,10 @@
             {
                 this.Caliber = rhs.Caliber.ToString();
             }
-            this.MaterialName = rhs.MaterialName;
+            this.MaterialName = rhs.Material;
             this.Description = rhs.Description;
             this.Name = rhs.Name;
             this.KeyWord = rhs.KeyWord;
-            this.IsDefault = rhs.IsDefault;
             this.SortCode = rhs.SortCode;
         }
 
@@ -118,7 +116,7 @@
         /// </summary>
         [DisplayName("鍏抽敭瀛�")]
         [Browsable(true)]
-        public string KeyWord { get; set; }
+        public List<string> KeyWord { get; set; }
 
         /// <summary>
         /// 鏄惁榛樿

--
Gitblit v1.9.3