lu
2025-09-10 bb59b3c2baa039889b74aef492a90883d69c4855
Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
已修改2个文件
965 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs 858 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs 107 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.Designer.cs
@@ -88,8 +88,8 @@
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_JY_USER = new DevExpress.XtraEditors.TextEdit();
            this.txt_checkBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_jyUSER = new DevExpress.XtraEditors.TextEdit();
            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
            this.txt_Guid = new DevExpress.XtraEditors.TextEdit();
            this.txt_ItemModel = new DevExpress.XtraEditors.TextEdit();
            this.txt_LineNo = new DevExpress.XtraEditors.TextEdit();
@@ -101,53 +101,53 @@
            this.txt_Voltage = new DevExpress.XtraEditors.TextEdit();
            this.txt_Batch = new DevExpress.XtraEditors.TextEdit();
            this.txt_Classes = new DevExpress.XtraEditors.TextEdit();
            this.txt_AcRe_A = new DevExpress.XtraEditors.TextEdit();
            this.txt_AcRe_B = new DevExpress.XtraEditors.TextEdit();
            this.txt_AcRe_C = new DevExpress.XtraEditors.TextEdit();
            this.txt_acReA = new DevExpress.XtraEditors.TextEdit();
            this.txt_acReB = new DevExpress.XtraEditors.TextEdit();
            this.txt_acReC = new DevExpress.XtraEditors.TextEdit();
            this.txt_SampleSize1 = new DevExpress.XtraEditors.TextEdit();
            this.txt_SampleSize2 = new DevExpress.XtraEditors.TextEdit();
            this.txt_SampleSize3 = new DevExpress.XtraEditors.TextEdit();
            this.txt_SP_USER = new DevExpress.XtraEditors.TextEdit();
            this.txt_Remark = new DevExpress.XtraEditors.TextEdit();
            this.txt_CheckResult = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_ProcessResults = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_SampleMethod = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_ProductionDate = new DevExpress.XtraEditors.DateEdit();
            this.txt_productionDate = new DevExpress.XtraEditors.DateEdit();
            this.txt_SP_DATE = new DevExpress.XtraEditors.DateEdit();
            this.txt_JY_DATE = new DevExpress.XtraEditors.DateEdit();
            this.txt_checkDate = new DevExpress.XtraEditors.DateEdit();
            this.txt_OrgName = new DevExpress.XtraEditors.TextEdit();
            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
            this.txt_checkResult = new DevExpress.XtraEditors.TextEdit();
            this.txt_jyDATE = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
            this.gridControl1 = new DevExpress.XtraGrid.GridControl();
@@ -185,7 +185,6 @@
            this.repositoryItemSearchLookUpEdit2View = new DevExpress.XtraGrid.Views.Grid.GridView();
            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
            this.tips = new DevExpress.Utils.ToolTipController(this.components);
            this.picCheckBox = new System.Windows.Forms.PictureBox();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
            this.xtraTabPage1.SuspendLayout();
@@ -205,8 +204,8 @@
            this.splitMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_JY_USER.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_jyUSER.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ItemModel.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_LineNo.Properties)).BeginInit();
@@ -218,57 +217,55 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_Voltage.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_Batch.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_Classes.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_AcRe_A.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_AcRe_B.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_AcRe_C.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_acReA.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_acReB.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_acReC.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_SampleSize1.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_SampleSize2.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_SampleSize3.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_SP_USER.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_CheckResult.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ProcessResults.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_SampleMethod.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ProductionDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ProductionDate.Properties.CalendarTimeProperties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_productionDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_productionDate.Properties.CalendarTimeProperties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_SP_DATE.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_SP_DATE.Properties.CalendarTimeProperties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_JY_DATE.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_JY_DATE.Properties.CalendarTimeProperties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties.CalendarTimeProperties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_OrgName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkResult.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_jyDATE.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
            this.xtraTabControl2.SuspendLayout();
            this.xtraTabPage3.SuspendLayout();
@@ -281,7 +278,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit2View)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
            this.SuspendLayout();
            // 
            // toolBarMenu1
@@ -704,8 +700,8 @@
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_JY_USER);
            this.layoutMx1.Controls.Add(this.txt_checkBy);
            this.layoutMx1.Controls.Add(this.txt_jyUSER);
            this.layoutMx1.Controls.Add(this.txt_checkUser);
            this.layoutMx1.Controls.Add(this.txt_Guid);
            this.layoutMx1.Controls.Add(this.txt_ItemModel);
            this.layoutMx1.Controls.Add(this.txt_LineNo);
@@ -717,22 +713,22 @@
            this.layoutMx1.Controls.Add(this.txt_Voltage);
            this.layoutMx1.Controls.Add(this.txt_Batch);
            this.layoutMx1.Controls.Add(this.txt_Classes);
            this.layoutMx1.Controls.Add(this.txt_AcRe_A);
            this.layoutMx1.Controls.Add(this.txt_AcRe_B);
            this.layoutMx1.Controls.Add(this.txt_AcRe_C);
            this.layoutMx1.Controls.Add(this.txt_acReA);
            this.layoutMx1.Controls.Add(this.txt_acReB);
            this.layoutMx1.Controls.Add(this.txt_acReC);
            this.layoutMx1.Controls.Add(this.txt_SampleSize1);
            this.layoutMx1.Controls.Add(this.txt_SampleSize2);
            this.layoutMx1.Controls.Add(this.txt_SampleSize3);
            this.layoutMx1.Controls.Add(this.txt_SP_USER);
            this.layoutMx1.Controls.Add(this.txt_Remark);
            this.layoutMx1.Controls.Add(this.txt_CheckResult);
            this.layoutMx1.Controls.Add(this.txt_ProcessResults);
            this.layoutMx1.Controls.Add(this.txt_SampleMethod);
            this.layoutMx1.Controls.Add(this.txt_ProductionDate);
            this.layoutMx1.Controls.Add(this.txt_productionDate);
            this.layoutMx1.Controls.Add(this.txt_SP_DATE);
            this.layoutMx1.Controls.Add(this.txt_JY_DATE);
            this.layoutMx1.Controls.Add(this.txt_checkDate);
            this.layoutMx1.Controls.Add(this.txt_OrgName);
            this.layoutMx1.Controls.Add(this.txt_checkDate);
            this.layoutMx1.Controls.Add(this.txt_checkResult);
            this.layoutMx1.Controls.Add(this.txt_jyDATE);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem9});
