From 0e54c48e8190937f5b483c79e3cc9d17ec7c9af0 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 27 九月 2024 15:45:37 +0800
Subject: [PATCH] 提交自动匹配界面优化
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingViewModel.cs | 39 +++++++++++++++++++++++++++------------
1 files changed, 27 insertions(+), 12 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingViewModel.cs
index d6cc0e0..b052c14 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingViewModel.cs
@@ -15,20 +15,28 @@
this.Material = rhs.Material;
this.Caliber = rhs.Caliber;
this.Code = rhs.Code;
- this.Dbid = rhs.Dbid;
+ 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)
+ if (rhs.DbId == null || rhs.DbId == string.Empty)
{
MatchingType = eMatchingStatus.Failed;
}
else
{
MatchingType = eMatchingStatus.Succeed;
+ }
+ if (rhs.MatchingDbId == null || rhs.MatchingDbId == string.Empty)
+ {
+ MatchingSatus = eMatchingStatus.Failed;
+ }
+ else
+ {
+ MatchingSatus = eMatchingStatus.Succeed;
}
}
@@ -58,7 +66,7 @@
/// </summary>
[DisplayName("MatchingDbid")]
[Browsable(false)]
- public long? MatchingDbid { get; set; }
+ public string MatchingDbId { get; set; }
/// <summary>
/// 缂栫爜
@@ -70,7 +78,7 @@
/// <summary>
/// 鍨嬪彿鍚�
/// </summary>
- [DisplayName("鍨嬪彿鍚�")]
+ [DisplayName("鍨嬪彿")]
[Browsable(true)]
public string ModelType { get; set; }
@@ -84,7 +92,7 @@
/// <summary>
///淇敼鍚庢潗璐�
/// </summary>
- [DisplayName("淇敼鍚庢潗璐�")]
+ [DisplayName("鍖归厤鏉愯川")]
[Browsable(true)]
public string MatchingMaterial { get; set; }
@@ -98,7 +106,7 @@
/// <summary>
///淇敼鍚庡彛寰�
/// </summary>
- [DisplayName("淇敼鍚庡彛寰�")]
+ [DisplayName("鍖归厤鍙ｅ緞")]
[Browsable(true)]
public string MatchingCaliber { get; set; }
@@ -117,17 +125,24 @@
public double? MinorLoss { get; set; }
/// <summary>
- ///淇敼鍚庢崯澶辩郴鏁�
+ ///鍖归厤鎹熷け绯绘暟
/// </summary>
- [DisplayName("淇敼鍚庢崯澶辩郴鏁�")]
+ [DisplayName("鍖归厤鎹熷け绯绘暟")]
[Browsable(true)]
public double? MatchingMinorLoss { get; set; }
/// <summary>
- /// 鏄惁鍖归厤鎴愬姛
+ /// 鍖归厤鐘舵��
/// </summary>
- [DisplayName("鏄惁鍖归厤鎴愬姛")]
+ [DisplayName("鍖归厤鐘舵��")]
[Browsable(true)]
public eMatchingStatus MatchingType { get; set; }
+
+ /// <summary>
+ /// 鏄惁鍖归厤鎴愬姛
+ /// </summary>
+ [DisplayName("鍖归厤")]
+ [Browsable(true)]
+ public eMatchingStatus MatchingSatus { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3