~tjx/GsMesClient.git

			@@ -53,26 +53,23 @@
			this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
			this.gcMain1 = new DevExpress.XtraGrid.GridControl();
			this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
			this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_pba005 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_pba009 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn3 = 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.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.pageBar1 = new UserControls.Data.UcPageBar();
			this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
			this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
			@@ -361,46 +358,29 @@
			this.gridView1.Appearance.Row.Options.UseFont = true;
			this.gridView1.ColumnPanelRowHeight = 50;
			this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
			this.gv_fstatus,
			this.gridColumn4,
			this.gridColumn1,
			this.gridColumn2,
			this.gv_checkUser,
			this.gv_checkDate,
			this.gv_pba005,
			this.gv_pba006,
			this.gv_pba009,
			this.gridColumn5,
			this.gridColumn3,
			this.gridColumn6,
			this.gridColumn7,
			this.gridColumn8,
			this.gridColumn9,
			this.gridColumn10,
			this.gridColumn11,
			this.gridColumn12,
			this.gridColumn13,
			this.gridColumn14});
			this.gridColumn14,
			this.gridColumn15,
			this.gridColumn16,
			this.gridColumn17,
			this.gridColumn18,
			this.gridColumn3,
			this.gridColumn5,
			this.gridColumn6,
			this.gridColumn7,
			this.gridColumn11});
			this.gridView1.GridControl = this.gcMain1;
			this.gridView1.IndicatorWidth = 50;
			this.gridView1.Name = "gridView1";
			this.gridView1.OptionsFind.ShowSearchNavButtons = false;
			this.gridView1.OptionsView.ShowAutoFilterRow = true;
			this.gridView1.OptionsView.ShowGroupPanel = false;
			//
			// gv_fstatus
			//
			this.gv_fstatus.AppearanceCell.Options.UseFont = true;
			this.gv_fstatus.Caption = "审核标识";
			this.gv_fstatus.FieldName = "chkStatus";
			this.gv_fstatus.MaxWidth = 50;
			this.gv_fstatus.MinWidth = 50;
			this.gv_fstatus.Name = "gv_fstatus";
			this.gv_fstatus.OptionsColumn.AllowEdit = false;
			this.gv_fstatus.Tag = "query_a.fstatus";
			this.gv_fstatus.Visible = true;
			this.gv_fstatus.VisibleIndex = 0;
			this.gv_fstatus.Width = 50;
			//
			// gridColumn4
			//
			@@ -417,7 +397,7 @@
			this.gridColumn1.MinWidth = 25;
			this.gridColumn1.Name = "gridColumn1";
			this.gridColumn1.Visible = true;
			this.gridColumn1.VisibleIndex = 1;
			this.gridColumn1.VisibleIndex = 4;
			this.gridColumn1.Width = 94;
			//
			// gridColumn2
			@@ -427,7 +407,7 @@
			this.gridColumn2.Name = "gridColumn2";
			this.gridColumn2.OptionsColumn.AllowEdit = false;
			this.gridColumn2.Visible = true;
			this.gridColumn2.VisibleIndex = 2;
			this.gridColumn2.VisibleIndex = 5;
			this.gridColumn2.Width = 150;
			//
			// gv_checkUser
			@@ -439,94 +419,8 @@
			this.gv_checkUser.OptionsColumn.AllowEdit = false;
			this.gv_checkUser.Tag = "query_a.check_user";
			this.gv_checkUser.Visible = true;
			this.gv_checkUser.VisibleIndex = 3;
			this.gv_checkUser.VisibleIndex = 6;
			this.gv_checkUser.Width = 94;
			//
			// gv_checkDate
			//
			this.gv_checkDate.AppearanceCell.Options.UseFont = true;
			this.gv_checkDate.Caption = "审核者";
			this.gv_checkDate.FieldName = "checkBy";
			this.gv_checkDate.Name = "gv_checkDate";
			this.gv_checkDate.OptionsColumn.AllowEdit = false;
			this.gv_checkDate.Tag = "query_a.check_date";
			this.gv_checkDate.Visible = true;
			this.gv_checkDate.VisibleIndex = 4;
			this.gv_checkDate.Width = 180;
			//
			// gv_pba005
			//
			this.gv_pba005.AppearanceCell.Options.UseFont = true;
			this.gv_pba005.Caption = "审核时间";
			this.gv_pba005.FieldName = "checkDate";
			this.gv_pba005.Name = "gv_pba005";
			this.gv_pba005.OptionsColumn.AllowEdit = false;
			this.gv_pba005.Tag = "query_a.pba005";
			this.gv_pba005.Visible = true;
			this.gv_pba005.VisibleIndex = 5;
			this.gv_pba005.Width = 94;
			//
			// gv_pba006
			//
			this.gv_pba006.AppearanceCell.Options.UseFont = true;
			this.gv_pba006.Caption = "处置意见";
			this.gv_pba006.FieldName = "handSuggestion";
			this.gv_pba006.Name = "gv_pba006";
			this.gv_pba006.OptionsColumn.AllowEdit = false;
			this.gv_pba006.Tag = "query_a.pba006";
			this.gv_pba006.Visible = true;
			this.gv_pba006.VisibleIndex = 6;
			this.gv_pba006.Width = 180;
			//
			// gv_pba009
			//
			this.gv_pba009.AppearanceCell.Options.UseFont = true;
			this.gv_pba009.Caption = "选别类别";
			this.gv_pba009.FieldName = "chooseType";
			this.gv_pba009.Name = "gv_pba009";
			this.gv_pba009.OptionsColumn.AllowEdit = false;
			this.gv_pba009.Tag = "query_a.pba009";
			this.gv_pba009.Visible = true;
			this.gv_pba009.VisibleIndex = 7;
			this.gv_pba009.Width = 100;
			//
			// gridColumn5
			//
			this.gridColumn5.Caption = "选别数量";
			this.gridColumn5.FieldName = "chooseQty";
			this.gridColumn5.MinWidth = 25;
			this.gridColumn5.Name = "gridColumn5";
			this.gridColumn5.Width = 94;
			//
			// gridColumn3
			//
			this.gridColumn3.Caption = "选别良品数";
			this.gridColumn3.FieldName = "chooseGoodQty";
			this.gridColumn3.MinWidth = 25;
			this.gridColumn3.Name = "gridColumn3";
			this.gridColumn3.Visible = true;
			this.gridColumn3.VisibleIndex = 8;
			this.gridColumn3.Width = 94;
			//
			// gridColumn6
			//
			this.gridColumn6.Caption = "选别不良品数";
			this.gridColumn6.FieldName = "chooseBadQty";
			this.gridColumn6.MinWidth = 25;
			this.gridColumn6.Name = "gridColumn6";
			this.gridColumn6.Visible = true;
			this.gridColumn6.VisibleIndex = 9;
			this.gridColumn6.Width = 94;
			//
			// gridColumn7
			//
			this.gridColumn7.Caption = "判定结果";
			this.gridColumn7.FieldName = "handResult";
			this.gridColumn7.MinWidth = 25;
			this.gridColumn7.Name = "gridColumn7";
			this.gridColumn7.Visible = true;
			this.gridColumn7.VisibleIndex = 10;
			this.gridColumn7.Width = 94;
			//
			// gridColumn8
			//
			@@ -534,8 +428,6 @@
			this.gridColumn8.FieldName = "itemNo";
			this.gridColumn8.MinWidth = 25;
			this.gridColumn8.Name = "gridColumn8";
			this.gridColumn8.Visible = true;
			this.gridColumn8.VisibleIndex = 11;
			this.gridColumn8.Width = 94;
			//
			// gridColumn9
			@@ -545,7 +437,7 @@
			this.gridColumn9.MinWidth = 25;
			this.gridColumn9.Name = "gridColumn9";
			this.gridColumn9.Visible = true;
			this.gridColumn9.VisibleIndex = 12;
			this.gridColumn9.VisibleIndex = 7;
			this.gridColumn9.Width = 94;
			//
			// gridColumn10
			@@ -554,39 +446,7 @@
			this.gridColumn10.FieldName = "itemModel";
			this.gridColumn10.MinWidth = 25;
			this.gridColumn10.Name = "gridColumn10";
			this.gridColumn10.Visible = true;
			this.gridColumn10.VisibleIndex = 13;
			this.gridColumn10.Width = 94;
			//
			// gridColumn11
			//
			this.gridColumn11.Caption = "供应商";
			this.gridColumn11.FieldName = "gysName";
			this.gridColumn11.MinWidth = 25;
			this.gridColumn11.Name = "gridColumn11";
			this.gridColumn11.Visible = true;
			this.gridColumn11.VisibleIndex = 14;
			this.gridColumn11.Width = 94;
			//
			// gridColumn12
			//
			this.gridColumn12.Caption = "到货日期";
			this.gridColumn12.FieldName = "dhdDate";
			this.gridColumn12.MinWidth = 25;
			this.gridColumn12.Name = "gridColumn12";
			this.gridColumn12.Visible = true;
			this.gridColumn12.VisibleIndex = 15;
			this.gridColumn12.Width = 94;
			//
			// gridColumn13
			//
			this.gridColumn13.Caption = "到货单号";
			this.gridColumn13.FieldName = "dhdNo";
			this.gridColumn13.MinWidth = 25;
			this.gridColumn13.Name = "gridColumn13";
			this.gridColumn13.Visible = true;
			this.gridColumn13.VisibleIndex = 16;
			this.gridColumn13.Width = 94;
			//
			// gridColumn14
			//
			@@ -595,8 +455,98 @@
			this.gridColumn14.MinWidth = 25;
			this.gridColumn14.Name = "gridColumn14";
			this.gridColumn14.Visible = true;
			this.gridColumn14.VisibleIndex = 17;
			this.gridColumn14.VisibleIndex = 11;
			this.gridColumn14.Width = 94;
			//
			// gridColumn15
			//
			this.gridColumn15.Caption = "线别";
			this.gridColumn15.FieldName = "lineName";
			this.gridColumn15.MinWidth = 25;
			this.gridColumn15.Name = "gridColumn15";
			this.gridColumn15.Visible = true;
			this.gridColumn15.VisibleIndex = 0;
			this.gridColumn15.Width = 94;
			//
			// gridColumn16
			//
			this.gridColumn16.Caption = "生产工单";
			this.gridColumn16.FieldName = "daaNo";
			this.gridColumn16.MinWidth = 25;
			this.gridColumn16.Name = "gridColumn16";
			this.gridColumn16.Visible = true;
			this.gridColumn16.VisibleIndex = 8;
			this.gridColumn16.Width = 94;
			//
			// gridColumn17
			//
			this.gridColumn17.Caption = "问题等级";
			this.gridColumn17.FieldName = "wtdj";
			this.gridColumn17.MinWidth = 25;
			this.gridColumn17.Name = "gridColumn17";
			this.gridColumn17.Visible = true;
			this.gridColumn17.VisibleIndex = 2;
			this.gridColumn17.Width = 94;
			//
			// gridColumn18
			//
			this.gridColumn18.Caption = "不良原因";
			this.gridColumn18.FieldName = "wtMs";
			this.gridColumn18.MinWidth = 25;
			this.gridColumn18.Name = "gridColumn18";
			this.gridColumn18.Visible = true;
			this.gridColumn18.VisibleIndex = 3;
			this.gridColumn18.Width = 94;
			//
			// gridColumn3
			//
			this.gridColumn3.Caption = "检验人";
			this.gridColumn3.FieldName = "jyUser";
			this.gridColumn3.MinWidth = 25;
			this.gridColumn3.Name = "gridColumn3";
			this.gridColumn3.Visible = true;
			this.gridColumn3.VisibleIndex = 9;
			this.gridColumn3.Width = 94;
			//
			// gridColumn5
			//
			this.gridColumn5.Caption = "检验日期";
			this.gridColumn5.FieldName = "jyDate";
			this.gridColumn5.MinWidth = 25;
			this.gridColumn5.Name = "gridColumn5";
			this.gridColumn5.Visible = true;
			this.gridColumn5.VisibleIndex = 10;
			this.gridColumn5.Width = 94;
			//
			// gridColumn6
			//
			this.gridColumn6.Caption = "责任人";
			this.gridColumn6.FieldName = "fzrName";
			this.gridColumn6.MinWidth = 25;
			this.gridColumn6.Name = "gridColumn6";
			this.gridColumn6.Visible = true;
			this.gridColumn6.VisibleIndex = 12;
			this.gridColumn6.Width = 94;
			//
			// gridColumn7
			//
			this.gridColumn7.Caption = "责任判定";
			this.gridColumn7.FieldName = "zrType";
			this.gridColumn7.MinWidth = 25;
			this.gridColumn7.Name = "gridColumn7";
			this.gridColumn7.Visible = true;
			this.gridColumn7.VisibleIndex = 13;
			this.gridColumn7.Width = 94;
			//
			// gridColumn11
			//
			this.gridColumn11.Caption = "异常单号";
			this.gridColumn11.FieldName = "fBillNo";
			this.gridColumn11.MinWidth = 25;
			this.gridColumn11.Name = "gridColumn11";
			this.gridColumn11.Visible = true;
			this.gridColumn11.VisibleIndex = 1;
			this.gridColumn11.Width = 94;
			//
			// pageBar1
			//
			@@ -1708,7 +1658,7 @@
			this.Controls.Add(this.xtraTabControl1);
			this.Controls.Add(this.toolBarMenu1);
			this.Name = "MesFqcExceptional";
			this.Text = "IQC异常报告";
			this.Text = "FQC异常报告";
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
			this.xtraTabControl1.ResumeLayout(false);
			this.xtraTabPage1.ResumeLayout(false);
			@@ -1832,28 +1782,16 @@
			private DevExpress.XtraEditors.SplitContainerControl split1;
			private DevExpress.XtraGrid.GridControl gcMain1;
			private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
			private DevExpress.XtraGrid.Columns.GridColumn gv_fstatus;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
			private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
			private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
			private DevExpress.XtraGrid.Columns.GridColumn gv_pba005;
			private DevExpress.XtraGrid.Columns.GridColumn gv_pba006;
			private DevExpress.XtraGrid.Columns.GridColumn gv_pba009;
			private UserControls.Data.UcPageBar pageBar1;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
			private DevExpress.Utils.ToolTipController tips;
			private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
			@@ -1951,5 +1889,14 @@
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
			}
			}