From f4d5aa97370f698c63b0b9f185f06e7bae56975c Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 19 八月 2025 08:15:50 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs |  802 ++++++++++++++++++++++++++++-----------------------------
 1 files changed, 396 insertions(+), 406 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
index 27182c5..921a4dd 100644
--- a/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/FQC/Frm_FqcDetect01.Designer.cs
@@ -118,39 +118,43 @@
             this.txt_itemId = new DevExpress.XtraEditors.TextEdit();
             this.txt_lineId = new DevExpress.XtraEditors.TextEdit();
             this.txt_kbSl = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
             this.txt_itemId1111 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_boxQty11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.txt_epTagtxt = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.txt_lineName111 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_boxQty11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_lineName111 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -216,10 +220,6 @@
             this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.txt_fmrmode = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
@@ -270,39 +270,43 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
             this.xtraTabControl2.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -346,10 +350,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             this.SuspendLayout();
             // 
             // repositoryItemComboBox1
@@ -563,8 +563,6 @@
             this.gv_itemId.Name = "gv_itemId";
             this.gv_itemId.OptionsColumn.AllowEdit = false;
             this.gv_itemId.Tag = "query_a.item_id";
-            this.gv_itemId.Visible = true;
-            this.gv_itemId.VisibleIndex = 7;
             this.gv_itemId.Width = 30;
             // 
             // gv_itemNo
@@ -577,7 +575,7 @@
             this.gv_itemNo.OptionsColumn.AllowEdit = false;
             this.gv_itemNo.Tag = "query_a.item_no";
             this.gv_itemNo.Visible = true;
-            this.gv_itemNo.VisibleIndex = 8;
+            this.gv_itemNo.VisibleIndex = 7;
             this.gv_itemNo.Width = 136;
             // 
             // gv_boardStyle
@@ -590,7 +588,7 @@
             this.gv_boardStyle.OptionsColumn.AllowEdit = false;
             this.gv_boardStyle.Tag = "query_a.board_style";
             this.gv_boardStyle.Visible = true;
-            this.gv_boardStyle.VisibleIndex = 9;
+            this.gv_boardStyle.VisibleIndex = 8;
             this.gv_boardStyle.Width = 164;
             // 
             // gridColumn14
@@ -601,7 +599,7 @@
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.OptionsColumn.ReadOnly = true;
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 10;
+            this.gridColumn14.VisibleIndex = 9;
             this.gridColumn14.Width = 200;
             // 
             // gv_fcovertQty
@@ -615,7 +613,7 @@
             this.gv_fcovertQty.OptionsColumn.ReadOnly = true;
             this.gv_fcovertQty.Tag = "query_a.fcovert_qty";
             this.gv_fcovertQty.Visible = true;
-            this.gv_fcovertQty.VisibleIndex = 11;
+            this.gv_fcovertQty.VisibleIndex = 10;
             this.gv_fcovertQty.Width = 60;
             // 
             // gv_fbatchQty
@@ -628,7 +626,7 @@
             this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
             this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
             this.gv_fbatchQty.Visible = true;
-            this.gv_fbatchQty.VisibleIndex = 12;
+            this.gv_fbatchQty.VisibleIndex = 11;
             this.gv_fbatchQty.Width = 80;
             // 
             // gv_remarks
@@ -641,7 +639,7 @@
             this.gv_remarks.OptionsColumn.AllowEdit = false;
             this.gv_remarks.Tag = "query_a.remarks";
             this.gv_remarks.Visible = true;
-            this.gv_remarks.VisibleIndex = 13;
+            this.gv_remarks.VisibleIndex = 12;
             this.gv_remarks.Width = 100;
             // 
             // gv_fcheckBy
@@ -654,7 +652,7 @@
             this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
             this.gv_fcheckBy.Tag = "query_a.fcheck_by";
             this.gv_fcheckBy.Visible = true;
-            this.gv_fcheckBy.VisibleIndex = 14;
+            this.gv_fcheckBy.VisibleIndex = 13;
             this.gv_fcheckBy.Width = 118;
             // 
             // gv_fcheckDate
@@ -667,7 +665,7 @@
             this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
             this.gv_fcheckDate.Tag = "query_a.fcheck_date";
             this.gv_fcheckDate.Visible = true;
-            this.gv_fcheckDate.VisibleIndex = 15;
+            this.gv_fcheckDate.VisibleIndex = 14;
             this.gv_fcheckDate.Width = 182;
             // 
             // gv_createBy
@@ -680,7 +678,7 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 16;
+            this.gv_createBy.VisibleIndex = 15;
             this.gv_createBy.Width = 67;
             // 
             // gridColumn15
@@ -690,7 +688,7 @@
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 17;
+            this.gridColumn15.VisibleIndex = 16;
             this.gridColumn15.Width = 94;
             // 
             // gv_lastupdateBy
@@ -703,7 +701,7 @@
             this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
             this.gv_lastupdateBy.Visible = true;
-            this.gv_lastupdateBy.VisibleIndex = 18;
+            this.gv_lastupdateBy.VisibleIndex = 17;
             this.gv_lastupdateBy.Width = 60;
             // 
             // gv_lastupdateDate
@@ -716,7 +714,7 @@
             this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
             this.gv_lastupdateDate.Visible = true;
-            this.gv_lastupdateDate.VisibleIndex = 19;
+            this.gv_lastupdateDate.VisibleIndex = 18;
             this.gv_lastupdateDate.Width = 120;
             // 
             // gridColumn18
@@ -726,7 +724,7 @@
             this.gridColumn18.MinWidth = 25;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 20;
+            this.gridColumn18.VisibleIndex = 19;
             this.gridColumn18.Width = 94;
             // 
             // gridColumn19
