修改匹配显示状态

duheng

2024-09-27 3b03ac9340fb8153fbb99c8e00702494192c00b6

修改匹配显示状态

 WinFrmUI/HStation.WinFrmUI.Assets.Core/06-pipelineManage/pipelineManageMainPanel.Designer.cs

@@ -169,6 +169,7 @@
            // 
            gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCaliber, colMaterial, colHazen, colDarcy, colManning, colDescription });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";

 WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/SysTypeManageMainPanel.Designer.cs

@@ -174,6 +174,7 @@
            // 
            gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colExtendTypeDisPlayName, colSortCode, colDescription });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";

 WinFrmUI/HStation.WinFrmUI.Basic/01-SysCatalogManage/SysCatalogManageMainPanel.Designer.cs

@@ -180,6 +180,7 @@
            // 
            treeList1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            treeList1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            treeList1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
            treeList1.Columns.AddRange(new DevExpress.XtraTreeList.Columns.TreeListColumn[] { colName, colCode, colSortCode, colDescription });
            treeList1.DataSource = catalogViewModelBindingSource;
            treeList1.Dock = DockStyle.Fill;

 WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SysPropManageMainPanel.Designer.cs

@@ -186,6 +186,7 @@
            // 
            gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
            gridView1.Appearance.HeaderPanel.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
            gridView1.BorderStyle = DevExpress.XtraEditors.Controls.BorderStyles.NoBorder;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colSortCode, colDescription, colDefaultValue, colFormat, colIsNull, colUnitName, ColPropEdit });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/00-core/XhsProjectSimulationMatchingListCtrl.Designer.cs

@@ -104,7 +104,7 @@
            tabPane1.Controls.Add(tabNavigationPage7);
            tabPane1.Location = new Point(2, 2);
            tabPane1.Name = "tabPane1";
            tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabNavigationPage1, tabNavigationPage2, tabNavigationPage3, tabNavigationPage4, tabNavigationPage5, tabNavigationPage6, tabNavigationPage7 });
            tabPane1.Pages.AddRange(new DevExpress.XtraBars.Navigation.NavigationPageBase[] { tabNavigationPage1, tabNavigationPage2, tabNavigationPage3, tabNavigationPage7, tabNavigationPage4, tabNavigationPage5, tabNavigationPage6 });
            tabPane1.RegularSize = new Size(956, 505);
            tabPane1.SelectedPage = tabNavigationPage2;
            tabPane1.Size = new Size(956, 505);
@@ -120,11 +120,11 @@
            tabNavigationPage1.Name = "tabNavigationPage1";
            tabNavigationPage1.PageVisible = false;
            tabNavigationPage1.Properties.ShowMode = DevExpress.XtraBars.Navigation.ItemShowMode.ImageAndText;
            tabNavigationPage1.Size = new Size(960, 502);
            tabNavigationPage1.Size = new Size(956, 472);
            // 
            // tabNavigationPage2
            // 
            tabNavigationPage2.Caption = "水泵匹配";
            tabNavigationPage2.Caption = "水泵";
            tabNavigationPage2.Controls.Add(pumpMatchingCtrl1);
            tabNavigationPage2.Name = "tabNavigationPage2";
            tabNavigationPage2.Size = new Size(956, 472);
