修改阀门表

duheng

2024-11-06 793bb79d635530949de3e53c40e6e1aca8b86a34

修改阀门表

 Dto/HStation.Dto.Assets.Core/01-ValveManage/01-ValveSeries/AddValveSeriesInput.cs

@@ -13,7 +13,7 @@
        /// <summary>
        /// 父级ID
        /// </summary>
        public long ParentID { get; set; }
        public List<long> ParentIds { get; set; }

        /// <summary>
        /// 参数

 Dto/HStation.Dto.Assets.Core/01-ValveManage/01-ValveSeries/UpdateValveSeriesInput.cs

@@ -15,7 +15,7 @@
        /// <summary>
        /// 父级ID
        /// </summary>
        public long ParentID { get; set; }
        public List<long> ParentIds { get; set; }

        /// <summary>
        /// 名称

 Dto/HStation.Dto.Assets.Core/01-ValveManage/03-VavleCofficient/AddValveMainInput.cs

@@ -23,10 +23,5 @@
        /// 局阻系数
        /// </summary>
        public double? MinorLoss { get; set; }

        /// <summary>
        /// 阀门类型
        /// </summary>
        public eValveType ValveType { get; set; }
    }
}

 Dto/HStation.Dto.Assets.Core/01-ValveManage/03-VavleCofficient/UpdateValveMainInput.cs

@@ -30,10 +30,5 @@
        /// 局阻系数
        /// </summary>
        public double? MinorLoss { get; set; }

        /// <summary>
        /// 阀门类型
        /// </summary>
        public eValveType ValveType { get; set; }
    }
}

 Dto/HStation.Dto.Assets.Core/01-ValveManage/03-VavleCofficient/ValveMainDto.cs

@@ -15,7 +15,6 @@
            this.Material = rhs.Material;
            this.Caliber = rhs.Caliber;
            this.MinorLoss = rhs.MinorLoss;
            this.ValveType = rhs.ValveType;
        }

        /// <summary>

 Service/HStation.Service.Assets.Core/01-entity/08-Valve/AssetsValveCoefficient.cs

@@ -21,11 +21,6 @@
        public string Name { get; set; }

        /// <summary>
        /// 阀门类型
        /// </summary>
        public string ValveType { get; set; }

        /// <summary>
        /// 口径
        /// </summary>
        public double? Caliber { get; set; }

 Service/HStation.Service.Assets.Core/01-entity/08-Valve/AssetsValveMain.cs

@@ -23,11 +23,11 @@
            this.ID = rhs.ID;
            this.SeriesID = rhs.SeriesID;
            this.Name = rhs.Name;
            this.ValveType = rhs.ValveType;
            this.Material = rhs.Material;
            this.Caliber = rhs.Caliber;//mm
            this.ValveSetting = rhs.ValveSetting;
            this.MinorLoss = rhs.MinorLoss;
            this.ValveType = rhs.ValveType;
            this.ValveSetting = rhs.ValveSetting;
            this.SortCode = rhs.SortCode;
            this.Description = rhs.Description;
        }

 Service/HStation.Service.Assets.Core/02-model/08-ValveManage/AssetsValveCoefficient.cs

@@ -23,7 +23,6 @@
            this.Caliber = rhs.Caliber;
            this.Material = rhs.Material;
            this.MinorLoss = rhs.MinorLoss;
            this.ValveType = rhs.ValveType;
        }

        public void Reset(AssetsValveCoefficient rhs)
@@ -33,7 +32,6 @@
            this.Caliber = rhs.Caliber;
            this.Material = rhs.Material;
            this.MinorLoss = rhs.MinorLoss;
            this.ValveType = rhs.ValveType;
        }

        /// <summary>
@@ -55,11 +53,6 @@
        /// 局阻系数
        /// </summary>
        public double? MinorLoss { get; set; }

        /// <summary>
        /// 阀门类型
        /// </summary>
        public eValveType ValveType { get; set; }

        /// <summary>
        ///

 Vmo/HStation.Vmo.Assets.Core/02-ValveManage/AssetsValveCoefficientVmo.cs