@@ -736,7 +734,7 @@
             this.gridColumn19.MinWidth = 25;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 21;
+            this.gridColumn19.VisibleIndex = 20;
             this.gridColumn19.Width = 94;
             // 
             // gridColumn30
@@ -753,8 +751,6 @@
             this.gridColumn13.FieldName = "lineId";
             this.gridColumn13.MinWidth = 25;
             this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 22;
             this.gridColumn13.Width = 94;
             // 
             // gridColumn17
@@ -771,8 +767,6 @@
             this.gridColumn7.FieldName = "djType";
             this.gridColumn7.MinWidth = 25;
             this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 23;
             this.gridColumn7.Width = 94;
             // 
             // pageBar1
@@ -858,7 +852,10 @@
             this.layoutControlItem21,
             this.txt_itemId1111,
             this.layoutControlItem4,
-            this.layoutControlItem29});
+            this.layoutControlItem29,
+            this.layoutControlItem23,
+            this.layoutControlItem31,
+            this.layoutControlItem33});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(789, 440, 812, 500);
@@ -872,15 +869,15 @@
             this.txt_fzrId.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_fzrId.Appearance.Options.UseForeColor = true;
             this.txt_fzrId.IsReadly = false;
-            this.txt_fzrId.Location = new System.Drawing.Point(1059, 152);
+            this.txt_fzrId.Location = new System.Drawing.Point(1074, 152);
             this.txt_fzrId.Name = "txt_fzrId";
-            this.txt_fzrId.Size = new System.Drawing.Size(250, 24);
+            this.txt_fzrId.Size = new System.Drawing.Size(256, 24);
             this.txt_fzrId.TabIndex = 839;
             // 
             // txt_zrType
             // 
             this.txt_zrType.EditValue = "-璇烽�夋嫨-";
-            this.txt_zrType.Location = new System.Drawing.Point(1059, 124);
+            this.txt_zrType.Location = new System.Drawing.Point(1074, 124);
             this.txt_zrType.Name = "txt_zrType";
             this.txt_zrType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -889,14 +886,14 @@
             "1:鐢熶骇璐d换",
             "2:闈炵敓浜ц矗浠�"});
             this.txt_zrType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_zrType.Size = new System.Drawing.Size(250, 24);
+            this.txt_zrType.Size = new System.Drawing.Size(256, 24);
             this.txt_zrType.StyleController = this.layoutMx1;
             this.txt_zrType.TabIndex = 838;
             // 
             // txt_fngHandle
             // 
             this.txt_fngHandle.EditValue = "-璇烽�夋嫨-";
-            this.txt_fngHandle.Location = new System.Drawing.Point(1059, 96);
+            this.txt_fngHandle.Location = new System.Drawing.Point(1074, 96);
             this.txt_fngHandle.Name = "txt_fngHandle";
             this.txt_fngHandle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -905,16 +902,16 @@
             "1:杩斿伐"});
             this.txt_fngHandle.Properties.NullText = "-璇烽�夋嫨-";
             this.txt_fngHandle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fngHandle.Size = new System.Drawing.Size(250, 24);
+            this.txt_fngHandle.Size = new System.Drawing.Size(256, 24);
             this.txt_fngHandle.StyleController = this.layoutMx1;
             this.txt_fngHandle.TabIndex = 837;
             // 
             // txt_msg
             // 
             this.txt_msg.BtnTxt = "杩濊绫诲埆";
-            this.txt_msg.Location = new System.Drawing.Point(987, 12);
+            this.txt_msg.Location = new System.Drawing.Point(1002, 12);
             this.txt_msg.Name = "txt_msg";
-            this.txt_msg.Size = new System.Drawing.Size(322, 80);
+            this.txt_msg.Size = new System.Drawing.Size(328, 80);
             this.txt_msg.TabIndex = 814;
             this.txt_msg.TextTxt = "";
             this.txt_msg.WhereTxt = " a.s_type=\'杩濊绫诲埆\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -922,9 +919,9 @@
             // txt_suppId
             // 
             this.txt_suppId.IsReadly = false;
-            this.txt_suppId.Location = new System.Drawing.Point(409, 96);
+            this.txt_suppId.Location = new System.Drawing.Point(414, 96);
             this.txt_suppId.Name = "txt_suppId";
-            this.txt_suppId.Size = new System.Drawing.Size(249, 24);
+            this.txt_suppId.Size = new System.Drawing.Size(254, 24);
             this.txt_suppId.TabIndex = 811;
             // 
             // lbGuid
@@ -938,126 +935,126 @@
             // 
             // txt_remarks
             // 
-            this.txt_remarks.Location = new System.Drawing.Point(409, 208);
+            this.txt_remarks.Location = new System.Drawing.Point(84, 208);
             this.txt_remarks.Name = "txt_remarks";
             this.txt_remarks.Properties.Appearance.Options.UseFont = true;
-            this.txt_remarks.Size = new System.Drawing.Size(249, 24);
+            this.txt_remarks.Size = new System.Drawing.Size(254, 24);
             this.txt_remarks.StyleController = this.layoutMx1;
             this.txt_remarks.TabIndex = 797;
             // 
             // txt_fcheckResu
             // 
-            this.txt_fcheckResu.Location = new System.Drawing.Point(734, 124);
+            this.txt_fcheckResu.Location = new System.Drawing.Point(744, 68);
             this.txt_fcheckResu.Name = "txt_fcheckResu";
             this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
-            this.txt_fcheckResu.Size = new System.Drawing.Size(249, 24);
+            this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
             this.txt_fcheckResu.StyleController = this.layoutMx1;
             this.txt_fcheckResu.TabIndex = 798;
             this.txt_fcheckResu.Tag = "readonly";
             // 
             // txt_releaseNo
             // 
