fqc
lu
2025-04-08 3108a1c6f7bdddcf22905ff601633a71f73a480d
fqc
已修改5个文件
1050 ■■■■ 文件已修改
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs 380 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs 11 ●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs 466 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs 190 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/UserControl/UCUpFileList.cs 3 ●●●●● 补丁 | 查看 | 原始文档 | blame | 历史
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -87,8 +87,6 @@
            this.txt_itemId = new DevExpress.XtraEditors.ButtonEdit();
            this.txt_lineId = new Gs.DevApp.UserControl.UcLookWorkline();
            this.txt_msg = new Gs.DevApp.UserControl.UcDictionary();
            this.txt_workNo = new Gs.DevApp.UserControl.UcLookGx();
            this.txt_fzrId = new Gs.DevApp.UserControl.UcLookStaff();
            this.txt_suppId = new Gs.DevApp.UserControl.UcLookCustomer();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_fsecondResu = new DevExpress.XtraEditors.TextEdit();
@@ -115,27 +113,20 @@
            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
            this.txt_fzrId = new DevExpress.XtraEditors.TextEdit();
            this.txt_workNo = new DevExpress.XtraEditors.TextEdit();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -146,7 +137,16 @@
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
            this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -251,27 +251,20 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fzrId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
@@ -282,7 +275,16 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
            this.xtraTabControl2.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -811,8 +813,6 @@
            this.layoutMx1.Controls.Add(this.txt_itemId);
            this.layoutMx1.Controls.Add(this.txt_lineId);
            this.layoutMx1.Controls.Add(this.txt_msg);
            this.layoutMx1.Controls.Add(this.txt_workNo);
            this.layoutMx1.Controls.Add(this.txt_fzrId);
            this.layoutMx1.Controls.Add(this.txt_suppId);
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_fsecondResu);
@@ -839,13 +839,15 @@
            this.layoutMx1.Controls.Add(this.txt_createBy);
            this.layoutMx1.Controls.Add(this.txt_createDate);
            this.layoutMx1.Controls.Add(this.txt_itemName);
            this.layoutMx1.Controls.Add(this.txt_fzrId);
            this.layoutMx1.Controls.Add(this.txt_workNo);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem17,
            this.layoutControlItem21});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(267, 359, 812, 500);
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(859, 421, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1342, 282);
            this.layoutMx1.TabIndex = 0;
@@ -880,23 +882,6 @@
            this.txt_msg.TextTxt = "";
            this.txt_msg.WhereTxt = null;
            // 
            // txt_workNo
            //
            this.txt_workNo.IsReadly = false;
            this.txt_workNo.Location = new System.Drawing.Point(414, 208);
            this.txt_workNo.Margin = new System.Windows.Forms.Padding(0);
            this.txt_workNo.Name = "txt_workNo";
            this.txt_workNo.Size = new System.Drawing.Size(254, 24);
            this.txt_workNo.TabIndex = 813;
            //
            // txt_fzrId
            //
            this.txt_fzrId.IsReadly = false;
            this.txt_fzrId.Location = new System.Drawing.Point(744, 142);
            this.txt_fzrId.Name = "txt_fzrId";
            this.txt_fzrId.Size = new System.Drawing.Size(254, 24);
            this.txt_fzrId.TabIndex = 812;
            //
            // txt_suppId
            // 
            this.txt_suppId.IsReadly = false;
@@ -916,9 +901,9 @@
            // 
            // txt_fsecondResu
            // 
            this.txt_fsecondResu.Location = new System.Drawing.Point(414, 175);
            this.txt_fsecondResu.Location = new System.Drawing.Point(1074, 175);
            this.txt_fsecondResu.Name = "txt_fsecondResu";
            this.txt_fsecondResu.Size = new System.Drawing.Size(254, 24);
            this.txt_fsecondResu.Size = new System.Drawing.Size(256, 24);
            this.txt_fsecondResu.StyleController = this.layoutMx1;
            this.txt_fsecondResu.TabIndex = 801;
            this.txt_fsecondResu.Tag = "readonly";
@@ -935,7 +920,7 @@
            // 
            // txt_fcheckResu
            // 
            this.txt_fcheckResu.Location = new System.Drawing.Point(414, 142);
            this.txt_fcheckResu.Location = new System.Drawing.Point(414, 175);
            this.txt_fcheckResu.Name = "txt_fcheckResu";
            this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
            this.txt_fcheckResu.StyleController = this.layoutMx1;
@@ -955,7 +940,7 @@
            // 
            // txt_fcheckDate
            // 
            this.txt_fcheckDate.Location = new System.Drawing.Point(414, 44);
            this.txt_fcheckDate.Location = new System.Drawing.Point(414, 76);
            this.txt_fcheckDate.Name = "txt_fcheckDate";
            this.txt_fcheckDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
@@ -997,7 +982,7 @@
            // 
            // txt_fcheckBy
            // 
            this.txt_fcheckBy.Location = new System.Drawing.Point(414, 76);
            this.txt_fcheckBy.Location = new System.Drawing.Point(414, 109);
            this.txt_fcheckBy.Name = "txt_fcheckBy";
            this.txt_fcheckBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
            this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
@@ -1047,9 +1032,9 @@
            // 
            // txt_fmanageNo
            // 
            this.txt_fmanageNo.Location = new System.Drawing.Point(1074, 175);
            this.txt_fmanageNo.Location = new System.Drawing.Point(414, 208);
            this.txt_fmanageNo.Name = "txt_fmanageNo";
            this.txt_fmanageNo.Size = new System.Drawing.Size(256, 24);
            this.txt_fmanageNo.Size = new System.Drawing.Size(254, 24);
            this.txt_fmanageNo.StyleController = this.layoutMx1;
            this.txt_fmanageNo.TabIndex = 807;
            this.txt_fmanageNo.Tag = "";
@@ -1088,24 +1073,25 @@
            // 
            // txt_lotNo
            // 
            this.txt_lotNo.Location = new System.Drawing.Point(1074, 241);
            this.txt_lotNo.Location = new System.Drawing.Point(414, 44);
            this.txt_lotNo.Name = "txt_lotNo";
            this.txt_lotNo.Size = new System.Drawing.Size(256, 24);
            this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
            this.txt_lotNo.StyleController = this.layoutMx1;
            this.txt_lotNo.TabIndex = 815;
            this.txt_lotNo.Tag = "readonly";
            // 
            // txt_lotNo2
            // 
            this.txt_lotNo2.Location = new System.Drawing.Point(1074, 208);
            this.txt_lotNo2.Location = new System.Drawing.Point(1074, 241);
            this.txt_lotNo2.Name = "txt_lotNo2";
            this.txt_lotNo2.Size = new System.Drawing.Size(256, 24);
            this.txt_lotNo2.StyleController = this.layoutMx1;
            this.txt_lotNo2.TabIndex = 816;
            this.txt_lotNo2.Tag = "readonly";
            // 
            // textEdit5
            // 
            this.textEdit5.Location = new System.Drawing.Point(414, 109);
            this.textEdit5.Location = new System.Drawing.Point(414, 142);
            this.textEdit5.Name = "textEdit5";
            this.textEdit5.Size = new System.Drawing.Size(254, 24);
            this.textEdit5.StyleController = this.layoutMx1;
