lu
2025-06-09 ccc1b0d541d8f3bdd2bcb72dd0b5533e68b886d5
DevApp/Gs.DevApp/DevFrm/Work/Frm_Repair.Designer.cs
@@ -31,17 +31,17 @@
        private void InitializeComponent()
        {
            this.components = new System.ComponentModel.Container();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
            this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -61,6 +61,7 @@
            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.repositoryItemMemoEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
            this.repositoryItemMemoEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit();
            this.pageBar1 = new UserControls.Data.UcPageBar();
@@ -68,13 +69,13 @@
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.splitTop1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.txt_badReson = new Gs.DevApp.UserControl.UcDictionary();
            this.txt_repairReson = new Gs.DevApp.UserControl.UcDictionary();
            this.txt_badDescription = new Gs.DevApp.UserControl.UcDictionary();
            this.txt_repairMethd = new Gs.DevApp.UserControl.UcDictionary();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_gdbh = new DevExpress.XtraEditors.TextEdit();
            this.txt_gx = new DevExpress.XtraEditors.TextEdit();
            this.txt_collectBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_processNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_barCode = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
@@ -115,24 +116,6 @@
            this.btnGood = new DevExpress.XtraEditors.SimpleButton();
            this.btnBad = new DevExpress.XtraEditors.SimpleButton();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2status = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -143,7 +126,6 @@
            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -151,6 +133,23 @@
            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn36 = 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();
            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2status = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
@@ -180,8 +179,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_collectBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_processNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
@@ -210,12 +209,12 @@
            this.panel1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            this.tabMxPage2.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
            this.tabMxPage1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -305,7 +304,8 @@
            this.gridColumn20,
            this.gridColumn21,
            this.gridColumn23,
            this.gridColumn37});
            this.gridColumn37,
            this.gridColumn38});
            this.gridView1.GridControl = this.gcMain1;
            this.gridView1.Name = "gridView1";
            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
@@ -442,6 +442,14 @@
            this.gridColumn37.VisibleIndex = 9;
            this.gridColumn37.Width = 94;
            // 
            // gridColumn38
            //
            this.gridColumn38.Caption = "主键Guid";
            this.gridColumn38.FieldName = "guid";
            this.gridColumn38.MinWidth = 25;
            this.gridColumn38.Name = "gridColumn38";
            this.gridColumn38.Width = 94;
            //
            // repositoryItemMemoEdit1
            // 
            this.repositoryItemMemoEdit1.Name = "repositoryItemMemoEdit1";
@@ -523,13 +531,13 @@
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.txt_badReson);
            this.layoutMx1.Controls.Add(this.txt_repairReson);
            this.layoutMx1.Controls.Add(this.txt_badDescription);
            this.layoutMx1.Controls.Add(this.txt_repairMethd);
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_gdbh);
            this.layoutMx1.Controls.Add(this.txt_gx);
            this.layoutMx1.Controls.Add(this.txt_collectBy);
            this.layoutMx1.Controls.Add(this.txt_processNo);
            this.layoutMx1.Controls.Add(this.txt_createBy);
            this.layoutMx1.Controls.Add(this.txt_barCode);
            this.layoutMx1.Controls.Add(this.txt_itemNo);
            this.layoutMx1.Controls.Add(this.txt_itemName);
@@ -548,15 +556,15 @@
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
            // txt_badReson
            // txt_repairReson
            // 
            this.txt_badReson.BtnTxt = "不良原因";
            this.txt_badReson.Location = new System.Drawing.Point(12, 157);
            this.txt_badReson.Name = "txt_badReson";
            this.txt_badReson.Size = new System.Drawing.Size(410, 57);
            this.txt_badReson.TabIndex = 26;
            this.txt_badReson.TextTxt = "";
            this.txt_badReson.WhereTxt = "s_type=\'现场维修不良原因\'   and pid<>\'00000000-0000-0000-0000-000000000000\'";
            this.txt_repairReson.BtnTxt = "不良原因";
            this.txt_repairReson.Location = new System.Drawing.Point(12, 157);
            this.txt_repairReson.Name = "txt_repairReson";
            this.txt_repairReson.Size = new System.Drawing.Size(410, 57);
            this.txt_repairReson.TabIndex = 26;
            this.txt_repairReson.TextTxt = "";
            this.txt_repairReson.WhereTxt = " a.s_type=\'工序不良原因\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
            // 
            // txt_badDescription
            // 