-            this.txt_releaseNo.Location = new System.Drawing.Point(409, 12);
+            this.txt_releaseNo.Location = new System.Drawing.Point(414, 12);
             this.txt_releaseNo.Name = "txt_releaseNo";
             this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_releaseNo.Size = new System.Drawing.Size(249, 24);
+            this.txt_releaseNo.Size = new System.Drawing.Size(254, 24);
             this.txt_releaseNo.StyleController = this.layoutMx1;
             this.txt_releaseNo.TabIndex = 213;
             this.txt_releaseNo.Tag = "readonly";
             // 
             // txt_fcheckDate
             // 
-            this.txt_fcheckDate.Location = new System.Drawing.Point(734, 152);
+            this.txt_fcheckDate.Location = new System.Drawing.Point(744, 96);
             this.txt_fcheckDate.Name = "txt_fcheckDate";
             this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcheckDate.Size = new System.Drawing.Size(249, 24);
+            this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
             this.txt_fcheckDate.StyleController = this.layoutMx1;
             this.txt_fcheckDate.TabIndex = 216;
             this.txt_fcheckDate.Tag = "readonly";
             // 
             // txt_lotNo1
             // 
-            this.txt_lotNo1.Location = new System.Drawing.Point(409, 124);
+            this.txt_lotNo1.Location = new System.Drawing.Point(414, 124);
             this.txt_lotNo1.Name = "txt_lotNo1";
             this.txt_lotNo1.Properties.Appearance.Options.UseFont = true;
-            this.txt_lotNo1.Size = new System.Drawing.Size(249, 24);
+            this.txt_lotNo1.Size = new System.Drawing.Size(254, 24);
             this.txt_lotNo1.StyleController = this.layoutMx1;
             this.txt_lotNo1.TabIndex = 262;
             this.txt_lotNo1.Tag = "";
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(84, 152);
+            this.txt_itemNo.Location = new System.Drawing.Point(84, 124);
             this.txt_itemNo.Name = "txt_itemNo";
             this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(249, 24);
+            this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 789;
             this.txt_itemNo.Tag = "readonly";
             // 
             // txt_itemModel
             // 
-            this.txt_itemModel.Location = new System.Drawing.Point(84, 208);
+            this.txt_itemModel.Location = new System.Drawing.Point(84, 180);
             this.txt_itemModel.Name = "txt_itemModel";
-            this.txt_itemModel.Size = new System.Drawing.Size(249, 24);
+            this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
             this.txt_itemModel.TabIndex = 801;
             this.txt_itemModel.Tag = "readonly";
             // 
             // txt_fcheckBy
             // 
-            this.txt_fcheckBy.Location = new System.Drawing.Point(734, 68);
+            this.txt_fcheckBy.Location = new System.Drawing.Point(744, 12);
             this.txt_fcheckBy.Name = "txt_fcheckBy";
             this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcheckBy.Size = new System.Drawing.Size(249, 24);
+            this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
             this.txt_fcheckBy.StyleController = this.layoutMx1;
             this.txt_fcheckBy.TabIndex = 217;
             this.txt_fcheckBy.Tag = "readonly";
             // 
             // txt_fbatchQty
             // 
-            this.txt_fbatchQty.Location = new System.Drawing.Point(409, 40);
+            this.txt_fbatchQty.Location = new System.Drawing.Point(414, 40);
             this.txt_fbatchQty.Name = "txt_fbatchQty";
             this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
-            this.txt_fbatchQty.Size = new System.Drawing.Size(249, 24);
+            this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24);
             this.txt_fbatchQty.StyleController = this.layoutMx1;
             this.txt_fbatchQty.TabIndex = 222;
             this.txt_fbatchQty.Tag = "";
             // 
             // txt_fsubmitBy
             // 
-            this.txt_fsubmitBy.Location = new System.Drawing.Point(734, 208);
+            this.txt_fsubmitBy.Location = new System.Drawing.Point(744, 152);
             this.txt_fsubmitBy.Name = "txt_fsubmitBy";
-            this.txt_fsubmitBy.Size = new System.Drawing.Size(249, 24);
+            this.txt_fsubmitBy.Size = new System.Drawing.Size(254, 24);
             this.txt_fsubmitBy.StyleController = this.layoutMx1;
             this.txt_fsubmitBy.TabIndex = 804;
             this.txt_fsubmitBy.Tag = "readonly";
             // 
             // txt_fsubmitDate
             // 
-            this.txt_fsubmitDate.Location = new System.Drawing.Point(734, 180);
+            this.txt_fsubmitDate.Location = new System.Drawing.Point(744, 124);
             this.txt_fsubmitDate.Name = "txt_fsubmitDate";
-            this.txt_fsubmitDate.Size = new System.Drawing.Size(249, 24);
+            this.txt_fsubmitDate.Size = new System.Drawing.Size(254, 24);
             this.txt_fsubmitDate.StyleController = this.layoutMx1;
             this.txt_fsubmitDate.TabIndex = 805;
             this.txt_fsubmitDate.Tag = "readonly";
             // 
             // txt_fsubmit
             // 
-            this.txt_fsubmit.Location = new System.Drawing.Point(987, 208);
+            this.txt_fsubmit.Location = new System.Drawing.Point(672, 180);
             this.txt_fsubmit.Name = "txt_fsubmit";
             this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_fsubmit.Size = new System.Drawing.Size(322, 24);
+            this.txt_fsubmit.Size = new System.Drawing.Size(326, 24);
             this.txt_fsubmit.StyleController = this.layoutMx1;
             this.txt_fsubmit.TabIndex = 806;
             this.txt_fsubmit.Tag = "readonly";
             // 
             // txt_fmanageNo
             // 