@@ -1149,6 +1135,24 @@
            this.txt_itemName.TabIndex = 825;
            this.txt_itemName.Tag = "readonly";
            // 
            // txt_fzrId
            //
            this.txt_fzrId.Location = new System.Drawing.Point(744, 142);
            this.txt_fzrId.Name = "txt_fzrId";
            this.txt_fzrId.Size = new System.Drawing.Size(254, 24);
            this.txt_fzrId.StyleController = this.layoutMx1;
            this.txt_fzrId.TabIndex = 826;
            this.txt_fzrId.Tag = "readonly";
            //
            // txt_workNo
            //
            this.txt_workNo.Location = new System.Drawing.Point(1074, 208);
            this.txt_workNo.Name = "txt_workNo";
            this.txt_workNo.Size = new System.Drawing.Size(256, 24);
            this.txt_workNo.StyleController = this.layoutMx1;
            this.txt_workNo.TabIndex = 827;
            this.txt_workNo.Tag = "readonly";
            //
            // layoutControlItem17
            // 
            this.layoutControlItem17.Control = this.lbGuid;
@@ -1179,22 +1183,13 @@
            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem1,
            this.layoutControlItem23,
            this.layoutControlItem8,
            this.layoutControlItem2,
            this.layoutControlItem9,
            this.layoutControlItem25,
            this.layoutControlItem3,
            this.layoutControlItem24,
            this.layoutControlItem27,
            this.layoutControlItem22,
            this.txt_epTagtxt,
            this.layoutControlItem13,
            this.layoutControlItem10,
            this.layoutControlItem32,
            this.layoutControlItem12,
            this.layoutControlItem26,
            this.layoutControlItem18,
            this.layoutControlItem29,
            this.layoutControlItem5,
            this.layoutControlItem30,
            this.layoutControlItem4,
@@ -1205,7 +1200,16 @@
            this.layoutControlItem16,
            this.layoutControlItem15,
            this.layoutControlItem14,
            this.layoutControlItem28});
            this.layoutControlItem29,
            this.layoutControlItem13,
            this.layoutControlItem18,
            this.layoutControlItem10,
            this.layoutControlItem32,
            this.layoutControlItem8,
            this.layoutControlItem2,
            this.layoutControlItem28,
            this.layoutControlItem7,
            this.layoutControlItem25});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1268,28 +1272,6 @@
            this.layoutControlItem23.Text = "单据类型";
            this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem8
            //
            this.layoutControlItem8.Control = this.txt_fcheckBy;
            this.layoutControlItem8.Location = new System.Drawing.Point(330, 64);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem8.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem8.Text = "检验人员";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem2
            //
            this.layoutControlItem2.Control = this.txt_fcheckDate;
            this.layoutControlItem2.Location = new System.Drawing.Point(330, 32);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem2.Size = new System.Drawing.Size(330, 32);
            this.layoutControlItem2.Text = "检验日期";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem9
            // 
            this.layoutControlItem9.Control = this.txt_fbatchQty;
@@ -1299,17 +1281,6 @@
            this.layoutControlItem9.Size = new System.Drawing.Size(330, 32);
            this.layoutControlItem9.Text = "抽检数量";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem25
            //
            this.layoutControlItem25.Control = this.txt_fzrId;
            this.layoutControlItem25.Location = new System.Drawing.Point(660, 130);
            this.layoutControlItem25.Name = "layoutControlItem25";
            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem25.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem25.Text = "责任人";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem3
            // 
@@ -1367,39 +1338,6 @@
            this.txt_epTagtxt.Text = "环保标识";
            this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.txt_fsecondResu;
            this.layoutControlItem13.Location = new System.Drawing.Point(330, 163);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem13.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem13.Text = "处置结果";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_fcheckResu;
            this.layoutControlItem10.Location = new System.Drawing.Point(330, 130);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem10.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem10.Text = "检验结果";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem32
            //
            this.layoutControlItem32.Control = this.textEdit5;
            this.layoutControlItem32.Location = new System.Drawing.Point(330, 97);
            this.layoutControlItem32.Name = "layoutControlItem32";
            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem32.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem32.Text = "检验状态";
            this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem12
            // 
            this.layoutControlItem12.Control = this.txt_remarks;
@@ -1410,39 +1348,6 @@
            this.layoutControlItem12.Size = new System.Drawing.Size(660, 33);
            this.layoutControlItem12.Text = "备注说明";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem26
            //
            this.layoutControlItem26.Control = this.txt_workNo;
            this.layoutControlItem26.Location = new System.Drawing.Point(330, 196);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem26.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem26.Text = "返工工序";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem18
            //
            this.layoutControlItem18.Control = this.txt_fmanageNo;
            this.layoutControlItem18.Location = new System.Drawing.Point(990, 163);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem18.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem18.Text = "流程编号";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem29
            //
            this.layoutControlItem29.Control = this.txt_lotNo2;
            this.layoutControlItem29.Location = new System.Drawing.Point(990, 196);
            this.layoutControlItem29.Name = "layoutControlItem29";
            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem29.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem29.Text = "返工单号";
            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem5
            // 
@@ -1503,7 +1408,7 @@
            this.layoutControlItem31.Name = "layoutControlItem31";
            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem31.Size = new System.Drawing.Size(332, 32);
            this.layoutControlItem31.Text = "创建人";
            this.layoutControlItem31.Text = "创建人员";
            this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem33
@@ -1525,7 +1430,7 @@
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem16.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem16.Text = "审核人";
            this.layoutControlItem16.Text = "审核人员";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem15