@@ -576,7 +584,7 @@
            this.txt_repairMethd.Size = new System.Drawing.Size(411, 115);
            this.txt_repairMethd.TabIndex = 24;
            this.txt_repairMethd.TextTxt = "";
            this.txt_repairMethd.WhereTxt = "s_type=\'现场维修不良对策\' and pid<>\'00000000-0000-0000-0000-000000000000\'";
            this.txt_repairMethd.WhereTxt = " a.s_type=\'工序不良对策\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
            // 
            // lbGuid
            // 
@@ -595,23 +603,23 @@
            this.txt_gdbh.StyleController = this.layoutMx1;
            this.txt_gdbh.TabIndex = 4;
            // 
            // txt_gx
            // txt_processNo
            // 
            this.txt_gx.Location = new System.Drawing.Point(498, 70);
            this.txt_gx.Name = "txt_gx";
            this.txt_gx.Properties.ReadOnly = true;
            this.txt_gx.Size = new System.Drawing.Size(131, 24);
            this.txt_gx.StyleController = this.layoutMx1;
            this.txt_gx.TabIndex = 5;
            this.txt_processNo.Location = new System.Drawing.Point(498, 70);
            this.txt_processNo.Name = "txt_processNo";
            this.txt_processNo.Properties.ReadOnly = true;
            this.txt_processNo.Size = new System.Drawing.Size(131, 24);
            this.txt_processNo.StyleController = this.layoutMx1;
            this.txt_processNo.TabIndex = 5;
            // 
            // txt_collectBy
            // txt_createBy
            // 
            this.txt_collectBy.Location = new System.Drawing.Point(705, 70);
            this.txt_collectBy.Name = "txt_collectBy";
            this.txt_collectBy.Properties.ReadOnly = true;
            this.txt_collectBy.Size = new System.Drawing.Size(132, 24);
            this.txt_collectBy.StyleController = this.layoutMx1;
            this.txt_collectBy.TabIndex = 6;
            this.txt_createBy.Location = new System.Drawing.Point(705, 70);
            this.txt_createBy.Name = "txt_createBy";
            this.txt_createBy.Properties.ReadOnly = true;
            this.txt_createBy.Size = new System.Drawing.Size(132, 24);
            this.txt_createBy.StyleController = this.layoutMx1;
            this.txt_createBy.TabIndex = 6;
            // 
            // txt_barCode
            // 
@@ -706,41 +714,41 @@
            this.layoutControlItem3});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition5.Width = 100D;
            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition6.Width = 100D;
            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition7.Width = 100D;
            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition8.Width = 100D;
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1.Width = 100D;
            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition2.Width = 100D;
            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition3.Width = 100D;
            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition4.Width = 100D;
            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
            columnDefinition5,
            columnDefinition6,
            columnDefinition7,
            columnDefinition8});
            rowDefinition8.Height = 100D;
            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition9.Height = 100D;
            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition10.Height = 100D;
            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition11.Height = 100D;
            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition12.Height = 100D;
            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition13.Height = 100D;
            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition14.Height = 100D;
            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
            columnDefinition1,
            columnDefinition2,
            columnDefinition3,
            columnDefinition4});
            rowDefinition1.Height = 100D;
            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition2.Height = 100D;
            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition3.Height = 100D;
            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition4.Height = 100D;
            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition5.Height = 100D;
            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition6.Height = 100D;
            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
            rowDefinition7.Height = 100D;
            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
            rowDefinition8,
            rowDefinition9,
            rowDefinition10,
            rowDefinition11,
            rowDefinition12,
            rowDefinition13,
            rowDefinition14});
            rowDefinition1,
            rowDefinition2,
            rowDefinition3,
            rowDefinition4,
            rowDefinition5,
            rowDefinition6,
            rowDefinition7});
            this.Root.Size = new System.Drawing.Size(849, 226);
            this.Root.TextVisible = false;
            // 