-            this.txt_fmanageNo.Location = new System.Drawing.Point(409, 180);
+            this.txt_fmanageNo.Location = new System.Drawing.Point(414, 180);
             this.txt_fmanageNo.Name = "txt_fmanageNo";
-            this.txt_fmanageNo.Size = new System.Drawing.Size(249, 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 = "";
@@ -1073,21 +1070,20 @@
             // 
             // txt_lifnr
             // 
-            this.txt_lifnr.Location = new System.Drawing.Point(409, 68);
+            this.txt_lifnr.Location = new System.Drawing.Point(414, 68);
             this.txt_lifnr.Name = "txt_lifnr";
-            this.txt_lifnr.Size = new System.Drawing.Size(249, 24);
+            this.txt_lifnr.Size = new System.Drawing.Size(254, 24);
             this.txt_lifnr.StyleController = this.layoutMx1;
             this.txt_lifnr.TabIndex = 809;
             // 
             // txt_djType
             // 
-            this.txt_djType.EditValue = "-璇烽�夋嫨-";
-            this.txt_djType.Location = new System.Drawing.Point(84, 12);
+            this.txt_djType.EditValue = "1:甯歌娴佺▼";
+            this.txt_djType.Location = new System.Drawing.Point(84, 10);
             this.txt_djType.Name = "txt_djType";
             this.txt_djType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txt_djType.Properties.Items.AddRange(new object[] {
-            "-璇烽�夋嫨-",
             "1:甯歌娴佺▼"});
             this.txt_djType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             this.txt_djType.Size = new System.Drawing.Size(249, 24);
@@ -1105,28 +1101,28 @@
             // 
             // txt_checkStates
             // 
-            this.txt_checkStates.Location = new System.Drawing.Point(734, 96);
+            this.txt_checkStates.Location = new System.Drawing.Point(744, 40);
             this.txt_checkStates.Name = "txt_checkStates";
             this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
-            this.txt_checkStates.Size = new System.Drawing.Size(249, 24);
+            this.txt_checkStates.Size = new System.Drawing.Size(254, 24);
             this.txt_checkStates.StyleController = this.layoutMx1;
             this.txt_checkStates.TabIndex = 819;
             this.txt_checkStates.Tag = "readonly";
             // 
             // txt_epTag
             // 
-            this.txt_epTag.Location = new System.Drawing.Point(409, 152);
+            this.txt_epTag.Location = new System.Drawing.Point(414, 152);
             this.txt_epTag.Name = "txt_epTag";
             this.txt_epTag.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_epTag.Size = new System.Drawing.Size(249, 24);
+            this.txt_epTag.Size = new System.Drawing.Size(254, 24);
             this.txt_epTag.StyleController = this.layoutMx1;
             this.txt_epTag.TabIndex = 820;
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(734, 12);
+            this.txt_createBy.Location = new System.Drawing.Point(734, 10);
             this.txt_createBy.Name = "txt_createBy";
             this.txt_createBy.Size = new System.Drawing.Size(249, 24);
             this.txt_createBy.StyleController = this.layoutMx1;
@@ -1135,7 +1131,7 @@
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(734, 40);
+            this.txt_createDate.Location = new System.Drawing.Point(734, 38);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Size = new System.Drawing.Size(249, 24);
             this.txt_createDate.StyleController = this.layoutMx1;
@@ -1144,39 +1140,39 @@
             // 
             // txt_itemName
             // 
-            this.txt_itemName.Location = new System.Drawing.Point(84, 180);
+            this.txt_itemName.Location = new System.Drawing.Point(84, 152);
             this.txt_itemName.Name = "txt_itemName";
-            this.txt_itemName.Size = new System.Drawing.Size(249, 24);
+            this.txt_itemName.Size = new System.Drawing.Size(254, 24);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 825;
             this.txt_itemName.Tag = "readonly";
             // 
             // txt_kbList
             // 
-            this.txt_kbList.Location = new System.Drawing.Point(84, 68);
+            this.txt_kbList.Location = new System.Drawing.Point(84, 40);
             this.txt_kbList.Name = "txt_kbList";
             this.txt_kbList.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.txt_kbList.Size = new System.Drawing.Size(249, 24);
+            this.txt_kbList.Size = new System.Drawing.Size(254, 24);
             this.txt_kbList.StyleController = this.layoutMx1;
             this.txt_kbList.TabIndex = 830;
             // 
             // txt_lotNo
             // 
             this.txt_lotNo.EditValue = "";
-            this.txt_lotNo.Location = new System.Drawing.Point(84, 40);
+            this.txt_lotNo.Location = new System.Drawing.Point(84, 12);
             this.txt_lotNo.Name = "txt_lotNo";
             this.txt_lotNo.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.txt_lotNo.Size = new System.Drawing.Size(249, 24);
+            this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
             this.txt_lotNo.StyleController = this.layoutMx1;
             this.txt_lotNo.TabIndex = 831;
             // 
             // txt_lineName
             // 
-            this.txt_lineName.Location = new System.Drawing.Point(84, 124);
+            this.txt_lineName.Location = new System.Drawing.Point(84, 96);
             this.txt_lineName.Name = "txt_lineName";
-            this.txt_lineName.Size = new System.Drawing.Size(249, 24);
+            this.txt_lineName.Size = new System.Drawing.Size(254, 24);
             this.txt_lineName.StyleController = this.layoutMx1;
             this.txt_lineName.TabIndex = 832;
             this.txt_lineName.Tag = "readonly";
@@ -1201,12 +1197,24 @@
             // 
             // txt_kbSl
             // 
-            this.txt_kbSl.Location = new System.Drawing.Point(84, 96);
+            this.txt_kbSl.Location = new System.Drawing.Point(84, 68);
             this.txt_kbSl.Name = "txt_kbSl";
-            this.txt_kbSl.Size = new System.Drawing.Size(249, 24);
+            this.txt_kbSl.Size = new System.Drawing.Size(254, 24);
             this.txt_kbSl.StyleController = this.layoutMx1;
             this.txt_kbSl.TabIndex = 835;
             this.txt_kbSl.Tag = "readonly";
+            // 
+            // txt_fmrmode
+            // 
+            this.txt_fmrmode.Location = new System.Drawing.Point(1074, 180);
+            this.txt_fmrmode.Name = "txt_fmrmode";
+            this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_fmrmode.Properties.NullText = "-璇烽�夋嫨-";
+            this.txt_fmrmode.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_fmrmode.Size = new System.Drawing.Size(256, 24);
+            this.txt_fmrmode.StyleController = this.layoutMx1;
+            this.txt_fmrmode.TabIndex = 840;
             // 
             // layoutControlItem17
             // 
@@ -1253,40 +1261,78 @@
             this.layoutControlItem4.Text = "绾垮埆ID";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
             // 
+            // layoutControlItem29
+            // 
+            this.layoutControlItem29.Control = this.txt_workNo;
+            this.layoutControlItem29.Location = new System.Drawing.Point(990, 174);
+            this.layoutControlItem29.Name = "layoutControlItem29";
+            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem29.Size = new System.Drawing.Size(332, 29);
+            this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
+            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem23
+            // 
+            this.layoutControlItem23.Control = this.txt_djType;
+            this.layoutControlItem23.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem23.Name = "layoutControlItem23";
+            this.layoutControlItem23.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷";
+            this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem31
+            // 
+            this.layoutControlItem31.Control = this.txt_createBy;
+            this.layoutControlItem31.Location = new System.Drawing.Point(650, 0);
+            this.layoutControlItem31.Name = "layoutControlItem31";
+            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem31.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
+            this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem33
+            // 
+            this.layoutControlItem33.Control = this.txt_createDate;
+            this.layoutControlItem33.Location = new System.Drawing.Point(650, 28);
+            this.layoutControlItem33.Name = "layoutControlItem33";
+            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem33.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
+            this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem31,
-            this.layoutControlItem10,
-            this.layoutControlItem32,
-            this.layoutControlItem8,
-            this.layoutControlItem33,
-            this.layoutControlItem2,
-            this.layoutControlItem6,
-            this.layoutControlItem34,
-            this.layoutControlItem5,
             this.layoutControlItem1,
-            this.layoutControlItem28,
-            this.txt_boxQty11,
             this.layoutControlItem9,
             this.layoutControlItem22,
             this.layoutControlItem24,
             this.layoutControlItem3,
             this.txt_epTagtxt,
             this.layoutControlItem18,
-            this.txt_lineName111,
-            this.layoutControlItem30,
-            this.layoutControlItem23,
             this.layoutControlItem13,
             this.layoutControlItem7,
             this.layoutControlItem35,
-            this.layoutControlItem16,
-            this.layoutControlItem15,
             this.layoutControlItem27,
             this.layoutControlItem25,
+            this.layoutControlItem28,
+            this.txt_boxQty11,
+            this.layoutControlItem30,
+            this.txt_lineName111,
+            this.layoutControlItem5,
+            this.layoutControlItem34,
+            this.layoutControlItem6,
             this.layoutControlItem12,
+            this.layoutControlItem8,
+            this.layoutControlItem32,
+            this.layoutControlItem10,
+            this.layoutControlItem2,
+            this.layoutControlItem16,
+            this.layoutControlItem15,
             this.layoutControlItem14});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