@@ -1551,16 +1456,115 @@
            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem14.TextVisible = false;
            // 
            // layoutControlItem29
            //
            this.layoutControlItem29.Control = this.txt_lotNo2;
            this.layoutControlItem29.Location = new System.Drawing.Point(990, 229);
            this.layoutControlItem29.Name = "layoutControlItem29";
            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem29.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem29.Text = "返工单号";
            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.txt_fsecondResu;
            this.layoutControlItem13.Location = new System.Drawing.Point(990, 163);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem13.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem13.Text = "处置结果";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem18
            //
            this.layoutControlItem18.Control = this.txt_fmanageNo;
            this.layoutControlItem18.Location = new System.Drawing.Point(330, 196);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem18.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem18.Text = "流程编号";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem10
            //
            this.layoutControlItem10.Control = this.txt_fcheckResu;
            this.layoutControlItem10.Location = new System.Drawing.Point(330, 163);
            this.layoutControlItem10.Name = "layoutControlItem10";
            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem10.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem10.Text = "检验结果";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem32
            //
            this.layoutControlItem32.Control = this.textEdit5;
            this.layoutControlItem32.Location = new System.Drawing.Point(330, 130);
            this.layoutControlItem32.Name = "layoutControlItem32";
            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem32.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem32.Text = "检验状态";
            this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem8
            //
            this.layoutControlItem8.Control = this.txt_fcheckBy;
            this.layoutControlItem8.Location = new System.Drawing.Point(330, 97);
            this.layoutControlItem8.Name = "layoutControlItem8";
            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem8.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem8.Text = "检验人员";
            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem2
            //
            this.layoutControlItem2.Control = this.txt_fcheckDate;
            this.layoutControlItem2.Location = new System.Drawing.Point(330, 64);
            this.layoutControlItem2.Name = "layoutControlItem2";
            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem2.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem2.Text = "检验日期";
            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem28
            // 
            this.layoutControlItem28.Control = this.txt_lotNo;
            this.layoutControlItem28.Location = new System.Drawing.Point(990, 229);
            this.layoutControlItem28.Location = new System.Drawing.Point(330, 32);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem28.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem28.Size = new System.Drawing.Size(330, 32);
            this.layoutControlItem28.Text = "生产工单";
            this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem7
            //
            this.layoutControlItem7.Control = this.txt_fzrId;
            this.layoutControlItem7.Location = new System.Drawing.Point(660, 130);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem7.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem7.Text = "责任人员";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem25
            //
            this.layoutControlItem25.Control = this.txt_workNo;
            this.layoutControlItem25.Location = new System.Drawing.Point(990, 196);
            this.layoutControlItem25.Name = "layoutControlItem25";
            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem25.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem25.Text = "反工工序";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
            // 
            // xtraTabControl2
            // 
@@ -2316,27 +2320,20 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fzrId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_workNo.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
@@ -2347,7 +2344,16 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
            this.xtraTabControl2.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -2504,18 +2510,13 @@
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
        private DevExpress.XtraEditors.TextEdit txt_lifnr;
        private DevExpress.XtraEditors.ComboBoxEdit txt_djType;
        private UserControl.UcLookStaff txt_fzrId;
        private UserControl.UcLookCustomer txt_suppId;
        private UserControl.UcLookGx txt_workNo;
        private UserControl.UcDictionary txt_msg;
        private DevExpress.XtraEditors.TextEdit txt_lotNo;
        private DevExpress.XtraEditors.TextEdit txt_lotNo2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
@@ -2523,16 +2524,10 @@
        private DevExpress.XtraEditors.TextEdit textEdit5;
        private DevExpress.XtraEditors.ComboBoxEdit txt_epTag;
        private DevExpress.XtraLayout.LayoutControlItem txt_epTagtxt;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
        private UserControl.UcLookWorkline txt_lineId;
        private DevExpress.XtraEditors.TextEdit txt_createBy;
        private DevExpress.XtraEditors.TextEdit txt_createDate;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
        private DevExpress.XtraEditors.ButtonEdit txt_itemId;
@@ -2545,11 +2540,22 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
        private UserControl.UCUpFileList ucUpFileList1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
        private DevExpress.XtraEditors.TextEdit txt_fzrId;
        private DevExpress.XtraEditors.TextEdit txt_workNo;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
    }
}
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.cs
@@ -405,6 +405,7 @@
            gridViews.Add(gvMx1);
            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
            Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
            this.ucUpFileList1.pGuid = "";
        }
        /// <summary>
        /// 修改事件
@@ -451,9 +452,9 @@
            string _txt_lineId = txt_lineId.GetId();
            string _txt_itemId = txt_itemId.Text.Trim();
            string _txt_remarks = txt_remarks.Text.Trim();
            string _txt_workNo = txt_workNo.GetCode();
            string _txt_workNo = "";
            string _txt_epTag = txt_epTag.Text.Trim();
            string _txt_fzrId = txt_fzrId.GetId();
            string _txt_fzrId = "";
            string _txt_msg = txt_msg.TextTxt;
            string _txt_fmanageNo = txt_fmanageNo.Text.Trim();
            string _txt_lotNo2 = txt_lotNo2.Text.Trim();
@@ -475,12 +476,6 @@
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("产线不能为空!");
                txt_lineId.Focus();
                return;
            }
            if (string.IsNullOrEmpty(_txt_itemId.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("产品不能为空!");
                txt_itemId.Focus();
                return;
            }
            if (string.IsNullOrEmpty(_txt_itemId.Trim()))
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.Designer.cs
@@ -78,14 +78,10 @@
            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
            this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
            this.txt_itemId = new DevExpress.XtraEditors.ButtonEdit();
            this.txt_lineId = new Gs.DevApp.UserControl.UcLookWorkline();
            this.txt_msg = new Gs.DevApp.UserControl.UcDictionary();
            this.txt_workNo = new Gs.DevApp.UserControl.UcLookGx();
            this.txt_fzrId = new Gs.DevApp.UserControl.UcLookStaff();
            this.txt_suppId = new Gs.DevApp.UserControl.UcLookCustomer();
            this.lbGuid = new System.Windows.Forms.Label();
            this.txt_fsecondResu = new DevExpress.XtraEditors.TextEdit();
            this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
            this.txt_fcheckResu = new DevExpress.XtraEditors.TextEdit();
            this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
@@ -109,6 +105,11 @@
            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
            this.txt_lineId = new DevExpress.XtraEditors.TextEdit();
            this.txt_itemId = new DevExpress.XtraEditors.TextEdit();
            this.txt_suppId = new DevExpress.XtraEditors.TextEdit();
            this.txt_fsecondResu = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_freceQty = new DevExpress.XtraEditors.ComboBoxEdit();
            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -117,22 +118,14 @@
            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -140,7 +133,13 @@
            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
            this.txt_itemId11111 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem11 = 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();
@@ -191,6 +190,9 @@
            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.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
            this.xtraTabControl1.SuspendLayout();
@@ -211,8 +213,6 @@
            this.splitMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
            this.layoutMx1.SuspendLayout();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fsecondResu.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).BeginInit();