@@ -139,77 +139,77 @@
            // 
            // tabNavigationPage3
            // 
            tabNavigationPage3.Caption = "阀门匹配";
            tabNavigationPage3.Caption = "阀门";
            tabNavigationPage3.Controls.Add(valveMatchingCtrl1);
            tabNavigationPage3.Name = "tabNavigationPage3";
            tabNavigationPage3.Size = new Size(956, 471);
            tabNavigationPage3.Size = new Size(956, 472);
            // 
            // valveMatchingCtrl1
            // 
            valveMatchingCtrl1.Dock = DockStyle.Fill;
            valveMatchingCtrl1.Location = new Point(0, 0);
            valveMatchingCtrl1.Name = "valveMatchingCtrl1";
            valveMatchingCtrl1.Size = new Size(956, 471);
            valveMatchingCtrl1.Size = new Size(956, 472);
            valveMatchingCtrl1.TabIndex = 0;
            // 
            // tabNavigationPage4
            // 
            tabNavigationPage4.Caption = "管道匹配";
            tabNavigationPage4.Caption = "管道";
            tabNavigationPage4.Controls.Add(pipeLineMatchingCtrl1);
            tabNavigationPage4.Name = "tabNavigationPage4";
            tabNavigationPage4.Size = new Size(956, 471);
            tabNavigationPage4.Size = new Size(956, 472);
            // 
            // pipeLineMatchingCtrl1
            // 
            pipeLineMatchingCtrl1.Dock = DockStyle.Fill;
            pipeLineMatchingCtrl1.Location = new Point(0, 0);
            pipeLineMatchingCtrl1.Name = "pipeLineMatchingCtrl1";
            pipeLineMatchingCtrl1.Size = new Size(956, 471);
            pipeLineMatchingCtrl1.Size = new Size(956, 472);
            pipeLineMatchingCtrl1.TabIndex = 0;
            // 
            // tabNavigationPage5
            // 
            tabNavigationPage5.Caption = "三通匹配";
            tabNavigationPage5.Caption = "三通";
            tabNavigationPage5.Controls.Add(threeLinkMatchingCtrl1);
            tabNavigationPage5.Name = "tabNavigationPage5";
            tabNavigationPage5.Size = new Size(956, 471);
            tabNavigationPage5.Size = new Size(956, 472);
            // 
            // threeLinkMatchingCtrl1
            // 
            threeLinkMatchingCtrl1.Dock = DockStyle.Fill;
            threeLinkMatchingCtrl1.Location = new Point(0, 0);
            threeLinkMatchingCtrl1.Name = "threeLinkMatchingCtrl1";
            threeLinkMatchingCtrl1.Size = new Size(956, 471);
            threeLinkMatchingCtrl1.Size = new Size(956, 472);
            threeLinkMatchingCtrl1.TabIndex = 0;
            // 
            // tabNavigationPage6
            // 
            tabNavigationPage6.Caption = "四通匹配";
            tabNavigationPage6.Caption = "四通";
            tabNavigationPage6.Controls.Add(fourLinkMatchingCtrl1);
            tabNavigationPage6.Name = "tabNavigationPage6";
            tabNavigationPage6.Size = new Size(956, 471);
            tabNavigationPage6.Size = new Size(956, 472);
            // 
            // fourLinkMatchingCtrl1
            // 
            fourLinkMatchingCtrl1.Dock = DockStyle.Fill;
            fourLinkMatchingCtrl1.Location = new Point(0, 0);
            fourLinkMatchingCtrl1.Name = "fourLinkMatchingCtrl1";
            fourLinkMatchingCtrl1.Size = new Size(956, 471);
            fourLinkMatchingCtrl1.Size = new Size(956, 472);
            fourLinkMatchingCtrl1.TabIndex = 0;
            // 
            // tabNavigationPage7
            // 
            tabNavigationPage7.Caption = "弯头匹配";
            tabNavigationPage7.Caption = "弯头";
            tabNavigationPage7.Controls.Add(elbowsMatchingCtrl1);
            tabNavigationPage7.Name = "tabNavigationPage7";
            tabNavigationPage7.Size = new Size(956, 471);
            tabNavigationPage7.Size = new Size(956, 472);
            // 
            // elbowsMatchingCtrl1
            // 
            elbowsMatchingCtrl1.Dock = DockStyle.Fill;
            elbowsMatchingCtrl1.Location = new Point(0, 0);
            elbowsMatchingCtrl1.Name = "elbowsMatchingCtrl1";
            elbowsMatchingCtrl1.Size = new Size(956, 471);
            elbowsMatchingCtrl1.Size = new Size(956, 472);
            elbowsMatchingCtrl1.TabIndex = 0;
            // 
            // Root
