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

lixiaojun

2024-10-18 1fe41eb1c9f2b2914b4a66a145f1ad0a75b9c915

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

@@ -1,10 +1,11 @@
using System.ComponentModel;
using HStation.Assets;
using System.ComponentModel;

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;
@@ -31,7 +32,7 @@
            this.SortCode = rhs.SortCode;
        }

        public void Reset(Vmo.ValveMainVmo rhs)
        public void Reset(Vmo.AssetsValveMainVmo rhs)
        {
            this.ID = rhs.ID;
            this.Name = rhs.Name;
@@ -96,7 +97,7 @@
        /// </summary>
        [DisplayName("类型")]
        [Browsable(true)]
        public HStation.Assets.eValveSeriesType SeriesType { get; set; }
        public HStation.Assets.eAssetsValveSeriesType SeriesType { get; set; }

        /// <summary>
        /// 说明
@@ -106,6 +107,13 @@
        public string? Description { get; set; }

        /// <summary>
        /// 阀门状态
        /// </summary>
        [DisplayName("阀门状态")]
        [Browsable(true)]
        public eValveOpenStatus OpenStatus { get; set; }

        /// <summary>
        /// 排序码
        /// </summary>
        [DisplayName("排序码")]