@@ -25,11 +25,6 @@
        public string Material { get; set; }

        /// <summary>
        /// 阀门类型
        /// </summary>
        public eValveType ValveType { get; set; }

        /// <summary>
        /// 局阻系数
        /// </summary>
        public double? MinorLoss { get; set; }

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

@@ -15,7 +15,6 @@
            this.Caliber = rhs.Caliber;
            this.Material = rhs.Material;
            this.MinorLoss = rhs.MinorLoss;
            this.ValveType = rhs.ValveType;
        }

        /// <summary>
@@ -50,12 +49,5 @@
        [DisplayName("局阻系数")]
        [Browsable(true)]
        public double? MinorLoss { get; set; }

        /// <summary>
        /// 阀门类型
        /// </summary>
        [DisplayName("阀门类型")]
        [Browsable(true)]
        public eValveType ValveType { get; set; }
    }
}

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

@@ -1,4 +1,5 @@
using DevExpress.XtraRichEdit.Model.History;
using Yw.Untity;

namespace HStation.WinFrmUI.Assets
{
@@ -12,10 +13,8 @@
        {
            this.Name = rhs.Name;
            this.ID = rhs.ID;
            if (rhs.ParentIds.Count > 0)
            {
                this.ParentID = rhs.ParentIds.Last();
            }
            this.ParentID = TreeParentIdsHelper.GetLastParentID(rhs.ParentIds);

            this.Description = rhs.Description;
        }

@@ -23,10 +22,7 @@
        {
            this.Name = rhs.Name;
            this.ID = rhs.ID;
            if (rhs.ParentIds.Count > 0)
            {
                this.ParentID = rhs.ParentIds.Last();
            }
            this.ParentID = TreeParentIdsHelper.GetLastParentID(rhs.ParentIds);
            this.Description = rhs.Description;
        }


 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/01-series/AddValveSeriesDlg.cs

@@ -1,4 +1,6 @@
namespace HStation.WinFrmUI.Assets
using Yw.Untity;

namespace HStation.WinFrmUI.Assets
{
    public partial class AddAssetsValveSeriesDlg : DevExpress.XtraEditors.XtraForm
    {
@@ -8,13 +10,20 @@
            this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
        }

        public event Func<Vmo.AssetsValveSeriesVmo, Task<bool>> ReloadDataEvent = null;
        public event Func<Vmo.AssetsValveSeriesVmo, string, Task<bool>> ReloadDataEvent = null;

        private List<AssetsValveSeriesViewModel> _assetsValveSeriesViews;

        //初始化
        private async void AddAssetsValveSeriesDlg_Load(object sender, EventArgs e)
        {
            _assetsValveSeriesViews = new List<AssetsValveSeriesViewModel>();
            var allList = await new BLL.AssetsValveSeries().GetAll();
            treeListLookUpEdit1TreeList.DataSource = allList;
            foreach (var item in allList)
            {
                _assetsValveSeriesViews.Add(new AssetsValveSeriesViewModel(item));
            }
            treeListLookUpEdit1TreeList.DataSource = _assetsValveSeriesViews;
        }

        //数据验证
@@ -38,14 +47,7 @@
            model.Name = NameTextEdit.Text;
            model.TagName = TagNameTextEdit.Text;
            model.Description = DescriptionTextEdit.Text;
            if (TextEditParentList.EditValue != null)
            {
                if (long.TryParse(TextEditParentList.EditValue.ToString(), out long parentId))
                {
                    model.ParentIds = new List<long> { parentId };
                }
            }
             if (await this.ReloadDataEvent.Invoke(model))
            if (await this.ReloadDataEvent.Invoke(model, TextEditParentList.EditValue.ToString()))
            {
                TipFormHelper.ShowSucceed("添加成功!");
            }

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/01-series/EditValveSeriesDlg.Designer.cs

@@ -43,6 +43,10 @@
            layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
            TextEditParentList = new DevExpress.XtraEditors.TreeListLookUpEdit();
            treeListLookUpEdit1TreeList = new DevExpress.XtraTreeList.TreeList();
            treeListColumn1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)TagNameTextEdit.Properties).BeginInit();