@@ -236,6 +236,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fsecondResu.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -244,22 +249,14 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
@@ -267,7 +264,13 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId11111)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
            this.xtraTabControl2.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -299,6 +302,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
            this.SuspendLayout();
            // 
            // repositoryItemComboBox1
@@ -425,7 +431,7 @@
            this.gv_fsubmit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
            this.gv_fsubmit.AppearanceCell.Options.UseFont = true;
            this.gv_fsubmit.Caption = "审核标识";
            this.gv_fsubmit.FieldName = "fsubmitTxt";
            this.gv_fsubmit.FieldName = "modifyFlagTxt";
            this.gv_fsubmit.MinWidth = 30;
            this.gv_fsubmit.Name = "gv_fsubmit";
            this.gv_fsubmit.OptionsColumn.AllowEdit = false;
@@ -680,7 +686,7 @@
            // gridColumn18
            // 
            this.gridColumn18.Caption = "审核人";
            this.gridColumn18.FieldName = "fsubmitBy";
            this.gridColumn18.FieldName = "modify1By";
            this.gridColumn18.MinWidth = 25;
            this.gridColumn18.Name = "gridColumn18";
            this.gridColumn18.Visible = true;
@@ -690,7 +696,7 @@
            // gridColumn19
            // 
            this.gridColumn19.Caption = "审核日期";
            this.gridColumn19.FieldName = "fsubmitDate";
            this.gridColumn19.FieldName = "modify1Date";
            this.gridColumn19.MinWidth = 25;
            this.gridColumn19.Name = "gridColumn19";
            this.gridColumn19.Visible = true;
@@ -784,14 +790,10 @@
            // 
            // layoutMx1
            // 
            this.layoutMx1.Controls.Add(this.txt_itemId);
            this.layoutMx1.Controls.Add(this.txt_lineId);
            this.layoutMx1.Controls.Add(this.txt_msg);
            this.layoutMx1.Controls.Add(this.txt_workNo);
            this.layoutMx1.Controls.Add(this.txt_fzrId);
            this.layoutMx1.Controls.Add(this.txt_suppId);
            this.layoutMx1.Controls.Add(this.lbGuid);
            this.layoutMx1.Controls.Add(this.txt_fsecondResu);
            this.layoutMx1.Controls.Add(this.txt_remarks);
            this.layoutMx1.Controls.Add(this.txt_fcheckResu);
            this.layoutMx1.Controls.Add(this.txt_releaseNo);
@@ -815,43 +817,29 @@
            this.layoutMx1.Controls.Add(this.txt_createBy);
            this.layoutMx1.Controls.Add(this.txt_createDate);
            this.layoutMx1.Controls.Add(this.txt_itemName);
            this.layoutMx1.Controls.Add(this.txt_lineId);
            this.layoutMx1.Controls.Add(this.txt_itemId);
            this.layoutMx1.Controls.Add(this.txt_suppId);
            this.layoutMx1.Controls.Add(this.txt_fsecondResu);
            this.layoutMx1.Controls.Add(this.txt_freceQty);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem17,
            this.layoutControlItem21});
            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
            this.layoutMx1.Name = "layoutMx1";
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(267, 359, 812, 500);
            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(225, 479, 812, 500);
            this.layoutMx1.Root = this.Root;
            this.layoutMx1.Size = new System.Drawing.Size(1342, 282);
            this.layoutMx1.TabIndex = 0;
            this.layoutMx1.Text = "layoutControl1";
            // 
            // txt_itemId
            //
            this.txt_itemId.Location = new System.Drawing.Point(84, 109);
            this.txt_itemId.Name = "txt_itemId";
            this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton()});
            this.txt_itemId.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_itemId.Size = new System.Drawing.Size(254, 24);
            this.txt_itemId.StyleController = this.layoutMx1;
            this.txt_itemId.TabIndex = 824;
            //
            // txt_lineId
            //
            this.txt_lineId.IsReadly = false;
            this.txt_lineId.Location = new System.Drawing.Point(84, 76);
            this.txt_lineId.Name = "txt_lineId";
            this.txt_lineId.Size = new System.Drawing.Size(254, 24);
            this.txt_lineId.TabIndex = 821;
            //
            // txt_msg
            // 
            this.txt_msg.BtnTxt = "违规类别";
            this.txt_msg.Location = new System.Drawing.Point(672, 175);
            this.txt_msg.Location = new System.Drawing.Point(672, 208);
            this.txt_msg.Name = "txt_msg";
            this.txt_msg.Size = new System.Drawing.Size(326, 95);
            this.txt_msg.Size = new System.Drawing.Size(326, 62);
            this.txt_msg.TabIndex = 814;
            this.txt_msg.TextTxt = "";
            this.txt_msg.WhereTxt = null;
@@ -859,27 +847,20 @@
            // txt_workNo
            // 
            this.txt_workNo.IsReadly = false;
            this.txt_workNo.Location = new System.Drawing.Point(414, 208);
            this.txt_workNo.Location = new System.Drawing.Point(1074, 241);
            this.txt_workNo.Margin = new System.Windows.Forms.Padding(0);
            this.txt_workNo.Name = "txt_workNo";
            this.txt_workNo.Size = new System.Drawing.Size(254, 24);
            this.txt_workNo.Size = new System.Drawing.Size(256, 24);
            this.txt_workNo.TabIndex = 813;
            this.txt_workNo.Tag = "readonly";
            // 
            // txt_fzrId
            // 
            this.txt_fzrId.IsReadly = false;
            this.txt_fzrId.Location = new System.Drawing.Point(744, 142);
            this.txt_fzrId.Location = new System.Drawing.Point(744, 175);
            this.txt_fzrId.Name = "txt_fzrId";
            this.txt_fzrId.Size = new System.Drawing.Size(254, 24);
            this.txt_fzrId.TabIndex = 812;
            //
            // txt_suppId
            //
            this.txt_suppId.IsReadly = false;
            this.txt_suppId.Location = new System.Drawing.Point(744, 44);
            this.txt_suppId.Name = "txt_suppId";
            this.txt_suppId.Size = new System.Drawing.Size(254, 24);
            this.txt_suppId.TabIndex = 811;
            // 
            // lbGuid
            // 
@@ -890,15 +871,6 @@
            this.lbGuid.Text = "lbGuid";
            this.lbGuid.Visible = false;
            // 
            // txt_fsecondResu
            //
            this.txt_fsecondResu.Location = new System.Drawing.Point(414, 175);
            this.txt_fsecondResu.Name = "txt_fsecondResu";
            this.txt_fsecondResu.Size = new System.Drawing.Size(254, 24);
            this.txt_fsecondResu.StyleController = this.layoutMx1;
            this.txt_fsecondResu.TabIndex = 801;
            this.txt_fsecondResu.Tag = "readonly";
            //
            // txt_remarks
            // 
            this.txt_remarks.Location = new System.Drawing.Point(84, 241);
