From 21c97aab9153758bebfc9b3944859b0eec271c76 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期三, 25 九月 2024 16:31:19 +0800
Subject: [PATCH] 一些简单的尝试

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ValveMatchingCtrl.Designer.cs |   75 ++++++++++++++++++++++++++++---------
 1 files changed, 56 insertions(+), 19 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ValveMatchingCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ValveMatchingCtrl.Designer.cs
index 7a0c48e..12da030 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ValveMatchingCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ValveMatchingCtrl.Designer.cs
@@ -30,23 +30,27 @@
         {
             components = new Container();
             gridControl1 = new DevExpress.XtraGrid.GridControl();
+            valveFormViewModelBindingSource = new BindingSource(components);
             gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            valveMatchingViewModelBindingSource = new BindingSource(components);
             colName = new DevExpress.XtraGrid.Columns.GridColumn();
             colCode = new DevExpress.XtraGrid.Columns.GridColumn();
             colModelType = new DevExpress.XtraGrid.Columns.GridColumn();
             colMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
+            colMatchingMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
             colCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
+            colMatchingCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
             colDbLocked = new DevExpress.XtraGrid.Columns.GridColumn();
-            colIsMatching = new DevExpress.XtraGrid.Columns.GridColumn();
+            colMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
+            colMatchingMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
+            colMatchingType = new DevExpress.XtraGrid.Columns.GridColumn();
             ((ISupportInitialize)gridControl1).BeginInit();
+            ((ISupportInitialize)valveFormViewModelBindingSource).BeginInit();
             ((ISupportInitialize)gridView1).BeginInit();
-            ((ISupportInitialize)valveMatchingViewModelBindingSource).BeginInit();
             SuspendLayout();
             // 
             // gridControl1
             // 
-            gridControl1.DataSource = valveMatchingViewModelBindingSource;
+            gridControl1.DataSource = valveFormViewModelBindingSource;
             gridControl1.Dock = DockStyle.Fill;
             gridControl1.Location = new Point(0, 0);
             gridControl1.MainView = gridView1;
@@ -55,16 +59,17 @@
             gridControl1.TabIndex = 0;
             gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
             // 
+            // valveFormViewModelBindingSource
+            // 
+            valveFormViewModelBindingSource.DataSource = typeof(ValveFormViewModel);
+            // 
             // gridView1
             // 
-            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colMaterial, colCaliber, colDbLocked, colIsMatching });
+            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colMaterial, colMatchingMaterial, colCaliber, colMatchingCaliber, colDbLocked, colMinorLoss, colMatchingMinorLoss, colMatchingType });
             gridView1.GridControl = gridControl1;
             gridView1.Name = "gridView1";
             gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // valveMatchingViewModelBindingSource
-            // 
-            valveMatchingViewModelBindingSource.DataSource = typeof(ValveMatchingViewModel);
+            gridView1.RowCellClick += gridView1_RowCellClick;
             // 
             // colName
             // 
@@ -94,26 +99,54 @@
             colMaterial.Visible = true;
             colMaterial.VisibleIndex = 3;
             // 
+            // colMatchingMaterial
+            // 
+            colMatchingMaterial.FieldName = "MatchingMaterial";
+            colMatchingMaterial.Name = "colMatchingMaterial";
+            colMatchingMaterial.Visible = true;
+            colMatchingMaterial.VisibleIndex = 4;
+            // 
             // colCaliber
             // 
             colCaliber.FieldName = "Caliber";
             colCaliber.Name = "colCaliber";
             colCaliber.Visible = true;
-            colCaliber.VisibleIndex = 4;
+            colCaliber.VisibleIndex = 5;
+            // 
+            // colMatchingCaliber
+            // 
+            colMatchingCaliber.FieldName = "MatchingCaliber";
+            colMatchingCaliber.Name = "colMatchingCaliber";
+            colMatchingCaliber.Visible = true;
+            colMatchingCaliber.VisibleIndex = 6;
             // 
             // colDbLocked
             // 
             colDbLocked.FieldName = "DbLocked";
             colDbLocked.Name = "colDbLocked";
             colDbLocked.Visible = true;
-            colDbLocked.VisibleIndex = 5;
+            colDbLocked.VisibleIndex = 10;
             // 
-            // colIsMatching
+            // colMinorLoss
             // 
-            colIsMatching.FieldName = "IsMatching";
-            colIsMatching.Name = "colIsMatching";
-            colIsMatching.Visible = true;
-            colIsMatching.VisibleIndex = 6;
+            colMinorLoss.FieldName = "MinorLoss";
+            colMinorLoss.Name = "colMinorLoss";
+            colMinorLoss.Visible = true;
+            colMinorLoss.VisibleIndex = 7;
+            // 
+            // colMatchingMinorLoss
+            // 
+            colMatchingMinorLoss.FieldName = "MatchingMinorLoss";
+            colMatchingMinorLoss.Name = "colMatchingMinorLoss";
+            colMatchingMinorLoss.Visible = true;
+            colMatchingMinorLoss.VisibleIndex = 8;
+            // 
+            // colMatchingType
+            // 
+            colMatchingType.FieldName = "MatchingType";
+            colMatchingType.Name = "colMatchingType";
+            colMatchingType.Visible = true;
+            colMatchingType.VisibleIndex = 9;
             // 
             // ValveMatchingCtrl
             // 
@@ -123,8 +156,8 @@
             Name = "ValveMatchingCtrl";
             Size = new Size(1035, 503);
             ((ISupportInitialize)gridControl1).EndInit();
+            ((ISupportInitialize)valveFormViewModelBindingSource).EndInit();
             ((ISupportInitialize)gridView1).EndInit();
-            ((ISupportInitialize)valveMatchingViewModelBindingSource).EndInit();
             ResumeLayout(false);
         }
 
@@ -132,13 +165,17 @@
 
         private DevExpress.XtraGrid.GridControl gridControl1;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private BindingSource valveMatchingViewModelBindingSource;
+        private BindingSource valveFormViewModelBindingSource;
         private DevExpress.XtraGrid.Columns.GridColumn colName;
         private DevExpress.XtraGrid.Columns.GridColumn colCode;
         private DevExpress.XtraGrid.Columns.GridColumn colModelType;
         private DevExpress.XtraGrid.Columns.GridColumn colMaterial;
+        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 colIsMatching;
+        private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
+        private DevExpress.XtraGrid.Columns.GridColumn colMatchingMinorLoss;
+        private DevExpress.XtraGrid.Columns.GridColumn colMatchingType;
     }
 }

--
Gitblit v1.9.3