修改阀门匹配

duheng

2024-11-06 31e3f4ffdf7d566db391a5fcb94984f23e0abb02

 WinFrmUI/HStation.WinFrmUI.Assets.Core/05-elbow/02-main/ElbowViewModel.cs

@@ -21,21 +21,20 @@
            {
                this.Caliber = rhs.Caliber.ToString();
            }
            if (rhs.MaterialName == null)
            if (rhs.Material == null)
            {
                this.MaterialName = "默认";
            }
            else
            {
                this.MaterialName = rhs.MaterialName.ToString();
                this.MaterialName = rhs.Material.ToString();
            }
            this.Name = rhs.Name;
            this.SortCode = rhs.SortCode;
            this.KeyWord = rhs.KeyWord;
            this.IsDefault = rhs.IsDefault;
            this.Angle = rhs.Angle;
            this.ConnectionLength = rhs.ConnectionLength;
            this.Coefficient = rhs.Coefficient;
            this.ElbowLengthType = rhs.ElbowLengthType;
            this.MinorLoss = rhs.MinorLoss;
        }

        public void Reset(Vmo.AssetsElbowMainVmo rhs)
@@ -49,22 +48,21 @@
            {
                this.Caliber = rhs.Caliber.ToString();
            }
            if (rhs.MaterialName == null)
            if (rhs.Material == null)
            {
                this.MaterialName = "默认";
            }
            else
            {
                this.MaterialName = rhs.MaterialName.ToString();
                this.MaterialName = rhs.Material.ToString();
            }
            this.Description = rhs.Description;
            this.Name = rhs.Name;
            this.KeyWord = rhs.KeyWord;
            this.IsDefault = rhs.IsDefault;
            this.SortCode = rhs.SortCode;
            this.Angle = rhs.Angle;
            this.ConnectionLength = rhs.ConnectionLength;
            this.Coefficient = rhs.Coefficient;
            this.ElbowLengthType = rhs.ElbowLengthType;
            this.MinorLoss = rhs.MinorLoss;
        }

        /// <summary>
@@ -98,7 +96,7 @@
        /// </summary>
        [DisplayName("损失系数")]
        [Browsable(true)]
        public double? Coefficient { get; set; }
        public double? MinorLoss { get; set; }

        /// <summary>
        /// 排序码
@@ -115,18 +113,11 @@
        public string KeyWord { get; set; }

        /// <summary>
        /// 是否默认
        /// </summary>
        [DisplayName("是否默认")]
        [Browsable(true)]
        public bool IsDefault { get; set; }

        /// <summary>
        /// 弯头类型
        /// </summary>
        [DisplayName("弯头类型")]
        [Browsable(true)]
        public eLengthType? ConnectionLength { get; set; }
        public eLengthType? ElbowLengthType { get; set; }

        /// <summary>
        /// 角度