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

duheng

2024-12-20 ab65b0ac21e7fabfd8548538142d9a1b66a2ad3d

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs

@@ -2,14 +2,13 @@

namespace HStation.WinFrmUI.Assets
{
    public class ValveMainViewModel
    public class AssetsValveMainViewModel
    {
        public ValveMainViewModel(Vmo.ValveMainVmo rhs)
        public AssetsValveMainViewModel(Vmo.AssetsValveMainVmo rhs)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
            this.Description = rhs.Description;
            this.Material = rhs.Material;
            if (rhs.Caliber == null)
            {
                this.Caliber = "默认";
@@ -18,13 +17,23 @@
            {
                this.Caliber = rhs.Caliber.ToString();
            }
            this.Coefficient = rhs.Coefficient;
            if (rhs.Material == null || rhs.Material == string.Empty)
            {
                this.Material = "默认";
            }
            else
            {
                this.Material = rhs.Material.ToString();
            }
            this.Coefficient = rhs.MinorLoss;
            this.SeriesID = rhs.SeriesID;
            this.SeriesType = rhs.SeriesType;
            this.ValveType = rhs.ValveType;
            this.SortCode = rhs.SortCode;
            this.KeyWord = string.Join(",", rhs.KeyWords);
            this.ValveSetting = rhs.ValveSetting;
        }

        public void Reset(Vmo.ValveMainVmo rhs)
        public void Reset(Vmo.AssetsValveMainVmo rhs)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
@@ -38,10 +47,20 @@
            {
                this.Caliber = rhs.Caliber.ToString();
            }
            this.Coefficient = rhs.Coefficient;
            if (rhs.Material == null || rhs.Material == string.Empty)
            {
                this.Material = "默认";
            }
            else
            {
                this.Material = rhs.Material.ToString();
            }
            this.Coefficient = rhs.MinorLoss;
            this.SeriesID = rhs.SeriesID;
            this.SeriesType = rhs.SeriesType;
            this.ValveType = rhs.ValveType;
            this.SortCode = rhs.SortCode;
            this.KeyWord = string.Join(",", rhs.KeyWords);
            this.ValveSetting = rhs.ValveSetting;
        }

        [DisplayName("ID")]
@@ -81,14 +100,14 @@
        /// </summary>
        [DisplayName("类型")]
        [Browsable(true)]
        public HStation.Assets.eValveSeriesType SeriesType { get; set; }
        public HStation.Assets.eValveType ValveType { get; set; }

        /// <summary>
        /// 说明
        /// </summary>
        [DisplayName("说明")]
        [Browsable(true)]
        public string? Description { get; set; }
        public string Description { get; set; }

        /// <summary>
        /// 排序码
@@ -108,14 +127,28 @@
        /// 创建人
        /// </summary>
        [DisplayName("创建人")]
        [Browsable(true)]
        [Browsable(false)]
        public string CreateName { get; set; }

        /// <summary>
        /// 创建时间
        /// </summary>
        [DisplayName("创建时间")]
        [Browsable(true)]
        [Browsable(false)]
        public string CreateTime { get; set; }

        /// <summary>
        /// 识别关键字
        /// </summary>
        [DisplayName("关键字")]
        [Browsable(true)]
        public string KeyWord { get; set; }

        /// <summary>
        /// 阀门设置
        /// </summary>
        [DisplayName("阀门设置")]
        [Browsable(true)]
        public string ValveSetting { get; set; }
    }
}