~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();
			@@ -406,7 +407,8 @@
			this.gridColumn13,
			this.gridColumn17,
			this.gridColumn5,
			this.gridColumn6});
			this.gridColumn6,
			this.gridColumn7});
			this.gridView1.GridControl = this.gcMain1;
			this.gridView1.IndicatorWidth = 50;
			this.gridView1.Name = "gridView1";
			@@ -438,7 +440,7 @@
			this.gv_releaseNo.OptionsColumn.AllowEdit = false;
			this.gv_releaseNo.Tag = "query_a.release_no";
			this.gv_releaseNo.Visible = true;
			this.gv_releaseNo.VisibleIndex = 1;
			this.gv_releaseNo.VisibleIndex = 2;
			this.gv_releaseNo.Width = 100;
			//
			// gv_lotNo
			@@ -451,7 +453,7 @@
			this.gv_lotNo.OptionsColumn.AllowEdit = false;
			this.gv_lotNo.Tag = "query_a.lot_no";
			this.gv_lotNo.Visible = true;
			this.gv_lotNo.VisibleIndex = 2;
			this.gv_lotNo.VisibleIndex = 3;
			this.gv_lotNo.Width = 120;
			//
			// gridColumn23
			@@ -461,7 +463,7 @@
			this.gridColumn23.MinWidth = 25;
			this.gridColumn23.Name = "gridColumn23";
			this.gridColumn23.Visible = true;
			this.gridColumn23.VisibleIndex = 3;
			this.gridColumn23.VisibleIndex = 4;
			this.gridColumn23.Width = 94;
			//
			// gv_itemId
			@@ -473,8 +475,6 @@
			this.gv_itemId.Name = "gv_itemId";
			this.gv_itemId.OptionsColumn.AllowEdit = false;
			this.gv_itemId.Tag = "query_a.item_id";
			this.gv_itemId.Visible = true;
			this.gv_itemId.VisibleIndex = 6;
			this.gv_itemId.Width = 30;
			//
			// gv_itemNo
			@@ -537,13 +537,15 @@
			this.gv_fbatchQty.Name = "gv_fbatchQty";
			this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
			this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
			this.gv_fbatchQty.Visible = true;
			this.gv_fbatchQty.VisibleIndex = 11;
			this.gv_fbatchQty.Width = 80;
			//
			// gv_fcheckResu
			//
			this.gv_fcheckResu.AppearanceCell.ForeColor = System.Drawing.Color.CornflowerBlue;
			this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
			this.gv_fcheckResu.AppearanceCell.Options.UseForeColor = true;
			this.gv_fcheckResu.AppearanceHeader.ForeColor = DevExpress.LookAndFeel.DXSkinColors.ForeColors.Hyperlink;
			this.gv_fcheckResu.AppearanceHeader.Options.UseForeColor = true;
			this.gv_fcheckResu.Caption = "检验结果";
			this.gv_fcheckResu.FieldName = "fcheckResu";
			this.gv_fcheckResu.MinWidth = 30;
			@@ -551,7 +553,7 @@
			this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
			this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
			this.gv_fcheckResu.Visible = true;
			this.gv_fcheckResu.VisibleIndex = 5;
			this.gv_fcheckResu.VisibleIndex = 6;
			this.gv_fcheckResu.Width = 50;
			//
			// gv_remarks
			@@ -563,8 +565,6 @@
			this.gv_remarks.Name = "gv_remarks";
			this.gv_remarks.OptionsColumn.AllowEdit = false;
			this.gv_remarks.Tag = "query_a.remarks";
			this.gv_remarks.Visible = true;
			this.gv_remarks.VisibleIndex = 12;
			this.gv_remarks.Width = 100;
			//
			// gv_fcheckBy
			@@ -577,7 +577,7 @@
			this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
			this.gv_fcheckBy.Tag = "query_a.fcheck_by";
			this.gv_fcheckBy.Visible = true;
			this.gv_fcheckBy.VisibleIndex = 13;
			this.gv_fcheckBy.VisibleIndex = 11;
			this.gv_fcheckBy.Width = 118;
			//
			// gv_fcheckDate
			@@ -590,7 +590,7 @@
			this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
			this.gv_fcheckDate.Tag = "query_a.fcheck_date";
			this.gv_fcheckDate.Visible = true;
			this.gv_fcheckDate.VisibleIndex = 14;
			this.gv_fcheckDate.VisibleIndex = 12;
			this.gv_fcheckDate.Width = 182;
			//
			// gv_createBy
			@@ -603,7 +603,7 @@
			this.gv_createBy.OptionsColumn.AllowEdit = false;
			this.gv_createBy.Tag = "query_a.create_by";
			this.gv_createBy.Visible = true;
			this.gv_createBy.VisibleIndex = 15;
			this.gv_createBy.VisibleIndex = 13;
			this.gv_createBy.Width = 67;
			//
			// gridColumn15
			@@ -613,7 +613,7 @@
			this.gridColumn15.MinWidth = 25;
			this.gridColumn15.Name = "gridColumn15";
			this.gridColumn15.Visible = true;
			this.gridColumn15.VisibleIndex = 16;
			this.gridColumn15.VisibleIndex = 14;
			this.gridColumn15.Width = 94;
			//
			// gv_lastupdateBy
			@@ -625,8 +625,6 @@
			this.gv_lastupdateBy.Name = "gv_lastupdateBy";
			this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
			this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
			this.gv_lastupdateBy.Visible = true;
			this.gv_lastupdateBy.VisibleIndex = 17;
			this.gv_lastupdateBy.Width = 60;
			//
			// gv_lastupdateDate
			@@ -638,8 +636,6 @@
			this.gv_lastupdateDate.Name = "gv_lastupdateDate";
			this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
			this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
			this.gv_lastupdateDate.Visible = true;
			this.gv_lastupdateDate.VisibleIndex = 18;
			this.gv_lastupdateDate.Width = 120;
			//
			// gridColumn18
			@@ -649,7 +645,7 @@
			this.gridColumn18.MinWidth = 25;
			this.gridColumn18.Name = "gridColumn18";
			this.gridColumn18.Visible = true;
			this.gridColumn18.VisibleIndex = 19;
			this.gridColumn18.VisibleIndex = 15;
			this.gridColumn18.Width = 94;
			//
			// gridColumn19
			@@ -659,7 +655,7 @@
			this.gridColumn19.MinWidth = 25;
			this.gridColumn19.Name = "gridColumn19";
			this.gridColumn19.Visible = true;
			this.gridColumn19.VisibleIndex = 20;
			this.gridColumn19.VisibleIndex = 16;
			this.gridColumn19.Width = 94;
			//
			// gridColumn30
			@@ -676,8 +672,6 @@
			this.gridColumn13.FieldName = "daa020";
			this.gridColumn13.MinWidth = 25;
			this.gridColumn13.Name = "gridColumn13";
			this.gridColumn13.Visible = true;
			this.gridColumn13.VisibleIndex = 21;
			this.gridColumn13.Width = 94;
			//
			// gridColumn17
			@@ -690,12 +684,12 @@
			//
			// gridColumn5
			//
			this.gridColumn5.Caption = "检验状态";
			this.gridColumn5.FieldName = "checkStates";
			this.gridColumn5.Caption = "审核状态";
			this.gridColumn5.FieldName = "txtColor";
			this.gridColumn5.MinWidth = 25;
			this.gridColumn5.Name = "gridColumn5";
			this.gridColumn5.Visible = true;
			this.gridColumn5.VisibleIndex = 4;
			this.gridColumn5.VisibleIndex = 5;
			this.gridColumn5.Width = 94;
			//
			// gridColumn6
			@@ -705,7 +699,7 @@
			this.gridColumn6.MinWidth = 25;
			this.gridColumn6.Name = "gridColumn6";
			this.gridColumn6.Visible = true;
			this.gridColumn6.VisibleIndex = 22;
			this.gridColumn6.VisibleIndex = 1;
			this.gridColumn6.Width = 94;
			//
			// rptButtonUrl
			@@ -718,6 +712,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 = 17;
			this.gridColumn7.Width = 94;
			//
			// pageBar1
			//
			@@ -735,6 +739,7 @@
			//
			this.xtraTabPage2.Controls.Add(this.splitMx1);
			this.xtraTabPage2.Name = "xtraTabPage2";
			this.xtraTabPage2.PageVisible = false;
			this.xtraTabPage2.Size = new System.Drawing.Size(1342, 688);
			this.xtraTabPage2.Text = "数据详细";
			//
			@@ -2218,5 +2223,6 @@
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
			private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptButtonUrl;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
			}
			}