@@ -256,12 +256,12 @@
            emptySpaceItem2.Size = new Size(857, 26);
            emptySpaceItem2.TextSize = new Size(0, 0);
            // 
            // AssetsMainChoicePage
            // XhsProjectSimulationMatchingListCtrl
            // 
            AutoScaleDimensions = new SizeF(7F, 14F);
            AutoScaleMode = AutoScaleMode.Font;
            Controls.Add(layoutControl1);
            Name = "AssetsMainChoicePage";
            Name = "XhsProjectSimulationMatchingListCtrl";
            Size = new Size(960, 535);
            ((ISupportInitialize)layoutControl1).EndInit();
            layoutControl1.ResumeLayout(false);

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/01-viewmodel/PumpMatchingViewModel.cs

@@ -82,8 +82,6 @@
        [Browsable(true)]
        public double? RatedN { get; set; }



        /// <summary>
        /// 匹配型号
        /// </summary>
@@ -153,7 +151,5 @@
        [DisplayName("匹配流量效率曲线")]
        [Browsable(false)]
        public List<CurvePointMatchingViewModel> MatchingCurveQE { get; set; }


    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/02-pump/XhsProjectSimulationPumpMatchingListCtrl.Designer.cs

@@ -44,7 +44,7 @@
            colMatchingRatedQ = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingRatedH = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingRatedN = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingType = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingSatus = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)pumpFormViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
@@ -69,10 +69,11 @@
            // gridView1
            // 
            gridView1.BorderStyle = BorderStyles.NoBorder;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colRatedP, colRatedQ, colRatedH, colRatedN, colDbLocked, colMatchingRatedP, colMatchingRatedQ, colMatchingRatedH, colMatchingRatedN, colMatchingType });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colRatedP, colRatedQ, colRatedH, colRatedN, colDbLocked, colMatchingRatedP, colMatchingRatedQ, colMatchingRatedH, colMatchingRatedN, colMatchingSatus });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsView.ShowGroupPanel = false;
            gridView1.SortInfo.AddRange(new DevExpress.XtraGrid.Columns.GridColumnSortInfo[] { new DevExpress.XtraGrid.Columns.GridColumnSortInfo(colMatchingSatus, DevExpress.Data.ColumnSortOrder.Ascending) });
            gridView1.RowCellClick += gridView1_RowCellClick;
            // 
            // colName
@@ -159,12 +160,12 @@
            colMatchingRatedN.Visible = true;
            colMatchingRatedN.VisibleIndex = 10;
            // 
            // colMatchingType
            // colMatchingSatus
            // 
            colMatchingType.FieldName = "MatchingType";
            colMatchingType.Name = "colMatchingType";
            colMatchingType.Visible = true;
            colMatchingType.VisibleIndex = 11;
            colMatchingSatus.FieldName = "MatchingSatus";
            colMatchingSatus.Name = "colMatchingSatus";
            colMatchingSatus.Visible = true;
            colMatchingSatus.VisibleIndex = 11;
            // 
            // XhsProjectSimulationPumpMatchingListCtrl
            // 
@@ -196,6 +197,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingRatedQ;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingRatedH;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingRatedN;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingType;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingSatus;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/02-pump/XhsProjectSimulationPumpMatchingViewModel.cs

@@ -33,6 +33,14 @@
            {
                MatchingType = eMatchingStatus.Succeed;
            }
            if (rhs.MatchingDbId == null || rhs.MatchingDbId == string.Empty)
            {
                MatchingSatus = eMatchingStatus.Failed;
            }
            else
            {
                MatchingSatus = eMatchingStatus.Succeed;
            }
        }

        [DisplayName("ID")]
@@ -142,8 +150,15 @@
        /// <summary>
        /// 是否匹配成功
        /// </summary>
        [DisplayName("是否匹配成功")]
        [DisplayName("匹配状态")]
        [Browsable(true)]
        public eMatchingStatus MatchingType { get; set; }

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

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/03-valve/XhsProjectSimulationValveMatchingListCtrl.Designer.cs

@@ -42,7 +42,7 @@
            colDbLocked = new DevExpress.XtraGrid.Columns.GridColumn();
            colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingType = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingSatus = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)valveFormViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