@@ -826,7 +834,7 @@
            // 
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_badReson;
            this.layoutControlItem9.Control = this.txt_repairReson;
            this.layoutControlItem9.Location = new System.Drawing.Point(0, 145);
            this.layoutControlItem9.Name = "layoutControlItem9";
            this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
@@ -839,7 +847,7 @@
            // 
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_gx;
            this.layoutControlItem2.Control = this.txt_processNo;
            this.layoutControlItem2.Location = new System.Drawing.Point(414, 58);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
@@ -880,7 +888,7 @@
            // 
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_collectBy;
            this.layoutControlItem3.Control = this.txt_createBy;
            this.layoutControlItem3.Location = new System.Drawing.Point(621, 58);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
@@ -1056,211 +1064,12 @@
            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
            this.tabMx.Location = new System.Drawing.Point(0, 0);
            this.tabMx.Name = "tabMx";
            this.tabMx.SelectedTabPage = this.tabMxPage1;
            this.tabMx.SelectedTabPage = this.tabMxPage2;
            this.tabMx.Size = new System.Drawing.Size(1251, 332);
            this.tabMx.TabIndex = 4;
            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
            this.tabMxPage1,
            this.tabMxPage2});
            //
            // tabMxPage1
            //
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1249, 300);
            this.tabMxPage1.Text = "已修理明细";
            //
            // gcMx1
            //
            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.Size = new System.Drawing.Size(1249, 300);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
            //
            // gvMx1
            //
            this.gvMx1.Appearance.Row.Options.UseFont = true;
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn12,
            this.gridColumn24,
            this.gvMx2status,
            this.gvMx2pbillNo,
            this.gvMx2itemNo,
            this.gridColumn5,
            this.gridColumn6,
            this.gridColumn3,
            this.gridColumn7,
            this.gridColumn2,
            this.gridColumn26,
            this.gridColumn15,
            this.gridColumn4,
            this.gridColumn14,
            this.gridColumn25});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            //
            // gridColumn12
            //
            this.gridColumn12.Caption = "guid";
            this.gridColumn12.FieldName = "guid";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.OptionsColumn.ReadOnly = true;
            this.gridColumn12.Width = 94;
            //
            // gridColumn24
            //
            this.gridColumn24.Caption = "产线";
            this.gridColumn24.FieldName = "lineName";
            this.gridColumn24.MinWidth = 25;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 0;
            this.gridColumn24.Width = 94;
            //
            // gvMx2status
            //
            this.gvMx2status.AppearanceCell.Options.UseFont = true;
            this.gvMx2status.Caption = "工单编号";
            this.gvMx2status.FieldName = "gdbh";
            this.gvMx2status.MinWidth = 10;
            this.gvMx2status.Name = "gvMx2status";
            this.gvMx2status.OptionsColumn.ReadOnly = true;
            this.gvMx2status.Tag = "query_a.status";
            this.gvMx2status.Visible = true;
            this.gvMx2status.VisibleIndex = 1;
            this.gvMx2status.Width = 71;
            //
            // gvMx2pbillNo
            //
            this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
            this.gvMx2pbillNo.Caption = "追溯码";
            this.gvMx2pbillNo.FieldName = "barCode";
            this.gvMx2pbillNo.Name = "gvMx2pbillNo";
            this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
            this.gvMx2pbillNo.Tag = "query_a.pbill_no";
            this.gvMx2pbillNo.Visible = true;
            this.gvMx2pbillNo.VisibleIndex = 2;
            this.gvMx2pbillNo.Width = 91;
            //
            // gvMx2itemNo
            //
            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemNo.Caption = "物料编码";
            this.gvMx2itemNo.FieldName = "itemNo";
            this.gvMx2itemNo.Name = "gvMx2itemNo";
            this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
            this.gvMx2itemNo.Tag = "query_a.item_no";
            this.gvMx2itemNo.Visible = true;
            this.gvMx2itemNo.VisibleIndex = 3;
            this.gvMx2itemNo.Width = 91;
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "物料名称";
            this.gridColumn5.FieldName = "itemName";
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 4;
            this.gridColumn5.Width = 91;
            //
            // gridColumn6
            //
            this.gridColumn6.Caption = "规格型号";
            this.gridColumn6.FieldName = "itemModel";
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 91;
            //
            // gridColumn3
            //
            this.gridColumn3.Caption = "数量";
            this.gridColumn3.FieldName = "quantity";
            this.gridColumn3.MinWidth = 25;
            this.gridColumn3.Name = "gridColumn3";
            this.gridColumn3.Visible = true;
            this.gridColumn3.VisibleIndex = 6;
            this.gridColumn3.Width = 91;
            //
            // gridColumn7
            //
            this.gridColumn7.Caption = "修理状态";
            this.gridColumn7.FieldName = "repairResult";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 7;
            this.gridColumn7.Width = 91;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "送修工序";
            this.gridColumn2.FieldName = "processNo";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 8;
            this.gridColumn2.Width = 91;
            //
            // gridColumn26
            //
            this.gridColumn26.Caption = "送修员";
            this.gridColumn26.FieldName = "collectByName";
            this.gridColumn26.MinWidth = 25;
            this.gridColumn26.Name = "gridColumn26";
            this.gridColumn26.Visible = true;
            this.gridColumn26.VisibleIndex = 9;
            this.gridColumn26.Width = 94;
            //
            // gridColumn15
            //
            this.gridColumn15.Caption = "送修时间";
            this.gridColumn15.FieldName = "createDate";
            this.gridColumn15.MinWidth = 25;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 10;
            this.gridColumn15.Width = 113;
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "不良描述";
            this.gridColumn4.FieldName = "badDescription";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 11;
            this.gridColumn4.Width = 91;
            //
            // gridColumn14
            //
            this.gridColumn14.Caption = "不良原因";
            this.gridColumn14.FieldName = "badReson";
            this.gridColumn14.MinWidth = 25;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 12;
            this.gridColumn14.Width = 94;
            //
            // gridColumn25
            //
            this.gridColumn25.Caption = "不良对策";
            this.gridColumn25.FieldName = "repairMethd";
            this.gridColumn25.MinWidth = 25;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 13;
            this.gridColumn25.Width = 94;
            // 
            // tabMxPage2
            // 
