From c22cc4c60e9ff156fc25b39a5c024cc758df354b Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期一, 30 十二月 2024 09:40:51 +0800
Subject: [PATCH] 水力模块联动修改

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 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 9d44c12..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,7 +17,7 @@
             {
                 this.Caliber = rhs.Caliber.ToString();
             }
-            if (rhs.Material == null)
+            if (rhs.Material == null || rhs.Material == string.Empty)
             {
                 this.Material = "榛樿";
             }
@@ -29,7 +29,7 @@
             this.SeriesID = rhs.SeriesID;
             this.ValveType = rhs.ValveType;
             this.SortCode = rhs.SortCode;
-            this.KeyWord = rhs.KeyWord;
+            this.KeyWord = string.Join(",", rhs.KeyWords);
             this.ValveSetting = rhs.ValveSetting;
         }
 
@@ -47,7 +47,7 @@
             {
                 this.Caliber = rhs.Caliber.ToString();
             }
-            if (rhs.Material == null)
+            if (rhs.Material == null || rhs.Material == string.Empty)
             {
                 this.Material = "榛樿";
             }
@@ -59,7 +59,7 @@
             this.SeriesID = rhs.SeriesID;
             this.ValveType = rhs.ValveType;
             this.SortCode = rhs.SortCode;
-            this.KeyWord = rhs.KeyWord;
+            this.KeyWord = string.Join(",", rhs.KeyWords);
             this.ValveSetting = rhs.ValveSetting;
         }
 

--
Gitblit v1.9.3