@@ -66,7 +66,7 @@
            // gridView1
            // 
            gridView1.BorderStyle = BorderStyles.NoBorder;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colMaterial, colMatchingMaterial, colCaliber, colMatchingCaliber, colDbLocked, colMinorLoss, colMatchingMinorLoss, colMatchingType });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colMaterial, colMatchingMaterial, colCaliber, colMatchingCaliber, colDbLocked, colMinorLoss, colMatchingMinorLoss, colMatchingSatus });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsView.ShowGroupPanel = false;
@@ -142,12 +142,12 @@
            colMatchingMinorLoss.Visible = true;
            colMatchingMinorLoss.VisibleIndex = 8;
            // 
            // colMatchingType
            // colMatchingSatus
            // 
            colMatchingType.FieldName = "MatchingType";
            colMatchingType.Name = "colMatchingType";
            colMatchingType.Visible = true;
            colMatchingType.VisibleIndex = 9;
            colMatchingSatus.FieldName = "MatchingSatus";
            colMatchingSatus.Name = "colMatchingSatus";
            colMatchingSatus.Visible = true;
            colMatchingSatus.VisibleIndex = 9;
            // 
            // XhsProjectSimulationValveMatchingListCtrl
            // 
@@ -177,6 +177,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn colDbLocked;
        private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingMinorLoss;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingType;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingSatus;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/03-valve/XhsProjectSimulationValveMatchingViewModel.cs

@@ -29,6 +29,14 @@
            {
                MatchingType = eMatchingStatus.Succeed;
            }
            if (rhs.MatchingDbId == null || rhs.MatchingDbId == string.Empty)
            {
                MatchingSatus = eMatchingStatus.Failed;
            }
            else
            {
                MatchingSatus = eMatchingStatus.Succeed;
            }
        }

        /// <summary>
@@ -123,10 +131,17 @@
        public double? MatchingMinorLoss { get; set; }

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

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

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/04-pipe/XhsProjectSimulationPipeMatchingListCtrl.Designer.cs

@@ -42,7 +42,7 @@
            colDbLocked = new DevExpress.XtraGrid.Columns.GridColumn();
            colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingType = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingSatus = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)pipeLineFormViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
@@ -66,7 +66,7 @@
            // gridView1
            // 
            gridView1.BorderStyle = BorderStyles.NoBorder;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colMaterial, colMatchingMaterial, colCaliber, colMatchingCaliber, colDbLocked, colMinorLoss, colMatchingMinorLoss, colMatchingType });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colMaterial, colMatchingMaterial, colCaliber, colMatchingCaliber, colDbLocked, colMinorLoss, colMatchingMinorLoss, colMatchingSatus });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsView.ShowGroupPanel = false;
@@ -142,12 +142,12 @@
            colMatchingMinorLoss.Visible = true;
            colMatchingMinorLoss.VisibleIndex = 8;
            // 
            // colMatchingType
            // colMatchingSatus
            // 
            colMatchingType.FieldName = "MatchingType";
            colMatchingType.Name = "colMatchingType";
            colMatchingType.Visible = true;
            colMatchingType.VisibleIndex = 9;
            colMatchingSatus.FieldName = "MatchingSatus";
            colMatchingSatus.Name = "colMatchingSatus";
            colMatchingSatus.Visible = true;
            colMatchingSatus.VisibleIndex = 9;
            // 
            // XhsProjectSimulationPipeMatchingListCtrl
            // 
@@ -177,6 +177,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn colDbLocked;
        private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingMinorLoss;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingType;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingSatus;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/04-pipe/XhsProjectSimulationPipeMatchingViewModel.cs

@@ -31,6 +31,14 @@
            {
                MatchingType = eMatchingStatus.Succeed;
            }
            if (rhs.MatchingDbId == null || rhs.MatchingDbId == string.Empty)
            {
                MatchingSatus = eMatchingStatus.Failed;
            }
            else
            {
                MatchingSatus = eMatchingStatus.Succeed;
            }
        }

        /// <summary>
