HStation/XHS.V1.0.git

			@@ -1,4 +1,5 @@
			using System.ComponentModel;
			using 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>
			/// 说明