@@ -755,26 +751,26 @@
            this.lbGuid.Text = "lbGuid";
            this.lbGuid.Visible = false;
            // 
            // txt_JY_USER
            // txt_jyUSER
            // 
            this.txt_JY_USER.Location = new System.Drawing.Point(114, 205);
            this.txt_JY_USER.Margin = new System.Windows.Forms.Padding(4);
            this.txt_JY_USER.Name = "txt_JY_USER";
            this.txt_JY_USER.Properties.Appearance.Options.UseFont = true;
            this.txt_JY_USER.Size = new System.Drawing.Size(241, 28);
            this.txt_JY_USER.StyleController = this.layoutMx1;
            this.txt_JY_USER.TabIndex = 231;
            this.txt_JY_USER.Tag = "";
            this.txt_jyUSER.Location = new System.Drawing.Point(1155, 12);
            this.txt_jyUSER.Margin = new System.Windows.Forms.Padding(4);
            this.txt_jyUSER.Name = "txt_jyUSER";
            this.txt_jyUSER.Properties.Appearance.Options.UseFont = true;
            this.txt_jyUSER.Size = new System.Drawing.Size(241, 28);
            this.txt_jyUSER.StyleController = this.layoutMx1;
            this.txt_jyUSER.TabIndex = 231;
            this.txt_jyUSER.Tag = "readonly";
            // 
            // txt_checkBy
            // txt_checkUser
            // 
            this.txt_checkBy.Location = new System.Drawing.Point(808, 205);
            this.txt_checkBy.Margin = new System.Windows.Forms.Padding(4);
            this.txt_checkBy.Name = "txt_checkBy";
            this.txt_checkBy.Size = new System.Drawing.Size(241, 28);
            this.txt_checkBy.StyleController = this.layoutMx1;
            this.txt_checkBy.TabIndex = 247;
            this.txt_checkBy.Tag = "";
            this.txt_checkUser.Location = new System.Drawing.Point(1155, 127);
            this.txt_checkUser.Margin = new System.Windows.Forms.Padding(4);
            this.txt_checkUser.Name = "txt_checkUser";
            this.txt_checkUser.Size = new System.Drawing.Size(241, 28);
            this.txt_checkUser.StyleController = this.layoutMx1;
            this.txt_checkUser.TabIndex = 247;
            this.txt_checkUser.Tag = "readonly";
            // 
            // txt_Guid
            // 
@@ -799,7 +795,7 @@
            // 
            // txt_LineNo
            // 
            this.txt_LineNo.Location = new System.Drawing.Point(1155, 12);
            this.txt_LineNo.Location = new System.Drawing.Point(808, 12);
            this.txt_LineNo.Margin = new System.Windows.Forms.Padding(4);
            this.txt_LineNo.Name = "txt_LineNo";
            this.txt_LineNo.Size = new System.Drawing.Size(241, 28);
@@ -849,7 +845,7 @@
            // 
            // txt_Temperature
            // 
            this.txt_Temperature.Location = new System.Drawing.Point(808, 12);
            this.txt_Temperature.Location = new System.Drawing.Point(1155, 244);
            this.txt_Temperature.Margin = new System.Windows.Forms.Padding(4);
            this.txt_Temperature.Name = "txt_Temperature";
            this.txt_Temperature.Size = new System.Drawing.Size(241, 28);
@@ -859,7 +855,7 @@
            // 
            // txt_Voltage
            // 
            this.txt_Voltage.Location = new System.Drawing.Point(808, 49);
            this.txt_Voltage.Location = new System.Drawing.Point(808, 244);
            this.txt_Voltage.Margin = new System.Windows.Forms.Padding(4);
            this.txt_Voltage.Name = "txt_Voltage";
            this.txt_Voltage.Size = new System.Drawing.Size(241, 28);
@@ -869,7 +865,7 @@
            // 
            // txt_Batch
            // 
            this.txt_Batch.Location = new System.Drawing.Point(1155, 49);
            this.txt_Batch.Location = new System.Drawing.Point(808, 49);
            this.txt_Batch.Margin = new System.Windows.Forms.Padding(4);
            this.txt_Batch.Name = "txt_Batch";
            this.txt_Batch.Size = new System.Drawing.Size(241, 28);