@@ -908,6 +880,7 @@
            this.txt_remarks.Size = new System.Drawing.Size(584, 28);
            this.txt_remarks.StyleController = this.layoutMx1;
            this.txt_remarks.TabIndex = 797;
            this.txt_remarks.Tag = "readonly";
            // 
            // txt_fcheckResu
            // 
@@ -949,7 +922,7 @@
            this.txt_lotNo1.Size = new System.Drawing.Size(254, 28);
            this.txt_lotNo1.StyleController = this.layoutMx1;
            this.txt_lotNo1.TabIndex = 262;
            this.txt_lotNo1.Tag = "";
            this.txt_lotNo1.Tag = "readonly";
            // 
            // txt_itemNo
            // 
@@ -991,7 +964,7 @@
            this.txt_fbatchQty.Size = new System.Drawing.Size(254, 28);
            this.txt_fbatchQty.StyleController = this.layoutMx1;
            this.txt_fbatchQty.TabIndex = 222;
            this.txt_fbatchQty.Tag = "";
            this.txt_fbatchQty.Tag = "readonly";
            // 
            // txt_fsubmitBy
            // 
@@ -1023,12 +996,12 @@
            // 
            // txt_fmanageNo
            // 
            this.txt_fmanageNo.Location = new System.Drawing.Point(1074, 175);
            this.txt_fmanageNo.Location = new System.Drawing.Point(414, 208);
            this.txt_fmanageNo.Name = "txt_fmanageNo";
            this.txt_fmanageNo.Size = new System.Drawing.Size(256, 24);
            this.txt_fmanageNo.Size = new System.Drawing.Size(254, 24);
            this.txt_fmanageNo.StyleController = this.layoutMx1;
            this.txt_fmanageNo.TabIndex = 807;
            this.txt_fmanageNo.Tag = "";
            this.txt_fmanageNo.Tag = "readonly";
            // 
            // txt_guid
            // 
@@ -1046,6 +1019,7 @@
            this.txt_lifnr.Size = new System.Drawing.Size(254, 24);
            this.txt_lifnr.StyleController = this.layoutMx1;
            this.txt_lifnr.TabIndex = 809;
            this.txt_lifnr.Tag = "readonly";
            // 
            // txt_djType
            // 
@@ -1061,12 +1035,13 @@
            this.txt_djType.Size = new System.Drawing.Size(254, 24);
            this.txt_djType.StyleController = this.layoutMx1;
            this.txt_djType.TabIndex = 810;
            this.txt_djType.Tag = "readonly";
            // 
            // txt_lotNo
            // 
            this.txt_lotNo.Location = new System.Drawing.Point(1074, 241);
            this.txt_lotNo.Location = new System.Drawing.Point(414, 175);
            this.txt_lotNo.Name = "txt_lotNo";
            this.txt_lotNo.Size = new System.Drawing.Size(256, 24);
            this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
            this.txt_lotNo.StyleController = this.layoutMx1;
            this.txt_lotNo.TabIndex = 815;
            this.txt_lotNo.Tag = "readonly";
@@ -1097,6 +1072,7 @@
            this.txt_epTag.Size = new System.Drawing.Size(254, 24);
            this.txt_epTag.StyleController = this.layoutMx1;
            this.txt_epTag.TabIndex = 820;
            this.txt_epTag.Tag = "readonly";
            // 
            // txt_createBy
            // 
@@ -1124,6 +1100,66 @@
            this.txt_itemName.StyleController = this.layoutMx1;
            this.txt_itemName.TabIndex = 825;
            this.txt_itemName.Tag = "readonly";
            //
            // txt_lineId
            //
            this.txt_lineId.Location = new System.Drawing.Point(84, 76);
            this.txt_lineId.Name = "txt_lineId";
            this.txt_lineId.Size = new System.Drawing.Size(254, 24);
            this.txt_lineId.StyleController = this.layoutMx1;
            this.txt_lineId.TabIndex = 826;
            this.txt_lineId.Tag = "readonly";
            //
            // txt_itemId
            //
            this.txt_itemId.Location = new System.Drawing.Point(84, 109);
            this.txt_itemId.Name = "txt_itemId";
            this.txt_itemId.Size = new System.Drawing.Size(254, 24);
            this.txt_itemId.StyleController = this.layoutMx1;
            this.txt_itemId.TabIndex = 827;
            this.txt_itemId.Tag = "readonly";
            //
            // txt_suppId
            //
            this.txt_suppId.Location = new System.Drawing.Point(744, 44);
            this.txt_suppId.Name = "txt_suppId";
            this.txt_suppId.Size = new System.Drawing.Size(254, 24);
            this.txt_suppId.StyleController = this.layoutMx1;
            this.txt_suppId.TabIndex = 828;
            this.txt_suppId.Tag = "readonly";
            //
            // txt_fsecondResu
            //
            this.txt_fsecondResu.EditValue = "-请选择-";
            this.txt_fsecondResu.Location = new System.Drawing.Point(1074, 175);
            this.txt_fsecondResu.Name = "txt_fsecondResu";
            this.txt_fsecondResu.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_fsecondResu.Properties.Items.AddRange(new object[] {
            "-请选择-",
            "返工",
            "特采",
            "挑选使用"});
            this.txt_fsecondResu.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_fsecondResu.Size = new System.Drawing.Size(256, 24);
            this.txt_fsecondResu.StyleController = this.layoutMx1;
            this.txt_fsecondResu.TabIndex = 829;
            //
            // txt_freceQty
            //
            this.txt_freceQty.EditValue = "-请选择-";
            this.txt_freceQty.Location = new System.Drawing.Point(744, 142);
            this.txt_freceQty.Name = "txt_freceQty";
            this.txt_freceQty.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
            this.txt_freceQty.Properties.Items.AddRange(new object[] {
            "-请选择-",
            "1:合格",
            "2:不合格"});
            this.txt_freceQty.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_freceQty.Size = new System.Drawing.Size(254, 24);
            this.txt_freceQty.StyleController = this.layoutMx1;
            this.txt_freceQty.TabIndex = 830;
            // 
            // layoutControlItem17
            // 