@@ -56,10 +60,14 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)TextEditParentList.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1TreeList).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
            // 
            layoutControl1.Controls.Add(TextEditParentList);
            layoutControl1.Controls.Add(BtnOk);
            layoutControl1.Controls.Add(btnCancel);
            layoutControl1.Controls.Add(TagNameTextEdit);
@@ -115,9 +123,9 @@
            // 
            // DescriptionTextEdit
            // 
            DescriptionTextEdit.Location = new Point(55, 56);
            DescriptionTextEdit.Location = new Point(55, 80);
            DescriptionTextEdit.Name = "DescriptionTextEdit";
            DescriptionTextEdit.Size = new Size(448, 185);
            DescriptionTextEdit.Size = new Size(448, 161);
            DescriptionTextEdit.StyleController = layoutControl1;
            DescriptionTextEdit.TabIndex = 4;
            // 
@@ -127,7 +135,7 @@
            Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
            Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
            Root.GroupBordersVisible = false;
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5, layoutControlItem1, layoutControlItem6, emptySpaceItem1, layoutControlItem4, layoutControlItem3 });
            Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5, layoutControlItem1, layoutControlItem6, emptySpaceItem1, layoutControlItem4, layoutControlItem3, layoutControlItem2 });
            Root.Name = "Root";
            Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
            Root.Size = new Size(511, 275);
@@ -136,9 +144,9 @@
            // layoutControlItem5
            // 
            layoutControlItem5.Control = DescriptionTextEdit;
            layoutControlItem5.Location = new Point(0, 48);
            layoutControlItem5.Location = new Point(0, 72);
            layoutControlItem5.Name = "layoutControlItem5";
            layoutControlItem5.Size = new Size(499, 189);
            layoutControlItem5.Size = new Size(499, 165);
            layoutControlItem5.Text = "说明:";
            layoutControlItem5.TextSize = new Size(35, 14);
            // 
@@ -191,6 +199,46 @@
            // 
            dxErrorProvider1.ContainerControl = this;
            // 
            // TextEditParentList
            // 
            TextEditParentList.Location = new Point(55, 56);
            TextEditParentList.Name = "TextEditParentList";
            TextEditParentList.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
            TextEditParentList.Properties.DisplayMember = "Name";
            TextEditParentList.Properties.NullText = "";
            TextEditParentList.Properties.TreeList = treeListLookUpEdit1TreeList;
            TextEditParentList.Properties.ValueMember = "ID";
            TextEditParentList.Size = new Size(448, 20);
            TextEditParentList.StyleController = layoutControl1;
            TextEditParentList.TabIndex = 8;
            // 
            // treeListLookUpEdit1TreeList
            // 
            treeListLookUpEdit1TreeList.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { treeListColumn1 });
            treeListLookUpEdit1TreeList.Location = new Point(4, 37);
            treeListLookUpEdit1TreeList.Name = "treeListLookUpEdit1TreeList";
            treeListLookUpEdit1TreeList.OptionsView.ShowIndentAsRowStyle = true;
            treeListLookUpEdit1TreeList.Size = new Size(400, 200);
            treeListLookUpEdit1TreeList.TabIndex = 0;
            treeListLookUpEdit1TreeList.ViewStyle = DevExpress.XtraTreeList.TreeListViewStyle.TreeView;
            // 
            // treeListColumn1
            // 
            treeListColumn1.Caption = "treeListColumn1";
            treeListColumn1.FieldName = "Name";
            treeListColumn1.Name = "treeListColumn1";
            treeListColumn1.Visible = true;
            treeListColumn1.VisibleIndex = 0;
            // 
            // layoutControlItem2
            // 
            layoutControlItem2.Control = TextEditParentList;
            layoutControlItem2.Location = new Point(0, 48);
            layoutControlItem2.Name = "layoutControlItem2";
            layoutControlItem2.Size = new Size(499, 24);
            layoutControlItem2.Text = "父级:";
            layoutControlItem2.TextSize = new Size(35, 14);
            // 
            // EditAssetsValveSeriesDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