@@ -1291,7 +1100,6 @@
            this.gridColumn17,
            this.gridColumn27,
            this.gridColumn28,
            this.gridColumn29,
            this.gridColumn30,
            this.gridColumn31,
            this.gridColumn32,
@@ -1381,24 +1189,18 @@
            this.gridColumn28.VisibleIndex = 5;
            this.gridColumn28.Width = 91;
            // 
            // gridColumn29
            //
            this.gridColumn29.Caption = "数量";
            this.gridColumn29.FieldName = "quantity";
            this.gridColumn29.MinWidth = 25;
            this.gridColumn29.Name = "gridColumn29";
            this.gridColumn29.Visible = true;
            this.gridColumn29.VisibleIndex = 6;
            this.gridColumn29.Width = 91;
            //
            // gridColumn30
            // 
            this.gridColumn30.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn30.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn30.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn30.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn30.Caption = "修理状态";
            this.gridColumn30.FieldName = "repairResult";
            this.gridColumn30.MinWidth = 25;
            this.gridColumn30.Name = "gridColumn30";
            this.gridColumn30.Visible = true;
            this.gridColumn30.VisibleIndex = 7;
            this.gridColumn30.VisibleIndex = 6;
            this.gridColumn30.Width = 91;
            // 
            // gridColumn31