@@ -1328,308 +1374,298 @@
             rowDefinition6,
             rowDefinition7,
             rowDefinition8});
-            this.Root.Size = new System.Drawing.Size(1321, 244);
+            this.Root.Size = new System.Drawing.Size(1342, 244);
             this.Root.TextVisible = false;
-            // 
-            // layoutControlItem31
-            // 
-            this.layoutControlItem31.Control = this.txt_createBy;
-            this.layoutControlItem31.Location = new System.Drawing.Point(650, 0);
-            this.layoutControlItem31.Name = "layoutControlItem31";
-            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem31.Size = new System.Drawing.Size(325, 28);
-            this.layoutControlItem31.Text = "鍒涘缓浜哄憳";
-            this.layoutControlItem31.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txt_fcheckResu;
-            this.layoutControlItem10.Location = new System.Drawing.Point(650, 112);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem10.Size = new System.Drawing.Size(325, 28);
-            this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem32
-            // 
-            this.layoutControlItem32.Control = this.txt_checkStates;
-            this.layoutControlItem32.Location = new System.Drawing.Point(650, 84);
-            this.layoutControlItem32.Name = "layoutControlItem32";
-            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem32.Size = new System.Drawing.Size(325, 28);
-            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(650, 56);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(325, 28);
-            this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem33
-            // 
-            this.layoutControlItem33.Control = this.txt_createDate;
-            this.layoutControlItem33.Location = new System.Drawing.Point(650, 28);
-            this.layoutControlItem33.Name = "layoutControlItem33";
-            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem33.Size = new System.Drawing.Size(325, 28);
-            this.layoutControlItem33.Text = "鍒涘缓鏃堕棿";
-            this.layoutControlItem33.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txt_fcheckDate;
-            this.layoutControlItem2.Location = new System.Drawing.Point(650, 140);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem2.Size = new System.Drawing.Size(325, 28);
-            this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_itemModel;
-            this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 196);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem6.Size = new System.Drawing.Size(325, 28);
-            this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem34
-            // 
-            this.layoutControlItem34.Control = this.txt_itemName;
-            this.layoutControlItem34.Location = new System.Drawing.Point(0, 168);
-            this.layoutControlItem34.Name = "layoutControlItem34";
-            this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem34.Size = new System.Drawing.Size(325, 28);
-            this.layoutControlItem34.Text = "浜у搧鍚嶇О";
-            this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txt_itemNo;
-            this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 140);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem5.Size = new System.Drawing.Size(325, 28);
-            this.layoutControlItem5.Text = "浜у搧缂栫爜";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.txt_releaseNo;
-            this.layoutControlItem1.Location = new System.Drawing.Point(325, 0);
+            this.layoutControlItem1.Location = new System.Drawing.Point(330, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
             this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem1.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem1.Size = new System.Drawing.Size(330, 28);
             this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem28
-            // 
-            this.layoutControlItem28.Control = this.txt_lotNo;
-            this.layoutControlItem28.Location = new System.Drawing.Point(0, 28);
-            this.layoutControlItem28.Name = "layoutControlItem28";
-            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem28.Size = new System.Drawing.Size(325, 28);
-            this.layoutControlItem28.Text = "閫夋嫨宸ュ崟";
-            this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // txt_boxQty11
-            // 
-            this.txt_boxQty11.Control = this.txt_kbList;
-            this.txt_boxQty11.Location = new System.Drawing.Point(0, 56);
-            this.txt_boxQty11.Name = "txt_boxQty11";
-            this.txt_boxQty11.OptionsTableLayoutItem.RowIndex = 2;
-            this.txt_boxQty11.Size = new System.Drawing.Size(325, 28);
-            this.txt_boxQty11.Text = "閫佹绠辩爜";
-            this.txt_boxQty11.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_fbatchQty;
-            this.layoutControlItem9.Location = new System.Drawing.Point(325, 28);
+            this.layoutControlItem9.Location = new System.Drawing.Point(330, 28);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem9.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
             this.layoutControlItem9.Text = "鎶芥鏁伴噺";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem22
             // 
             this.layoutControlItem22.Control = this.txt_lifnr;
-            this.layoutControlItem22.Location = new System.Drawing.Point(325, 56);
+            this.layoutControlItem22.Location = new System.Drawing.Point(330, 56);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem22.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem22.Size = new System.Drawing.Size(330, 28);
             this.layoutControlItem22.Text = "瀹㈡埛璁㈠崟";
             this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem24
             // 
             this.layoutControlItem24.Control = this.txt_suppId;
-            this.layoutControlItem24.Location = new System.Drawing.Point(325, 84);
+            this.layoutControlItem24.Location = new System.Drawing.Point(330, 84);
             this.layoutControlItem24.Name = "layoutControlItem24";
             this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem24.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem24.Size = new System.Drawing.Size(330, 28);
             this.layoutControlItem24.Text = "瀹㈡埛缂栫爜";
             this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_lotNo1;
-            this.layoutControlItem3.Location = new System.Drawing.Point(325, 112);
+            this.layoutControlItem3.Location = new System.Drawing.Point(330, 112);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem3.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem3.Size = new System.Drawing.Size(330, 28);
             this.layoutControlItem3.Text = "閫佹鎵瑰彿";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
             // 
             // txt_epTagtxt
             // 
             this.txt_epTagtxt.Control = this.txt_epTag;
-            this.txt_epTagtxt.Location = new System.Drawing.Point(325, 140);
+            this.txt_epTagtxt.Location = new System.Drawing.Point(330, 140);
             this.txt_epTagtxt.Name = "txt_epTagtxt";
             this.txt_epTagtxt.OptionsTableLayoutItem.ColumnIndex = 1;
             this.txt_epTagtxt.OptionsTableLayoutItem.RowIndex = 5;
-            this.txt_epTagtxt.Size = new System.Drawing.Size(325, 28);
+            this.txt_epTagtxt.Size = new System.Drawing.Size(330, 28);
             this.txt_epTagtxt.Text = "鐜繚鏍囪瘑";
             this.txt_epTagtxt.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_fmanageNo;
-            this.layoutControlItem18.Location = new System.Drawing.Point(325, 168);
+            this.layoutControlItem18.Location = new System.Drawing.Point(330, 168);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem18.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem18.Size = new System.Drawing.Size(330, 28);
             this.layoutControlItem18.Text = "娴佺▼缂栧彿";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // txt_lineName111
-            // 
-            this.txt_lineName111.Control = this.txt_lineName;
-            this.txt_lineName111.Location = new System.Drawing.Point(0, 112);
-            this.txt_lineName111.Name = "txt_lineName111";
-            this.txt_lineName111.OptionsTableLayoutItem.RowIndex = 4;
-            this.txt_lineName111.Size = new System.Drawing.Size(325, 28);
-            this.txt_lineName111.Text = "鐢熶骇绾垮埆";
-            this.txt_lineName111.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem30
-            // 
-            this.layoutControlItem30.Control = this.txt_kbSl;
-            this.layoutControlItem30.Location = new System.Drawing.Point(0, 84);
-            this.layoutControlItem30.Name = "layoutControlItem30";
-            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem30.Size = new System.Drawing.Size(325, 28);
-            this.layoutControlItem30.Text = "閫佹鏁伴噺";
-            this.layoutControlItem30.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem23
-            // 
-            this.layoutControlItem23.Control = this.txt_djType;
-            this.layoutControlItem23.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem23.Name = "layoutControlItem23";
-            this.layoutControlItem23.Size = new System.Drawing.Size(325, 28);
-            this.layoutControlItem23.Text = "鍗曟嵁绫诲瀷";
-            this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_fngHandle;
-            this.layoutControlItem13.Location = new System.Drawing.Point(975, 84);
+            this.layoutControlItem13.Location = new System.Drawing.Point(990, 84);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(326, 28);
+            this.layoutControlItem13.Size = new System.Drawing.Size(332, 28);
             this.layoutControlItem13.Text = "澶勭疆缁撴灉";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_zrType;
-            this.layoutControlItem7.Location = new System.Drawing.Point(975, 112);
+            this.layoutControlItem7.Location = new System.Drawing.Point(990, 112);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem7.Size = new System.Drawing.Size(326, 28);
+            this.layoutControlItem7.Size = new System.Drawing.Size(332, 28);
             this.layoutControlItem7.Text = "鍒ゅ畾璐d换";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem35
             // 
             this.layoutControlItem35.Control = this.txt_fzrId;
-            this.layoutControlItem35.Location = new System.Drawing.Point(975, 140);
+            this.layoutControlItem35.Location = new System.Drawing.Point(990, 140);
             this.layoutControlItem35.Name = "layoutControlItem35";
             this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem35.Size = new System.Drawing.Size(326, 28);
+            this.layoutControlItem35.Size = new System.Drawing.Size(332, 28);
             this.layoutControlItem35.Text = "璐d换浜�";
             this.layoutControlItem35.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem29
+            // layoutControlItem27
             // 
-            this.layoutControlItem29.Control = this.txt_workNo;
-            this.layoutControlItem29.Location = new System.Drawing.Point(990, 174);
-            this.layoutControlItem29.Name = "layoutControlItem29";
-            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem29.Size = new System.Drawing.Size(332, 29);
-            this.layoutControlItem29.Text = "杩斿伐鍗曞彿";
-            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem27.Control = this.txt_msg;
+            this.layoutControlItem27.Location = new System.Drawing.Point(990, 0);
+            this.layoutControlItem27.Name = "layoutControlItem27";
+            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 3;
+            this.layoutControlItem27.Size = new System.Drawing.Size(332, 84);
+            this.layoutControlItem27.Text = "杩濊绫诲埆";
+            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem27.TextVisible = false;
+            // 
+            // layoutControlItem25
+            // 
+            this.layoutControlItem25.Control = this.txt_fmrmode;
+            this.layoutControlItem25.Location = new System.Drawing.Point(990, 168);
+            this.layoutControlItem25.Name = "layoutControlItem25";
+            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem25.Size = new System.Drawing.Size(332, 28);
+            this.layoutControlItem25.Text = "杩斿伐宸ュ簭";
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem28
+            // 
+            this.layoutControlItem28.Control = this.txt_lotNo;
+            this.layoutControlItem28.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem28.Name = "layoutControlItem28";
+            this.layoutControlItem28.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem28.Text = "閫夋嫨宸ュ崟";
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // txt_boxQty11
+            // 
+            this.txt_boxQty11.Control = this.txt_kbList;
+            this.txt_boxQty11.Location = new System.Drawing.Point(0, 28);
+            this.txt_boxQty11.Name = "txt_boxQty11";
+            this.txt_boxQty11.OptionsTableLayoutItem.RowIndex = 1;
+            this.txt_boxQty11.Size = new System.Drawing.Size(330, 28);
+            this.txt_boxQty11.Text = "閫佹绠辩爜";
+            this.txt_boxQty11.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem30
+            // 
+            this.layoutControlItem30.Control = this.txt_kbSl;
+            this.layoutControlItem30.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem30.Name = "layoutControlItem30";
+            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem30.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem30.Text = "閫佹鏁伴噺";
+            this.layoutControlItem30.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // txt_lineName111
+            // 
+            this.txt_lineName111.Control = this.txt_lineName;
+            this.txt_lineName111.Location = new System.Drawing.Point(0, 84);
+            this.txt_lineName111.Name = "txt_lineName111";
+            this.txt_lineName111.OptionsTableLayoutItem.RowIndex = 3;
+            this.txt_lineName111.Size = new System.Drawing.Size(330, 28);
+            this.txt_lineName111.Text = "鐢熶骇绾垮埆";
+            this.txt_lineName111.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_itemNo;
+            this.layoutControlItem5.CustomizationFormText = "浜у搧缂栫爜";
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 112);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem5.Text = "浜у搧缂栫爜";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem34
+            // 
+            this.layoutControlItem34.Control = this.txt_itemName;
+            this.layoutControlItem34.Location = new System.Drawing.Point(0, 140);
+            this.layoutControlItem34.Name = "layoutControlItem34";
+            this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem34.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem34.Text = "浜у搧鍚嶇О";
+            this.layoutControlItem34.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_itemModel;
+            this.layoutControlItem6.CustomizationFormText = "浜у搧瑙勬牸";
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 168);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_remarks;
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 196);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem12.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem12.Text = "澶囨敞璇存槑";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_fcheckBy;
+            this.layoutControlItem8.Location = new System.Drawing.Point(660, 0);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem8.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem32
+            // 
+            this.layoutControlItem32.Control = this.txt_checkStates;
+            this.layoutControlItem32.Location = new System.Drawing.Point(660, 28);
+            this.layoutControlItem32.Name = "layoutControlItem32";
+            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem32.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem32.Text = "妫�楠岀姸鎬�";
+            this.layoutControlItem32.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.txt_fcheckResu;
+            this.layoutControlItem10.Location = new System.Drawing.Point(660, 56);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_fcheckDate;
+            this.layoutControlItem2.Location = new System.Drawing.Point(660, 84);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_fsubmitDate;
-            this.layoutControlItem16.Location = new System.Drawing.Point(650, 168);
+            this.layoutControlItem16.Location = new System.Drawing.Point(660, 112);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem16.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem16.Size = new System.Drawing.Size(330, 28);
             this.layoutControlItem16.Text = "瀹℃牳浜哄憳";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_fsubmitBy;
