From eb374e4405bac15c8d28ce9d17e6ee47b43338d4 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期三, 27 八月 2025 14:00:23 +0800
Subject: [PATCH] 生产部分优化

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs |  657 +++++++++++++++++++++++++++++++----------------------------
 1 files changed, 349 insertions(+), 308 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs
index 15b20ef..945244d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs
@@ -112,21 +112,6 @@
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
-            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gv_workers = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_hours = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_capacity = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gv_sCapacity = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemComboBox4 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gv_lineType = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemComboBox5 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gv_changeTime = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -135,15 +120,34 @@
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_gxOrder = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.rptGx = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
+            this.repositoryItemCheckEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
+            this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gv_workers = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_hours = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_capacity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_sCapacity = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_lineType = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemComboBox5 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.gv_changeTime = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMxTui = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.repositoryItemComboBox4 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -211,20 +215,24 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
-            this.xtraTabPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptGx)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
+            this.xtraTabPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
             this.SuspendLayout();
@@ -254,7 +262,7 @@
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(451, 30);
+            this.pageBar1.Size = new System.Drawing.Size(458, 30);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
@@ -297,7 +305,7 @@
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split1.Size = new System.Drawing.Size(1081, 491);
-            this.split1.SplitterPosition = 451;
+            this.split1.SplitterPosition = 458;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
@@ -308,7 +316,7 @@
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(451, 461);
+            this.gcMain1.Size = new System.Drawing.Size(458, 461);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -418,7 +426,7 @@
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx1.Size = new System.Drawing.Size(620, 491);
+            this.splitMx1.Size = new System.Drawing.Size(613, 491);
             this.splitMx1.SplitterPosition = 92;
             this.splitMx1.TabIndex = 1;
             // 
@@ -470,7 +478,7 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(168, 334, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(620, 92);
+            this.layoutMx1.Size = new System.Drawing.Size(613, 92);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -511,7 +519,7 @@
             this.txt_itemName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_itemName.Name = "txt_itemName";
             this.txt_itemName.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemName.Size = new System.Drawing.Size(168, 22);
+            this.txt_itemName.Size = new System.Drawing.Size(166, 22);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 216;
             this.txt_itemName.Tag = "readonly";
@@ -529,11 +537,11 @@
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(304, 12);
+            this.txt_itemNo.Location = new System.Drawing.Point(302, 12);
             this.txt_itemNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_itemNo.Name = "txt_itemNo";
             this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(170, 20);
+            this.txt_itemNo.Size = new System.Drawing.Size(166, 20);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 213;
             this.txt_itemNo.Tag = "readonly";
@@ -620,7 +628,7 @@
             this.txt_orgName.Location = new System.Drawing.Point(72, 12);
             this.txt_orgName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_orgName.Name = "txt_orgName";
-            this.txt_orgName.Size = new System.Drawing.Size(168, 20);
+            this.txt_orgName.Size = new System.Drawing.Size(166, 20);
             this.txt_orgName.StyleController = this.layoutMx1;
             this.txt_orgName.TabIndex = 417;
             this.txt_orgName.Tag = "readonly";
@@ -723,7 +731,7 @@
             this.btnCopy.Location = new System.Drawing.Point(127, 64);
             this.btnCopy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnCopy.Name = "btnCopy";
-            this.btnCopy.Size = new System.Drawing.Size(113, 22);
+            this.btnCopy.Size = new System.Drawing.Size(111, 22);
             this.btnCopy.StyleController = this.layoutMx1;
             this.btnCopy.TabIndex = 426;
             this.btnCopy.Text = "澶嶅埗鍒板叾瀹冧骇鍝�";
@@ -962,7 +970,7 @@
             rowDefinition3,
             rowDefinition4,
             rowDefinition5});
-            this.Root.Size = new System.Drawing.Size(603, 150);
+            this.Root.Size = new System.Drawing.Size(596, 150);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem14
@@ -971,18 +979,18 @@
             this.layoutControlItem14.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(232, 26);
