过渡件匹配Model修改，增加过渡件类型匹配字段

lixiaojun

2025-02-07 d107fd0519b4b84c31bc55bbd30cc0ba0af7507d

过渡件匹配Model修改，增加过渡件类型匹配字段

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/00-core/02-enum/eTranslationType.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,32 @@
namespace Yw.WinFrmUI
{
    /// <summary>
    /// è¿‡æ¸¡ä»¶ç±»åž‹
    /// </summary>
    public enum eTranslationType
    {
        /// <summary>
        /// æ¸ç¼©å˜å¾„
        /// </summary>
        [Display(Name = "渐缩变径")]
        GradualContraction = 0,

        /// <summary>
        /// åå¿ƒæ¸ç¼©
        /// </summary>
        [Display(Name = "偏心渐缩")]
        EccentricContraction = 1,

        /// <summary>
        /// åå¿ƒæ¸æ‰©
        /// </summary>
        [Display(Name = "偏心渐扩")]
        EccentricExpansion = 2,

        /// <summary>
        /// æ¸æ‰©å˜å¾„
        /// </summary>
        [Display(Name = "渐扩变径")]
        GradualExpansion = 3
    }
}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/00-core/03-helper/HydroTranslationTypeEnumHelper.cs

¶Ô±ÈÐÂÎļþ
@@ -0,0 +1,45 @@
namespace Yw.WinFrmUI
{
    /// <summary>
    /// è¿‡æ¸¡ä»¶ç±»åž‹æžšä¸¾è¾…助类
    /// </summary>
    public class HydroTranslationTypeEnumHelper
    {

        //字典
        private static readonly Dictionary<eTranslationType, string> _dict = new Dictionary<eTranslationType, string>()
        {
            { eTranslationType.GradualContraction,"渐缩变径"},
            { eTranslationType.EccentricContraction,"偏心渐缩"},
            { eTranslationType.EccentricExpansion,"偏心渐扩"},
            { eTranslationType.GradualExpansion,"渐扩变径"},
        };

        /// <summary>
        /// èŽ·å–过渡件类型
        /// </summary>
        public static eTranslationType? GetTranslationType(string name)
        {
            if (_dict.ContainsValue(name))
            {
                return _dict.First(x => x.Value == name).Key;
            }
            return default;
        }

        /// <summary>
        /// èŽ·å–过渡件类型名称
        /// </summary>
        public static string GetTranslationTypeName(eTranslationType translationType)
        {
            if (_dict.ContainsKey(translationType))
            {
                return _dict[translationType];
            }
            return default;
        }



    }
}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/04-viewmodel/04-link/03-pump/HydroPumpViewModel.cs

@@ -22,6 +22,7 @@
            this.RatedHz = rhs.RatedHz;
            this.InletDiameter = rhs.InletDiameter;
            this.OutletDiameter = rhs.OutletDiameter;
            this.Elev = Math.Round(rhs.Elev, 4);
            this.CurveQH = rhs.CurveQH;
            this.CurveQP = rhs.CurveQP;
            this.CurveQE = rhs.CurveQE;