@@ -213,6 +261,9 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
            ((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
            ((System.ComponentModel.ISupportInitialize)TextEditParentList.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)treeListLookUpEdit1TreeList).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
            ResumeLayout(false);
        }

@@ -232,5 +283,9 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.EmptySpaceItem emptySpaceItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraEditors.TreeListLookUpEdit TextEditParentList;
        private DevExpress.XtraTreeList.TreeList treeListLookUpEdit1TreeList;
        private DevExpress.XtraTreeList.Columns.TreeListColumn treeListColumn1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
    }
}

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/01-series/EditValveSeriesDlg.cs

@@ -8,16 +8,25 @@
            this.IconOptions.Icon = Yw.WinFrmUI.GlobalParas.AppIcon;
        }

        public event Func<Vmo.AssetsValveSeriesVmo, Task<bool>> ReloadDataEvent = null;
        public event Func<Vmo.AssetsValveSeriesVmo, string, Task<bool>> ReloadDataEvent = null;

        private Vmo.AssetsValveSeriesVmo _AssetsValveSeries = null;
        private List<AssetsValveSeriesViewModel> _assetsValveSeriesViews;

        public void SetBindingData(Vmo.AssetsValveSeriesVmo seriesVmo)
        public async void SetBindingData(Vmo.AssetsValveSeriesVmo seriesVmo)
        {
            _AssetsValveSeries = seriesVmo;
            this.NameTextEdit.Text = _AssetsValveSeries.Name;
            this.DescriptionTextEdit.Text = _AssetsValveSeries.Description;
            this.TagNameTextEdit.Text = _AssetsValveSeries.TagName;
            _assetsValveSeriesViews = new List<AssetsValveSeriesViewModel>();
            var allList = await new BLL.AssetsValveSeries().GetAll();
            foreach (var item in allList)
            {
                _assetsValveSeriesViews.Add(new AssetsValveSeriesViewModel(item));
            }
            treeListLookUpEdit1TreeList.DataSource = _assetsValveSeriesViews;
            TextEditParentList.EditValue = _AssetsValveSeries.ParentIds.Last();
        }

        //数据验证
@@ -40,7 +49,7 @@
            _AssetsValveSeries.Name = NameTextEdit.Text;
            _AssetsValveSeries.TagName = TagNameTextEdit.Text;
            _AssetsValveSeries.Description = DescriptionTextEdit.Text;
            if (await this.ReloadDataEvent.Invoke(_AssetsValveSeries))
            if (await this.ReloadDataEvent.Invoke(_AssetsValveSeries, TextEditParentList.EditValue.ToString()))
            {
                TipFormHelper.ShowSucceed("修改成功!");
            }

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.Designer.cs

@@ -74,7 +74,6 @@
            colCaliber = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            colMaterial = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            colMinorLoss = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            colValveType = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)popupContainerControl1).BeginInit();
@@ -146,7 +145,7 @@
            // 
            // treeList1
            // 
            treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName1, colCaliber1, colMaterial1, colMinorLoss1, colValveType });
            treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName1, colCaliber1, colMaterial1, colMinorLoss1 });
            treeList1.DataSource = valveCoefficientViewModelBindingSource;
            treeList1.Dock = DockStyle.Fill;
            treeList1.Location = new Point(0, 0);
@@ -171,7 +170,7 @@
            colCaliber1.FieldName = "Caliber";
            colCaliber1.Name = "colCaliber1";
            colCaliber1.Visible = true;
            colCaliber1.VisibleIndex = 2;
            colCaliber1.VisibleIndex = 1;
            colCaliber1.Width = 151;
            // 
            // colMaterial1
@@ -180,7 +179,7 @@
            colMaterial1.FieldName = "Material";
            colMaterial1.Name = "colMaterial1";
            colMaterial1.Visible = true;
            colMaterial1.VisibleIndex = 3;
            colMaterial1.VisibleIndex = 2;
            colMaterial1.Width = 152;
            // 
            // colMinorLoss1