+            this.layoutControlItem14.Size = new System.Drawing.Size(230, 26);
             this.layoutControlItem14.Text = "浣跨敤缁勭粐";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(48, 14);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_itemNo;
-            this.layoutControlItem5.Location = new System.Drawing.Point(232, 0);
+            this.layoutControlItem5.Location = new System.Drawing.Point(230, 0);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem5.Size = new System.Drawing.Size(234, 26);
+            this.layoutControlItem5.Size = new System.Drawing.Size(230, 26);
             this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(48, 14);
             // 
@@ -993,7 +1001,7 @@
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem1.Size = new System.Drawing.Size(232, 26);
+            this.layoutControlItem1.Size = new System.Drawing.Size(230, 26);
             this.layoutControlItem1.Text = "鐗╂枡鍚嶇О";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(48, 14);
             // 
@@ -1004,7 +1012,7 @@
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem10.Size = new System.Drawing.Size(117, 26);
+            this.layoutControlItem10.Size = new System.Drawing.Size(115, 26);
             this.layoutControlItem10.Text = "澶嶅埗";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -1029,221 +1037,28 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabMx.Name = "tabMx";
-            this.tabMx.SelectedTabPage = this.xtraTabPage2;
-            this.tabMx.Size = new System.Drawing.Size(620, 389);
+            this.tabMx.SelectedTabPage = this.tabMxPage1;
+            this.tabMx.Size = new System.Drawing.Size(613, 389);
             this.tabMx.TabIndex = 4;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
             this.xtraTabPage2});
