From 66a44a3b60c6b938c0c582811192223223bcdd7d Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 27 九月 2024 15:49:07 +0800
Subject: [PATCH] 提交剩余修改
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/05-elbows/XhsProjectSimulationElbowsMatchingViewModel.cs | 20 ++++++++++----------
1 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/05-elbows/XhsProjectSimulationElbowsMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/05-elbows/XhsProjectSimulationElbowsMatchingViewModel.cs
index 36f9bea..e8a8916 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/05-elbows/XhsProjectSimulationElbowsMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/05-elbows/XhsProjectSimulationElbowsMatchingViewModel.cs
@@ -8,7 +8,7 @@
{
}
- public XhsProjectSimulationElbowsMatchingViewModel(ElbowsMatchingViewModel rhs)
+ public XhsProjectSimulationElbowsMatchingViewModel(ElbowMatchingViewModel rhs)
{
this.ID = rhs.ID;
this.DbLocked = rhs.DbLocked;
@@ -17,12 +17,12 @@
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.MatchingMaterial = rhs.MatchingMaterial;
- if (rhs.DbId == null)
+ if (rhs.DbId == null || rhs.DbId == string.Empty)
{
MatchingType = eMatchingStatus.Failed;
}
@@ -58,7 +58,7 @@
/// </summary>
[DisplayName("MatchingDbid")]
[Browsable(false)]
- public long? MatchingDbid { get; set; }
+ public string MatchingDbid { get; set; }
/// <summary>
/// 缂栫爜
@@ -70,7 +70,7 @@
/// <summary>
/// 鍨嬪彿鍚�
/// </summary>
- [DisplayName("鍨嬪彿鍚�")]
+ [DisplayName("鍨嬪彿")]
[Browsable(true)]
public string ModelType { get; set; }
@@ -84,7 +84,7 @@
/// <summary>
///淇敼鍚庢潗璐�
/// </summary>
- [DisplayName("淇敼鍚庢潗璐�")]
+ [DisplayName("鍖归厤鏉愯川")]
[Browsable(true)]
public string MatchingMaterial { get; set; }
@@ -98,14 +98,14 @@
/// <summary>
///淇敼鍚庡彛寰�
/// </summary>
- [DisplayName("淇敼鍚庡彛寰�")]
+ [DisplayName("鍖归厤鍙ｅ緞")]
[Browsable(true)]
public string MatchingCaliber { get; set; }
/// <summary>
/// Db閿佸畾
/// </summary>
- [DisplayName("鏄惁閿佸畾")]
+ [DisplayName("閿佸畾")]
[Browsable(true)]
public bool DbLocked { get; set; }
@@ -119,14 +119,14 @@
/// <summary>
///淇敼鍚庢崯澶辩郴鏁�
/// </summary>
- [DisplayName("淇敼鍚庢崯澶辩郴鏁�")]
+ [DisplayName("鍖归厤鎹熷け绯绘暟")]
[Browsable(true)]
public double? MatchingMinorLoss { get; set; }
/// <summary>
/// 鏄惁鍖归厤鎴愬姛
/// </summary>
- [DisplayName("鏄惁鍖归厤鎴愬姛")]
+ [DisplayName("鍖归厤")]
[Browsable(true)]
public eMatchingStatus MatchingType { get; set; }
}
--
Gitblit v1.9.3