-            this.layoutControlItem15.Location = new System.Drawing.Point(650, 196);
+            this.layoutControlItem15.Location = new System.Drawing.Point(660, 140);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem15.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem15.Size = new System.Drawing.Size(330, 28);
             this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem27
+            // layoutControlItem14
             // 
-            this.layoutControlItem27.Control = this.txt_msg;
-            this.layoutControlItem27.Location = new System.Drawing.Point(975, 0);
-            this.layoutControlItem27.Name = "layoutControlItem27";
-            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem27.OptionsTableLayoutItem.RowSpan = 3;
-            this.layoutControlItem27.Size = new System.Drawing.Size(326, 84);
-            this.layoutControlItem27.Text = "杩濊绫诲埆";
-            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem27.TextVisible = false;
+            this.layoutControlItem14.Control = this.txt_fsubmit;
+            this.layoutControlItem14.Location = new System.Drawing.Point(660, 168);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem14.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem14.TextVisible = false;
             // 
             // xtraTabControl2
             // 
@@ -2321,7 +2357,7 @@
             // 
             this.tabMxPage2.Controls.Add(this.ucChouJianList1);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1340, 362);
+            this.tabMxPage2.Size = new System.Drawing.Size(1340, 402);
             this.tabMxPage2.Text = "浜у搧鏉$爜鏄庣粏";
             // 
             // ucChouJianList1