-            // 
-            // xtraTabPage2
-            // 
-            this.xtraTabPage2.Controls.Add(this.gcMx2);
-            this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(618, 363);
-            this.xtraTabPage2.Text = "鏍囦骇淇℃伅";
-            // 
-            // gcMx2
-            // 
-            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            gridLevelNode1.RelationName = "Level1";
-            this.gcMx2.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
-            gridLevelNode1});
-            this.gcMx2.Location = new System.Drawing.Point(0, 0);
-            this.gcMx2.MainView = this.gvMx2;
-            this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.gcMx2.Name = "gcMx2";
-            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit2,
-            this.repositoryItemComboBox3,
-            this.repositoryItemComboBox4,
-            this.repositoryItemComboBox5});
-            this.gcMx2.Size = new System.Drawing.Size(618, 363);
-            this.gcMx2.TabIndex = 1;
-            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx2});
-            // 
-            // gvMx2
-            // 
-            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
-            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gvMx2.ColumnPanelRowHeight = 39;
-            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_workers,
-            this.gv_hours,
-            this.gv_capacity,
-            this.gv_sCapacity,
-            this.gv_lineType,
-            this.gv_changeTime,
-            this.gridColumn13,
-            this.gridColumn14});
-            this.gvMx2.DetailHeight = 272;
-            this.gvMx2.GridControl = this.gcMx2;
-            this.gvMx2.Name = "gvMx2";
-            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
-            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
-            this.gvMx2.OptionsView.ShowGroupPanel = false;
-            // 
-            // gv_workers
-            // 
-            this.gv_workers.AppearanceCell.Options.UseFont = true;
-            this.gv_workers.Caption = "鏍囧噯浜烘暟";
-            this.gv_workers.FieldName = "workers";
-            this.gv_workers.MinWidth = 44;
-            this.gv_workers.Name = "gv_workers";
-            this.gv_workers.OptionsEditForm.StartNewRow = true;
-            this.gv_workers.Tag = "edit";
-            this.gv_workers.Width = 113;
-            // 
-            // gv_hours
-            // 
-            this.gv_hours.Caption = "鏍囧噯宸ユ椂锛堝皬鏃讹級";
-            this.gv_hours.FieldName = "hours";
-            this.gv_hours.MinWidth = 22;
-            this.gv_hours.Name = "gv_hours";
-            this.gv_hours.Tag = "query_a.hours";
-            this.gv_hours.Width = 82;
-            // 
-            // gv_capacity
-            // 
-            this.gv_capacity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gv_capacity.AppearanceCell.Options.UseFont = true;
-            this.gv_capacity.AppearanceCell.Options.UseForeColor = true;
-            this.gv_capacity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gv_capacity.AppearanceHeader.Options.UseForeColor = true;
-            this.gv_capacity.Caption = "鍗曞皬鏃朵骇鑳�";
-            this.gv_capacity.ColumnEdit = this.repositoryItemComboBox3;
-            this.gv_capacity.FieldName = "capacity";
-            this.gv_capacity.MinWidth = 44;
-            this.gv_capacity.Name = "gv_capacity";
-            this.gv_capacity.OptionsColumn.ReadOnly = true;
-            this.gv_capacity.Tag = "edit";
-            this.gv_capacity.Width = 100;
-            // 
-            // repositoryItemComboBox3
-            // 
-            this.repositoryItemComboBox3.AutoHeight = false;
-            this.repositoryItemComboBox3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBox3.Items.AddRange(new object[] {
-            "Y-鏄�",
-            "N-鍚�"});
-            this.repositoryItemComboBox3.Name = "repositoryItemComboBox3";
-            this.repositoryItemComboBox3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            // 
-            // gv_sCapacity
-            // 
-            this.gv_sCapacity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gv_sCapacity.AppearanceCell.Options.UseForeColor = true;
-            this.gv_sCapacity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gv_sCapacity.AppearanceHeader.Options.UseForeColor = true;
-            this.gv_sCapacity.Caption = "鏍囧噯浜ц兘";
-            this.gv_sCapacity.ColumnEdit = this.repositoryItemComboBox4;
-            this.gv_sCapacity.FieldName = "sCapacity";
-            this.gv_sCapacity.MinWidth = 22;
-            this.gv_sCapacity.Name = "gv_sCapacity";
-            this.gv_sCapacity.OptionsColumn.ReadOnly = true;
-            this.gv_sCapacity.Tag = "edit";
-            this.gv_sCapacity.Width = 80;
-            // 
-            // repositoryItemComboBox4
-            // 
-            this.repositoryItemComboBox4.AutoHeight = false;
-            this.repositoryItemComboBox4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBox4.Items.AddRange(new object[] {
-            "绌�",
-            "I-鎶曞叆",
-            "C-閲囬泦",
-            "F-瀹屽伐",
-            "E-涓嶈壇",
-            "J-妫�楠�"});
-            this.repositoryItemComboBox4.Name = "repositoryItemComboBox4";
-            this.repositoryItemComboBox4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            // 
-            // gv_lineType
-            // 
-            this.gv_lineType.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gv_lineType.AppearanceCell.Options.UseFont = true;
-            this.gv_lineType.AppearanceCell.Options.UseForeColor = true;
-            this.gv_lineType.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gv_lineType.AppearanceHeader.Options.UseForeColor = true;
-            this.gv_lineType.Caption = "绾夸綋绫诲埆";
-            this.gv_lineType.ColumnEdit = this.repositoryItemComboBox5;
-            this.gv_lineType.FieldName = "lineType";
-            this.gv_lineType.MinWidth = 131;
-            this.gv_lineType.Name = "gv_lineType";
-            this.gv_lineType.OptionsColumn.ReadOnly = true;
-            this.gv_lineType.Tag = "edit";
-            this.gv_lineType.Width = 131;
-            // 
-            // repositoryItemComboBox5
-            // 
-            this.repositoryItemComboBox5.AutoHeight = false;
-            this.repositoryItemComboBox5.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBox5.Name = "repositoryItemComboBox5";
-            this.repositoryItemComboBox5.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            // 
-            // gv_changeTime
-            // 
-            this.gv_changeTime.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gv_changeTime.AppearanceCell.Options.UseFont = true;
-            this.gv_changeTime.AppearanceCell.Options.UseForeColor = true;
-            this.gv_changeTime.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gv_changeTime.AppearanceHeader.Options.UseForeColor = true;
-            this.gv_changeTime.Caption = "鎹㈢嚎鏃堕棿";
-            this.gv_changeTime.FieldName = "changeTime";
-            this.gv_changeTime.MinWidth = 44;
-            this.gv_changeTime.Name = "gv_changeTime";
-            this.gv_changeTime.OptionsColumn.ReadOnly = true;
-            this.gv_changeTime.Tag = "edit";
-            this.gv_changeTime.Width = 78;
-            // 
-            // gridColumn13
-            // 
-            this.gridColumn13.Caption = "绉诲嚭";
-            this.gridColumn13.ColumnEdit = this.repositoryItemButtonEdit2;
-            this.gridColumn13.MinWidth = 22;
-            this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.OptionsColumn.ReadOnly = true;
-            this.gridColumn13.Width = 57;
-            // 
-            // repositoryItemButtonEdit2
-            // 
-            this.repositoryItemButtonEdit2.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit2.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(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
-            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            // 
-            // gridColumn14
-            // 
-            this.gridColumn14.Caption = "涓婚敭Guid";
-            this.gridColumn14.FieldName = "guid";
-            this.gridColumn14.MinWidth = 22;
-            this.gridColumn14.Name = "gridColumn14";
-            this.gridColumn14.Width = 82;
             // 
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(618, 363);
+            this.tabMxPage1.Size = new System.Drawing.Size(611, 363);
             this.tabMxPage1.Text = "宸ュ簭淇℃伅";
             // 
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            gridLevelNode2.RelationName = "Level1";
+            gridLevelNode1.RelationName = "Level1";
             this.gcMx1.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
-            gridLevelNode2});
+            gridLevelNode1});
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -1252,11 +1067,14 @@
             this.repositoryItemButtonEdit1,
             this.repositoryItemComboBox1,
             this.repositoryItemComboBox2,