@@ -154,13 +155,24 @@
        public double? OutletDiameter { get; set; }

        /// <summary>
        /// æ ‡é«˜/高程
        /// </summary>
        [Category("数据")]
        [DisplayName("标高")]
        [DisplayUnit("m")]
        [Display(Name = "标高(m)")]
        [PropertyOrder(2009)]
        [Browsable(true)]
        public virtual double Elev { get; set; }

        /// <summary>
        /// è®¾å®šé¢‘率
        /// </summary>
        [Category("数据")]
        [Display(Name = "设定频率")]
        [DisplayName("设定频率")]
        [DisplayUnit("hz")]
        [PropertyOrder(2009)]
        [PropertyOrder(2010)]
        [Browsable(true)]
        public double CurrentHz
        {
@@ -181,7 +193,7 @@
        /// </summary>
        [Category("数据")]
        [DisplayName("性能曲线")]
        [PropertyOrder(2009)]
        [PropertyOrder(2011)]
        [HydroCurvePro(HydroCurve.Pump)]
        [Browsable(true)]
        public string Curve
@@ -201,7 +213,7 @@
        /// </summary>
        [Category("数据")]
        [DisplayName("流量扬程曲线")]
        [PropertyOrder(2010)]
        [PropertyOrder(2012)]
        [HydroCurvePro(HydroCurve.Pump, HydroCurveType.CurveQH)]
        [Browsable(true)]
        public string CurveQH { get; set; }
@@ -211,7 +223,7 @@
        /// </summary>
        [Category("数据")]
        [DisplayName("流量功率曲线")]
        [PropertyOrder(2011)]
        [PropertyOrder(2013)]
        [HydroCurvePro(HydroCurve.Pump, HydroCurveType.CurveQP)]
        [Browsable(true)]
        public string CurveQP { get; set; }
@@ -221,7 +233,7 @@
        /// </summary>
        [Category("数据")]
        [DisplayName("流量效率曲线")]
        [PropertyOrder(2012)]
        [PropertyOrder(2014)]
        [HydroCurvePro(HydroCurve.Pump, HydroCurveType.CurveQE)]
        [Browsable(true)]
        public string CurveQE { get; set; }

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/15-pipe/HydroPipeListCtrl.Designer.cs

@@ -30,11 +30,11 @@
        {
            components = new Container();
            ComponentResourceManager resources = new ComponentResourceManager(typeof(HydroPipeListCtrl));
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
            gridControl1 = new DevExpress.XtraGrid.GridControl();
            hydroPipeViewModelBindingSource = new BindingSource(components);
            gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -68,6 +68,11 @@
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            txtDiameterMin = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            txtDiameterMax = new DevExpress.XtraEditors.TextEdit();
            layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            simpleLabelItem1 = new DevExpress.XtraLayout.SimpleLabelItem();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)hydroPipeViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
@@ -84,6 +89,11 @@
            ((ISupportInitialize)layoutControlItem3).BeginInit();
            ((ISupportInitialize)layoutControlItem1).BeginInit();
            ((ISupportInitialize)layoutControlItem9).BeginInit();
            ((ISupportInitialize)txtDiameterMin.Properties).BeginInit();
            ((ISupportInitialize)layoutControlItem5).BeginInit();
            ((ISupportInitialize)txtDiameterMax.Properties).BeginInit();
            ((ISupportInitialize)layoutControlItem6).BeginInit();
            ((ISupportInitialize)simpleLabelItem1).BeginInit();
            SuspendLayout();
            // 
            // gridControl1
@@ -298,14 +308,16 @@
            // repositoryItemButtonEdit1
            // 
            repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions1.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions1.SvgImage");
            editorButtonImageOptions1.SvgImageSize = new Size(20, 20);
            repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
            editorButtonImageOptions4.SvgImage = (DevExpress.Utils.Svg.SvgImage)resources.GetObject("editorButtonImageOptions4.SvgImage");
            editorButtonImageOptions4.SvgImageSize = new Size(20, 20);
            repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default) });
            repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(txtDiameterMax);
            layoutControl1.Controls.Add(txtDiameterMin);
            layoutControl1.Controls.Add(generalSearchAndSetCtrl1);
            layoutControl1.Controls.Add(gridControl1);
            layoutControl1.Controls.Add(txtName);
@@ -322,10 +334,10 @@
            // 
            // generalSearchAndSetCtrl1
            // 
            generalSearchAndSetCtrl1.Location = new Point(614, 14);
            generalSearchAndSetCtrl1.Location = new Point(794, 14);
            generalSearchAndSetCtrl1.Margin = new Padding(2, 2, 2, 2);
            generalSearchAndSetCtrl1.Name = "generalSearchAndSetCtrl1";
            generalSearchAndSetCtrl1.Size = new Size(702, 24);
            generalSearchAndSetCtrl1.Size = new Size(522, 24);
            generalSearchAndSetCtrl1.TabIndex = 9;
            // 
            // txtName
@@ -366,7 +378,7 @@
            // 
            // groupForHead
            // 
            groupForHead.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem2, layoutControlItem3, layoutControlItem1 });
            groupForHead.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem4, layoutControlItem2, layoutControlItem3, layoutControlItem1, layoutControlItem5, layoutControlItem6, simpleLabelItem1 });
            groupForHead.Location = new Point(0, 0);
            groupForHead.Name = "groupForHead";
            groupForHead.Size = new Size(1330, 52);