@@ -887,35 +883,35 @@
            this.txt_Classes.TabIndex = 250;
            this.txt_Classes.Tag = "";
            // 
            // txt_AcRe_A
            // txt_acReA
            // 
            this.txt_AcRe_A.Location = new System.Drawing.Point(114, 127);
            this.txt_AcRe_A.Margin = new System.Windows.Forms.Padding(4);
            this.txt_AcRe_A.Name = "txt_AcRe_A";
            this.txt_AcRe_A.Size = new System.Drawing.Size(241, 28);
            this.txt_AcRe_A.StyleController = this.layoutMx1;
            this.txt_AcRe_A.TabIndex = 250;
            this.txt_AcRe_A.Tag = "";
            this.txt_acReA.Location = new System.Drawing.Point(114, 127);
            this.txt_acReA.Margin = new System.Windows.Forms.Padding(4);
            this.txt_acReA.Name = "txt_acReA";
            this.txt_acReA.Size = new System.Drawing.Size(241, 28);
            this.txt_acReA.StyleController = this.layoutMx1;
            this.txt_acReA.TabIndex = 250;
            this.txt_acReA.Tag = "";
            // 
            // txt_AcRe_B
            // txt_acReB
            // 
            this.txt_AcRe_B.Location = new System.Drawing.Point(461, 127);
            this.txt_AcRe_B.Margin = new System.Windows.Forms.Padding(4);
            this.txt_AcRe_B.Name = "txt_AcRe_B";
            this.txt_AcRe_B.Size = new System.Drawing.Size(241, 28);
            this.txt_AcRe_B.StyleController = this.layoutMx1;
            this.txt_AcRe_B.TabIndex = 250;
            this.txt_AcRe_B.Tag = "";
            this.txt_acReB.Location = new System.Drawing.Point(461, 127);
            this.txt_acReB.Margin = new System.Windows.Forms.Padding(4);
            this.txt_acReB.Name = "txt_acReB";
            this.txt_acReB.Size = new System.Drawing.Size(241, 28);
            this.txt_acReB.StyleController = this.layoutMx1;
            this.txt_acReB.TabIndex = 250;
            this.txt_acReB.Tag = "";
            // 
            // txt_AcRe_C
            // txt_acReC
            // 
            this.txt_AcRe_C.Location = new System.Drawing.Point(808, 127);
            this.txt_AcRe_C.Margin = new System.Windows.Forms.Padding(4);
            this.txt_AcRe_C.Name = "txt_AcRe_C";
            this.txt_AcRe_C.Size = new System.Drawing.Size(241, 28);
            this.txt_AcRe_C.StyleController = this.layoutMx1;
            this.txt_AcRe_C.TabIndex = 250;
            this.txt_AcRe_C.Tag = "";
            this.txt_acReC.Location = new System.Drawing.Point(808, 127);
            this.txt_acReC.Margin = new System.Windows.Forms.Padding(4);
            this.txt_acReC.Name = "txt_acReC";
            this.txt_acReC.Size = new System.Drawing.Size(241, 28);
            this.txt_acReC.StyleController = this.layoutMx1;
            this.txt_acReC.TabIndex = 250;
            this.txt_acReC.Tag = "";
            // 
            // txt_SampleSize1
            // 
@@ -939,7 +935,7 @@
            // 
            // txt_SampleSize3
            // 
            this.txt_SampleSize3.Location = new System.Drawing.Point(1155, 166);
            this.txt_SampleSize3.Location = new System.Drawing.Point(114, 205);
            this.txt_SampleSize3.Margin = new System.Windows.Forms.Padding(4);
            this.txt_SampleSize3.Name = "txt_SampleSize3";
            this.txt_SampleSize3.Size = new System.Drawing.Size(241, 28);
@@ -949,7 +945,7 @@
            // 
            // txt_SP_USER
            // 
            this.txt_SP_USER.Location = new System.Drawing.Point(114, 244);
            this.txt_SP_USER.Location = new System.Drawing.Point(461, 283);
            this.txt_SP_USER.Margin = new System.Windows.Forms.Padding(4);
            this.txt_SP_USER.Name = "txt_SP_USER";
            this.txt_SP_USER.Properties.Appearance.Options.UseFont = true;
@@ -960,7 +956,7 @@
            // 
            // txt_Remark
            // 
            this.txt_Remark.Location = new System.Drawing.Point(808, 244);
            this.txt_Remark.Location = new System.Drawing.Point(461, 205);
            this.txt_Remark.Margin = new System.Windows.Forms.Padding(4);
            this.txt_Remark.Name = "txt_Remark";
            this.txt_Remark.Size = new System.Drawing.Size(241, 28);
@@ -968,26 +964,9 @@
            this.txt_Remark.TabIndex = 250;
            this.txt_Remark.Tag = "";
            // 
            // txt_CheckResult
            //
            this.txt_CheckResult.Location = new System.Drawing.Point(1155, 88);
            this.txt_CheckResult.Margin = new System.Windows.Forms.Padding(4);
            this.txt_CheckResult.Name = "txt_CheckResult";
            this.txt_CheckResult.Properties.Appearance.Options.UseFont = true;
            this.txt_CheckResult.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_CheckResult.Properties.Items.AddRange(new object[] {
            "未知",
            "合格",
            "不合格"});
            this.txt_CheckResult.Size = new System.Drawing.Size(241, 28);
            this.txt_CheckResult.StyleController = this.layoutMx1;
            this.txt_CheckResult.TabIndex = 228;
            this.txt_CheckResult.Tag = "";
            //
            // txt_ProcessResults
            // 
            this.txt_ProcessResults.Location = new System.Drawing.Point(1155, 127);
            this.txt_ProcessResults.Location = new System.Drawing.Point(461, 244);
            this.txt_ProcessResults.Margin = new System.Windows.Forms.Padding(4);
            this.txt_ProcessResults.Name = "txt_ProcessResults";
            this.txt_ProcessResults.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -1017,31 +996,30 @@
            this.txt_SampleMethod.TabIndex = 250;
            this.txt_SampleMethod.Tag = "";
            // 
            // txt_ProductionDate
            // txt_productionDate
            // 
            this.txt_ProductionDate.EditValue = null;
            this.txt_ProductionDate.Location = new System.Drawing.Point(461, 88);
            this.txt_ProductionDate.Margin = new System.Windows.Forms.Padding(4);
            this.txt_ProductionDate.Name = "txt_ProductionDate";
            this.txt_ProductionDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            this.txt_productionDate.EditValue = null;
            this.txt_productionDate.Location = new System.Drawing.Point(461, 88);
            this.txt_productionDate.Margin = new System.Windows.Forms.Padding(4);
            this.txt_productionDate.Name = "txt_productionDate";
            this.txt_productionDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_ProductionDate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            this.txt_productionDate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_ProductionDate.Properties.DisplayFormat.FormatString = "";
            this.txt_ProductionDate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.txt_ProductionDate.Properties.EditFormat.FormatString = "";
            this.txt_ProductionDate.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.txt_ProductionDate.Properties.Mask.EditMask = "";
            this.txt_ProductionDate.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.None;
            this.txt_ProductionDate.Size = new System.Drawing.Size(241, 28);
            this.txt_ProductionDate.StyleController = this.layoutMx1;
            this.txt_ProductionDate.TabIndex = 250;
            this.txt_ProductionDate.Tag = "";
            this.txt_productionDate.Properties.DisplayFormat.FormatString = "";
            this.txt_productionDate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.txt_productionDate.Properties.EditFormat.FormatString = "";
            this.txt_productionDate.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.txt_productionDate.Properties.MaskSettings.Set("mask", "");
            this.txt_productionDate.Size = new System.Drawing.Size(241, 28);
            this.txt_productionDate.StyleController = this.layoutMx1;
            this.txt_productionDate.TabIndex = 250;
            this.txt_productionDate.Tag = "";
            // 
            // txt_SP_DATE
            // 
            this.txt_SP_DATE.EditValue = null;
            this.txt_SP_DATE.Location = new System.Drawing.Point(461, 244);
            this.txt_SP_DATE.Location = new System.Drawing.Point(808, 283);
            this.txt_SP_DATE.Margin = new System.Windows.Forms.Padding(4);
            this.txt_SP_DATE.Name = "txt_SP_DATE";
            this.txt_SP_DATE.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
