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/04-pipe/XhsProjectSimulationPipeMatchingViewModel.cs | 19 +++++++++++++++++--
1 files changed, 17 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/04-pipe/XhsProjectSimulationPipeMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/04-pipe/XhsProjectSimulationPipeMatchingViewModel.cs
index 4fb5b69..754e96d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/04-pipe/XhsProjectSimulationPipeMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/04-pipe/XhsProjectSimulationPipeMatchingViewModel.cs
@@ -31,6 +31,14 @@
{
MatchingType = eMatchingStatus.Succeed;
}
+ if (rhs.MatchingDbId == null || rhs.MatchingDbId == string.Empty)
+ {
+ MatchingSatus = eMatchingStatus.Failed;
+ }
+ else
+ {
+ MatchingSatus = eMatchingStatus.Succeed;
+ }
}
/// <summary>
@@ -125,9 +133,9 @@
public double? MatchingMinorLoss { get; set; }
/// <summary>
- /// 鏄惁鍖归厤鎴愬姛
+ /// 鍖归厤鐘舵��
/// </summary>
- [DisplayName("鏄惁鍖归厤鎴愬姛")]
+ [DisplayName("鍖归厤鐘舵��")]
[Browsable(true)]
public eMatchingStatus MatchingType { get; set; }
@@ -135,5 +143,12 @@
/// 绠楁硶绫诲瀷
/// </summary>
public HStation.Assets.eAlgorithmType eAlgorithmType { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍖归厤鎴愬姛
+ /// </summary>
+ [DisplayName("鏄惁鍖归厤鎴愬姛")]
+ [Browsable(true)]
+ public eMatchingStatus MatchingSatus { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3