From d9b8c4b8639e5239cea8fbb88fa2ae6fa1ac706b Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 23 九月 2024 09:48:29 +0800
Subject: [PATCH] 提交修改

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModel.cs |   68 ++++++++++++++++++++++++++++++++--
 1 files changed, 64 insertions(+), 4 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModel.cs
index afa5c6f..5d346ab 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModel.cs
@@ -1,4 +1,6 @@
-锘縩amespace Yw.WinFrmUI
+锘縰sing SqlSugar;
+
+namespace Yw.WinFrmUI
 {
     /// <summary>
     /// 姘村姏缁勪欢灞炴�ц鍥�
@@ -20,7 +22,9 @@
             this.Catalog = HydroParterCatalogHelper.GetCatalogName(rhs.Catalog);
             this.Name = rhs.Name;
             this.Code = rhs.Code;
-            this.Flags = rhs.Flags;
+            this.ModelType = rhs.ModelType;
+            this.DbId = rhs.DbId;
+            this.Flags = rhs.Flags?.ToList();
             this.Description = rhs.Description;
         }
 
@@ -62,11 +66,38 @@
         public string Code { get; set; }
 
         /// <summary>
+        /// 鍨嬪彿
+        /// </summary>
+        [Category("鍩虹淇℃伅")]
+        [DisplayName("鍨嬪彿")]
+        [PropertyOrder(5)]
+        [Browsable(true)]
+        public string ModelType { get; set; }
+
+        /// <summary>
+        /// DbId
+        /// </summary>
+        [Category("鍩虹淇℃伅")]
+        [DisplayName("DbId")]
+        [PropertyOrder(6)]
+        [Browsable(false)]
+        public string DbId { get; set; }
+
+        /// <summary>
+        /// 閿佸畾
+        /// </summary>
+        [Category("鍩虹淇℃伅")]
+        [DisplayName("閿佸畾")]
+        [PropertyOrder(7)]
+        [Browsable(true)]
+        public bool DbLocked { get; set; }
+
+        /// <summary>
         /// 鏍囩
         /// </summary>
         [Category("鍩虹淇℃伅")]
         [DisplayName("鏍囩")]
-        [PropertyOrder(5)]
+        [PropertyOrder(8)]
         [Browsable(true)]
         public List<string> Flags { get; set; }
 
@@ -75,11 +106,40 @@
         /// </summary>
         [Category("鍩虹淇℃伅")]
         [DisplayName("璇存槑")]
-        [PropertyOrder(5)]
+        [PropertyOrder(9)]
         [MultiText]
         [Browsable(true)]
         public string Description { get; set; }
 
+        /// <summary>
+        /// 鏇存柊灞炴��
+        /// </summary>
+        /// <param name="rhs">褰撳墠缁勪欢</param>
+        /// <param name="allParterList">鎵�鏈夌粍浠跺垪琛�</param>
+        public virtual void UpdateProperty(Yw.Model.HydroParterInfo rhs, List<Yw.Model.HydroParterInfo> allParterList)
+        {
+            this.ID = rhs.ID;
+            this.Catalog = HydroParterCatalogHelper.GetCatalogName(rhs.Catalog);
+            this.Name = rhs.Name;
+            this.Code = rhs.Code;
+            this.ModelType = rhs.ModelType;
+            this.DbId = rhs.DbId;
+            this.DbLocked = rhs.DbLocked;
+            this.Flags = rhs.Flags?.ToList();
+            this.Description = rhs.Description;
+        }
+
+        /// <summary>
+        /// 鏇存柊璁$畻灞炴��
+        /// </summary>
+        /// <param name="rhs">璁$畻灞炴��</param>
+        public virtual void UpdateCalcuProperty(IHydroCalcuProperty rhs)
+        {
+
+        }
+
+
+
 
 
 

--
Gitblit v1.9.3