@@ -1059,57 +1037,50 @@
            this.txt_SP_DATE.TabIndex = 250;
            this.txt_SP_DATE.Tag = "";
            // 
            // txt_JY_DATE
            //
            this.txt_JY_DATE.EditValue = null;
            this.txt_JY_DATE.Location = new System.Drawing.Point(461, 205);
            this.txt_JY_DATE.Margin = new System.Windows.Forms.Padding(4);
            this.txt_JY_DATE.Name = "txt_JY_DATE";
            this.txt_JY_DATE.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_JY_DATE.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_JY_DATE.Properties.DisplayFormat.FormatString = "";
            this.txt_JY_DATE.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.txt_JY_DATE.Properties.EditFormat.FormatString = "";
            this.txt_JY_DATE.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.txt_JY_DATE.Properties.Mask.EditMask = "";
            this.txt_JY_DATE.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.None;
            this.txt_JY_DATE.Size = new System.Drawing.Size(241, 28);
            this.txt_JY_DATE.StyleController = this.layoutMx1;
            this.txt_JY_DATE.TabIndex = 250;
            this.txt_JY_DATE.Tag = "";
            //
            // txt_checkDate
            //
            this.txt_checkDate.EditValue = null;
            this.txt_checkDate.Location = new System.Drawing.Point(1155, 205);
            this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_checkDate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_checkDate.Properties.DisplayFormat.FormatString = "";
            this.txt_checkDate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.txt_checkDate.Properties.EditFormat.FormatString = "";
            this.txt_checkDate.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.txt_checkDate.Properties.Mask.EditMask = "";
            this.txt_checkDate.Properties.Mask.MaskType = DevExpress.XtraEditors.Mask.MaskType.None;
            this.txt_checkDate.Size = new System.Drawing.Size(241, 28);
            this.txt_checkDate.StyleController = this.layoutMx1;
            this.txt_checkDate.TabIndex = 248;
            this.txt_checkDate.Tag = "";
            //
            // txt_OrgName
            // 
            this.txt_OrgName.Location = new System.Drawing.Point(114, 283);
            this.txt_OrgName.Location = new System.Drawing.Point(114, 244);
            this.txt_OrgName.Margin = new System.Windows.Forms.Padding(4);
            this.txt_OrgName.Name = "txt_OrgName";
            this.txt_OrgName.Size = new System.Drawing.Size(241, 28);
            this.txt_OrgName.StyleController = this.layoutMx1;
            this.txt_OrgName.TabIndex = 250;
            this.txt_OrgName.Tag = "readonly";
            //
            // txt_checkDate
            //
            this.txt_checkDate.Location = new System.Drawing.Point(1155, 166);
            this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
            this.txt_checkDate.Name = "txt_checkDate";
            this.txt_checkDate.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.txt_checkDate.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.txt_checkDate.Size = new System.Drawing.Size(241, 28);
            this.txt_checkDate.StyleController = this.layoutMx1;
            this.txt_checkDate.TabIndex = 248;
            this.txt_checkDate.Tag = "readonly";
            //
            // txt_checkResult
            //
            this.txt_checkResult.Location = new System.Drawing.Point(1155, 88);
            this.txt_checkResult.Margin = new System.Windows.Forms.Padding(4);
            this.txt_checkResult.Name = "txt_checkResult";
            this.txt_checkResult.Properties.Appearance.Options.UseFont = true;
            this.txt_checkResult.Size = new System.Drawing.Size(241, 28);
            this.txt_checkResult.StyleController = this.layoutMx1;
            this.txt_checkResult.TabIndex = 228;
            this.txt_checkResult.Tag = "readonly";
            //
            // txt_jyDATE
            //
            this.txt_jyDATE.Location = new System.Drawing.Point(1155, 49);
            this.txt_jyDATE.Margin = new System.Windows.Forms.Padding(4);
            this.txt_jyDATE.Name = "txt_jyDATE";
            this.txt_jyDATE.Properties.DisplayFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.txt_jyDATE.Properties.EditFormat.FormatType = DevExpress.Utils.FormatType.DateTime;
            this.txt_jyDATE.Size = new System.Drawing.Size(241, 28);
            this.txt_jyDATE.StyleController = this.layoutMx1;
            this.txt_jyDATE.TabIndex = 250;
            this.txt_jyDATE.Tag = "readonly";
            // 
            // layoutControlItem9
            // 