@@ -189,7 +188,7 @@
            colMinorLoss1.FieldName = "MinorLoss";
            colMinorLoss1.Name = "colMinorLoss1";
            colMinorLoss1.Visible = true;
            colMinorLoss1.VisibleIndex = 4;
            colMinorLoss1.VisibleIndex = 3;
            colMinorLoss1.Width = 152;
            // 
            // valveCoefficientViewModelBindingSource
@@ -209,9 +208,9 @@
            // 
            BtnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
            BtnOk.Appearance.Options.UseBackColor = true;
            BtnOk.Location = new Point(507, 452);
            BtnOk.Location = new Point(513, 452);
            BtnOk.Name = "BtnOk";
            BtnOk.Size = new Size(82, 22);
            BtnOk.Size = new Size(76, 22);
            BtnOk.StyleController = layoutControl1;
            BtnOk.TabIndex = 10;
            BtnOk.Text = "确定";
@@ -307,9 +306,9 @@
            // layoutControlItem4
            // 
            layoutControlItem4.Control = BtnOk;
            layoutControlItem4.Location = new Point(499, 444);
            layoutControlItem4.Location = new Point(505, 444);
            layoutControlItem4.Name = "layoutControlItem4";
            layoutControlItem4.Size = new Size(86, 26);
            layoutControlItem4.Size = new Size(80, 26);
            layoutControlItem4.TextSize = new Size(0, 0);
            layoutControlItem4.TextVisible = false;
            // 
@@ -318,7 +317,7 @@
            emptySpaceItem1.AllowHotTrack = false;
            emptySpaceItem1.Location = new Point(0, 444);
            emptySpaceItem1.Name = "emptySpaceItem1";
            emptySpaceItem1.Size = new Size(499, 26);
            emptySpaceItem1.Size = new Size(505, 26);
            emptySpaceItem1.TextSize = new Size(0, 0);
            // 
            // layoutControlItem8
@@ -525,15 +524,6 @@
            colMinorLoss.Visible = true;
            colMinorLoss.VisibleIndex = 3;
            // 
            // colValveType
            // 
            colValveType.Caption = "阀门类型";
            colValveType.FieldName = "ValveType";
            colValveType.Name = "colValveType";
            colValveType.Visible = true;
            colValveType.VisibleIndex = 1;
            colValveType.Width = 158;
            // 
            // AddAssetsValveMainDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
@@ -634,6 +624,5 @@
        private DevExpress.XtraTreeList.Columns.TreeListColumn colCaliber1;
        private DevExpress.XtraTreeList.Columns.TreeListColumn colMaterial1;
        private DevExpress.XtraTreeList.Columns.TreeListColumn colMinorLoss1;
        private DevExpress.XtraTreeList.Columns.TreeListColumn colValveType;
    }
}

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/AddValveMainDlg.cs

@@ -119,7 +119,10 @@
        {
            var select = GetCoefficientByMaterial(TextEditMaterial.Text);
            if (select == null)
            {
                this.TextEditCoefficient.Text = string.Empty;
                return;
            }
            this.TextEditCoefficient.Text = select.MinorLoss.ToString();
        }


 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.Designer.cs

@@ -36,7 +36,7 @@
            colCaliber1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            colMaterial1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            colMinorLoss1 = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            colValveType = new DevExpress.XtraTreeList.Columns.TreeListColumn();
            valveCoefficientViewModelBindingSource = new BindingSource(components);
            TextEditType = new DevExpress.XtraEditors.ImageComboBoxEdit();
            TextEditKeyWord = new DevExpress.XtraEditors.TextEdit();
            BtnOk = new DevExpress.XtraEditors.SimpleButton();
@@ -70,12 +70,12 @@
            layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
            layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            valveCoefficientViewModelBindingSource = new BindingSource(components);
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)popupContainerControl1).BeginInit();
            popupContainerControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)treeList1).BeginInit();
            ((System.ComponentModel.ISupportInitialize)valveCoefficientViewModelBindingSource).BeginInit();
            ((System.ComponentModel.ISupportInitialize)TextEditType.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).BeginInit();
            ((System.ComponentModel.ISupportInitialize)TextEditName.Properties).BeginInit();
