From 3b03ac9340fb8153fbb99c8e00702494192c00b6 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 27 九月 2024 11:44:43 +0800
Subject: [PATCH] 修改匹配显示状态
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/06-threelink/XhsProjectSimulationThreelinkMatchingViewModel.cs | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/06-threelink/XhsProjectSimulationThreelinkMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/06-threelink/XhsProjectSimulationThreelinkMatchingViewModel.cs
index eaf6f42..355a62b 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/06-threelink/XhsProjectSimulationThreelinkMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/06-threelink/XhsProjectSimulationThreelinkMatchingViewModel.cs
@@ -17,9 +17,9 @@
this.Code = rhs.Code;
this.DbId = rhs.DbId;
this.ModelType = rhs.ModelType;
- this.MatchingCaliber = rhs.MatchingCaliber;
+ this.MatchingCaliber = rhs.MatchingCaliber.ToString();
this.MatchingMinorLoss = rhs.MatchingMinorLoss;
- this.MatchingDbid = rhs.MatchingDbid;
+ this.MatchingDbId = rhs.MatchingDbId;
this.MatchingMaterial = rhs.MatchingMaterial;
if (rhs.DbId == null)
{
@@ -28,6 +28,14 @@
else
{
MatchingType = eMatchingStatus.Succeed;
+ }
+ if (rhs.MatchingDbId == null || rhs.MatchingDbId == string.Empty)
+ {
+ MatchingSatus = eMatchingStatus.Failed;
+ }
+ else
+ {
+ MatchingSatus = eMatchingStatus.Succeed;
}
}
@@ -57,7 +65,7 @@
/// </summary>
[DisplayName("MatchingDbid")]
[Browsable(false)]
- public long? MatchingDbid { get; set; }
+ public string MatchingDbId { get; set; }
/// <summary>
/// 缂栫爜
@@ -123,10 +131,17 @@
public double? MatchingMinorLoss { get; set; }
/// <summary>
+ /// 鍖归厤鐘舵��
+ /// </summary>
+ [DisplayName("鍖归厤鐘舵��")]
+ [Browsable(true)]
+ public eMatchingStatus MatchingType { get; set; }
+
+ /// <summary>
/// 鏄惁鍖归厤鎴愬姛
/// </summary>
[DisplayName("鏄惁鍖归厤鎴愬姛")]
[Browsable(true)]
- public eMatchingStatus MatchingType { get; set; }
+ public eMatchingStatus MatchingSatus { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3