~tjx/GsMesClient.git

			@@ -68,7 +68,6 @@
			this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_fcovertQty = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_fbatchQty = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_fcheckResu = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_remarks = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_fcheckBy = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_fcheckDate = new DevExpress.XtraGrid.Columns.GridColumn();
			@@ -153,6 +152,10 @@
			this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
			this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
			this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
			this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
			@@ -218,10 +221,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.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
			this.xtraTabControl1.SuspendLayout();
			@@ -304,6 +303,10 @@
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
			this.xtraTabControl2.SuspendLayout();
			this.tabMxPage1.SuspendLayout();
			@@ -347,10 +350,6 @@
			((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
			this.SuspendLayout();
			//
			// repositoryItemComboBox1
			@@ -452,7 +451,6 @@
			this.gridColumn14,
			this.gv_fcovertQty,
			this.gv_fbatchQty,
			this.gv_fcheckResu,
			this.gv_remarks,
			this.gv_fcheckBy,
			this.gv_fcheckDate,
			@@ -633,19 +631,6 @@
			this.gv_fbatchQty.VisibleIndex = 12;
			this.gv_fbatchQty.Width = 80;
			//
			// gv_fcheckResu
			//
			this.gv_fcheckResu.AppearanceCell.Options.UseFont = true;
			this.gv_fcheckResu.Caption = "检验结果";
			this.gv_fcheckResu.FieldName = "fcheckResu";
			this.gv_fcheckResu.MinWidth = 30;
			this.gv_fcheckResu.Name = "gv_fcheckResu";
			this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
			this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
			this.gv_fcheckResu.Visible = true;
			this.gv_fcheckResu.VisibleIndex = 13;
			this.gv_fcheckResu.Width = 50;
			//
			// gv_remarks
			//
			this.gv_remarks.AppearanceCell.Options.UseFont = true;
			@@ -656,7 +641,7 @@
			this.gv_remarks.OptionsColumn.AllowEdit = false;
			this.gv_remarks.Tag = "query_a.remarks";
			this.gv_remarks.Visible = true;
			this.gv_remarks.VisibleIndex = 14;
			this.gv_remarks.VisibleIndex = 13;
			this.gv_remarks.Width = 100;
			//
			// gv_fcheckBy
			@@ -669,7 +654,7 @@
			this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
			this.gv_fcheckBy.Tag = "query_a.fcheck_by";
			this.gv_fcheckBy.Visible = true;
			this.gv_fcheckBy.VisibleIndex = 15;
			this.gv_fcheckBy.VisibleIndex = 14;
			this.gv_fcheckBy.Width = 118;
			//
			// gv_fcheckDate
			@@ -682,7 +667,7 @@
			this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
			this.gv_fcheckDate.Tag = "query_a.fcheck_date";
			this.gv_fcheckDate.Visible = true;
			this.gv_fcheckDate.VisibleIndex = 16;
			this.gv_fcheckDate.VisibleIndex = 15;
			this.gv_fcheckDate.Width = 182;
			//
			// gv_createBy
			@@ -695,7 +680,7 @@
			this.gv_createBy.OptionsColumn.AllowEdit = false;
			this.gv_createBy.Tag = "query_a.create_by";
			this.gv_createBy.Visible = true;
			this.gv_createBy.VisibleIndex = 17;
			this.gv_createBy.VisibleIndex = 16;
			this.gv_createBy.Width = 67;
			//
			// gridColumn15
			@@ -705,7 +690,7 @@
			this.gridColumn15.MinWidth = 25;
			this.gridColumn15.Name = "gridColumn15";
			this.gridColumn15.Visible = true;
			this.gridColumn15.VisibleIndex = 18;
			this.gridColumn15.VisibleIndex = 17;
			this.gridColumn15.Width = 94;
			//
			// gv_lastupdateBy
			@@ -718,7 +703,7 @@
			this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
			this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
			this.gv_lastupdateBy.Visible = true;
			this.gv_lastupdateBy.VisibleIndex = 19;
			this.gv_lastupdateBy.VisibleIndex = 18;
			this.gv_lastupdateBy.Width = 60;
			//
			// gv_lastupdateDate
			@@ -731,7 +716,7 @@
			this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
			this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
			this.gv_lastupdateDate.Visible = true;
			this.gv_lastupdateDate.VisibleIndex = 20;
			this.gv_lastupdateDate.VisibleIndex = 19;
			this.gv_lastupdateDate.Width = 120;
			//
			// gridColumn18
			@@ -741,7 +726,7 @@
			this.gridColumn18.MinWidth = 25;
			this.gridColumn18.Name = "gridColumn18";
			this.gridColumn18.Visible = true;
			this.gridColumn18.VisibleIndex = 21;
			this.gridColumn18.VisibleIndex = 20;
			this.gridColumn18.Width = 94;
			//
			// gridColumn19
			@@ -751,7 +736,7 @@
			this.gridColumn19.MinWidth = 25;
			this.gridColumn19.Name = "gridColumn19";
			this.gridColumn19.Visible = true;
			this.gridColumn19.VisibleIndex = 22;
			this.gridColumn19.VisibleIndex = 21;
			this.gridColumn19.Width = 94;
			//
			// gridColumn30
			@@ -769,7 +754,7 @@
			this.gridColumn13.MinWidth = 25;
			this.gridColumn13.Name = "gridColumn13";
			this.gridColumn13.Visible = true;
			this.gridColumn13.VisibleIndex = 23;
			this.gridColumn13.VisibleIndex = 22;
			this.gridColumn13.Width = 94;
			//
			// gridColumn17
			@@ -787,7 +772,7 @@
			this.gridColumn7.MinWidth = 25;
			this.gridColumn7.Name = "gridColumn7";
			this.gridColumn7.Visible = true;
			this.gridColumn7.VisibleIndex = 24;
			this.gridColumn7.VisibleIndex = 23;
			this.gridColumn7.Width = 94;
			//
			// pageBar1
			@@ -943,7 +928,7 @@
			this.txt_msg.Size = new System.Drawing.Size(328, 83);
			this.txt_msg.TabIndex = 814;
			this.txt_msg.TextTxt = "";
			this.txt_msg.WhereTxt = null;
			this.txt_msg.WhereTxt = " a.s_type=\'违规类别\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
			//
			// txt_suppId
			//
			@@ -1650,6 +1635,52 @@
			this.layoutControlItem25.Text = "返工工序";
			this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem16
			//
			this.layoutControlItem16.Control = this.txt_fsubmitDate;
			this.layoutControlItem16.Location = new System.Drawing.Point(660, 174);
			this.layoutControlItem16.Name = "layoutControlItem16";
			this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 6;
			this.layoutControlItem16.Size = new System.Drawing.Size(330, 29);
			this.layoutControlItem16.Text = "审核人员";
			this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem15
			//
			this.layoutControlItem15.Control = this.txt_fsubmitBy;
			this.layoutControlItem15.Location = new System.Drawing.Point(660, 203);
			this.layoutControlItem15.Name = "layoutControlItem15";
			this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7;
			this.layoutControlItem15.Size = new System.Drawing.Size(330, 29);
			this.layoutControlItem15.Text = "审核日期";
			this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem14
			//
			this.layoutControlItem14.Control = this.txt_fsubmit;
			this.layoutControlItem14.Location = new System.Drawing.Point(660, 232);
			this.layoutControlItem14.Name = "layoutControlItem14";
			this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 8;
			this.layoutControlItem14.Size = new System.Drawing.Size(330, 30);
			this.layoutControlItem14.Text = "审核标识";
			this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem14.TextVisible = false;
			//
			// layoutControlItem27
			//
			this.layoutControlItem27.Control = this.txt_msg;
			this.layoutControlItem27.Location = new System.Drawing.Point(990, 0);
			this.layoutControlItem27.Name = "layoutControlItem27";
			this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 3;
			this.layoutControlItem27.Size = new System.Drawing.Size(332, 87);
			this.layoutControlItem27.Text = "违规类别";
			this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem27.TextVisible = false;
			//
			// xtraTabControl2
			//
			this.xtraTabControl2.Dock = System.Windows.Forms.DockStyle.Fill;
			@@ -1973,7 +2004,7 @@
			this.gridColumn10.AppearanceCell.Options.UseForeColor = true;
			this.gridColumn10.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
			this.gridColumn10.AppearanceHeader.Options.UseForeColor = true;
			this.gridColumn10.Caption = "缺陷描述";
			this.gridColumn10.Caption = "异常描述";
			this.gridColumn10.ColumnEdit = this.rptDefectDetails;
			this.gridColumn10.FieldName = "defectDetails";
			this.gridColumn10.MinWidth = 25;
			@@ -2402,52 +2433,6 @@
			//
			this.gridView4.Name = "gridView4";
			//
			// layoutControlItem16
			//
			this.layoutControlItem16.Control = this.txt_fsubmitDate;
			this.layoutControlItem16.Location = new System.Drawing.Point(660, 174);
			this.layoutControlItem16.Name = "layoutControlItem16";
			this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 6;
			this.layoutControlItem16.Size = new System.Drawing.Size(330, 29);
			this.layoutControlItem16.Text = "审核人员";
			this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem15
			//
			this.layoutControlItem15.Control = this.txt_fsubmitBy;
			this.layoutControlItem15.Location = new System.Drawing.Point(660, 203);
			this.layoutControlItem15.Name = "layoutControlItem15";
			this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7;
			this.layoutControlItem15.Size = new System.Drawing.Size(330, 29);
			this.layoutControlItem15.Text = "审核日期";
			this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem14
			//
			this.layoutControlItem14.Control = this.txt_fsubmit;
			this.layoutControlItem14.Location = new System.Drawing.Point(660, 232);
			this.layoutControlItem14.Name = "layoutControlItem14";
			this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 8;
			this.layoutControlItem14.Size = new System.Drawing.Size(330, 30);
			this.layoutControlItem14.Text = "审核标识";
			this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem14.TextVisible = false;
			//
			// layoutControlItem27
			//
			this.layoutControlItem27.Control = this.txt_msg;
			this.layoutControlItem27.Location = new System.Drawing.Point(990, 0);
			this.layoutControlItem27.Name = "layoutControlItem27";
			this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 3;
			this.layoutControlItem27.Size = new System.Drawing.Size(332, 87);
			this.layoutControlItem27.Text = "违规类别";
			this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem27.TextVisible = false;
			//
			// Frm_FqcDetect01
			//
			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
			@@ -2540,6 +2525,10 @@
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
			this.xtraTabControl2.ResumeLayout(false);
			this.tabMxPage1.ResumeLayout(false);
			@@ -2583,10 +2572,6 @@
			((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
			this.ResumeLayout(false);

			}
			@@ -2608,7 +2593,6 @@
			private DevExpress.XtraGrid.Columns.GridColumn gv_boardStyle;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
			private DevExpress.XtraGrid.Columns.GridColumn gv_fbatchQty;
			private DevExpress.XtraGrid.Columns.GridColumn gv_fcheckResu;
			private DevExpress.XtraGrid.Columns.GridColumn gv_fcovertQty;
			private DevExpress.XtraGrid.Columns.GridColumn gv_remarks;
			private DevExpress.XtraGrid.Columns.GridColumn gv_createBy;