提交自动匹配界面优化

duheng

2024-09-27 0e54c48e8190937f5b483c79e3cc9d17ec7c9af0

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingViewModel.cs

@@ -15,20 +15,28 @@
            this.Material = rhs.Material;
            this.Caliber = rhs.Caliber;
            this.Code = rhs.Code;
            this.Dbid = rhs.Dbid;
            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.MatchingDbId = rhs.MatchingDbId;
            this.MatchingMaterial = rhs.MatchingMaterial;

            if (rhs.Dbid == null)
            if (rhs.DbId == null || rhs.DbId == string.Empty)
            {
                MatchingType = eMatchingStatus.Failed;
            }
            else
            {
                MatchingType = eMatchingStatus.Succeed;
            }
            if (rhs.MatchingDbId == null || rhs.MatchingDbId == string.Empty)
            {
                MatchingSatus = eMatchingStatus.Failed;
            }
            else
            {
                MatchingSatus = eMatchingStatus.Succeed;
            }
        }

@@ -58,7 +66,7 @@
        /// </summary>
        [DisplayName("MatchingDbid")]
        [Browsable(false)]
        public long? MatchingDbid { get; set; }
        public string MatchingDbId { get; set; }

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

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

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

@@ -117,17 +125,24 @@
        public double? MinorLoss { get; set; }

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

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

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