-            this.rptGx});
-            this.gcMx1.Size = new System.Drawing.Size(618, 363);
+            this.rptGx,
+            this.repositoryItemCheckEdit1,
+            this.repositoryItemCheckEdit2});
+            this.gcMx1.Size = new System.Drawing.Size(611, 363);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx1});
+            this.gvMx1,
+            this.gridView3});
             // 
             // gvMx1
             // 
@@ -1326,6 +1144,7 @@
             this.gv_gxOrder.Caption = "宸ュ簭椤哄簭鍙�";
             this.gv_gxOrder.FieldName = "gxOrder";
             this.gv_gxOrder.Name = "gv_gxOrder";
+            this.gv_gxOrder.Tag = "edit";
             this.gv_gxOrder.Visible = true;
             this.gv_gxOrder.VisibleIndex = 3;
             this.gv_gxOrder.Width = 66;
@@ -1338,26 +1157,15 @@
             this.gvMx1daa003.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1daa003.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1daa003.Caption = "鎶ュ伐鏍囪瘑";
-            this.gvMx1daa003.ColumnEdit = this.repositoryItemComboBox1;
             this.gvMx1daa003.FieldName = "signingFlag";
             this.gvMx1daa003.MinWidth = 44;
             this.gvMx1daa003.Name = "gvMx1daa003";
             this.gvMx1daa003.OptionsColumn.ReadOnly = true;
             this.gvMx1daa003.Tag = "edit";
+            this.gvMx1daa003.UnboundDataType = typeof(bool);
             this.gvMx1daa003.Visible = true;
             this.gvMx1daa003.VisibleIndex = 4;
             this.gvMx1daa003.Width = 100;
-            // 
-            // repositoryItemComboBox1
-            // 
-            this.repositoryItemComboBox1.AutoHeight = false;
-            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBox1.Items.AddRange(new object[] {
-            "Y-鏄�",
-            "N-鍚�"});
-            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
-            this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             // 
             // gridColumn1
             // 
@@ -1366,30 +1174,15 @@
             this.gridColumn1.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
             this.gridColumn1.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn1.Caption = "鍏ュ簱鏍囪瘑";
-            this.gridColumn1.ColumnEdit = this.repositoryItemComboBox2;
             this.gridColumn1.FieldName = "storageFlag";
             this.gridColumn1.MinWidth = 22;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.OptionsColumn.ReadOnly = true;
             this.gridColumn1.Tag = "edit";