@@ -1158,22 +1194,14 @@
            this.layoutControlItem8,
            this.layoutControlItem2,
            this.layoutControlItem9,
            this.layoutControlItem25,
            this.layoutControlItem3,
            this.layoutControlItem24,
            this.layoutControlItem27,
            this.layoutControlItem22,
            this.txt_epTagtxt,
            this.layoutControlItem13,
            this.layoutControlItem10,
            this.layoutControlItem32,
            this.layoutControlItem12,
            this.layoutControlItem26,
            this.layoutControlItem18,
            this.layoutControlItem29,
            this.layoutControlItem5,
            this.layoutControlItem30,
            this.layoutControlItem4,
            this.layoutControlItem6,
            this.layoutControlItem34,
            this.layoutControlItem31,
@@ -1181,7 +1209,16 @@
            this.layoutControlItem16,
            this.layoutControlItem15,
            this.layoutControlItem14,
            this.layoutControlItem28});
            this.layoutControlItem7,
            this.txt_itemId11111,
            this.layoutControlItem18,
            this.layoutControlItem28,
            this.layoutControlItem4,
            this.layoutControlItem11,
            this.layoutControlItem27,
            this.layoutControlItem25,
            this.layoutControlItem13,
            this.layoutControlItem26});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1276,17 +1313,6 @@
            this.layoutControlItem9.Text = "抽检数量";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem25
            //
            this.layoutControlItem25.Control = this.txt_fzrId;
            this.layoutControlItem25.Location = new System.Drawing.Point(660, 130);
            this.layoutControlItem25.Name = "layoutControlItem25";
            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem25.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem25.Text = "责任人";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem3
            // 
            this.layoutControlItem3.Control = this.txt_lotNo1;
@@ -1297,30 +1323,6 @@
            this.layoutControlItem3.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem3.Text = "送检批号";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem24
            //
            this.layoutControlItem24.Control = this.txt_suppId;
            this.layoutControlItem24.Location = new System.Drawing.Point(660, 32);
            this.layoutControlItem24.Name = "layoutControlItem24";
            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem24.Size = new System.Drawing.Size(330, 32);
            this.layoutControlItem24.Text = "客户编码";
            this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem27
            //
            this.layoutControlItem27.Control = this.txt_msg;
            this.layoutControlItem27.Location = new System.Drawing.Point(660, 163);
            this.layoutControlItem27.Name = "layoutControlItem27";
            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 3;
            this.layoutControlItem27.Size = new System.Drawing.Size(330, 99);
            this.layoutControlItem27.Text = "违规类别";
            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem27.TextVisible = false;
            // 
            // layoutControlItem22
            // 
@@ -1342,17 +1344,6 @@
            this.txt_epTagtxt.Size = new System.Drawing.Size(330, 33);
            this.txt_epTagtxt.Text = "环保标识";
            this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.txt_fsecondResu;
            this.layoutControlItem13.Location = new System.Drawing.Point(330, 163);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem13.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem13.Text = "处置结果";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem10
            // 
@@ -1387,28 +1378,6 @@
            this.layoutControlItem12.Text = "备注说明";
            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem26
            //
            this.layoutControlItem26.Control = this.txt_workNo;
            this.layoutControlItem26.Location = new System.Drawing.Point(330, 196);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem26.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem26.Text = "返工工序";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem18
            //
            this.layoutControlItem18.Control = this.txt_fmanageNo;
            this.layoutControlItem18.Location = new System.Drawing.Point(990, 163);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem18.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem18.Text = "流程编号";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem29
            // 
            this.layoutControlItem29.Control = this.txt_lotNo2;
@@ -1430,26 +1399,6 @@
            this.layoutControlItem5.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem5.Text = "物料编码";
            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem30
            //
            this.layoutControlItem30.Control = this.txt_lineId;
            this.layoutControlItem30.Location = new System.Drawing.Point(0, 64);
            this.layoutControlItem30.Name = "layoutControlItem30";
            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem30.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem30.Text = "选择产线";
            this.layoutControlItem30.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem4
            //
            this.layoutControlItem4.Control = this.txt_itemId;
            this.layoutControlItem4.Location = new System.Drawing.Point(0, 97);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 3;
            this.layoutControlItem4.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem4.Text = "选择产品";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem6
            // 
@@ -1475,11 +1424,12 @@
            // layoutControlItem31
            // 
            this.layoutControlItem31.Control = this.txt_createBy;
            this.layoutControlItem31.CustomizationFormText = "创建人员";
            this.layoutControlItem31.Location = new System.Drawing.Point(990, 0);
            this.layoutControlItem31.Name = "layoutControlItem31";
            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem31.Size = new System.Drawing.Size(332, 32);
            this.layoutControlItem31.Text = "创建人";
            this.layoutControlItem31.Text = "创建人员";
            this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem33
@@ -1496,12 +1446,13 @@
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.txt_fsubmitDate;
            this.layoutControlItem16.CustomizationFormText = "审核人员";
            this.layoutControlItem16.Location = new System.Drawing.Point(990, 64);
            this.layoutControlItem16.Name = "layoutControlItem16";
            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem16.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem16.Text = "审核人";
            this.layoutControlItem16.Text = "审核人员";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem15
@@ -1527,16 +1478,82 @@
            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem14.TextVisible = false;
            // 
            // layoutControlItem7
            //
            this.layoutControlItem7.Control = this.txt_lineId;
            this.layoutControlItem7.Location = new System.Drawing.Point(0, 64);
            this.layoutControlItem7.Name = "layoutControlItem7";
            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
            this.layoutControlItem7.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem7.Text = "生产线别";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            //
            // txt_itemId11111
            //
            this.txt_itemId11111.Control = this.txt_itemId;
            this.txt_itemId11111.Location = new System.Drawing.Point(0, 97);
            this.txt_itemId11111.Name = "txt_itemId11111";
            this.txt_itemId11111.OptionsTableLayoutItem.RowIndex = 3;
            this.txt_itemId11111.Size = new System.Drawing.Size(330, 33);
            this.txt_itemId11111.Text = "物料ID";
            this.txt_itemId11111.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem18
            //
            this.layoutControlItem18.Control = this.txt_fmanageNo;
            this.layoutControlItem18.Location = new System.Drawing.Point(330, 196);
            this.layoutControlItem18.Name = "layoutControlItem18";
            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem18.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem18.Text = "流程编号";
            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem28
            // 
            this.layoutControlItem28.Control = this.txt_lotNo;
            this.layoutControlItem28.Location = new System.Drawing.Point(990, 229);
            this.layoutControlItem28.Location = new System.Drawing.Point(330, 163);
            this.layoutControlItem28.Name = "layoutControlItem28";
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem28.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem28.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem28.Text = "生产工单";
            this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem4
            //
            this.layoutControlItem4.Control = this.txt_suppId;
            this.layoutControlItem4.Location = new System.Drawing.Point(660, 32);
            this.layoutControlItem4.Name = "layoutControlItem4";
            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
            this.layoutControlItem4.Size = new System.Drawing.Size(330, 32);
            this.layoutControlItem4.Text = "客户名称";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem11
            //
            this.layoutControlItem11.Control = this.txt_fsecondResu;
            this.layoutControlItem11.Location = new System.Drawing.Point(990, 163);
            this.layoutControlItem11.Name = "layoutControlItem11";
            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem11.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem11.Text = "处置结果";
            this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem27
            //
            this.layoutControlItem27.Control = this.txt_msg;
            this.layoutControlItem27.Location = new System.Drawing.Point(660, 196);
            this.layoutControlItem27.Name = "layoutControlItem27";
            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
            this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 2;
            this.layoutControlItem27.Size = new System.Drawing.Size(330, 66);
            this.layoutControlItem27.Text = "违规类别";
            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem27.TextVisible = false;
            // 
            // xtraTabControl2
            // 
