From 9ffb31c233f3b4891550293294c2ee716f77b42a Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期日, 22 九月 2024 19:08:49 +0800
Subject: [PATCH] 完善自动匹配

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/ThreeLinkMatchingViewModel.cs |  104 ++++++++++++++++++++++++++++++++++++++++++++++++++-
 1 files changed, 101 insertions(+), 3 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/ThreeLinkMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/ThreeLinkMatchingViewModel.cs
index 4f0a06c..5f84750 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/ThreeLinkMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/ThreeLinkMatchingViewModel.cs
@@ -1,13 +1,111 @@
 锘縩amespace HStation.WinFrmUI
 {
-    public class ThreeLinkMatchingViewModel : AdaptingViewModel
+    public class ThreeLinkMatchingViewModel
     {
-        public ThreeLinkMatchingViewModel() : base()
+        public ThreeLinkMatchingViewModel()
         {
         }
 
-        public ThreeLinkMatchingViewModel(ThreeLinkMatchingViewModel rhs) : base(rhs)
+        public ThreeLinkMatchingViewModel(ThreeLinkMatchingViewModel rhs)
         {
+            this.ID = rhs.ID;
+            this.DbLocked = rhs.DbLocked;
+            this.Material = rhs.Material;
+            this.Caliber = rhs.Caliber;
+            this.Code = rhs.Code;
+            this.DbId = rhs.DbId;
+            this.ModelType = rhs.ModelType;
         }
+
+        /// <summary>
+        /// ID
+        /// </summary>
+        [DisplayName("ID")]
+        [Browsable(false)]
+        public long ID { get; set; }
+
+        /// <summary>
+        /// 鍚嶇О
+        /// </summary>
+        [DisplayName("鍚嶇О")]
+        [Browsable(true)]
+        public string Name { get; set; }
+
+        /// <summary>
+        ///淇敼鍓岲bid
+        /// </summary>
+        [DisplayName("Dbid")]
+        [Browsable(false)]
+        public string DbId { get; set; }
+
+        /// <summary>
+        ///淇敼鍚嶥bid
+        /// </summary>
+        [DisplayName("MatchingDbid")]
+        [Browsable(false)]
+        public long? MatchingDbid { get; set; }
+
+        /// <summary>
+        /// 缂栫爜
+        /// </summary>
+        [DisplayName("缂栫爜")]
+        [Browsable(true)]
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 鍨嬪彿鍚�
+        /// </summary>
+        [DisplayName("鍨嬪彿鍚�")]
+        [Browsable(true)]
+        public string ModelType { get; set; }
+
+        /// <summary>
+        /// 鏉愯川
+        /// </summary>
+        [DisplayName("鏉愯川")]
+        [Browsable(true)]
+        public string Material { get; set; }
+
+        /// <summary>
+        ///淇敼鍚庢潗璐�
+        /// </summary>
+        [DisplayName("淇敼鍚庢潗璐�")]
+        [Browsable(true)]
+        public string MatchingMaterial { get; set; }
+
+        /// <summary>
+        /// 鍙e緞
+        /// </summary>
+        [DisplayName("鍙e緞")]
+        [Browsable(true)]
+        public double? Caliber { get; set; }
+
+        /// <summary>
+        ///淇敼鍚庡彛寰�
+        /// </summary>
+        [DisplayName("淇敼鍚庡彛寰�")]
+        [Browsable(true)]
+        public string MatchingCaliber { get; set; }
+
+        /// <summary>
+        /// Db閿佸畾
+        /// </summary>
+        [DisplayName("鏄惁閿佸畾")]
+        [Browsable(true)]
+        public bool DbLocked { get; set; }
+
+        /// <summary>
+        /// 鎹熷け绯绘暟
+        /// </summary>
+        [DisplayName("鎹熷け绯绘暟")]
+        [Browsable(true)]
+        public double? MinorLoss { get; set; }
+
+        /// <summary>
+        ///淇敼鍚庢崯澶辩郴鏁�
+        /// </summary>
+        [DisplayName("淇敼鍚庢崯澶辩郴鏁�")]
+        [Browsable(true)]
+        public double? MatchingMinorLoss { get; set; }
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3