@@ -1129,34 +1100,34 @@
            this.Root.GroupBordersVisible = false;
            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem12,
            this.layoutControlItem5,
            this.layoutControlItem2,
            this.layoutControlItem16,
            this.layoutControlItem11,
            this.layoutControlItem1,
            this.layoutControlItem3,
            this.layoutControlItem14,
            this.layoutControlItem4,
            this.layoutControlItem15,
            this.layoutControlItem18,
            this.layoutControlItem6,
            this.layoutControlItem19,
            this.layoutControlItem20,
            this.layoutControlItem21,
            this.layoutControlItem22,
            this.layoutControlItem23,
            this.layoutControlItem24,
            this.layoutControlItem25,
            this.layoutControlItem26,
            this.layoutControlItem13,
            this.layoutControlItem8,
            this.layoutControlItem7,
            this.layoutControlItem27,
            this.layoutControlItem28,
            this.layoutControlItem17,
            this.layoutControlItem29,
            this.layoutControlItem28,
            this.layoutControlItem4,
            this.layoutControlItem3,
            this.layoutControlItem22,
            this.layoutControlItem14,
            this.layoutControlItem15,
            this.layoutControlItem6,
            this.layoutControlItem27,
            this.layoutControlItem5,
            this.layoutControlItem7,
            this.layoutControlItem8,
            this.layoutControlItem26,
            this.layoutControlItem30,
            this.layoutControlItem10,
            this.layoutControlItem17});
            this.layoutControlItem10});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1212,17 +1183,6 @@
            this.layoutControlItem12.Text = "生产车间";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 22);
            // 
            // layoutControlItem5
            //
            this.layoutControlItem5.Control = this.txt_CheckResult;
            this.layoutControlItem5.Location = new System.Drawing.Point(1041, 76);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem5.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem5.Text = "检验结果";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem2
            // 
            this.layoutControlItem2.Control = this.txt_Brand;
@@ -1262,7 +1222,7 @@
            // 
            // layoutControlItem1
            // 
            this.layoutControlItem1.Control = this.txt_ProductionDate;
            this.layoutControlItem1.Control = this.txt_productionDate;
            this.layoutControlItem1.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem1.CustomizationFormText = "生产日期";
            this.layoutControlItem1.Location = new System.Drawing.Point(347, 76);
@@ -1272,56 +1232,6 @@
            this.layoutControlItem1.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem1.Text = "生产日期";
            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem3
            //
            this.layoutControlItem3.Control = this.txt_Temperature;
            this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem3.CustomizationFormText = "室温";
            this.layoutControlItem3.Location = new System.Drawing.Point(694, 0);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem3.Size = new System.Drawing.Size(347, 37);
            this.layoutControlItem3.Text = "室温";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem14
            //
            this.layoutControlItem14.Control = this.txt_LineNo;
            this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem14.CustomizationFormText = "线号";
            this.layoutControlItem14.Location = new System.Drawing.Point(1041, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem14.Size = new System.Drawing.Size(347, 37);
            this.layoutControlItem14.Text = "线号";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem4
            //
            this.layoutControlItem4.Control = this.txt_Voltage;
            this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem4.CustomizationFormText = "电压";
            this.layoutControlItem4.Location = new System.Drawing.Point(694, 37);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem4.Text = "电压";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem15
            //
            this.layoutControlItem15.Control = this.txt_Batch;
            this.layoutControlItem15.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem15.CustomizationFormText = "批量";
            this.layoutControlItem15.Location = new System.Drawing.Point(1041, 37);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem15.Text = "批量";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 22);
            // 
            // layoutControlItem18
            // 
@@ -1336,19 +1246,9 @@
            this.layoutControlItem18.Text = "班次";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 22);
            // 
            // layoutControlItem6
            //
            this.layoutControlItem6.Control = this.txt_JY_USER;
            this.layoutControlItem6.Location = new System.Drawing.Point(0, 193);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem6.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem6.Text = "检验人";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem19
            // 
            this.layoutControlItem19.Control = this.txt_AcRe_A;
            this.layoutControlItem19.Control = this.txt_acReA;
            this.layoutControlItem19.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem19.CustomizationFormText = "Ac/Re(A类)";
            this.layoutControlItem19.Location = new System.Drawing.Point(0, 115);
@@ -1360,7 +1260,7 @@
            // 
            // layoutControlItem20
            // 
            this.layoutControlItem20.Control = this.txt_AcRe_B;
            this.layoutControlItem20.Control = this.txt_acReB;
            this.layoutControlItem20.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem20.CustomizationFormText = "Ac/Re(B类)";
            this.layoutControlItem20.Location = new System.Drawing.Point(347, 115);
@@ -1373,7 +1273,7 @@
            // 
            // layoutControlItem21
            // 
            this.layoutControlItem21.Control = this.txt_AcRe_C;
            this.layoutControlItem21.Control = this.txt_acReC;
            this.layoutControlItem21.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem21.CustomizationFormText = "Ac/Re(C类)";
            this.layoutControlItem21.Location = new System.Drawing.Point(694, 115);
@@ -1383,19 +1283,6 @@
            this.layoutControlItem21.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem21.Text = "Ac/Re(C类)";
            this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem22
            //
            this.layoutControlItem22.Control = this.txt_ProcessResults;
            this.layoutControlItem22.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem22.CustomizationFormText = "处理结果";
            this.layoutControlItem22.Location = new System.Drawing.Point(1041, 115);
            this.layoutControlItem22.Name = "layoutControlItem22";
            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem22.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem22.Text = "处理结果";
            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 22);
            // 
            // layoutControlItem23
            // 
@@ -1435,19 +1322,6 @@
            this.layoutControlItem25.Text = "随机抽样数";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 22);
            // 
            // layoutControlItem26
            //
            this.layoutControlItem26.Control = this.txt_SampleSize3;
            this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem26.CustomizationFormText = "样本数";
            this.layoutControlItem26.Location = new System.Drawing.Point(1041, 154);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem26.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem26.Text = "样本数";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_Guid;