@@ -107,7 +107,6 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem27).BeginInit();
            ((System.ComponentModel.ISupportInitialize)valveCoefficientViewModelBindingSource).BeginInit();
            SuspendLayout();
            // 
            // layoutControl1
@@ -142,7 +141,7 @@
            // 
            // treeList1
            // 
            treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName1, colCaliber1, colMaterial1, colMinorLoss1, colValveType });
            treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName1, colCaliber1, colMaterial1, colMinorLoss1 });
            treeList1.DataSource = valveCoefficientViewModelBindingSource;
            treeList1.Dock = DockStyle.Fill;
            treeList1.Location = new Point(0, 0);
@@ -167,7 +166,7 @@
            colCaliber1.FieldName = "Caliber";
            colCaliber1.Name = "colCaliber1";
            colCaliber1.Visible = true;
            colCaliber1.VisibleIndex = 2;
            colCaliber1.VisibleIndex = 1;
            colCaliber1.Width = 144;
            // 
            // colMaterial1
@@ -176,7 +175,7 @@
            colMaterial1.FieldName = "Material";
            colMaterial1.Name = "colMaterial1";
            colMaterial1.Visible = true;
            colMaterial1.VisibleIndex = 3;
            colMaterial1.VisibleIndex = 2;
            colMaterial1.Width = 144;
            // 
            // colMinorLoss1
@@ -185,17 +184,12 @@
            colMinorLoss1.FieldName = "MinorLoss";
            colMinorLoss1.Name = "colMinorLoss1";
            colMinorLoss1.Visible = true;
            colMinorLoss1.VisibleIndex = 4;
            colMinorLoss1.VisibleIndex = 3;
            colMinorLoss1.Width = 144;
            // 
            // colValveType
            // valveCoefficientViewModelBindingSource
            // 
            colValveType.Caption = "阀门类型";
            colValveType.FieldName = "ValveType";
            colValveType.Name = "colValveType";
            colValveType.Visible = true;
            colValveType.VisibleIndex = 1;
            colValveType.Width = 199;
            valveCoefficientViewModelBindingSource.DataSource = typeof(ValveCoefficientViewModel);
            // 
            // TextEditType
            // 
@@ -497,10 +491,6 @@
            layoutControlItem27.Text = "说明:";
            layoutControlItem27.TextSize = new Size(59, 14);
            // 
            // valveCoefficientViewModelBindingSource
            // 
            valveCoefficientViewModelBindingSource.DataSource = typeof(ValveCoefficientViewModel);
            // 
            // EditAssetsValveMainDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
@@ -515,6 +505,7 @@
            ((System.ComponentModel.ISupportInitialize)popupContainerControl1).EndInit();
            popupContainerControl1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)treeList1).EndInit();
            ((System.ComponentModel.ISupportInitialize)valveCoefficientViewModelBindingSource).EndInit();
            ((System.ComponentModel.ISupportInitialize)TextEditType.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)TextEditKeyWord.Properties).EndInit();
            ((System.ComponentModel.ISupportInitialize)TextEditName.Properties).EndInit();
@@ -546,7 +537,6 @@
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
            ((System.ComponentModel.ISupportInitialize)layoutControlItem27).EndInit();
            ((System.ComponentModel.ISupportInitialize)valveCoefficientViewModelBindingSource).EndInit();
            ResumeLayout(false);
        }

@@ -596,7 +586,6 @@
        private DevExpress.XtraTreeList.Columns.TreeListColumn colCaliber1;
        private DevExpress.XtraTreeList.Columns.TreeListColumn colMaterial1;
        private DevExpress.XtraTreeList.Columns.TreeListColumn colMinorLoss1;
        private DevExpress.XtraTreeList.Columns.TreeListColumn colValveType;
        private BindingSource valveCoefficientViewModelBindingSource;
    }
}

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/02-main/EditValveMainDlg.cs

