From 1fe41eb1c9f2b2914b4a66a145f1ad0a75b9c915 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期五, 18 十月 2024 11:18:33 +0800
Subject: [PATCH] Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs | 23 +++++++++++++++++++----
1 files changed, 19 insertions(+), 4 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs
index e42f956..870155c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs
@@ -1,4 +1,5 @@
-锘縰sing System.ComponentModel;
+锘縰sing HStation.Assets;
+using System.ComponentModel;
namespace HStation.WinFrmUI.Assets
{
@@ -8,7 +9,7 @@
{
}
- public ElbowViewModel(Vmo.ElbowMainVmo rhs)
+ public ElbowViewModel(Vmo.AssetsElbowMainVmo rhs)
{
this.ID = rhs.ID;
this.Description = rhs.Description;
@@ -32,10 +33,12 @@
this.SortCode = rhs.SortCode;
this.KeyWord = rhs.KeyWord;
this.IsDefault = rhs.IsDefault;
+ this.Angle = rhs.Angle;
+ this.ConnectionLength = rhs.ConnectionLength;
this.Coefficient = rhs.Coefficient;
}
- public void Reset(Vmo.ElbowMainVmo rhs)
+ public void Reset(Vmo.AssetsElbowMainVmo rhs)
{
this.ID = rhs.ID;
if (rhs.Caliber == null)
@@ -59,6 +62,8 @@
this.KeyWord = rhs.KeyWord;
this.IsDefault = rhs.IsDefault;
this.SortCode = rhs.SortCode;
+ this.Angle = rhs.Angle;
+ this.ConnectionLength = rhs.ConnectionLength;
this.Coefficient = rhs.Coefficient;
}
@@ -116,9 +121,19 @@
[Browsable(true)]
public bool IsDefault { get; set; }
+ /// <summary>
+ /// 绠¤矾杩炴帴闀垮害
+ /// </summary>
+ [DisplayName("杩炴帴闀垮害")]
+ [Browsable(true)]
+ public eLengthType? ConnectionLength { get; set; }
+
+ /// <summary>
+ /// 瑙掑害
+ /// </summary>
[DisplayName("瑙掑害")]
[Browsable(true)]
- public string Angle { get; set; }
+ public int? Angle { get; set; }
/// <summary>
/// 璇存槑
--
Gitblit v1.9.3