@@ -125,9 +133,9 @@
        public double? MatchingMinorLoss { get; set; }

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

@@ -135,5 +143,12 @@
        /// 算法类型
        /// </summary>
        public HStation.Assets.eAlgorithmType eAlgorithmType { get; set; }

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

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

@@ -42,7 +42,7 @@
            colDbLocked = new DevExpress.XtraGrid.Columns.GridColumn();
            colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingType = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingSatus = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)elbowsFormViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
@@ -66,7 +66,7 @@
            // gridView1
            // 
            gridView1.BorderStyle = BorderStyles.NoBorder;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colMaterial, colMatchingMaterial, colCaliber, colMatchingCaliber, colDbLocked, colMinorLoss, colMatchingMinorLoss, colMatchingType });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colMaterial, colMatchingMaterial, colCaliber, colMatchingCaliber, colDbLocked, colMinorLoss, colMatchingMinorLoss, colMatchingSatus });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsView.ShowGroupPanel = false;
@@ -146,12 +146,12 @@
            colMatchingMinorLoss.Visible = true;
            colMatchingMinorLoss.VisibleIndex = 8;
            // 
            // colMatchingType
            // colMatchingSatus
            // 
            colMatchingType.FieldName = "MatchingType";
            colMatchingType.Name = "colMatchingType";
            colMatchingType.Visible = true;
            colMatchingType.VisibleIndex = 9;
            colMatchingSatus.FieldName = "MatchingSatus";
            colMatchingSatus.Name = "colMatchingSatus";
            colMatchingSatus.Visible = true;
            colMatchingSatus.VisibleIndex = 9;
            // 
            // XhsProjectSimulationElbowsMatchingListCtrl
            // 
@@ -181,6 +181,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn colDbLocked;
        private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingMinorLoss;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingType;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingSatus;
    }
}

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

@@ -30,6 +30,14 @@
            {
                MatchingType = eMatchingStatus.Succeed;
            }
            if (rhs.MatchingDbId == null || rhs.MatchingDbId == string.Empty)
            {
                MatchingSatus = eMatchingStatus.Failed;
            }
            else
            {
                MatchingSatus = eMatchingStatus.Succeed;
            }
        }

        /// <summary>
@@ -124,10 +132,17 @@
        public double? MatchingMinorLoss { get; set; }

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

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

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/06-threelink/XhsProjectSimulationThreelinkMatchingListCtrl.Designer.cs

@@ -42,7 +42,7 @@
            colDbLocked = new DevExpress.XtraGrid.Columns.GridColumn();
            colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingType = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingSatus = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)threeLinkFormViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
@@ -66,7 +66,7 @@
            // gridView1
            // 
            gridView1.BorderStyle = BorderStyles.NoBorder;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colMaterial, colMatchingMaterial, colCaliber, colMatchingCaliber, colDbLocked, colMinorLoss, colMatchingMinorLoss, colMatchingType });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colMaterial, colMatchingMaterial, colCaliber, colMatchingCaliber, colDbLocked, colMinorLoss, colMatchingMinorLoss, colMatchingSatus });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsView.ShowGroupPanel = false;
@@ -142,12 +142,12 @@
            colMatchingMinorLoss.Visible = true;
            colMatchingMinorLoss.VisibleIndex = 8;
            // 
            // colMatchingType
            // colMatchingSatus
            // 
            colMatchingType.FieldName = "MatchingType";
            colMatchingType.Name = "colMatchingType";
            colMatchingType.Visible = true;
            colMatchingType.VisibleIndex = 9;
            colMatchingSatus.FieldName = "MatchingSatus";
            colMatchingSatus.Name = "colMatchingSatus";
            colMatchingSatus.Visible = true;
            colMatchingSatus.VisibleIndex = 9;
            // 
            // XhsProjectSimulationThreelinkMatchingListCtrl
            // 
@@ -179,6 +179,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn colDbLocked;
        private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingMinorLoss;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingType;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingSatus;
    }
}

 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/06-threelink/XhsProjectSimulationThreelinkMatchingViewModel.cs