@@ -2330,14 +2366,14 @@
             this.ucChouJianList1.Location = new System.Drawing.Point(0, 0);
             this.ucChouJianList1.Name = "ucChouJianList1";
             this.ucChouJianList1.pGuid = null;
-            this.ucChouJianList1.Size = new System.Drawing.Size(1340, 362);
+            this.ucChouJianList1.Size = new System.Drawing.Size(1340, 402);
             this.ucChouJianList1.TabIndex = 0;
             // 
             // tabMxPage3
             // 
             this.tabMxPage3.Controls.Add(this.ucUpFileList1);
             this.tabMxPage3.Name = "tabMxPage3";
-            this.tabMxPage3.Size = new System.Drawing.Size(1340, 362);
+            this.tabMxPage3.Size = new System.Drawing.Size(1340, 402);
             this.tabMxPage3.Text = "闄勪欢淇℃伅";
             // 
             // ucUpFileList1
@@ -2347,7 +2383,7 @@
             this.ucUpFileList1.Name = "ucUpFileList1";
             this.ucUpFileList1.parentGroup = null;
             this.ucUpFileList1.pGuid = null;
-            this.ucUpFileList1.Size = new System.Drawing.Size(1340, 362);
+            this.ucUpFileList1.Size = new System.Drawing.Size(1340, 402);
             this.ucUpFileList1.TabIndex = 0;
             // 
             // repositoryItemComboBox2