@@ -1408,7 +1210,7 @@
            this.gridColumn31.MinWidth = 25;
            this.gridColumn31.Name = "gridColumn31";
            this.gridColumn31.Visible = true;
            this.gridColumn31.VisibleIndex = 8;
            this.gridColumn31.VisibleIndex = 7;
            this.gridColumn31.Width = 91;
            // 
            // gridColumn32
@@ -1418,7 +1220,7 @@
            this.gridColumn32.MinWidth = 25;
            this.gridColumn32.Name = "gridColumn32";
            this.gridColumn32.Visible = true;
            this.gridColumn32.VisibleIndex = 9;
            this.gridColumn32.VisibleIndex = 8;
            this.gridColumn32.Width = 94;
            // 
            // gridColumn33
@@ -1428,7 +1230,7 @@
            this.gridColumn33.MinWidth = 25;
            this.gridColumn33.Name = "gridColumn33";
            this.gridColumn33.Visible = true;
            this.gridColumn33.VisibleIndex = 10;
            this.gridColumn33.VisibleIndex = 9;
            this.gridColumn33.Width = 113;
            // 
            // gridColumn34
@@ -1438,7 +1240,7 @@
            this.gridColumn34.MinWidth = 25;
            this.gridColumn34.Name = "gridColumn34";
            this.gridColumn34.Visible = true;
            this.gridColumn34.VisibleIndex = 11;
            this.gridColumn34.VisibleIndex = 10;
            this.gridColumn34.Width = 91;
            // 
            // gridColumn35
@@ -1448,7 +1250,7 @@
            this.gridColumn35.MinWidth = 25;
            this.gridColumn35.Name = "gridColumn35";
            this.gridColumn35.Visible = true;
            this.gridColumn35.VisibleIndex = 12;
            this.gridColumn35.VisibleIndex = 11;
            this.gridColumn35.Width = 94;
            // 
            // gridColumn36