@@ -2111,6 +2128,39 @@
            // 
            this.gridView4.Name = "gridView4";
            // 
            // layoutControlItem25
            //
            this.layoutControlItem25.Control = this.txt_fzrId;
            this.layoutControlItem25.Location = new System.Drawing.Point(660, 163);
            this.layoutControlItem25.Name = "layoutControlItem25";
            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 5;
            this.layoutControlItem25.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem25.Text = "责任人";
            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem13
            //
            this.layoutControlItem13.Control = this.txt_freceQty;
            this.layoutControlItem13.Location = new System.Drawing.Point(660, 130);
            this.layoutControlItem13.Name = "layoutControlItem13";
            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
            this.layoutControlItem13.Size = new System.Drawing.Size(330, 33);
            this.layoutControlItem13.Text = "判定结果";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            //
            // layoutControlItem26
            //
            this.layoutControlItem26.Control = this.txt_workNo;
            this.layoutControlItem26.Location = new System.Drawing.Point(990, 229);
            this.layoutControlItem26.Name = "layoutControlItem26";
            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 7;
            this.layoutControlItem26.Size = new System.Drawing.Size(332, 33);
            this.layoutControlItem26.Text = "返工工序";
            this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
            //
            // Frm_FqcDetect01Check
            // 
            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2120,7 +2170,7 @@
            this.Controls.Add(this.xtraTabControl1);
            this.Controls.Add(this.toolBarMenu1);
            this.Name = "Frm_FqcDetect01Check";
            this.Text = "fqc申请";
            this.Text = "fqc审核";
            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
            this.xtraTabControl1.ResumeLayout(false);
@@ -2141,8 +2191,6 @@
            this.splitMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
            this.layoutMx1.ResumeLayout(false);
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fsecondResu.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).EndInit();
@@ -2166,6 +2214,11 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_suppId.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fsecondResu.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -2174,22 +2227,14 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
@@ -2197,7 +2242,13 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId11111)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
            this.xtraTabControl2.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -2229,6 +2280,9 @@
            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
            this.ResumeLayout(false);
        }
@@ -2263,7 +2317,6 @@
        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView3;
        private DevExpress.XtraGrid.Views.Grid.GridView gridView4;
        private DevExpress.XtraEditors.TextEdit txt_fsecondResu;
        private DevExpress.XtraEditors.TextEdit txt_fcheckResu;
        private DevExpress.XtraEditors.TextEdit txt_remarks;
        private DevExpress.XtraEditors.TextEdit txt_itemNo;
@@ -2337,7 +2390,6 @@
        private DevExpress.XtraEditors.TextEdit txt_lifnr;
        private DevExpress.XtraEditors.ComboBoxEdit txt_djType;
        private UserControl.UcLookStaff txt_fzrId;
        private UserControl.UcLookCustomer txt_suppId;
        private UserControl.UcLookGx txt_workNo;
        private UserControl.UcDictionary txt_msg;
        private DevExpress.XtraEditors.TextEdit txt_lotNo;
@@ -2347,28 +2399,18 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
        private DevExpress.XtraEditors.TextEdit textEdit5;
        private DevExpress.XtraEditors.ComboBoxEdit txt_epTag;
        private DevExpress.XtraLayout.LayoutControlItem txt_epTagtxt;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
        private UserControl.UcLookWorkline txt_lineId;
        private DevExpress.XtraEditors.TextEdit txt_createBy;
        private DevExpress.XtraEditors.TextEdit txt_createDate;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
        private DevExpress.XtraEditors.ButtonEdit txt_itemId;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraEditors.TextEdit txt_itemName;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
@@ -2377,11 +2419,25 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
        private UserControl.UCUpFileList ucUpFileList1;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
        private DevExpress.Utils.ToolTipController tips;
        private DevExpress.XtraEditors.TextEdit txt_lineId;
        private DevExpress.XtraEditors.TextEdit txt_itemId;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
        private DevExpress.XtraLayout.LayoutControlItem txt_itemId11111;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
        private DevExpress.XtraEditors.TextEdit txt_suppId;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
        private DevExpress.XtraEditors.ComboBoxEdit txt_fsecondResu;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
        private DevExpress.XtraEditors.ComboBoxEdit txt_freceQty;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
    }
}
DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01Check.cs
@@ -24,12 +24,12 @@
            this.toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
            this.toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
            toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
            toolBarMenu1.btnJianYanClick += ToolBarMenu1_btnJianYanClick;
            this.toolBarMenu1.btnChkClick += ToolBarMenu1_btnZhiLiangChkClick;
            this.toolBarMenu1.getXmlConfig();
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx3);
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fsubmitTxt", "", (value) =>
            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "modifyFlagTxt", "", (value) =>
            {
                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
            }, tips);
