提交剩余修改

duheng

2024-09-27 66a44a3b60c6b938c0c582811192223223bcdd7d

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/05-elbows/XhsProjectSimulationElbowsMatchingViewModel.cs

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

        public XhsProjectSimulationElbowsMatchingViewModel(ElbowsMatchingViewModel rhs)
        public XhsProjectSimulationElbowsMatchingViewModel(ElbowMatchingViewModel rhs)
        {
            this.ID = rhs.ID;
            this.DbLocked = rhs.DbLocked;
@@ -17,12 +17,12 @@
            this.Code = rhs.Code;
            this.Dbid = rhs.DbId;
            this.ModelType = rhs.ModelType;
            this.MatchingCaliber = rhs.MatchingCaliber;
            this.MatchingCaliber = rhs.MatchingCaliber.ToString();
            this.MatchingMinorLoss = rhs.MatchingMinorLoss;
            this.MatchingDbid = rhs.MatchingDbId;
            this.MatchingMaterial = rhs.MatchingMaterial;

            if (rhs.DbId == null)
            if (rhs.DbId == null || rhs.DbId == string.Empty)
            {
                MatchingType = eMatchingStatus.Failed;
            }
@@ -58,7 +58,7 @@
        /// </summary>
        [DisplayName("MatchingDbid")]
        [Browsable(false)]
        public long? MatchingDbid { get; set; }
        public string MatchingDbid { get; set; }

        /// <summary>
        /// 编码
@@ -70,7 +70,7 @@
        /// <summary>
        /// 型号名
        /// </summary>
        [DisplayName("型号名")]
        [DisplayName("型号")]
        [Browsable(true)]
        public string ModelType { get; set; }

@@ -84,7 +84,7 @@
        /// <summary>
        ///修改后材质
        /// </summary>
        [DisplayName("修改后材质")]
        [DisplayName("匹配材质")]
        [Browsable(true)]
        public string MatchingMaterial { get; set; }

@@ -98,14 +98,14 @@
        /// <summary>
        ///修改后口径
        /// </summary>
        [DisplayName("修改后口径")]
        [DisplayName("匹配口径")]
        [Browsable(true)]
        public string MatchingCaliber { get; set; }

        /// <summary>
        /// Db锁定
        /// </summary>
        [DisplayName("是否锁定")]
        [DisplayName("锁定")]
        [Browsable(true)]
        public bool DbLocked { get; set; }

@@ -119,14 +119,14 @@
        /// <summary>
        ///修改后损失系数
        /// </summary>
        [DisplayName("修改后损失系数")]
        [DisplayName("匹配损失系数")]
        [Browsable(true)]
        public double? MatchingMinorLoss { get; set; }

        /// <summary>
        /// 是否匹配成功
        /// </summary>
        [DisplayName("是否匹配成功")]
        [DisplayName("匹配")]
        [Browsable(true)]
        public eMatchingStatus MatchingType { get; set; }
    }