From 3b08b5c772ffc0c10644c1aaa9f7b2447582c858 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 14 十月 2024 17:50:24 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/03-property/00-core/HydroParterPropertyViewModel.cs |   81 ++++++++++++++++++++++++++++++----------
 1 files changed, 61 insertions(+), 20 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 3fb6664..efcb4ce 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
@@ -9,67 +9,88 @@
         /// <summary>
         /// 
         /// </summary>
-        public HydroParterPropertyViewModel() { }
+        public HydroParterPropertyViewModel()
+        {
+            this.PropStatusList = new List<HydroParterPropStatusViewModel>();
+        }
 
         /// <summary>
         /// 
         /// </summary>
-        public HydroParterPropertyViewModel(Yw.Model.HydroParterInfo rhs)
+        public HydroParterPropertyViewModel(Yw.Model.HydroParterInfo rhs) : this()
         {
             this.ID = rhs.ID;
             this.Catalog = HydroParterCatalogHelper.GetCatalogName(rhs.Catalog);
             this.Name = rhs.Name;
             this.Code = rhs.Code;
             this.ModelType = rhs.ModelType;
-            this.Flags = rhs.Flags?.ToList();
+            this.DbId = rhs.DbId;
+            this.HasDb = !string.IsNullOrEmpty(rhs.DbId);
+            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
             this.Description = rhs.Description;
+            this.DbLocked = rhs.DbLocked;
         }
 
 
         /// <summary>
         /// ID
         /// </summary>
-        [Category("鍩虹淇℃伅")]
-        [DisplayName("ID")]
-        [PropertyOrder(1)]
         [Browsable(false)]
-        public long ID { get; set; }
+        public virtual long ID { get; set; }
 
         /// <summary>
         /// 鍒嗙被
         /// </summary>
         [Category("鍩虹淇℃伅")]
         [DisplayName("鍒嗙被")]
-        [PropertyOrder(2)]
+        [PropertyOrder(1)]
         [Browsable(true)]
-        public string Catalog { get; set; }
+        [ReadOnly(true)]
+        public virtual string Catalog { get; set; }
 
         /// <summary>
         /// 鍚嶇О
         /// </summary>
         [Category("鍩虹淇℃伅")]
         [DisplayName("鍚嶇О")]
-        [PropertyOrder(3)]
+        [PropertyOrder(2)]
         [Browsable(true)]
-        public string Name { get; set; }
+        public virtual string Name { get; set; }
 
         /// <summary>
         /// 缂栫爜
         /// </summary>
         [Category("鍩虹淇℃伅")]
         [DisplayName("缂栫爜")]
-        [PropertyOrder(4)]
+        [PropertyOrder(3)]
         [Browsable(true)]
-        public string Code { get; set; }
+        [ReadOnly(true)]
+        public virtual string Code { get; set; }
 
         /// <summary>
         /// 鍨嬪彿
         /// </summary>
         [Category("鍩虹淇℃伅")]
         [DisplayName("鍨嬪彿")]
-        [PropertyOrder(5)]
+        [PropertyOrder(4)]
+        [IsHydroModelType]
         [Browsable(true)]
-        public string ModelType { get; set; }
+        public virtual string ModelType { get; set; }
+
+        /// <summary>
+        /// DbId
+        /// </summary>
+        [Browsable(false)]
+        public virtual string DbId { get; set; }
+
+        /// <summary>
+        /// 鍖归厤
+        /// </summary>
+        [Category("鍩虹淇℃伅")]
+        [DisplayName("鍖归厤")]
+        [PropertyOrder(5)]
+        [ReadOnly(true)]
+        public virtual bool HasDb { get; set; }
 
         /// <summary>
         /// 鏍囩
@@ -77,8 +98,9 @@
         [Category("鍩虹淇℃伅")]
         [DisplayName("鏍囩")]
         [PropertyOrder(6)]
+        [IsHydroFlagsPro(true)]
         [Browsable(true)]
-        public List<string> Flags { get; set; }
+        public virtual string Flags { get; set; }
 
         /// <summary>
         /// 璇存槑
@@ -88,7 +110,24 @@
         [PropertyOrder(7)]
         [MultiText]
         [Browsable(true)]
-        public string Description { get; set; }
+        public virtual string Description { get; set; }
+
+        /// <summary>
+        /// 閿佸畾
+        /// </summary>
+        [Category("鍩虹淇℃伅")]
+        [DisplayName("閿佸畾")]
+        [PropertyOrder(8)]
+        [Browsable(true)]
+        public virtual bool DbLocked { get; set; }
+
+        /// <summary>
+        /// 灞炴�х姸鎬佸垪琛�
+        /// </summary>
+        [Browsable(false)]
+        public virtual List<HydroParterPropStatusViewModel> PropStatusList { get; set; }
+
+
 
         /// <summary>
         /// 鏇存柊灞炴��
@@ -102,19 +141,21 @@
             this.Name = rhs.Name;
             this.Code = rhs.Code;
             this.ModelType = rhs.ModelType;
-            this.Flags = rhs.Flags?.ToList();
+            this.DbId = rhs.DbId;
+            this.HasDb = !string.IsNullOrEmpty(rhs.DbId);
+            this.Flags = Yw.Untity.FlagsHelper.ToString(rhs.Flags);
             this.Description = rhs.Description;
+            this.DbLocked = rhs.DbLocked;
         }
 
         /// <summary>
         /// 鏇存柊璁＄畻灞炴��
         /// </summary>
         /// <param name="rhs">璁＄畻灞炴��</param>
-        public virtual void UpdateCalcuProperty(IHydroCalcuProperty rhs)
+        public virtual void UpdateCalcuProperty(IHydroCalcuResult rhs)
         {
 
         }
-
 
 
 

--
Gitblit v1.9.3