From 30e078df2eae453b8ea39680816d5abbf5c51b25 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期四, 26 九月 2024 14:01:07 +0800
Subject: [PATCH] Xhs匹配改造，有错误
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/01-viewmodel/FourlinkMatchingViewModel.cs | 122 ++++++++++++++++++++--------------------
1 files changed, 61 insertions(+), 61 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-matching/01-viewmodel/FourlinkMatchingViewModel.cs
similarity index 64%
rename from WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/01-ViewModel/ThreeLinkMatchingViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/01-viewmodel/FourlinkMatchingViewModel.cs
index 5f84750..c724d1a 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-matching/01-viewmodel/FourlinkMatchingViewModel.cs
@@ -1,21 +1,10 @@
锘縩amespace HStation.WinFrmUI
{
- public class ThreeLinkMatchingViewModel
+ /// <summary>
+ /// 鍥涢�氬尮閰峍iewModel
+ /// </summary>
+ public class FourlinkMatchingViewModel
{
- public ThreeLinkMatchingViewModel()
- {
- }
-
- 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
@@ -25,27 +14,6 @@
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("缂栫爜")]
@@ -53,11 +21,32 @@
public string Code { get; set; }
/// <summary>
- /// 鍨嬪彿鍚�
+ /// 鍚嶇О
/// </summary>
- [DisplayName("鍨嬪彿鍚�")]
+ [DisplayName("鍚嶇О")]
+ [Browsable(true)]
+ public string Name { get; set; }
+
+ /// <summary>
+ /// Db閿佸畾
+ /// </summary>
+ [DisplayName("閿佸畾")]
+ [Browsable(true)]
+ public bool DbLocked { 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>
/// 鏉愯川
@@ -67,32 +56,11 @@
public string Material { get; set; }
/// <summary>
- ///淇敼鍚庢潗璐�
- /// </summary>
- [DisplayName("淇敼鍚庢潗璐�")]
- [Browsable(true)]
- public string MatchingMaterial { get; set; }
-
- /// <summary>
/// 鍙ｅ緞
/// </summary>
[DisplayName("鍙ｅ緞")]
[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>
/// 鎹熷け绯绘暟
@@ -101,10 +69,42 @@
[Browsable(true)]
public double? MinorLoss { get; set; }
+
+
+
+
/// <summary>
- ///淇敼鍚庢崯澶辩郴鏁�
+ /// 鍖归厤鍨嬪彿
/// </summary>
- [DisplayName("淇敼鍚庢崯澶辩郴鏁�")]
+ [DisplayName("鍖归厤鍨嬪彿")]
+ [Browsable(true)]
+ public string MatchingModelType { get; set; }
+
+ /// <summary>
+ /// 鍖归厤Dbid
+ /// </summary>
+ [DisplayName("MatchingDbId")]
+ [Browsable(false)]
+ public string MatchingDbId { get; set; }
+
+ /// <summary>
+ /// 鍖归厤鏉愯川
+ /// </summary>
+ [DisplayName("鍖归厤鏉愯川")]
+ [Browsable(true)]
+ public string MatchingMaterial { get; set; }
+
+ /// <summary>
+ /// 鍖归厤鍙ｅ緞
+ /// </summary>
+ [DisplayName("鍖归厤鍙ｅ緞")]
+ [Browsable(true)]
+ public double? MatchingCaliber { get; set; }
+
+ /// <summary>
+ /// 鍖归厤鎹熷け绯绘暟
+ /// </summary>
+ [DisplayName("鍖归厤鎹熷け绯绘暟")]
[Browsable(true)]
public double? MatchingMinorLoss { get; set; }
}
--
Gitblit v1.9.3