@@ -1462,91 +1336,6 @@
            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 22);
            this.layoutControlItem13.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            // 
            // layoutControlItem8
            //
            this.layoutControlItem8.Control = this.txt_checkDate;
            this.layoutControlItem8.Location = new System.Drawing.Point(1041, 193);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem8.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem8.Text = "审核时间";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem7
            //
            this.layoutControlItem7.Control = this.txt_checkBy;
            this.layoutControlItem7.Location = new System.Drawing.Point(694, 193);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem7.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem7.Text = "审核者";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem27
            //
            this.layoutControlItem27.Control = this.txt_JY_DATE;
            this.layoutControlItem27.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem27.CustomizationFormText = "检验日期";
            this.layoutControlItem27.Location = new System.Drawing.Point(347, 193);
            this.layoutControlItem27.Name = "layoutControlItem27";
            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem27.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem27.Text = "检验日期";
            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem28
            //
            this.layoutControlItem28.Control = this.txt_SP_USER;
            this.layoutControlItem28.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem28.CustomizationFormText = "审批人";
            this.layoutControlItem28.Location = new System.Drawing.Point(0, 232);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem28.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem28.Text = "审批人";
            this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem29
            //
            this.layoutControlItem29.Control = this.txt_SP_DATE;
            this.layoutControlItem29.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem29.CustomizationFormText = "审批时间";
            this.layoutControlItem29.Location = new System.Drawing.Point(347, 232);
            this.layoutControlItem29.Name = "layoutControlItem29";
            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem29.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem29.Text = "审批时间";
            this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem30
            //
            this.layoutControlItem30.Control = this.txt_Remark;
            this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem30.CustomizationFormText = "备注";
            this.layoutControlItem30.Location = new System.Drawing.Point(694, 232);
            this.layoutControlItem30.Name = "layoutControlItem30";
            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem30.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem30.Text = "备注";
            this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_OrgName;
            this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem10.CustomizationFormText = "组织机构";
            this.layoutControlItem10.Location = new System.Drawing.Point(0, 271);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem10.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem10.Text = "组织机构";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem17
            // 
            this.layoutControlItem17.Control = this.txt_FQCNo;
@@ -1557,6 +1346,194 @@
            this.layoutControlItem17.Size = new System.Drawing.Size(347, 37);
            this.layoutControlItem17.Text = "检验单号";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem29
            //
            this.layoutControlItem29.Control = this.txt_SP_DATE;
            this.layoutControlItem29.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem29.CustomizationFormText = "审批时间";
            this.layoutControlItem29.Location = new System.Drawing.Point(694, 271);
            this.layoutControlItem29.Name = "layoutControlItem29";
            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem29.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem29.Text = "审批时间";
            this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 22);
            this.layoutControlItem29.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            //
            // layoutControlItem28
            //
            this.layoutControlItem28.Control = this.txt_SP_USER;
            this.layoutControlItem28.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem28.CustomizationFormText = "审批人";
            this.layoutControlItem28.Location = new System.Drawing.Point(347, 271);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem28.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem28.Text = "审批人";
            this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 22);
            this.layoutControlItem28.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            //
            // layoutControlItem4
            //
            this.layoutControlItem4.Control = this.txt_Voltage;
            this.layoutControlItem4.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem4.CustomizationFormText = "电压";
            this.layoutControlItem4.Location = new System.Drawing.Point(694, 232);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem4.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem4.Text = "电压";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 22);
            this.layoutControlItem4.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            //
            // layoutControlItem3
            //
            this.layoutControlItem3.Control = this.txt_Temperature;
            this.layoutControlItem3.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem3.CustomizationFormText = "室温";
            this.layoutControlItem3.Location = new System.Drawing.Point(1041, 232);
            this.layoutControlItem3.Name = "layoutControlItem3";
            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem3.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem3.Text = "室温";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 22);
            this.layoutControlItem3.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            //
            // layoutControlItem22
            //
            this.layoutControlItem22.Control = this.txt_ProcessResults;
            this.layoutControlItem22.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem22.CustomizationFormText = "处理结果";
            this.layoutControlItem22.Location = new System.Drawing.Point(347, 232);
            this.layoutControlItem22.Name = "layoutControlItem22";
            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem22.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem22.Text = "处理结果";
            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 22);
            this.layoutControlItem22.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
            //
            // layoutControlItem14
            //
            this.layoutControlItem14.Control = this.txt_LineNo;
            this.layoutControlItem14.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem14.CustomizationFormText = "线号";
            this.layoutControlItem14.Location = new System.Drawing.Point(694, 0);
            this.layoutControlItem14.Name = "layoutControlItem14";
            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem14.Size = new System.Drawing.Size(347, 37);
            this.layoutControlItem14.Text = "线号";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem15
            //
            this.layoutControlItem15.Control = this.txt_Batch;
            this.layoutControlItem15.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem15.CustomizationFormText = "批量";
            this.layoutControlItem15.Location = new System.Drawing.Point(694, 37);
            this.layoutControlItem15.Name = "layoutControlItem15";
            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem15.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem15.Text = "批量";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem6
            //
            this.layoutControlItem6.Control = this.txt_jyUSER;
            this.layoutControlItem6.Location = new System.Drawing.Point(1041, 0);
            this.layoutControlItem6.Name = "layoutControlItem6";
            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem6.Size = new System.Drawing.Size(347, 37);
            this.layoutControlItem6.Text = "检验人";
            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem27
            //
            this.layoutControlItem27.Control = this.txt_jyDATE;
            this.layoutControlItem27.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem27.CustomizationFormText = "检验日期";
            this.layoutControlItem27.Location = new System.Drawing.Point(1041, 37);
            this.layoutControlItem27.Name = "layoutControlItem27";
            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem27.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem27.Text = "检验日期";
            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem5
            //
            this.layoutControlItem5.Control = this.txt_checkResult;
            this.layoutControlItem5.Location = new System.Drawing.Point(1041, 76);
            this.layoutControlItem5.Name = "layoutControlItem5";
            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem5.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem5.Text = "检验结果";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem7
            //
            this.layoutControlItem7.Control = this.txt_checkUser;
            this.layoutControlItem7.Location = new System.Drawing.Point(1041, 115);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem7.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem7.Text = "审核者";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem8
            //
            this.layoutControlItem8.Control = this.txt_checkDate;
            this.layoutControlItem8.Location = new System.Drawing.Point(1041, 154);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem8.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem8.Text = "审核时间";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem26
            //
            this.layoutControlItem26.Control = this.txt_SampleSize3;
            this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem26.CustomizationFormText = "样本数";
            this.layoutControlItem26.Location = new System.Drawing.Point(0, 193);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem26.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem26.Text = "样本数";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem30
            //
            this.layoutControlItem30.Control = this.txt_Remark;
            this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem30.CustomizationFormText = "备注";
            this.layoutControlItem30.Location = new System.Drawing.Point(347, 193);
            this.layoutControlItem30.Name = "layoutControlItem30";
            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem30.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem30.Text = "备注";
            this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 22);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_OrgName;
            this.layoutControlItem10.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
            this.layoutControlItem10.CustomizationFormText = "组织机构";
            this.layoutControlItem10.Location = new System.Drawing.Point(0, 232);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem10.Size = new System.Drawing.Size(347, 39);
            this.layoutControlItem10.Text = "组织机构";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 22);
            // 
            // xtraTabControl2
            // 
