~tjx/GsMesClient.git

			@@ -66,6 +66,7 @@
			this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.pageBar1 = new UserControls.Data.UcPageBar();
			this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
			this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
			@@ -121,7 +122,6 @@
			this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
			this.tips = new DevExpress.Utils.ToolTipController(this.components);
			this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
			this.xtraTabControl1.SuspendLayout();
			this.xtraTabPage1.SuspendLayout();
			@@ -442,7 +442,7 @@
			// gridColumn18
			//
			this.gridColumn18.Caption = "OA处理状态";
			this.gridColumn18.FieldName = "oaCheckStatusTxt";
			this.gridColumn18.FieldName = "txtColor";
			this.gridColumn18.MinWidth = 25;
			this.gridColumn18.Name = "gridColumn18";
			this.gridColumn18.Visible = true;
			@@ -458,6 +458,16 @@
			this.gridColumn19.Visible = true;
			this.gridColumn19.VisibleIndex = 9;
			this.gridColumn19.Width = 94;
			//
			// gridColumn20
			//
			this.gridColumn20.Caption = "收料组织";
			this.gridColumn20.FieldName = "fSubsidiary";
			this.gridColumn20.MinWidth = 25;
			this.gridColumn20.Name = "gridColumn20";
			this.gridColumn20.Visible = true;
			this.gridColumn20.VisibleIndex = 15;
			this.gridColumn20.Width = 94;
			//
			// pageBar1
			//
			@@ -1078,16 +1088,6 @@
			this.layoutControlItem10.Name = "layoutControlItem10";
			this.layoutControlItem10.Size = new System.Drawing.Size(0, 0);
			this.layoutControlItem10.TextSize = new System.Drawing.Size(50, 20);
			//
			// gridColumn20
			//
			this.gridColumn20.Caption = "收料组织";
			this.gridColumn20.FieldName = "fSubsidiary";
			this.gridColumn20.MinWidth = 25;
			this.gridColumn20.Name = "gridColumn20";
			this.gridColumn20.Visible = true;
			this.gridColumn20.VisibleIndex = 15;
			this.gridColumn20.Width = 94;
			//
			// MesQcExceptional
			//