From 6f8c6a3b2277b92a24319f672811da113861cfc1 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 23 九月 2024 10:42:30 +0800
Subject: [PATCH] 提交缺少修改

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ThreeLinkMatchingCtrl.Designer.cs |   95 ++++++++++++++++++++++++-----------------------
 1 files changed, 48 insertions(+), 47 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ThreeLinkMatchingCtrl.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ThreeLinkMatchingCtrl.Designer.cs
index 1f615bb..6bd09d7 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ThreeLinkMatchingCtrl.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-AutoMatching/02-AsstesFormCtrl/ThreeLinkMatchingCtrl.Designer.cs
@@ -30,27 +30,27 @@
         {
             components = new Container();
             gridControl1 = new DevExpress.XtraGrid.GridControl();
-            threeLinkMatchingViewModelBindingSource = new BindingSource(components);
+            threeLinkFormViewModelBindingSource = new BindingSource(components);
             gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             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();
-            colAlterCaliber = new DevExpress.XtraGrid.Columns.GridColumn();
-            colAlterMaterial = new DevExpress.XtraGrid.Columns.GridColumn();
-            colAlterMinorLoss = new DevExpress.XtraGrid.Columns.GridColumn();
-            colMatchingType = 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)threeLinkMatchingViewModelBindingSource).BeginInit();
+            ((ISupportInitialize)threeLinkFormViewModelBindingSource).BeginInit();
             ((ISupportInitialize)gridView1).BeginInit();
             SuspendLayout();
             // 
             // gridControl1
             // 
-            gridControl1.DataSource = threeLinkMatchingViewModelBindingSource;
+            gridControl1.DataSource = threeLinkFormViewModelBindingSource;
             gridControl1.Dock = DockStyle.Fill;
             gridControl1.Location = new Point(0, 0);
             gridControl1.MainView = gridView1;
@@ -59,16 +59,17 @@
             gridControl1.TabIndex = 0;
             gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] { gridView1 });
             // 
-            // threeLinkMatchingViewModelBindingSource
+            // threeLinkFormViewModelBindingSource
             // 
-            threeLinkMatchingViewModelBindingSource.DataSource = typeof(ThreeLinkMatchingViewModel);
+            threeLinkFormViewModelBindingSource.DataSource = typeof(ThreeLinkFormViewModel);
             // 
             // gridView1
             // 
-            gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] { colName, colCode, colModelType, colMaterial, colCaliber, colDbLocked, colAlterCaliber, colAlterMaterial, colAlterMinorLoss, colMatchingType, colMinorLoss });
+            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;
+            gridView1.RowCellClick += gridView1_RowCellClick;
             // 
             // colName
             // 
@@ -98,54 +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 = 7;
+            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 = 9;
-            // 
-            // colAlterCaliber
-            // 
-            colAlterCaliber.FieldName = "AlterCaliber";
-            colAlterCaliber.Name = "colAlterCaliber";
-            colAlterCaliber.Visible = true;
-            colAlterCaliber.VisibleIndex = 8;
-            // 
-            // colAlterMaterial
-            // 
-            colAlterMaterial.FieldName = "AlterMaterial";
-            colAlterMaterial.Name = "colAlterMaterial";
-            colAlterMaterial.Visible = true;
-            colAlterMaterial.VisibleIndex = 4;
-            // 
-            // colAlterMinorLoss
-            // 
-            colAlterMinorLoss.FieldName = "AlterMinorLoss";
-            colAlterMinorLoss.Name = "colAlterMinorLoss";
-            colAlterMinorLoss.Visible = true;
-            colAlterMinorLoss.VisibleIndex = 6;
-            // 
-            // colMatchingType
-            // 
-            colMatchingType.FieldName = "MatchingType";
-            colMatchingType.Name = "colMatchingType";
-            colMatchingType.Visible = true;
-            colMatchingType.VisibleIndex = 10;
+            colDbLocked.VisibleIndex = 10;
             // 
             // colMinorLoss
             // 
             colMinorLoss.FieldName = "MinorLoss";
             colMinorLoss.Name = "colMinorLoss";
             colMinorLoss.Visible = true;
-            colMinorLoss.VisibleIndex = 5;
+            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;
             // 
             // ThreeLinkMatchingCtrl
             // 
@@ -155,7 +156,7 @@
             Name = "ThreeLinkMatchingCtrl";
             Size = new Size(1035, 503);
             ((ISupportInitialize)gridControl1).EndInit();
-            ((ISupportInitialize)threeLinkMatchingViewModelBindingSource).EndInit();
+            ((ISupportInitialize)threeLinkFormViewModelBindingSource).EndInit();
             ((ISupportInitialize)gridView1).EndInit();
             ResumeLayout(false);
         }
@@ -164,17 +165,17 @@
 
         private DevExpress.XtraGrid.GridControl gridControl1;
         private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
+        private BindingSource threeLinkFormViewModelBindingSource;
         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 BindingSource threeLinkMatchingViewModelBindingSource;
-        private DevExpress.XtraGrid.Columns.GridColumn colAlterCaliber;
-        private DevExpress.XtraGrid.Columns.GridColumn colAlterMaterial;
-        private DevExpress.XtraGrid.Columns.GridColumn colAlterMinorLoss;
-        private DevExpress.XtraGrid.Columns.GridColumn colMatchingType;
         private DevExpress.XtraGrid.Columns.GridColumn colMinorLoss;
+        private DevExpress.XtraGrid.Columns.GridColumn colMatchingMinorLoss;
+        private DevExpress.XtraGrid.Columns.GridColumn colMatchingType;
     }
 }

--
Gitblit v1.9.3