@@ -138,7 +138,10 @@
        {
            var select = GetCoefficientByMaterial(TextEditMaterial.Text);
            if (select == null)
            {
                this.TextEditCoefficient.Text = string.Empty;
                return;
            }
            this.TextEditCoefficient.Text = select.MinorLoss.ToString();
        }


 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/SetValveCoefficientDlg.Designer.cs

@@ -54,7 +54,6 @@
            layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            emptySpaceItem2 = new DevExpress.XtraLayout.EmptySpaceItem();
            colValveType = new DevExpress.XtraGrid.Columns.GridColumn();
            ((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
            layoutControl1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)gridControl1).BeginInit();
@@ -127,7 +126,7 @@
            // 
            gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { ColDelete, colCaliber, colMaterial, colMinorLoss, colName, colValveType });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { ColDelete, colCaliber, colMaterial, colMinorLoss, colName });
            gridView1.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
@@ -150,7 +149,7 @@
            ColDelete.Name = "ColDelete";
            ColDelete.OptionsColumn.AllowEdit = false;
            ColDelete.Visible = true;
            ColDelete.VisibleIndex = 5;
            ColDelete.VisibleIndex = 4;
            ColDelete.Width = 47;
            // 
            // repositoryItemButtonEdit1
@@ -168,7 +167,7 @@
            colCaliber.FieldName = "Caliber";
            colCaliber.Name = "colCaliber";
            colCaliber.Visible = true;
            colCaliber.VisibleIndex = 2;
            colCaliber.VisibleIndex = 1;
            colCaliber.Width = 134;
            // 
            // colMaterial
@@ -178,7 +177,7 @@
            colMaterial.FieldName = "Material";
            colMaterial.Name = "colMaterial";
            colMaterial.Visible = true;
            colMaterial.VisibleIndex = 3;
            colMaterial.VisibleIndex = 2;
            colMaterial.Width = 134;
            // 
            // colMinorLoss
@@ -188,7 +187,7 @@
            colMinorLoss.FieldName = "MinorLoss";
            colMinorLoss.Name = "colMinorLoss";
            colMinorLoss.Visible = true;
            colMinorLoss.VisibleIndex = 4;
            colMinorLoss.VisibleIndex = 3;
            colMinorLoss.Width = 134;
            // 
            // colName
@@ -254,14 +253,6 @@
            emptySpaceItem2.Size = new Size(352, 26);
            emptySpaceItem2.TextSize = new Size(0, 0);
            // 
            // colValveType
            // 
            colValveType.FieldName = "ValveType";
            colValveType.Name = "colValveType";
            colValveType.Visible = true;
            colValveType.VisibleIndex = 1;
            colValveType.Width = 149;
            // 
            // SetValveCoefficientDlg
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
@@ -308,6 +299,5 @@
        private DevExpress.XtraGrid.Columns.GridColumn colCaliber;
        private DevExpress.XtraGrid.Columns.GridColumn colMaterial;
        private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
        private DevExpress.XtraGrid.Columns.GridColumn colValveType;
    }
}

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/SetValveCoefficientDlg.cs