@@ -1458,8 +1260,200 @@
            this.gridColumn36.MinWidth = 25;
            this.gridColumn36.Name = "gridColumn36";
            this.gridColumn36.Visible = true;
            this.gridColumn36.VisibleIndex = 13;
            this.gridColumn36.VisibleIndex = 12;
            this.gridColumn36.Width = 94;
            //
            // tabMxPage1
            //
            this.tabMxPage1.Controls.Add(this.gcMx1);
            this.tabMxPage1.Name = "tabMxPage1";
            this.tabMxPage1.Size = new System.Drawing.Size(1249, 300);
            this.tabMxPage1.Text = "已修理明细";
            //
            // gcMx1
            //
            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.gcMx1.Location = new System.Drawing.Point(0, 0);
            this.gcMx1.MainView = this.gvMx1;
            this.gcMx1.Name = "gcMx1";
            this.gcMx1.Size = new System.Drawing.Size(1249, 300);
            this.gcMx1.TabIndex = 0;
            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
            this.gvMx1});
            //
            // gvMx1
            //
            this.gvMx1.Appearance.Row.Options.UseFont = true;
            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
            this.gridColumn12,
            this.gridColumn24,
            this.gvMx2status,
            this.gvMx2pbillNo,
            this.gvMx2itemNo,
            this.gridColumn5,
            this.gridColumn6,
            this.gridColumn7,
            this.gridColumn2,
            this.gridColumn26,
            this.gridColumn15,
            this.gridColumn4,
            this.gridColumn14,
            this.gridColumn25});
            this.gvMx1.GridControl = this.gcMx1;
            this.gvMx1.Name = "gvMx1";
            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
            this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
            this.gvMx1.OptionsView.ShowGroupPanel = false;
            //
            // gridColumn12
            //
            this.gridColumn12.Caption = "guid";
            this.gridColumn12.FieldName = "guid";
            this.gridColumn12.MinWidth = 25;
            this.gridColumn12.Name = "gridColumn12";
            this.gridColumn12.OptionsColumn.ReadOnly = true;
            this.gridColumn12.Width = 94;
            //
            // gridColumn24
            //
            this.gridColumn24.Caption = "产线";
            this.gridColumn24.FieldName = "lineName";
            this.gridColumn24.MinWidth = 25;
            this.gridColumn24.Name = "gridColumn24";
            this.gridColumn24.Visible = true;
            this.gridColumn24.VisibleIndex = 0;
            this.gridColumn24.Width = 94;
            //
            // gvMx2status
            //
            this.gvMx2status.AppearanceCell.Options.UseFont = true;
            this.gvMx2status.Caption = "工单编号";
            this.gvMx2status.FieldName = "gdbh";
            this.gvMx2status.MinWidth = 10;
            this.gvMx2status.Name = "gvMx2status";
            this.gvMx2status.OptionsColumn.ReadOnly = true;
            this.gvMx2status.Tag = "query_a.status";
            this.gvMx2status.Visible = true;
            this.gvMx2status.VisibleIndex = 1;
            this.gvMx2status.Width = 71;
            //
            // gvMx2pbillNo
            //
            this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
            this.gvMx2pbillNo.Caption = "追溯码";
            this.gvMx2pbillNo.FieldName = "barCode";
            this.gvMx2pbillNo.Name = "gvMx2pbillNo";
            this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
            this.gvMx2pbillNo.Tag = "query_a.pbill_no";
            this.gvMx2pbillNo.Visible = true;
            this.gvMx2pbillNo.VisibleIndex = 2;
            this.gvMx2pbillNo.Width = 91;
            //
            // gvMx2itemNo
            //
            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
            this.gvMx2itemNo.Caption = "物料编码";
            this.gvMx2itemNo.FieldName = "itemNo";
            this.gvMx2itemNo.Name = "gvMx2itemNo";
            this.gvMx2itemNo.OptionsColumn.ReadOnly = true;
            this.gvMx2itemNo.Tag = "query_a.item_no";
            this.gvMx2itemNo.Visible = true;
            this.gvMx2itemNo.VisibleIndex = 3;
            this.gvMx2itemNo.Width = 91;
            //
            // gridColumn5
            //
            this.gridColumn5.Caption = "物料名称";
            this.gridColumn5.FieldName = "itemName";
            this.gridColumn5.Name = "gridColumn5";
            this.gridColumn5.OptionsColumn.ReadOnly = true;
            this.gridColumn5.Visible = true;
            this.gridColumn5.VisibleIndex = 4;
            this.gridColumn5.Width = 91;
            //
            // gridColumn6
            //
            this.gridColumn6.Caption = "规格型号";
            this.gridColumn6.FieldName = "itemModel";
            this.gridColumn6.Name = "gridColumn6";
            this.gridColumn6.OptionsColumn.ReadOnly = true;
            this.gridColumn6.Visible = true;
            this.gridColumn6.VisibleIndex = 5;
            this.gridColumn6.Width = 91;
            //
            // gridColumn7
            //
            this.gridColumn7.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn7.AppearanceCell.Options.UseForeColor = true;
            this.gridColumn7.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
            this.gridColumn7.AppearanceHeader.Options.UseForeColor = true;
            this.gridColumn7.Caption = "修理状态";
            this.gridColumn7.FieldName = "repairResult";
            this.gridColumn7.MinWidth = 25;
            this.gridColumn7.Name = "gridColumn7";
            this.gridColumn7.Visible = true;
            this.gridColumn7.VisibleIndex = 6;
            this.gridColumn7.Width = 91;
            //
            // gridColumn2
            //
            this.gridColumn2.Caption = "送修工序";
            this.gridColumn2.FieldName = "processNo";
            this.gridColumn2.MinWidth = 25;
            this.gridColumn2.Name = "gridColumn2";
            this.gridColumn2.Visible = true;
            this.gridColumn2.VisibleIndex = 7;
            this.gridColumn2.Width = 91;
            //
            // gridColumn26
            //
            this.gridColumn26.Caption = "送修员";
            this.gridColumn26.FieldName = "createBy";
            this.gridColumn26.MinWidth = 25;
            this.gridColumn26.Name = "gridColumn26";
            this.gridColumn26.Visible = true;
            this.gridColumn26.VisibleIndex = 8;
            this.gridColumn26.Width = 94;
            //
            // gridColumn15
            //
            this.gridColumn15.Caption = "送修时间";
            this.gridColumn15.FieldName = "createDate";
            this.gridColumn15.MinWidth = 25;
            this.gridColumn15.Name = "gridColumn15";
            this.gridColumn15.Visible = true;
            this.gridColumn15.VisibleIndex = 9;
            this.gridColumn15.Width = 113;
            //
            // gridColumn4
            //
            this.gridColumn4.Caption = "不良描述";
            this.gridColumn4.FieldName = "badDescription";
            this.gridColumn4.MinWidth = 25;
            this.gridColumn4.Name = "gridColumn4";
            this.gridColumn4.Visible = true;
            this.gridColumn4.VisibleIndex = 10;
            this.gridColumn4.Width = 91;
            //
            // gridColumn14
            //
            this.gridColumn14.Caption = "不良原因";
            this.gridColumn14.FieldName = "repairReson";
            this.gridColumn14.MinWidth = 25;
            this.gridColumn14.Name = "gridColumn14";
            this.gridColumn14.Visible = true;
            this.gridColumn14.VisibleIndex = 11;
            this.gridColumn14.Width = 94;
            //
            // gridColumn25
            //
            this.gridColumn25.Caption = "不良对策";
            this.gridColumn25.FieldName = "repairMethd";
            this.gridColumn25.MinWidth = 25;
            this.gridColumn25.Name = "gridColumn25";
            this.gridColumn25.Visible = true;
            this.gridColumn25.VisibleIndex = 12;
            this.gridColumn25.Width = 94;
            // 
            // Frm_Repair
            // 