+            this.gridColumn1.UnboundDataType = typeof(bool);
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 5;
             this.gridColumn1.Width = 80;
-            // 
-            // repositoryItemComboBox2
-            // 
-            this.repositoryItemComboBox2.AutoHeight = false;
-            this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBox2.Items.AddRange(new object[] {
-            "绌�",
-            "I-鎶曞叆",
-            "C-閲囬泦",
-            "F-瀹屽伐",
-            "E-涓嶈壇",
-            "J-妫�楠�"});
-            this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
-            this.repositoryItemComboBox2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             // 
             // gvMx1daa004
             // 
@@ -1448,10 +1241,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1463,6 +1256,246 @@
             this.gridColumn3.MinWidth = 22;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Width = 82;
+            // 
+            // repositoryItemComboBox1
+            // 
+            this.repositoryItemComboBox1.AutoHeight = false;
+            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox1.Items.AddRange(new object[] {
+            "Y-鏄�",
+            "N-鍚�"});
+            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+            this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            // 
+            // repositoryItemComboBox2
+            // 
+            this.repositoryItemComboBox2.AutoHeight = false;
+            this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox2.Items.AddRange(new object[] {
+            "绌�",
+            "I-鎶曞叆",
+            "C-閲囬泦",
+            "F-瀹屽伐",
+            "E-涓嶈壇",
+            "J-妫�楠�"});
+            this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
+            this.repositoryItemComboBox2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            // 
+            // repositoryItemCheckEdit1
+            // 
+            this.repositoryItemCheckEdit1.AutoHeight = false;
+            this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
+            // 
+            // repositoryItemCheckEdit2
+            // 
+            this.repositoryItemCheckEdit2.AutoHeight = false;
+            this.repositoryItemCheckEdit2.Name = "repositoryItemCheckEdit2";
+            // 
+            // gridView3
+            // 
+            this.gridView3.GridControl = this.gcMx1;
+            this.gridView3.Name = "gridView3";
+            // 
+            // xtraTabPage2
+            // 
+            this.xtraTabPage2.Controls.Add(this.gcMx2);
+            this.xtraTabPage2.Name = "xtraTabPage2";
+            this.xtraTabPage2.Size = new System.Drawing.Size(611, 363);
+            this.xtraTabPage2.Text = "鏍囦骇淇℃伅";
+            // 
+            // gcMx2
+            // 
+            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            gridLevelNode2.RelationName = "Level1";
+            this.gcMx2.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
+            gridLevelNode2});
+            this.gcMx2.Location = new System.Drawing.Point(0, 0);
+            this.gcMx2.MainView = this.gvMx2;
+            this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx2.Name = "gcMx2";
+            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit2,
+            this.repositoryItemComboBox3,
+            this.repositoryItemComboBox4,
+            this.repositoryItemComboBox5});
+            this.gcMx2.Size = new System.Drawing.Size(611, 363);
+            this.gcMx2.TabIndex = 1;
+            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx2,
+            this.gridView2});
+            // 
+            // gvMx2
+            // 
+            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx2.ColumnPanelRowHeight = 39;
+            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gv_workers,
+            this.gv_hours,
+            this.gv_capacity,
+            this.gv_sCapacity,
+            this.gv_lineType,
+            this.gv_changeTime,
+            this.gvMxTui,
+            this.gridColumn14});
+            this.gvMx2.DetailHeight = 272;
+            this.gvMx2.GridControl = this.gcMx2;
+            this.gvMx2.Name = "gvMx2";
+            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
+            this.gvMx2.OptionsView.ShowGroupPanel = false;
+            // 
+            // gv_workers
+            // 
+            this.gv_workers.AppearanceCell.Options.UseFont = true;
+            this.gv_workers.Caption = "鏍囧噯浜烘暟";
+            this.gv_workers.FieldName = "workers";
+            this.gv_workers.MinWidth = 44;
+            this.gv_workers.Name = "gv_workers";
+            this.gv_workers.OptionsEditForm.StartNewRow = true;
+            this.gv_workers.ShowUnboundExpressionMenu = true;
+            this.gv_workers.Tag = "edit";
+            this.gv_workers.Width = 113;
+            // 
+            // gv_hours
+            // 
+            this.gv_hours.Caption = "鏍囧噯宸ユ椂锛堝皬鏃讹級";
+            this.gv_hours.FieldName = "hours";
+            this.gv_hours.MinWidth = 22;
+            this.gv_hours.Name = "gv_hours";
+            this.gv_hours.Tag = "edit";
+            this.gv_hours.Width = 82;
+            // 
+            // gv_capacity
+            // 
+            this.gv_capacity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gv_capacity.AppearanceCell.Options.UseFont = true;
+            this.gv_capacity.AppearanceCell.Options.UseForeColor = true;
+            this.gv_capacity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gv_capacity.AppearanceHeader.Options.UseForeColor = true;
+            this.gv_capacity.Caption = "鍗曞皬鏃朵骇鑳�";
+            this.gv_capacity.FieldName = "capacity";
+            this.gv_capacity.MinWidth = 44;
+            this.gv_capacity.Name = "gv_capacity";
+            this.gv_capacity.Tag = "edit";
+            this.gv_capacity.Width = 100;
+            // 
+            // gv_sCapacity
+            // 
+            this.gv_sCapacity.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gv_sCapacity.AppearanceCell.Options.UseForeColor = true;
+            this.gv_sCapacity.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gv_sCapacity.AppearanceHeader.Options.UseForeColor = true;
+            this.gv_sCapacity.Caption = "鏍囧噯浜ц兘";
+            this.gv_sCapacity.FieldName = "sCapacity";
+            this.gv_sCapacity.MinWidth = 22;
+            this.gv_sCapacity.Name = "gv_sCapacity";
+            this.gv_sCapacity.Tag = "edit";
+            this.gv_sCapacity.Width = 80;
+            // 
+            // gv_lineType
+            // 
+            this.gv_lineType.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gv_lineType.AppearanceCell.Options.UseFont = true;
+            this.gv_lineType.AppearanceCell.Options.UseForeColor = true;
+            this.gv_lineType.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gv_lineType.AppearanceHeader.Options.UseForeColor = true;
+            this.gv_lineType.Caption = "绾夸綋绫诲埆";
+            this.gv_lineType.ColumnEdit = this.repositoryItemComboBox5;
+            this.gv_lineType.FieldName = "lineType";
+            this.gv_lineType.MinWidth = 131;
+            this.gv_lineType.Name = "gv_lineType";
+            this.gv_lineType.Tag = "edit";
+            this.gv_lineType.Width = 131;
+            // 
+            // repositoryItemComboBox5
+            // 
+            this.repositoryItemComboBox5.AutoHeight = false;
+            this.repositoryItemComboBox5.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox5.Items.AddRange(new object[] {
+            "",
+            "鎵嬪伐绾�",
+            "鑷姩绾�"});
+            this.repositoryItemComboBox5.Name = "repositoryItemComboBox5";
+            this.repositoryItemComboBox5.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            // 
+            // gv_changeTime
+            // 
+            this.gv_changeTime.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gv_changeTime.AppearanceCell.Options.UseFont = true;
+            this.gv_changeTime.AppearanceCell.Options.UseForeColor = true;
+            this.gv_changeTime.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gv_changeTime.AppearanceHeader.Options.UseForeColor = true;
+            this.gv_changeTime.Caption = "鎹㈢嚎鏃堕棿";
+            this.gv_changeTime.FieldName = "changeTime";
+            this.gv_changeTime.MinWidth = 44;
+            this.gv_changeTime.Name = "gv_changeTime";
+            this.gv_changeTime.Tag = "edit";
+            this.gv_changeTime.Width = 78;
+            // 
+            // gvMxTui
+            // 
+            this.gvMxTui.Caption = "绉诲嚭";
+            this.gvMxTui.ColumnEdit = this.repositoryItemButtonEdit2;
+            this.gvMxTui.MinWidth = 22;
+            this.gvMxTui.Name = "gvMxTui";
+            this.gvMxTui.OptionsColumn.ReadOnly = true;
+            this.gvMxTui.Width = 57;
+            // 
+            // repositoryItemButtonEdit2
+            // 
+            this.repositoryItemButtonEdit2.AutoHeight = false;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.Caption = "涓婚敭Guid";
+            this.gridColumn14.FieldName = "guid";
+            this.gridColumn14.MinWidth = 22;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Width = 82;
+            // 
+            // repositoryItemComboBox3
+            // 
+            this.repositoryItemComboBox3.AutoHeight = false;
+            this.repositoryItemComboBox3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox3.Items.AddRange(new object[] {
+            "Y-鏄�",
+            "N-鍚�"});
+            this.repositoryItemComboBox3.Name = "repositoryItemComboBox3";
+            this.repositoryItemComboBox3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            // 
+            // repositoryItemComboBox4
+            // 
+            this.repositoryItemComboBox4.AutoHeight = false;
+            this.repositoryItemComboBox4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox4.Items.AddRange(new object[] {
+            "绌�",
+            "I-鎶曞叆",
+            "C-閲囬泦",
+            "F-瀹屽伐",
+            "E-涓嶈壇",
+            "J-妫�楠�"});
+            this.repositoryItemComboBox4.Name = "repositoryItemComboBox4";
+            this.repositoryItemComboBox4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            // 
+            // gridView2
+            // 
+            this.gridView2.GridControl = this.gcMx2;
+            this.gridView2.Name = "gridView2";
             // 
             // picCheckBox
             // 