@@ -35,7 +35,7 @@
            var allList = new List<Vmo.AssetsValveCoefficientVmo>();
            foreach (var item in _allBindingList)
            {
                allList.Add(new Vmo.AssetsValveCoefficientVmo { ID = item.ID, Name = item.Name, Caliber = item.Caliber, Material = item.Material, MinorLoss = item.MinorLoss, ValveType = item.ValveType });
                allList.Add(new Vmo.AssetsValveCoefficientVmo { ID = item.ID, Name = item.Name, Caliber = item.Caliber, Material = item.Material, MinorLoss = item.MinorLoss });
            }
            if (await _bll.DeleteAll())
            {

 WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/ValveTypeTreeListCtrl.cs

@@ -1,5 +1,6 @@
using DevExpress.XtraEditors;
using Yw;
using Yw.Untity;

namespace HStation.WinFrmUI.Assets
{
@@ -47,8 +48,10 @@
        private void BtnAdd_ItemClick(object sender, DevExpress.XtraBars.ItemClickEventArgs e)
        {
            var dlg = new AddAssetsValveSeriesDlg();
            dlg.ReloadDataEvent += async (rhs) =>
            dlg.ReloadDataEvent += async (rhs, currentId) =>
            {
                var select = await _bll.GetByID(Convert.ToInt64(currentId));
                rhs.ParentIds = TreeParentIdsHelper.GetChildParentIds(select.ID, select.ParentIds);
                var bll = new BLL.AssetsValveSeries();
                var id = await bll.Insert(rhs);
                if (id > 0)
@@ -77,8 +80,10 @@
            if (AssetsValveSeries == null)
                return;
            dlg.SetBindingData(AssetsValveSeries);
            dlg.ReloadDataEvent += async (rhs) =>
            dlg.ReloadDataEvent += async (rhs, parentId) =>
            {
                var select = await _bll.GetByID(Convert.ToInt64(parentId));
                rhs.ParentIds = TreeParentIdsHelper.GetChildParentIds(select.ID, select.ParentIds);
                if (await BLLFactory<BLL.AssetsValveSeries>.Instance.Update(rhs))
                {
                    vm.Reset(rhs);

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs

@@ -211,14 +211,19 @@
            {
                return true;
            }
            /*       HStation.Vmo.AssetsValveMainVmo vmo = null;
            HStation.Vmo.AssetsValveMainVmo vmo = null;
                   //口径最小差值
                   // 绝对匹配
                   adaptingManageVmos = adaptingManageVmos.Where(x => x.ValveType.ToString() == input.ValveType).ToList();
                   var nameMatching = adaptingManageVmos.Where(x => GetIntersect(x.KeyWord== string.Empty
           ? x.Name : x.KeyWord, input.ModelType) >= 1)
           .OrderByDescending(x => GetIntersect(x.KeyWord == string.Empty ? x.Name : x.KeyWord, input.ModelType))
           .ToList();//使用型号名或者关键字找出相同字符在2以上并且进行排序

            var nameMatching = adaptingManageVmos.Where(x =>
        (x.KeyWord != null && x.KeyWord.Any(keyword => GetIntersect(keyword, input.ModelType) >= 1)) ||
        (x.KeyWord == null || !x.KeyWord.Any()) && GetIntersect(x.Name, input.ModelType) >= 1
        ) //先进行筛选,后进行从大到小排序
       .OrderByDescending(x =>
        (x.KeyWord != null && x.KeyWord.Any(keyword => GetIntersect(keyword, input.ModelType) >= 1)) ||
        (x.KeyWord == null || !x.KeyWord.Any()) && GetIntersect(x.Name, input.ModelType) >= 1)
       .ToList();//使用型号名或者关键字找出相同字符在1以上并且进行排序

                   if (nameMatching.Count > 0)
                   {
@@ -258,8 +263,7 @@
                       else
                           return false;
                   }

                   *//*var absoluteMatch = adaptingManageVmos.Where(i =>
            /*   var absoluteMatch = adaptingManageVmos.Where(i =>
                     ((i.Caliber == null) || i.Caliber == input.Diameter) &&
                      ((input.Material == null && i.Materia == null) || i.Materia == input.Material)).ToList();
                   if (absoluteMatch.Count > 1)
@@ -334,7 +338,7 @@
                       }
                   }
                   //口径和材料都没有匹配上,就用型号名匹配
                   firstCount = 0;*//*
              firstCount = 0;*/
                   if (vmo != null)
                   {
                       input.MatchingMinorLoss = vmo.MinorLoss;
@@ -345,7 +349,7 @@
                       input.MatchingValveSetting = vmo.ValveSetting;
                       input.MatchingValveType = vmo.ValveType.ToString();
                       return true;
                   }*/
            }
            return false;
        }

@@ -748,7 +752,6 @@
        public static int GetIntersect(string str1, string str2)
        {
            if (str1 == null || str2 == null) return 0;
            var a = string.Join("", str1.Intersect(str2)).Count();
            return string.Join("", str1.Intersect(str2)).Count();
        }
    }