@@ -1498,8 +1492,8 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_gdbh.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_gx.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_collectBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_processNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_barCode.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
@@ -1531,12 +1525,12 @@
            this.panel1.PerformLayout();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            this.tabMxPage2.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
            this.tabMxPage1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
            this.ResumeLayout(false);
        }
@@ -1559,8 +1553,8 @@
        private DevExpress.XtraEditors.SplitContainerControl splitTop1;
        private DevExpress.XtraLayout.LayoutControl layoutMx1;
        private DevExpress.XtraEditors.TextEdit txt_gdbh;
        private DevExpress.XtraEditors.TextEdit txt_gx;
        private DevExpress.XtraEditors.TextEdit txt_collectBy;
        private DevExpress.XtraEditors.TextEdit txt_processNo;
        private DevExpress.XtraEditors.TextEdit txt_createBy;
        private DevExpress.XtraEditors.TextEdit txt_barCode;
        private DevExpress.XtraEditors.TextEdit txt_itemNo;
        private DevExpress.XtraEditors.TextEdit txt_itemName;
@@ -1598,7 +1592,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gvMx2itemNo;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
@@ -1608,7 +1601,7 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private UcDictionary txt_repairMethd;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private UcDictionary txt_badReson;
        private UcDictionary txt_repairReson;
        private UcDictionary txt_badDescription;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
@@ -1641,7 +1634,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
@@ -1651,5 +1643,6 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
    }
}