Merge branch 'master' of http://47.103.154.90:83/r/HStation/XHS.V1.0

Shuxia Ning

2024-11-13 208ca42e1c20afafbe48d66259d553ee81eb48ed

 WinFrmUI/HStation.WinFrmUI.Assets.Core/04-pipe/02-main/PipeViewModel.cs

@@ -8,7 +8,7 @@
        {
        }

        public PipeViewModel(Vmo.PipeMainVmo rhs)
        public PipeViewModel(Vmo.AssetsPipeMainVmo rhs)
        {
            this.ID = rhs.ID;
            this.Description = rhs.Description;
@@ -20,17 +20,23 @@
            {
                this.Caliber = rhs.Caliber.ToString();
            }
            this.MaterialName = rhs.MaterialName;
            if (rhs.Material == null)
            {
                this.Material = "默认";
            }
            else
            {
                this.Material = rhs.Material.ToString();
            }
            this.Hazen = rhs.Hazen;
            this.Darcy = rhs.Darcy;
            this.Manning = rhs.Manning;
            this.Name = rhs.Name;
            this.SortCode = rhs.SortCode;
            this.KeyWord = rhs.KeyWord;
            this.IsDefault = rhs.IsDefault;
            this.KeyWord = string.Join(",", rhs.KeyWord);
        }

        public void Reset(Vmo.PipeMainVmo rhs)
        public void Reset(Vmo.AssetsPipeMainVmo rhs)
        {
            this.ID = rhs.ID;
            this.Hazen = rhs.Hazen;
@@ -44,11 +50,10 @@
            {
                this.Caliber = rhs.Caliber.ToString();
            }
            this.MaterialName = rhs.MaterialName;
            this.Material = rhs.Material;
            this.Description = rhs.Description;
            this.Name = rhs.Name;
            this.KeyWord = rhs.KeyWord;
            this.IsDefault = rhs.IsDefault;
            this.KeyWord = string.Join(",", rhs.KeyWord);
            this.SortCode = rhs.SortCode;
        }

@@ -76,7 +81,7 @@
        /// </summary>
        [DisplayName("材料")]
        [Browsable(true)]
        public string MaterialName { get; set; }
        public string Material { get; set; }

        /// <summary>
        /// Hazen
@@ -112,13 +117,6 @@
        [DisplayName("关键字")]
        [Browsable(true)]
        public string KeyWord { get; set; }

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

        /// <summary>
        /// 说明