@@ -416,9 +428,9 @@
            // 
            layoutControlItem1.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
            layoutControlItem1.Control = generalSearchAndSetCtrl1;
            layoutControlItem1.Location = new Point(600, 0);
            layoutControlItem1.Location = new Point(780, 0);
            layoutControlItem1.Name = "layoutControlItem1";
            layoutControlItem1.Size = new Size(706, 28);
            layoutControlItem1.Size = new Size(526, 28);
            layoutControlItem1.TextSize = new Size(0, 0);
            layoutControlItem1.TextVisible = false;
            // 
@@ -431,6 +443,73 @@
            layoutControlItem9.Size = new Size(1330, 555);
            layoutControlItem9.TextSize = new Size(0, 0);
            layoutControlItem9.TextVisible = false;
            // 
            // txtDiameterMin
            // 
            txtDiameterMin.Location = new Point(654, 16);
            txtDiameterMin.Name = "txtDiameterMin";
            txtDiameterMin.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
            txtDiameterMin.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
            txtDiameterMin.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
            txtDiameterMin.Properties.NullValuePrompt = "mm";
            txtDiameterMin.Size = new Size(50, 20);
            txtDiameterMin.StyleController = layoutControl1;
            txtDiameterMin.TabIndex = 10;
            // 
            // layoutControlItem5
            // 
            layoutControlItem5.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
            layoutControlItem5.Control = txtDiameterMin;
            layoutControlItem5.Location = new Point(600, 0);
            layoutControlItem5.MaxSize = new Size(94, 24);
            layoutControlItem5.MinSize = new Size(94, 24);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(94, 28);
            layoutControlItem5.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            layoutControlItem5.Text = "直径:";
            layoutControlItem5.TextSize = new Size(28, 14);
            // 
            // txtDiameterMax
            // 
            txtDiameterMax.Location = new Point(740, 16);
            txtDiameterMax.Name = "txtDiameterMax";
            txtDiameterMax.Properties.AllowNullInput = DevExpress.Utils.DefaultBoolean.True;
            txtDiameterMax.Properties.MaskSettings.Set("MaskManagerType", typeof(DevExpress.Data.Mask.NumericMaskManager));
            txtDiameterMax.Properties.MaskSettings.Set("MaskManagerSignature", "allowNull=False");
            txtDiameterMax.Properties.NullValuePrompt = "mm";
            txtDiameterMax.Size = new Size(50, 20);
            txtDiameterMax.StyleController = layoutControl1;
            txtDiameterMax.TabIndex = 11;
            // 
            // layoutControlItem6
            // 
            layoutControlItem6.ContentVertAlignment = DevExpress.Utils.VertAlignment.Center;
            layoutControlItem6.Control = txtDiameterMax;
            layoutControlItem6.Location = new Point(726, 0);
            layoutControlItem6.MaxSize = new Size(54, 24);
            layoutControlItem6.MinSize = new Size(54, 24);
            layoutControlItem6.Name = "layoutControlItem6";
            layoutControlItem6.Size = new Size(54, 28);
            layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            layoutControlItem6.Text = "-";
            layoutControlItem6.TextAlignMode = DevExpress.XtraLayout.TextAlignModeItem.AutoSize;
            layoutControlItem6.TextSize = new Size(0, 0);
            layoutControlItem6.TextToControlDistance = 0;
            layoutControlItem6.TextVisible = false;
            // 
            // simpleLabelItem1
            // 
            simpleLabelItem1.AllowHotTrack = false;
            simpleLabelItem1.AppearanceItemCaption.Options.UseTextOptions = true;
            simpleLabelItem1.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            simpleLabelItem1.Location = new Point(694, 0);
            simpleLabelItem1.MaxSize = new Size(32, 18);
            simpleLabelItem1.MinSize = new Size(32, 18);
            simpleLabelItem1.Name = "simpleLabelItem1";
            simpleLabelItem1.Size = new Size(32, 28);
            simpleLabelItem1.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            simpleLabelItem1.Text = "-";
            simpleLabelItem1.TextSize = new Size(28, 14);
            // 
            // HydroPipeListCtrl
            // 
