~tjx/GsMesClient.git

			@@ -82,6 +82,7 @@
			this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.rptButtonUrl = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
			this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.pageBar1 = new UserControls.Data.UcPageBar();
			this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
			this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
			@@ -188,7 +189,6 @@
			this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
			this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
			this.tips = new DevExpress.Utils.ToolTipController(this.components);
			this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
			this.xtraTabControl1.SuspendLayout();
			@@ -476,7 +476,7 @@
			this.gv_itemId.OptionsColumn.AllowEdit = false;
			this.gv_itemId.Tag = "query_a.item_id";
			this.gv_itemId.Visible = true;
			this.gv_itemId.VisibleIndex = 7;
			this.gv_itemId.VisibleIndex = 6;
			this.gv_itemId.Width = 30;
			//
			// gv_itemNo
			@@ -489,7 +489,7 @@
			this.gv_itemNo.OptionsColumn.AllowEdit = false;
			this.gv_itemNo.Tag = "query_a.item_no";
			this.gv_itemNo.Visible = true;
			this.gv_itemNo.VisibleIndex = 8;
			this.gv_itemNo.VisibleIndex = 7;
			this.gv_itemNo.Width = 136;
			//
			// gv_boardStyle
			@@ -502,7 +502,7 @@
			this.gv_boardStyle.OptionsColumn.AllowEdit = false;
			this.gv_boardStyle.Tag = "query_a.board_style";
			this.gv_boardStyle.Visible = true;
			this.gv_boardStyle.VisibleIndex = 9;
			this.gv_boardStyle.VisibleIndex = 8;
			this.gv_boardStyle.Width = 164;
			//
			// gridColumn14
			@@ -513,7 +513,7 @@
			this.gridColumn14.Name = "gridColumn14";
			this.gridColumn14.OptionsColumn.ReadOnly = true;
			this.gridColumn14.Visible = true;
			this.gridColumn14.VisibleIndex = 10;
			this.gridColumn14.VisibleIndex = 9;
			this.gridColumn14.Width = 200;
			//
			// gv_fcovertQty
			@@ -527,7 +527,7 @@
			this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
			this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
			this.gv_fcovertQty.Visible = true;
			this.gv_fcovertQty.VisibleIndex = 11;
			this.gv_fcovertQty.VisibleIndex = 10;
			this.gv_fcovertQty.Width = 60;
			//
			// gv_fbatchQty
			@@ -540,7 +540,7 @@
			this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
			this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
			this.gv_fbatchQty.Visible = true;
			this.gv_fbatchQty.VisibleIndex = 12;
			this.gv_fbatchQty.VisibleIndex = 11;
			this.gv_fbatchQty.Width = 80;
			//
			// gv_fcheckResu
			@@ -557,7 +557,7 @@
			this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
			this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
			this.gv_fcheckResu.Visible = true;
			this.gv_fcheckResu.VisibleIndex = 6;
			this.gv_fcheckResu.VisibleIndex = 5;
			this.gv_fcheckResu.Width = 50;
			//
			// gv_remarks
			@@ -570,7 +570,7 @@
			this.gv_remarks.OptionsColumn.AllowEdit = false;
			this.gv_remarks.Tag = "query_a.remarks";
			this.gv_remarks.Visible = true;
			this.gv_remarks.VisibleIndex = 13;
			this.gv_remarks.VisibleIndex = 12;
			this.gv_remarks.Width = 100;
			//
			// gv_fcheckBy
			@@ -583,7 +583,7 @@
			this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
			this.gv_fcheckBy.Tag = "query_a.fcheck_by";
			this.gv_fcheckBy.Visible = true;
			this.gv_fcheckBy.VisibleIndex = 14;
			this.gv_fcheckBy.VisibleIndex = 13;
			this.gv_fcheckBy.Width = 118;
			//
			// gv_fcheckDate
			@@ -596,7 +596,7 @@
			this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
			this.gv_fcheckDate.Tag = "query_a.fcheck_date";
			this.gv_fcheckDate.Visible = true;
			this.gv_fcheckDate.VisibleIndex = 15;
			this.gv_fcheckDate.VisibleIndex = 14;
			this.gv_fcheckDate.Width = 182;
			//
			// gv_createBy
			@@ -609,7 +609,7 @@
			this.gv_createBy.OptionsColumn.AllowEdit = false;
			this.gv_createBy.Tag = "query_a.create_by";
			this.gv_createBy.Visible = true;
			this.gv_createBy.VisibleIndex = 16;
			this.gv_createBy.VisibleIndex = 15;
			this.gv_createBy.Width = 67;
			//
			// gridColumn15
			@@ -619,7 +619,7 @@
			this.gridColumn15.MinWidth = 25;
			this.gridColumn15.Name = "gridColumn15";
			this.gridColumn15.Visible = true;
			this.gridColumn15.VisibleIndex = 17;
			this.gridColumn15.VisibleIndex = 16;
			this.gridColumn15.Width = 94;
			//
			// gv_lastupdateBy
			@@ -632,7 +632,7 @@
			this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
			this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
			this.gv_lastupdateBy.Visible = true;
			this.gv_lastupdateBy.VisibleIndex = 18;
			this.gv_lastupdateBy.VisibleIndex = 17;
			this.gv_lastupdateBy.Width = 60;
			//
			// gv_lastupdateDate
			@@ -645,7 +645,7 @@
			this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
			this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
			this.gv_lastupdateDate.Visible = true;
			this.gv_lastupdateDate.VisibleIndex = 19;
			this.gv_lastupdateDate.VisibleIndex = 18;
			this.gv_lastupdateDate.Width = 120;
			//
			// gridColumn18
			@@ -655,7 +655,7 @@
			this.gridColumn18.MinWidth = 25;
			this.gridColumn18.Name = "gridColumn18";
			this.gridColumn18.Visible = true;
			this.gridColumn18.VisibleIndex = 20;
			this.gridColumn18.VisibleIndex = 19;
			this.gridColumn18.Width = 94;
			//
			// gridColumn19
			@@ -665,7 +665,7 @@
			this.gridColumn19.MinWidth = 25;
			this.gridColumn19.Name = "gridColumn19";
			this.gridColumn19.Visible = true;
			this.gridColumn19.VisibleIndex = 21;
			this.gridColumn19.VisibleIndex = 20;
			this.gridColumn19.Width = 94;
			//
			// gridColumn30
			@@ -683,7 +683,7 @@
			this.gridColumn13.MinWidth = 25;
			this.gridColumn13.Name = "gridColumn13";
			this.gridColumn13.Visible = true;
			this.gridColumn13.VisibleIndex = 22;
			this.gridColumn13.VisibleIndex = 21;
			this.gridColumn13.Width = 94;
			//
			// gridColumn17
			@@ -700,8 +700,6 @@
			this.gridColumn5.FieldName = "checkStates";
			this.gridColumn5.MinWidth = 25;
			this.gridColumn5.Name = "gridColumn5";
			this.gridColumn5.Visible = true;
			this.gridColumn5.VisibleIndex = 5;
			this.gridColumn5.Width = 94;
			//
			// gridColumn6
			@@ -724,6 +722,16 @@
			this.rptButtonUrl.Name = "rptButtonUrl";
			this.rptButtonUrl.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
			this.rptButtonUrl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptButtonUrl_ButtonClick);
			//
			// gridColumn7
			//
			this.gridColumn7.Caption = "生产组织";
			this.gridColumn7.FieldName = "fSubsidiary";
			this.gridColumn7.MinWidth = 25;
			this.gridColumn7.Name = "gridColumn7";
			this.gridColumn7.Visible = true;
			this.gridColumn7.VisibleIndex = 22;
			this.gridColumn7.Width = 94;
			//
			// pageBar1
			//
			@@ -1967,16 +1975,6 @@
			// gridView4
			//
			this.gridView4.Name = "gridView4";
			//
			// gridColumn7
			//
			this.gridColumn7.Caption = "生产组织";
			this.gridColumn7.FieldName = "fSubsidiary";
			this.gridColumn7.MinWidth = 25;
			this.gridColumn7.Name = "gridColumn7";
			this.gridColumn7.Visible = true;
			this.gridColumn7.VisibleIndex = 23;
			this.gridColumn7.Width = 94;
			//
			// Frm_ShouJianDetect01
			//