@@ -2382,52 +2418,6 @@
             // gridView4
             // 
             this.gridView4.Name = "gridView4";
-            // 
-            // txt_fmrmode
-            // 
-            this.txt_fmrmode.Location = new System.Drawing.Point(1059, 180);
-            this.txt_fmrmode.Name = "txt_fmrmode";
-            this.txt_fmrmode.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_fmrmode.Properties.NullText = "-璇烽�夋嫨-";
-            this.txt_fmrmode.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fmrmode.Size = new System.Drawing.Size(250, 24);
-            this.txt_fmrmode.StyleController = this.layoutMx1;
-            this.txt_fmrmode.TabIndex = 840;
-            // 
-            // layoutControlItem25
-            // 
-            this.layoutControlItem25.Control = this.txt_fmrmode;
-            this.layoutControlItem25.Location = new System.Drawing.Point(975, 168);
-            this.layoutControlItem25.Name = "layoutControlItem25";
-            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem25.Size = new System.Drawing.Size(326, 28);
-            this.layoutControlItem25.Text = "杩斿伐宸ュ簭";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txt_remarks;
-            this.layoutControlItem12.Location = new System.Drawing.Point(325, 196);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem12.Size = new System.Drawing.Size(325, 28);
-            this.layoutControlItem12.Text = "澶囨敞璇存槑";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_fsubmit;
-            this.layoutControlItem14.Location = new System.Drawing.Point(975, 196);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 7;
-            this.layoutControlItem14.Size = new System.Drawing.Size(326, 28);
-            this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem14.TextVisible = false;
             // 
             // Frm_FqcDetect01
             // 
@@ -2489,39 +2479,43 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lineId.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_kbSl.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemId1111)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_epTagtxt)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_boxQty11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lineName111)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
             this.xtraTabControl2.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -2565,10 +2559,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2696,11 +2686,7 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
         private DevExpress.Utils.ToolTipController tips;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
@@ -2708,15 +2694,10 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptDefectDetails;
         private DevExpress.XtraEditors.ButtonEdit txt_kbList;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraEditors.ButtonEdit txt_lotNo;
         private DevExpress.XtraEditors.TextEdit txt_lineName;
         private DevExpress.XtraEditors.TextEdit txt_itemId;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
-        private DevExpress.XtraLayout.LayoutControlItem txt_boxQty11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
@@ -2729,8 +2710,6 @@
         private UcChouJianList ucChouJianList1;
         private DevExpress.XtraEditors.TextEdit txt_kbSl;
         private DevExpress.XtraLayout.LayoutControlItem txt_itemId1111;
-        private DevExpress.XtraLayout.LayoutControlItem txt_lineName111;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
         private DevExpress.XtraEditors.ComboBoxEdit txt_fngHandle;
         private DevExpress.XtraEditors.ComboBoxEdit txt_zrType;
         private UserControl.UcLookStaff txt_fzrId;
@@ -2739,12 +2718,23 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
         private DevExpress.XtraEditors.ComboBoxEdit txt_fmrmode;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+        private DevExpress.XtraLayout.LayoutControlItem txt_boxQty11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+        private DevExpress.XtraLayout.LayoutControlItem txt_lineName111;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3