From 687a3dfd095bc8c099b7fa6e65f0dc699fdc8f1d Mon Sep 17 00:00:00 2001
From: Shuxia Ning <NingShuxia0927@outlook.com>
Date: 星期三, 08 一月 2025 13:57:33 +0800
Subject: [PATCH] 冲突
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/AssetsTranslationFactorMgrViewModel.cs | 47 +++++++++++++++++++++++++++++++++++++++++++++--
1 files changed, 45 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/AssetsTranslationFactorMgrViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/AssetsTranslationFactorMgrViewModel.cs
index 2b90435..a4fe1d8 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/AssetsTranslationFactorMgrViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/19-translation/03-factor/AssetsTranslationFactorMgrViewModel.cs
@@ -18,6 +18,11 @@
{
this.ID = rhs.ID;
this.Name = rhs.Name;
+ this.Diameter = rhs.Diameter;
+ this.Material = rhs.Material;
+ this.StartDiameter = rhs.StartDiameter;
+ this.EndDiameter = rhs.EndDiameter;
+ this.TranslationType = rhs.TranslationType;
this.MinorLoss = rhs.MinorLoss;
this.Description = rhs.Description;
this.Vmo = rhs;
@@ -30,6 +35,11 @@
{
this.ID = rhs.ID;
this.Name = rhs.Name;
+ this.Diameter = rhs.Diameter;
+ this.Material = rhs.Material;
+ this.StartDiameter = rhs.StartDiameter;
+ this.EndDiameter = rhs.EndDiameter;
+ this.TranslationType = rhs.TranslationType;
this.MinorLoss = rhs.MinorLoss;
this.Description = rhs.Description;
this.Vmo = rhs;
@@ -42,13 +52,46 @@
public long ID { get; set; }
/// <summary>
- /// 鍚嶇О
+ /// 鍨嬪彿
/// </summary>
- [Display(Name = "鍚嶇О")]
+ [Display(Name = "鍨嬪彿")]
public string Name { get; set; }
/// <summary>
+ /// 鐩村緞
+ /// </summary>
+
+ [Display(Name = "鐩村緞(mm)")]
+ public double Diameter { get; set; }
+
+ /// <summary>
+ /// 涓婃父鐩村緞
+ /// </summary>
+
+ [Display(Name = "涓婃父鐩村緞")]
+ public double StartDiameter { get; set; }
+
+ /// <summary>
+ /// 涓嬫父鐩村緞
+ /// </summary>
+ [Display(Name = "涓嬫父鐩村緞")]
+ public double EndDiameter { get; set; }
+
+ /// <summary>
+ /// 鏉愭枡
+ ///</summary>
+ [Display(Name = "鏉愭枡")]
+ public string Material { get; set; }
+
+ /// <summary>
+ /// 杩囨浮浠剁被鍨�
+ /// </summary>
+ [Display(Name = "杩囨浮浠剁被鍨�")]
+ public HStation.Assets.eTranslationType TranslationType { get; set; }
+
+ /// <summary>
/// 灞�闃荤郴鏁�
+ ///
/// </summary>
[Display(Name = "灞�闃荤郴鏁�")]
public double MinorLoss { get; set; }
--
Gitblit v1.9.3