@@ -29,6 +29,14 @@
            {
                MatchingType = eMatchingStatus.Succeed;
            }
            if (rhs.MatchingDbId == null || rhs.MatchingDbId == string.Empty)
            {
                MatchingSatus = eMatchingStatus.Failed;
            }
            else
            {
                MatchingSatus = eMatchingStatus.Succeed;
            }
        }

        /// <summary>
@@ -123,10 +131,17 @@
        public double? MatchingMinorLoss { get; set; }

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

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

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

@@ -39,10 +39,10 @@
            colMatchingMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
            colCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
            colDbLocked = new DevExpress.XtraGrid.Columns.GridColumn();
            colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingType = new DevExpress.XtraGrid.Columns.GridColumn();
            colMatchingSatus = new DevExpress.XtraGrid.Columns.GridColumn();
            colDbLocked = new DevExpress.XtraGrid.Columns.GridColumn();
            ((ISupportInitialize)gridControl1).BeginInit();
            ((ISupportInitialize)fourLinkFormViewModelBindingSource).BeginInit();
            ((ISupportInitialize)gridView1).BeginInit();
@@ -66,7 +66,7 @@
            // gridView1
            // 
            gridView1.BorderStyle = BorderStyles.NoBorder;
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colMaterial, colMatchingMaterial, colCaliber, colMatchingCaliber, colDbLocked, colMinorLoss, colMatchingMinorLoss, colMatchingType });
            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colMaterial, colMatchingMaterial, colCaliber, colMatchingCaliber, colMinorLoss, colMatchingMinorLoss, colMatchingSatus, colDbLocked });
            gridView1.GridControl = gridControl1;
            gridView1.Name = "gridView1";
            gridView1.OptionsView.ShowGroupPanel = false;
@@ -121,11 +121,6 @@
            colMatchingCaliber.Visible = true;
            colMatchingCaliber.VisibleIndex = 6;
            // 
            // colDbLocked
            // 
            colDbLocked.FieldName = "DbLocked";
            colDbLocked.Name = "colDbLocked";
            // 
            // colMinorLoss
            // 
            colMinorLoss.FieldName = "MinorLoss";
@@ -140,12 +135,19 @@
            colMatchingMinorLoss.Visible = true;
            colMatchingMinorLoss.VisibleIndex = 8;
            // 
            // colMatchingType
            // colMatchingSatus
            // 
            colMatchingType.FieldName = "MatchingType";
            colMatchingType.Name = "colMatchingType";
            colMatchingType.Visible = true;
            colMatchingType.VisibleIndex = 9;
            colMatchingSatus.FieldName = "MatchingSatus";
            colMatchingSatus.Name = "colMatchingSatus";
            colMatchingSatus.Visible = true;
            colMatchingSatus.VisibleIndex = 9;
            // 
            // colDbLocked
            // 
            colDbLocked.FieldName = "DbLocked";
            colDbLocked.Name = "colDbLocked";
            colDbLocked.Visible = true;
            colDbLocked.VisibleIndex = 10;
            // 
            // XhsProjectSimulationFourlinkMatchingListCtrl
            // 
@@ -172,9 +174,9 @@
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingMaterial;
        private DevExpress.XtraGrid.Columns.GridColumn colCaliber;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingCaliber;
        private DevExpress.XtraGrid.Columns.GridColumn colDbLocked;
        private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingMinorLoss;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingType;
        private DevExpress.XtraGrid.Columns.GridColumn colMatchingSatus;
        private DevExpress.XtraGrid.Columns.GridColumn colDbLocked;
    }
}

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

@@ -30,6 +30,14 @@
            {
                MatchingType = eMatchingStatus.Succeed;
            }
            if (rhs.MatchingDbId == null || rhs.MatchingDbId == string.Empty)
            {
                MatchingSatus = eMatchingStatus.Failed;
            }
            else
            {
                MatchingSatus = eMatchingStatus.Succeed;
            }
        }

        /// <summary>
@@ -124,10 +132,17 @@
        public double? MatchingMinorLoss { get; set; }

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

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