@@ -455,6 +534,11 @@
            ((ISupportInitialize)layoutControlItem3).EndInit();
            ((ISupportInitialize)layoutControlItem1).EndInit();
            ((ISupportInitialize)layoutControlItem9).EndInit();
            ((ISupportInitialize)txtDiameterMin.Properties).EndInit();
            ((ISupportInitialize)layoutControlItem5).EndInit();
            ((ISupportInitialize)txtDiameterMax.Properties).EndInit();
            ((ISupportInitialize)layoutControlItem6).EndInit();
            ((ISupportInitialize)simpleLabelItem1).EndInit();
            ResumeLayout(false);
        }

@@ -493,5 +577,10 @@
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuQ;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuPr1;
        private DevExpress.XtraGrid.Columns.GridColumn colCalcuPr2;
        private DevExpress.XtraEditors.TextEdit txtDiameterMin;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraEditors.TextEdit txtDiameterMax;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.SimpleLabelItem simpleLabelItem1;
    }
}

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/15-pipe/HydroPipeListCtrl.cs

@@ -233,22 +233,33 @@
            {
                return;
            }
            var name = this.txtName.Text.Trim();
            var code = this.txtCode.Text.Trim();
            var modelType = this.txtModelType.Text.Trim();
            _allBindingList = _allList;

            var name = this.txtName.Text.Trim();
            if (!string.IsNullOrEmpty(name))
            {
                _allBindingList = _allBindingList.Where(x => !string.IsNullOrEmpty(x.Name) && x.Name.Contains(name)).ToList();
            }
            var code = this.txtCode.Text.Trim();
            if (!string.IsNullOrEmpty(code))
            {
                _allBindingList = _allBindingList.Where(x => !string.IsNullOrEmpty(x.Code) && x.Code.Contains(code)).ToList();
            }
            var modelType = this.txtModelType.Text.Trim();
            if (!string.IsNullOrEmpty(modelType))
            {
                _allBindingList = _allBindingList.Where(x => !string.IsNullOrEmpty(x.ModelType) && x.ModelType.Contains(modelType)).ToList();
            }
            double? diameterMin = this.txtDiameterMin.EditValue == null ? null : double.Parse(this.txtDiameterMin.EditValue.ToString());
            if (diameterMin.HasValue)
            {
                _allBindingList = _allBindingList.Where(x => x.Diameter >= diameterMin.Value).ToList();
            }
            double? diameterMax = this.txtDiameterMax.EditValue == null ? null : double.Parse(this.txtDiameterMax.EditValue.ToString());
            if (diameterMax.HasValue)
            {
                _allBindingList = _allBindingList.Where(x => x.Diameter <= diameterMax.Value).ToList();
            }
            this.hydroPipeViewModelBindingSource.DataSource = _allBindingList;
            this.hydroPipeViewModelBindingSource.ResetBindings(false);
        }

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/15-pipe/HydroPipeListCtrl.resx

@@ -351,7 +351,7 @@
        Pg0KICA8L2c+DQo8L3N2Zz4L
</value>
  </data>
  <data name="editorButtonImageOptions1.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
  <data name="editorButtonImageOptions4.SvgImage" type="DevExpress.Utils.Svg.SvgImage, DevExpress.Data.v23.2" mimetype="application/x-microsoft.net.object.bytearray.base64">
    <value>
        AAEAAAD/////AQAAAAAAAAAMAgAAAFlEZXZFeHByZXNzLkRhdGEudjIzLjIsIFZlcnNpb249MjMuMi40
        LjAsIEN1bHR1cmU9bmV1dHJhbCwgUHVibGljS2V5VG9rZW49Yjg4ZDE3NTRkNzAwZTQ5YQUBAAAAHURl

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/06-visual/16-translation/HydroTranslationListCtrl.cs

