From 158292021eb0b31e494b5fdc26a31c58af0bf01b Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 26 九月 2024 11:55:04 +0800
Subject: [PATCH] 匹配修改

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/PumpMatchingViewModel.cs |   87 ++++++++++++++++++++++++++++++++++---------
 1 files changed, 68 insertions(+), 19 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/PumpMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/PumpMatchingViewModel.cs
index cb9c640..b645b39 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/PumpMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/PumpMatchingViewModel.cs
@@ -1,17 +1,16 @@
 锘縩amespace HStation.WinFrmUI
 {
+    /// <summary>
+    /// 姘存车鍖归厤ViewModel
+    /// </summary>
     public class PumpMatchingViewModel
     {
+        /// <summary>
+        /// ID
+        /// </summary>
         [DisplayName("ID")]
         [Browsable(false)]
         public long ID { get; set; }
-
-        /// <summary>
-        /// 鍚嶇О
-        /// </summary>
-        [DisplayName("鍚嶇О")]
-        [Browsable(true)]
-        public string Name { get; set; }
 
         /// <summary>
         /// 缂栫爜
@@ -21,11 +20,32 @@
         public string Code { get; set; }
 
         /// <summary>
-        /// 鍨嬪彿鍚�
+        /// 鍚嶇О
         /// </summary>
-        [DisplayName("鍨嬪彿鍚�")]
+        [DisplayName("鍚嶇О")]
+        [Browsable(true)]
+        public string Name { get; set; }
+
+        /// <summary>
+        /// 鍨嬪彿
+        /// </summary>
+        [DisplayName("鍨嬪彿")]
         [Browsable(true)]
         public string ModelType { get; set; }
+
+        /// <summary>
+        /// DbId
+        /// </summary>
+        [DisplayName("DbId")]
+        [Browsable(false)]
+        public string DbId { get; set; }
+
+        /// <summary>
+        /// Db閿佸畾
+        /// </summary>
+        [DisplayName("閿佸畾")]
+        [Browsable(true)]
+        public bool DbLocked { get; set; }
 
         /// <summary>
         /// 棰濆畾鍔熺巼
@@ -55,19 +75,48 @@
         [Browsable(true)]
         public double? RatedN { get; set; }
 
-        /// <summary>
-        /// Db閿佸畾
-        /// </summary>
-        [DisplayName("鏄惁閿佸畾")]
-        [Browsable(true)]
-        public bool DbLocked { get; set; }
 
-        [DisplayName("鍖归厤鍓岲bID")]
-        [Browsable(false)]
-        public string DbID { get; set; }
+
+
 
         [DisplayName("ChartDbID")]
         [Browsable(false)]
-        public long ChartDbID { get; set; }
+        public string ChartDbID { get; set; }
+
+        [DisplayName("鍖归厤鍚嶥bID")]
+        [Browsable(false)]
+        public string MatchingDbID { get; set; }
+
+        [DisplayName("鍖归厤鍚嶤hartDbID")]
+        [Browsable(false)]
+        public long? MatchingChartDbID { get; set; }
+
+        /// <summary>
+        /// 淇敼鍚庨瀹氬姛鐜�
+        /// </summary>
+        [DisplayName("淇敼鍚庨瀹氬姛鐜�")]
+        [Browsable(true)]
+        public double? MatchingRatedP { get; set; }
+
+        /// <summary>
+        ///  淇敼鍚庨瀹氭祦閲�
+        /// </summary>
+        [DisplayName("淇敼鍚庨瀹氭祦閲�")]
+        [Browsable(true)]
+        public double? MatchingRatedQ { get; set; }
+
+        /// <summary>
+        /// 淇敼鍚庨瀹氭壃绋�
+        /// </summary>
+        [DisplayName("淇敼鍚庨瀹氭壃绋�")]
+        [Browsable(true)]
+        public double? MatchingRatedH { get; set; }
+
+        /// <summary>
+        /// 淇敼鍚庨瀹氳浆閫�
+        /// </summary>
+        [DisplayName("淇敼鍚庨瀹氳浆閫�")]
+        [Browsable(true)]
+        public double? MatchingRatedN { get; set; }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3