@@ -1959,24 +1936,11 @@
            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
            // 
            // picCheckBox
            //
            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
            this.picCheckBox.Location = new System.Drawing.Point(1285, 29);
            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
            this.picCheckBox.Name = "picCheckBox";
            this.picCheckBox.Size = new System.Drawing.Size(125, 61);
            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
            this.picCheckBox.TabIndex = 9;
            this.picCheckBox.TabStop = false;
            this.picCheckBox.Visible = false;
            //
            // Frm_FQCItem
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
            this.ClientSize = new System.Drawing.Size(1410, 834);
            this.Controls.Add(this.picCheckBox);
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Margin = new System.Windows.Forms.Padding(4);
@@ -2001,8 +1965,8 @@
            this.splitMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_JY_USER.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_jyUSER.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_Guid.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ItemModel.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_LineNo.Properties)).EndInit();
@@ -2014,57 +1978,55 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_Voltage.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_Batch.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_Classes.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_AcRe_A.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_AcRe_B.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_AcRe_C.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_acReA.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_acReB.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_acReC.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_SampleSize1.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_SampleSize2.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_SampleSize3.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_SP_USER.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_Remark.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_CheckResult.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ProcessResults.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_SampleMethod.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ProductionDate.Properties.CalendarTimeProperties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_ProductionDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_productionDate.Properties.CalendarTimeProperties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_productionDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_SP_DATE.Properties.CalendarTimeProperties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_SP_DATE.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_JY_DATE.Properties.CalendarTimeProperties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_JY_DATE.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties.CalendarTimeProperties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_OrgName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_checkResult.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_jyDATE.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
            this.xtraTabControl2.ResumeLayout(false);
            this.xtraTabPage3.ResumeLayout(false);
@@ -2077,7 +2039,6 @@
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit2View)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
            this.ResumeLayout(false);
        }
@@ -2092,17 +2053,15 @@
        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
        private System.Windows.Forms.Label lbGuid;
        private DevExpress.XtraEditors.TextEdit txt_JY_USER;
        private DevExpress.XtraEditors.TextEdit txt_jyUSER;
        private DevExpress.XtraLayout.LayoutControl layoutMx1;
        private DevExpress.XtraLayout.LayoutControlGroup Root;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraEditors.TextEdit txt_checkBy;
        private System.Windows.Forms.PictureBox picCheckBox;
        private DevExpress.XtraEditors.TextEdit txt_checkUser;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraEditors.TextEdit txt_ItemModel;
        private DevExpress.XtraEditors.TextEdit txt_LineNo;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraEditors.TextEdit txt_ItemName;
        private DevExpress.XtraEditors.TextEdit txt_Guid;
        private DevExpress.XtraEditors.TextEdit txt_FQCNo;
@@ -2138,38 +2097,25 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraEditors.TextEdit txt_Voltage;
        private DevExpress.XtraEditors.TextEdit txt_Batch;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraEditors.TextEdit txt_Classes;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraEditors.TextEdit txt_AcRe_A;
        private DevExpress.XtraEditors.TextEdit txt_AcRe_B;
        private DevExpress.XtraEditors.TextEdit txt_AcRe_C;
        private DevExpress.XtraEditors.TextEdit txt_acReA;
        private DevExpress.XtraEditors.TextEdit txt_acReB;
        private DevExpress.XtraEditors.TextEdit txt_acReC;
        private DevExpress.XtraEditors.TextEdit txt_SampleSize1;
        private DevExpress.XtraEditors.TextEdit txt_SampleSize2;
        private DevExpress.XtraEditors.TextEdit txt_SampleSize3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
        private DevExpress.XtraEditors.TextEdit txt_SP_USER;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
        private DevExpress.XtraEditors.TextEdit txt_Remark;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
        private DevExpress.XtraTab.XtraTabControl xtraTabControl2;
        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
        private DevExpress.XtraGrid.GridControl gridControl1;
@@ -2207,16 +2153,30 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn49;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn50;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn51;
        private DevExpress.XtraEditors.ComboBoxEdit txt_CheckResult;
        private DevExpress.XtraEditors.ComboBoxEdit txt_ProcessResults;
        private DevExpress.XtraEditors.ComboBoxEdit txt_SampleMethod;
        private DevExpress.XtraEditors.DateEdit txt_ProductionDate;
        private DevExpress.XtraEditors.DateEdit txt_productionDate;
        private DevExpress.XtraEditors.DateEdit txt_SP_DATE;
        private DevExpress.XtraEditors.DateEdit txt_JY_DATE;
        private DevExpress.XtraEditors.DateEdit txt_checkDate;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn52;
        private DevExpress.XtraEditors.TextEdit txt_OrgName;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
        private DevExpress.XtraEditors.TextEdit txt_checkDate;
        private DevExpress.XtraEditors.TextEdit txt_checkResult;
        private DevExpress.XtraEditors.TextEdit txt_jyDATE;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
    }
}
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FQCItem.cs
@@ -42,7 +42,8 @@
            this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            txt_SampleSize1.Leave += txt_SampleSize1_Leave;
            txt_SampleSize2.Leave += txt_SampleSize2_Leave;
            // 添加抽样方法下拉框事件
            this.txt_SampleMethod.SelectedIndexChanged += Txt_SampleMethod_SelectedIndexChanged;