@@ -1552,20 +1585,24 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
-            this.xtraTabPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptGx)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
+            this.xtraTabPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
             this.ResumeLayout(false);
@@ -1596,16 +1633,6 @@
         private DevExpress.XtraEditors.TextEdit txt_fCapacity;
         private DevExpress.XtraEditors.TextEdit txt_remark;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
-        private DevExpress.XtraTab.XtraTabControl tabMx;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
-        private DevExpress.XtraGrid.GridControl gcMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa002;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa010;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
         private DevExpress.XtraEditors.ComboBoxEdit txt_fJingDu;
         private DevExpress.XtraEditors.DateEdit txt_fBegDate;
         private DevExpress.XtraEditors.DateEdit txt_fEndDate;
@@ -1613,12 +1640,8 @@
         private DevExpress.XtraEditors.ComboBoxEdit txt_fType;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraEditors.SimpleButton btnSelect;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.TextEdit txt_guid;
         private DevExpress.XtraEditors.TextEdit txt_lastUpdateBy;
         private DevExpress.XtraEditors.TextEdit txt_lastUpdateDate;
@@ -1626,8 +1649,6 @@
         private DevExpress.XtraEditors.TextEdit txt_checkDate;
         private DevExpress.XtraEditors.CheckEdit txt_isCheck;
         private System.Windows.Forms.PictureBox picCheckBox;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGx;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
@@ -1641,30 +1662,50 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraEditors.SimpleButton btnCopy;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
+        private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
         private DevExpress.XtraGrid.GridControl gcMx2;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
         private DevExpress.XtraGrid.Columns.GridColumn gv_workers;
         private DevExpress.XtraGrid.Columns.GridColumn gv_hours;
         private DevExpress.XtraGrid.Columns.GridColumn gv_capacity;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3;
         private DevExpress.XtraGrid.Columns.GridColumn gv_sCapacity;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox4;
         private DevExpress.XtraGrid.Columns.GridColumn gv_lineType;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox5;
         private DevExpress.XtraGrid.Columns.GridColumn gv_changeTime;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMxTui;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox4;
+        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
+        private DevExpress.XtraGrid.GridControl gcMx1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa002;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa010;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gv_gxOrder;
-        private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGx;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
+        private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
+        private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+        private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3