@@ -232,18 +232,19 @@
            {
                return;
            }
            var name = this.txtName.Text.Trim();
            var code = this.txtCode.Text.Trim();
            var modelType = this.txtModelType.Text.Trim();
            _allBindingList = _allList;

            var name = this.txtName.Text.Trim();
            if (!string.IsNullOrEmpty(name))
            {
                _allBindingList = _allBindingList.Where(x => !string.IsNullOrEmpty(x.Name) && x.Name.Contains(name)).ToList();
            }
            var code = this.txtCode.Text.Trim();
            if (!string.IsNullOrEmpty(code))
            {
                _allBindingList = _allBindingList.Where(x => !string.IsNullOrEmpty(x.Code) && x.Code.Contains(code)).ToList();
            }
            var modelType = this.txtModelType.Text.Trim();
            if (!string.IsNullOrEmpty(modelType))
            {
                _allBindingList = _allBindingList.Where(x => !string.IsNullOrEmpty(x.ModelType) && x.ModelType.Contains(modelType)).ToList();

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/00-core/HydroMatchingHelper.cs

@@ -2486,8 +2486,11 @@
            //visual.DbLocked = matching.DbLocked;
            //visual.DbId = matching.DbId;
            //visual.ModelType = matching.ModelType;
            //if (matching.TranslationType.HasValue)
            //{
            //    visual.TranslationType = HydroTranslationTypeEnumHelper.GetTranslationTypeName(matching.TranslationType.Value);
            //}
            //visual.Material = matching.Material;
            //visual.Diameter = matching.Diameter;
            //visual.StartDiameter = matching.StartDiameter;
            //visual.EndDiameter = matching.EndDiameter;
            //visual.Roughness = matching.Roughness;
@@ -2517,6 +2520,17 @@
                    visual.DbId = matching.MatchingDbId;
                    result = true;
                }
                if (matching.MatchingTranslationType.HasValue)
                {
                    var translationType = HydroTranslationTypeEnumHelper.GetTranslationTypeName(matching.MatchingTranslationType.Value);
                    if (visual.TranslationType != translationType)
                    {
                        changeHelper?.Append(visual, eChangeType.Update);
                        propStatusHelper?.UpdatePropStatus(visual.Code, nameof(visual.TranslationType), ePropStatus.Normal, $"{DateTime.Now.ToStandardString()}通过产品配置匹配修改");
                    }
                    visual.TranslationType = translationType;
                    result = true;
                }
                if (!string.IsNullOrEmpty(matching.MatchingMaterial))
                {
                    if (visual.Material != matching.MatchingMaterial)

 WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/13-translation/HydroTranslationMatchingViewModel.cs

@@ -20,13 +20,12 @@
            this.DbLocked = rhs.DbLocked;
            this.DbId = rhs.DbId;
            this.ModelType = rhs.ModelType;
            this.TranslationType = HydroTranslationTypeEnumHelper.GetTranslationType(rhs.TranslationType);
            this.Material = rhs.Material;
            //this.Diameter = rhs.Diameter;
            this.StartDiameter = rhs.StartDiameter;
            this.EndDiameter = rhs.EndDiameter;
            this.Roughness = rhs.Roughness;
            this.MinorLoss = rhs.MinorLoss;
            this.eAlgorithmType = eAlgorithmType.Hazen;
        }

        /// <summary>
@@ -61,14 +60,14 @@
        public string ModelType { get; set; }

        /// <summary>
        /// è¿‡æ¸¡ä»¶ç±»åž‹
        /// </summary>
        public eTranslationType? TranslationType { get; set; }

        /// <summary>
        /// æè´¨
        /// </summary>
        public string Material { get; set; }

        /// <summary>
        /// ç›´å¾„
        /// </summary>
        public double Diameter { get; set; }

        /// <summary>
        /// ä¸Šæ¸¸ç›´å¾„
@@ -91,11 +90,6 @@
        public double MinorLoss { get; set; }

        /// <summary>
        /// ç®—法类型
        /// </summary>
        public eAlgorithmType eAlgorithmType { get; set; }

        /// <summary>
        /// åŒ¹é…åž‹å·
        /// </summary>
        public string MatchingModelType { get; set; }
@@ -106,14 +100,14 @@
        public string MatchingDbId { get; set; }

        /// <summary>
        /// åŒ¹é…è¿‡æ¸¡ä»¶ç±»åž‹
        /// </summary>
        public eTranslationType? MatchingTranslationType { get; set; }

        /// <summary>
        /// åŒ¹é…æè´¨
        /// </summary>
        public string MatchingMaterial { get; set; }

        /// <summary>
        /// åŒ¹é…ç›´å¾„
        /// </summary>
        public double? MatchingDiameter { get; set; }

        /// <summary>
        /// åŒ¹é…ä¸Šæ¸¸ç›´å¾„