@@ -51,7 +52,7 @@
            // 设置GridView参数
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gridView3);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "checkStatus", "", (value) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, null, this, "checkStatus", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
@@ -79,7 +80,8 @@
            if (comboBox != null)
            {
                string selectedValue = comboBox.Text.Trim();
                int sampleSize = 0;
                if (selectedValue == "匀速")
                {
                    // 选择匀速时:启用匀速抽样数,禁用随机抽样数
@@ -89,6 +91,9 @@
                    txt_SampleSize2.Properties.ReadOnly = true;
                    txt_SampleSize2.Properties.Appearance.BackColor = Color.WhiteSmoke;
                    txt_SampleSize2.Text = ""; // 清空随机抽样数
                    if (int.TryParse(txt_SampleSize1.Text.Trim(), out int size))
                        sampleSize = size;
                }
                else if (selectedValue == "随机")
                {
@@ -99,6 +104,9 @@
                    txt_SampleSize1.Properties.ReadOnly = true;
                    txt_SampleSize1.Properties.Appearance.BackColor = Color.WhiteSmoke;
                    txt_SampleSize1.Text = ""; // 清空匀速抽样数
                    if (int.TryParse(txt_SampleSize2.Text.Trim(), out int size))
                        sampleSize = size;
                }
                else
                {
@@ -111,7 +119,48 @@
                    txt_SampleSize2.Properties.Appearance.BackColor = Color.WhiteSmoke;
                    txt_SampleSize2.Text = "";
                }
                UpdateGridViewColumns(sampleSize);
            }
        }
        private void UpdateGridViewColumns(int sampleSize)
        {
            if (sampleSize < 0 || sampleSize > 16)
                return;
            // 获取所有值列(值1到值16)
            var valueColumns = new[]
            {
                gridColumn11, // 值1
                gridColumn12, // 值2
                gridColumn13, // 值3
                gridColumn14, // 值4
                gridColumn15, // 值5
                gridColumn16, // 值6
                gridColumn18, // 值7
                gridColumn19, // 值8
                gridColumn36, // 值9
                gridColumn37, // 值10
                gridColumn38, // 值11
                gridColumn39, // 值12
                gridColumn40, // 值13
                gridColumn49, // 值14
                gridColumn50, // 值15
                gridColumn51  // 值16
            };
            // 设置列的可见性
            for (int i = 0; i < valueColumns.Length; i++)
            {
                if (valueColumns[i] != null)
                {
                    valueColumns[i].Visible = i < sampleSize;
                }
            }
            // 刷新GridView
            gridView2.BestFitColumns();
        }
        /// <summary>
@@ -311,23 +360,23 @@
                itemName = txt_ItemName.Text.Trim(), // 产品名称
                itemModel = txt_ItemModel.Text.Trim(), // 规格型号
                brand = txt_Brand.Text.Trim(), // 商标
                productionDate = txt_ProductionDate.Text.Trim(), // 生产日期
                productionDate = txt_productionDate.Text.Trim(), // 生产日期
                temperature = txt_Temperature.Text.Trim(), // 室温
                voltage = txt_Voltage.Text.Trim(), // 电压
                lineNo = txt_LineNo.Text.Trim(), // 线号
                batch = txt_Batch.Text.Trim(), // 批量
                classes = txt_Classes.Text.Trim(), // 班次
                checkResult = txt_CheckResult.Text.Trim(), // 检验结果
                acRe_A = txt_AcRe_A.Text.Trim(), // AC/Re A类
                acRe_B = txt_AcRe_B.Text.Trim(), // AC/Re B类
                acRe_C = txt_AcRe_C.Text.Trim(), // AC/Re C类
                checkResult = txt_checkResult.Text.Trim(), // 检验结果
                acRe_A = txt_acReA.Text.Trim(), // AC/Re A类
                acRe_B = txt_acReB.Text.Trim(), // AC/Re B类
                acRe_C = txt_acReC.Text.Trim(), // AC/Re C类
                processResults = txt_ProcessResults.Text.Trim(), // 处理结果
                sampleMethod = txt_SampleMethod.Text.Trim(), // 抽样
                sampleSize1 = txt_SampleSize1.Text.Trim(), // 匀速抽样数
                sampleSize2 = txt_SampleSize2.Text.Trim(), // 随机抽样数
                sampleSize3 = txt_SampleSize3.Text.Trim(), // 样本数
                jy_USER = txt_JY_USER.Text.Trim(), // 检验人
                jy_DATE = txt_JY_DATE.Text.Trim(), // 检验时间
                jy_USER = txt_jyUSER.Text.Trim(), // 检验人
                jy_DATE = txt_jyDATE.Text.Trim(), // 检验时间
                sp_USER = txt_SP_USER.Text.Trim(), // 审批人
                sp_DATE = txt_SP_DATE.Text.Trim(), // 审批日期
                remark = txt_Remark.Text.Trim(), // 备注
@@ -549,6 +598,14 @@
                            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gridControl2, gridView3);
                        }
                    }
                    if (int.TryParse(txt_SampleSize1.Text.Trim(), out int size))
                    {
                        UpdateGridViewColumns(size);
                    }
                    else
                    {
                        UpdateGridViewColumns(0);
                    }
                }
                else
                    ToolBox.MsgHelper.Warning("提示:" + _rtn.rtnMsg);
@@ -636,5 +693,35 @@
                }
            }
        }
        private void txt_SampleSize1_Leave(object sender, EventArgs e)
        {
            if (txt_SampleMethod.Text.Trim() == "匀速")
            {
                if (int.TryParse(txt_SampleSize1.Text.Trim(), out int size))
                {
                    UpdateGridViewColumns(size);
                }
                else
                {
                    UpdateGridViewColumns(0);
                }
            }
        }
        private void txt_SampleSize2_Leave(object sender, EventArgs e)
        {
            if (txt_SampleMethod.Text.Trim() == "随机")
            {
                if (int.TryParse(txt_SampleSize2.Text.Trim(), out int size))
                {
                    UpdateGridViewColumns(size);
                }
                else
                {
                    UpdateGridViewColumns(0);
                }
            }
        }
    }
}