@@ -44,36 +44,6 @@
            pageBar1.PagerEvent += PageBar1_PagerEvent;
            xtraTabControl2.SelectedPageChanged += XtraTabControl2_SelectedPageChanged;
            gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
            txt_suppId.getSuppler("");
            txt_lineId.getSuppler("");
            txt_itemId.Click += (s, e) =>
            {
                string _lineId = txt_lineId.GetId();
                if (string.IsNullOrEmpty(_lineId))
                {
                    Gs.DevApp.ToolBox.MsgHelper.ShowInformation("请先选择产线!");
                    return;
                }
                var frm = new SelectFqcItem(_lineId);
                frm.UpdateParent += (ss, ee) =>
                {
                    try
                    {
                        var lst = new List<dynamic>();
                        lst = ee.DynamicList;
                        txt_itemId.Text = lst[0].itemId;
                        txt_itemModel.Text = lst[0].itemModel;
                        txt_itemName.Text = lst[0].itemName;
                        txt_itemNo.Text = lst[0].itemNo;
                        txt_lotNo.Text = lst[0].gdbh;
                    }
                    catch (Exception ex)
                    {
                        MessageBox.Show(ex.Message);
                    }
                };
                frm.ShowDialog();
            };
        }
        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -178,63 +148,14 @@
            toolBarMenu1.guidKey = rowGuid;
        }
        /// <summary>
        ///提交检验事件
        /// 质量审核
        /// </summary>
        /// <param name="sender"></param>
        /// <param name="e"></param>
        /// <exception cref="NotImplementedException"></exception>
        private void ToolBarMenu1_btnJianYanClick(object sender, EventArgs e)
        private void ToolBarMenu1_btnZhiLiangChkClick(object sender, EventArgs e)
        {
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
                lbGuid, txt_releaseNo, gridView1, "lotNo");
            toolBarMenu1.guidKey = rowGuid;
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定提交检验吗?"))
                return;
            if (txt_fcheckResu.Text.Trim() == "不合格")
            {
                if (string.IsNullOrEmpty(txt_remarks.Text.Trim()))
                {
                    MsgHelper.Warning("单据为不合格时,请填写备注说明!");
                    return;
                }
            };
            var _obj = new
            {
                guid = rowGuid,
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "EditModelSubmit",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning("提示:" + _rtn.rtnData.outMsg);
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    if (xtraTabControl1.SelectedTabPageIndex == 1)
                    {
                        getModel(lbGuid.Text.Trim(), "0");
                    }
                    int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                    gridView1.FocusedRowHandle = rowHandle;
                    int _inFieldValue = 1;
                    UtilityHelper.SetCheckIco(gridView1, "fsubmitTxt", "", "iqcDate", picCheckBox, this, _inFieldValue.ToString());
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
            _toolCk(1);
        }
        /// <summary>
        /// 取消事件
        /// </summary>
@@ -310,9 +231,9 @@
            string _txt_djType = txt_djType.Text.Trim();
            string _txt_fbatchQty = txt_fbatchQty.Text.Trim();
            string _txt_lifnr = txt_lifnr.Text.Trim();
            string _txt_suppId = txt_suppId.GetId();
            string _txt_lineId = txt_lineId.GetId();
            string _txt_itemId = txt_itemId.Text.Trim();
            string _txt_suppId ="";
            string _txt_lineId ="";
            string _txt_itemId = txt_itemId11111.Text.Trim();
            string _txt_remarks = txt_remarks.Text.Trim();
            string _txt_workNo = txt_workNo.GetCode();
            string _txt_epTag = txt_epTag.Text.Trim();
@@ -332,24 +253,6 @@
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("抽检数量不能为空!");
                txt_fbatchQty.Focus();
                return;
            }
            if (string.IsNullOrEmpty(_txt_lineId.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("产线不能为空!");
                txt_lineId.Focus();
                return;
            }
            if (string.IsNullOrEmpty(_txt_itemId.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("产品不能为空!");
                txt_itemId.Focus();
                return;
            }
            if (string.IsNullOrEmpty(_txt_itemId.Trim()))
            {
                Gs.DevApp.ToolBox.MsgHelper.Warning("产品不能为空!");
                txt_itemId.Focus();
                return;
            }
            if (string.IsNullOrEmpty(_txt_lotNo.Trim()))
@@ -407,7 +310,7 @@
        private void getPageList(int curPage)
        {
            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
            // _sbSqlWhere += " and isnull(fsubmit,0)=0";
            _sbSqlWhere += " and isnull(fsubmit,0)=1";
            PageQueryModel pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount, "release_no", "asc", "", _sbSqlWhere.ToString());
            string json = JsonConvert.SerializeObject(pgq);
            try
@@ -566,5 +469,80 @@
            //btnLoad.Enabled = bl;
            //btnIpt.Text = (bl == true ? "录入样本" : "查看样本");
        }
        /// <summary>
        /// 工具条事件
        /// </summary>
        /// <param name="inFieldValue"></param>
        private void _toolCk(int _inFieldValue)
        {
            string strMsg = "";
            switch (_inFieldValue)
            {
                case 1:
                    strMsg = "审核";
                    break;
            };
            toolBarMenu1.guidKey = "";
            string rowGuid, rowName;
            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_releaseNo, gridView1, "releaseNo");
            if (string.IsNullOrEmpty(rowGuid))
            {
                MsgHelper.Warning("请先选择你要操作的行!");
                return;
            }
            if (!MsgHelper.AskQuestion("你选择了【" + rowName + "】,确定" + strMsg + "吗?"))
                return;
            if (_inFieldValue == 1)
            {
                if (txt_fcheckResu.Text == "不合格")
                {
                    //if (txt_fngHandle.Text.Trim().Length == 0)
                    //{
                    //    MsgHelper.Warning("单据为不合格时请选择处理方式!");
                    //    return;
                    //}
                }
            }
            var _obj = new
            {
                guid = rowGuid,
                inFieldValue = _inFieldValue,
            };
            try
            {
                var strJson = UtilityHelper.HttpPost("",
                    _webServiceName + "EditModelSubmitZhiLiang",
                    JsonConvert.SerializeObject(_obj));
                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
                {
                    if (_inFieldValue >= 0)
                    {
                        if (xtraTabControl1.SelectedTabPageIndex == 1)
                        {
                            getModel(lbGuid.Text.Trim(),"0");
                        }
                        int rowHandle = gridView1.LocateByValue(1, gridView1.Columns["guid"], rowGuid);
                        gridView1.FocusedRowHandle = rowHandle;
                        UtilityHelper.SetCheckIco(gridView1, "modifyFlagTxt", "modify1By", "modify1Date", picCheckBox, this, _inFieldValue.ToString());
                    }
                    else
                    {
                        //if (xtraTabControl1.SelectedTabPageIndex == 1)
                        //    getModel(lbGuid.Text.Trim());
                        //else
                        //    getPageList(this.pageBar1.CurrentPage);
                        Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
                        getPageList(this.pageBar1.CurrentPage);
                    }
                }
            }
            catch (Exception ex)
            {
                MsgHelper.Warning("提示:" + ex.Message);
            }
        }
    }
}
DevApp/Gs.DevApp/UserControl/UCUpFileList.cs
@@ -47,6 +47,9 @@
        }
        public void getFileList()
        {
            gcMx4.DataSource = null;
            if (string.IsNullOrEmpty(pGuid))
                return;
            if (pGuid.Length <= 10)
                return;
            System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();