工序维护更新

kyy

2025-07-26 38bf604083cb74ec1405559facb42bb69691644f

 DevApp/Gs.DevApp/DevFrm/WOM/Frm_MesProcGx.Designer.cs

@@ -39,7 +39,6 @@
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesProcGx));
            DevExpress.XtraGrid.GridLevelNode gridLevelNode1 = new DevExpress.XtraGrid.GridLevelNode();
            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -52,6 +51,7 @@
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesProcGx));
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.pageBar1 = new UserControls.Data.UcPageBar();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -111,33 +111,9 @@
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.repositoryItemComboBox3 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.repositoryItemComboBox4 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.repositoryItemComboBox5 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            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.gv_changeTime = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.rptGx = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
            this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
            this.repositoryItemCheckEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -146,10 +122,34 @@
            this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
            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.tabMx = new DevExpress.XtraTab.XtraTabControl();
            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();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -213,28 +213,28 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
            this.xtraTabPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).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.rptGx)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            ((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();
            // 
            // toolBarMenu1
@@ -1031,214 +1031,18 @@
            this.layoutControlItem15.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem15.TextVisible = false;
            // 
            // picCheckBox
            // tabMx
            // 
            this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
            this.picCheckBox.Location = new System.Drawing.Point(956, 23);
            this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.picCheckBox.Name = "picCheckBox";
            this.picCheckBox.Size = new System.Drawing.Size(88, 39);
            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
            this.picCheckBox.TabIndex = 9;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // 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);
            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(611, 363);
            this.gcMx2.TabIndex = 1;
            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx2});
            // 
            // gridView2
            // 
            this.gridView2.GridControl = this.gcMx2;
            this.gridView2.Name = "gridView2";
            // 
            // 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;
            // 
            // 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;
            // 
            // 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;
            // 
            // 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.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;
            // 
            // 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;
            // 
            // 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;
            // 
            // gridColumn14
            // 
            this.gridColumn14.Caption = "主键Guid";
            this.gridColumn14.FieldName = "guid";
            this.gridColumn14.MinWidth = 22;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Width = 82;
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            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.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});
            // 
            // tabMxPage1
            // 
@@ -1252,9 +1056,9 @@
            // 
            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);
@@ -1269,67 +1073,8 @@
            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});
            // 
            // gridView3
            // 
            this.gridView3.GridControl = this.gcMx1;
            this.gridView3.Name = "gridView3";
            // 
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
            editorButtonImageOptions2.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)});
            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
            // 
            // 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;
            // 
            // rptGx
            // 
            this.rptGx.AutoHeight = false;
            this.rptGx.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.rptGx.Name = "rptGx";
            this.rptGx.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            // 
            // repositoryItemCheckEdit1
            // 
            this.repositoryItemCheckEdit1.AutoHeight = false;
            this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
            // 
            // repositoryItemCheckEdit2
            // 
            this.repositoryItemCheckEdit2.AutoHeight = false;
            this.repositoryItemCheckEdit2.Name = "repositoryItemCheckEdit2";
            this.gvMx1,
            this.gridView3});
            // 
            // gvMx1
            // 
@@ -1457,6 +1202,14 @@
            this.gvMx1daa004.VisibleIndex = 6;
            this.gvMx1daa004.Width = 131;
            // 
            // rptGx
            // 
            this.rptGx.AutoHeight = false;
            this.rptGx.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.rptGx.Name = "rptGx";
            this.rptGx.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            // 
            // gvMx1reporttime
            // 
            this.gvMx1reporttime.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
@@ -1485,6 +1238,17 @@
            this.gvMxDel.VisibleIndex = 8;
            this.gvMxDel.Width = 57;
            // 
            // repositoryItemButtonEdit1
            // 
            this.repositoryItemButtonEdit1.AutoHeight = false;
            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, 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);
            // 
            // gridColumn3
            // 
            this.gridColumn3.Caption = "主键Guid";
@@ -1493,18 +1257,257 @@
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Width = 82;
            // 
            // tabMx
            // repositoryItemComboBox1
            // 
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            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.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});
            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
            // 
            this.picCheckBox.Image = ((System.Drawing.Image)(resources.GetObject("picCheckBox.Image")));
            this.picCheckBox.Location = new System.Drawing.Point(956, 23);
            this.picCheckBox.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
            this.picCheckBox.Name = "picCheckBox";
            this.picCheckBox.Size = new System.Drawing.Size(88, 39);
            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
            this.picCheckBox.TabIndex = 9;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            // 
            // Frm_MesProcGx
            // 
@@ -1580,28 +1583,28 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
            this.xtraTabPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).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.rptGx)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            ((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);

        }
@@ -1678,7 +1681,7 @@
        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.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox3;