From 8e7b878c0a09fbd4c4bb57ff7b0def99482051de Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 16 四月 2025 16:33:14 +0800
Subject: [PATCH] 异常

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs          |   11 
 DevApp/Gs.DevApp/App.config                                        |    4 
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs      |  276 ++++++++-----
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs |   29 +
 DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs            |  770 +++++++++++++++++++---------------------
 5 files changed, 572 insertions(+), 518 deletions(-)

diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 2d4703e..09d6be2 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -28,8 +28,8 @@
 		</assemblyBinding>
 	</runtime>
     <appSettings>
-		 <add key="WebApiUrl" value="http://localhost:5263/" />
-		<!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />--> 
+		 <!--<add key="WebApiUrl" value="http://localhost:5263/" />-->
+		<add key="WebApiUrl" value="http://192.168.1.145:81/" /> 
         <add key="LogPath" value="logs" />
         <add key="ProductName" value="骞挎繁绉戞妧 G-MES V2.0" />
         <add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index c9840f6..17b051c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -39,11 +39,12 @@
             DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
             this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -115,9 +116,7 @@
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -185,6 +184,12 @@
             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_fngHandle = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fmrmode = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem25 = 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();
@@ -236,9 +241,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
@@ -287,6 +290,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
             this.SuspendLayout();
             // 
             // repositoryItemComboBox1
@@ -781,7 +790,7 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1342, 688);
-            this.splitMx1.SplitterPosition = 158;
+            this.splitMx1.SplitterPosition = 183;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -807,6 +816,8 @@
             this.layoutMx1.Controls.Add(this.txt_checkStates);
             this.layoutMx1.Controls.Add(this.txt_freceQty);
             this.layoutMx1.Controls.Add(this.txt_cgdNo);
+            this.layoutMx1.Controls.Add(this.txt_fngHandle);
+            this.layoutMx1.Controls.Add(this.txt_fmrmode);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem17,
@@ -816,7 +827,7 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1094, 495, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1342, 158);
+            this.layoutMx1.Size = new System.Drawing.Size(1342, 183);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -831,9 +842,9 @@
             // 
             // txt_suppName
             // 
-            this.txt_suppName.Location = new System.Drawing.Point(414, 96);
+            this.txt_suppName.Location = new System.Drawing.Point(409, 96);
             this.txt_suppName.Name = "txt_suppName";
-            this.txt_suppName.Size = new System.Drawing.Size(254, 24);
+            this.txt_suppName.Size = new System.Drawing.Size(249, 24);
             this.txt_suppName.StyleController = this.layoutMx1;
             this.txt_suppName.TabIndex = 801;
             this.txt_suppName.Tag = "readonly";
@@ -843,17 +854,17 @@
             this.txt_remarks.Location = new System.Drawing.Point(84, 124);
             this.txt_remarks.Name = "txt_remarks";
             this.txt_remarks.Properties.Appearance.Options.UseFont = true;
-            this.txt_remarks.Size = new System.Drawing.Size(584, 24);
+            this.txt_remarks.Size = new System.Drawing.Size(574, 24);
             this.txt_remarks.StyleController = this.layoutMx1;
             this.txt_remarks.TabIndex = 797;
             // 
             // txt_fcheckResu
             // 
-            this.txt_fcheckResu.Location = new System.Drawing.Point(744, 96);
+            this.txt_fcheckResu.Location = new System.Drawing.Point(734, 96);
             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(254, 24);
+            this.txt_fcheckResu.Size = new System.Drawing.Size(249, 24);
             this.txt_fcheckResu.StyleController = this.layoutMx1;
             this.txt_fcheckResu.TabIndex = 798;
             this.txt_fcheckResu.Tag = "readonly";
@@ -863,7 +874,7 @@
             this.txt_itemName.Location = new System.Drawing.Point(84, 40);
             this.txt_itemName.Name = "txt_itemName";
             this.txt_itemName.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemName.Size = new System.Drawing.Size(254, 24);
+            this.txt_itemName.Size = new System.Drawing.Size(249, 24);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 800;
             this.txt_itemName.Tag = "readonly";
@@ -873,27 +884,27 @@
             this.txt_releaseNo.Location = new System.Drawing.Point(84, 12);
             this.txt_releaseNo.Name = "txt_releaseNo";
             this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_releaseNo.Size = new System.Drawing.Size(254, 24);
+            this.txt_releaseNo.Size = new System.Drawing.Size(249, 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(744, 12);
+            this.txt_fcheckDate.Location = new System.Drawing.Point(734, 12);
             this.txt_fcheckDate.Name = "txt_fcheckDate";
             this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
+            this.txt_fcheckDate.Size = new System.Drawing.Size(249, 24);
             this.txt_fcheckDate.StyleController = this.layoutMx1;
             this.txt_fcheckDate.TabIndex = 216;
             this.txt_fcheckDate.Tag = "readonly";
             // 
             // txt_lotNo
             // 
-            this.txt_lotNo.Location = new System.Drawing.Point(414, 12);
+            this.txt_lotNo.Location = new System.Drawing.Point(409, 12);
             this.txt_lotNo.Name = "txt_lotNo";
             this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
+            this.txt_lotNo.Size = new System.Drawing.Size(249, 24);
             this.txt_lotNo.StyleController = this.layoutMx1;
             this.txt_lotNo.TabIndex = 262;
             this.txt_lotNo.Tag = "readonly";
@@ -903,7 +914,7 @@
             this.txt_itemNo.Location = new System.Drawing.Point(84, 68);
             this.txt_itemNo.Name = "txt_itemNo";
             this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
+            this.txt_itemNo.Size = new System.Drawing.Size(249, 24);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 789;
             this.txt_itemNo.Tag = "readonly";
@@ -912,7 +923,7 @@
             // 
             this.txt_itemModel.Location = new System.Drawing.Point(84, 96);
             this.txt_itemModel.Name = "txt_itemModel";
-            this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
+            this.txt_itemModel.Size = new System.Drawing.Size(249, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
             this.txt_itemModel.TabIndex = 801;
             this.txt_itemModel.Tag = "readonly";
@@ -928,57 +939,57 @@
             // 
             // txt_fcheckBy
             // 
-            this.txt_fcheckBy.Location = new System.Drawing.Point(744, 40);
+            this.txt_fcheckBy.Location = new System.Drawing.Point(734, 40);
             this.txt_fcheckBy.Name = "txt_fcheckBy";
             this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
+            this.txt_fcheckBy.Size = new System.Drawing.Size(249, 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(414, 68);
+            this.txt_fbatchQty.Location = new System.Drawing.Point(409, 68);
             this.txt_fbatchQty.Name = "txt_fbatchQty";
             this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
-            this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24);
+            this.txt_fbatchQty.Size = new System.Drawing.Size(249, 24);
             this.txt_fbatchQty.StyleController = this.layoutMx1;
             this.txt_fbatchQty.TabIndex = 222;
             this.txt_fbatchQty.Tag = "readonly";
             // 
             // txt_fsubmitBy
             // 
-            this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 40);
+            this.txt_fsubmitBy.Location = new System.Drawing.Point(1059, 40);
             this.txt_fsubmitBy.Name = "txt_fsubmitBy";
-            this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
+            this.txt_fsubmitBy.Size = new System.Drawing.Size(250, 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(1074, 68);
+            this.txt_fsubmitDate.Location = new System.Drawing.Point(1059, 68);
             this.txt_fsubmitDate.Name = "txt_fsubmitDate";
-            this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
+            this.txt_fsubmitDate.Size = new System.Drawing.Size(250, 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(1002, 12);
+            this.txt_fsubmit.Location = new System.Drawing.Point(987, 12);
             this.txt_fsubmit.Name = "txt_fsubmit";
             this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
+            this.txt_fsubmit.Size = new System.Drawing.Size(322, 24);
             this.txt_fsubmit.StyleController = this.layoutMx1;
             this.txt_fsubmit.TabIndex = 806;
             this.txt_fsubmit.Tag = "readonly";
             // 
             // txt_slOrg
             // 
-            this.txt_slOrg.Location = new System.Drawing.Point(1074, 96);
+            this.txt_slOrg.Location = new System.Drawing.Point(734, 124);
             this.txt_slOrg.Name = "txt_slOrg";
-            this.txt_slOrg.Size = new System.Drawing.Size(256, 24);
+            this.txt_slOrg.Size = new System.Drawing.Size(249, 24);
             this.txt_slOrg.StyleController = this.layoutMx1;
             this.txt_slOrg.TabIndex = 807;
             this.txt_slOrg.Tag = "readonly";
@@ -994,31 +1005,31 @@
             // 
             // txt_checkStates
             // 
-            this.txt_checkStates.Location = new System.Drawing.Point(744, 68);
+            this.txt_checkStates.Location = new System.Drawing.Point(734, 68);
             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(254, 24);
+            this.txt_checkStates.Size = new System.Drawing.Size(249, 24);
             this.txt_checkStates.StyleController = this.layoutMx1;
             this.txt_checkStates.TabIndex = 809;
             this.txt_checkStates.Tag = "readonly";
             // 
             // txt_freceQty
             // 
-            this.txt_freceQty.Location = new System.Drawing.Point(744, 124);
+            this.txt_freceQty.Location = new System.Drawing.Point(1059, 96);
             this.txt_freceQty.Name = "txt_freceQty";
             this.txt_freceQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_freceQty.Properties.Appearance.Options.UseForeColor = true;
-            this.txt_freceQty.Size = new System.Drawing.Size(254, 24);
+            this.txt_freceQty.Size = new System.Drawing.Size(250, 24);
             this.txt_freceQty.StyleController = this.layoutMx1;
             this.txt_freceQty.TabIndex = 810;
             this.txt_freceQty.Tag = "readonly";
             // 
             // txt_cgdNo
             // 
-            this.txt_cgdNo.Location = new System.Drawing.Point(414, 40);
+            this.txt_cgdNo.Location = new System.Drawing.Point(409, 40);
             this.txt_cgdNo.Name = "txt_cgdNo";
-            this.txt_cgdNo.Size = new System.Drawing.Size(254, 24);
+            this.txt_cgdNo.Size = new System.Drawing.Size(249, 24);
             this.txt_cgdNo.StyleController = this.layoutMx1;
             this.txt_cgdNo.TabIndex = 811;
             this.txt_cgdNo.Tag = "readonly";
@@ -1068,9 +1079,7 @@
             this.layoutControlItem15,
             this.layoutControlItem16,
             this.layoutControlItem14,
-            this.layoutControlItem18,
             this.layoutControlItem12,
-            this.layoutControlItem23,
             this.layoutControlItem10,
             this.layoutControlItem13,
             this.layoutControlItem22,
@@ -1078,7 +1087,11 @@
             this.layoutControlItem8,
             this.layoutControlItem2,
             this.layoutControlItem3,
-            this.layoutControlItem24});
+            this.layoutControlItem24,
+            this.layoutControlItem18,
+            this.layoutControlItem23,
+            this.layoutControlItem25,
+            this.layoutControlItem26});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1104,13 +1117,16 @@
             rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition5.Height = 100D;
             rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition1,
             rowDefinition2,
             rowDefinition3,
             rowDefinition4,
-            rowDefinition5});
-            this.Root.Size = new System.Drawing.Size(1342, 160);
+            rowDefinition5,
+            rowDefinition6});
+            this.Root.Size = new System.Drawing.Size(1321, 188);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -1118,7 +1134,7 @@
             this.layoutControlItem1.Control = this.txt_releaseNo;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem1.Size = new System.Drawing.Size(325, 28);
             this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -1128,7 +1144,7 @@
             this.layoutControlItem4.Location = new System.Drawing.Point(0, 28);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem4.Size = new System.Drawing.Size(325, 28);
             this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -1138,7 +1154,7 @@
             this.layoutControlItem5.Location = new System.Drawing.Point(0, 56);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem5.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem5.Size = new System.Drawing.Size(325, 28);
             this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -1148,53 +1164,42 @@
             this.layoutControlItem6.Location = new System.Drawing.Point(0, 84);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem6.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem6.Size = new System.Drawing.Size(325, 28);
             this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_fsubmitBy;
-            this.layoutControlItem15.Location = new System.Drawing.Point(990, 28);
+            this.layoutControlItem15.Location = new System.Drawing.Point(975, 28);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem15.Size = new System.Drawing.Size(332, 28);
+            this.layoutControlItem15.Size = new System.Drawing.Size(326, 28);
             this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_fsubmitDate;
-            this.layoutControlItem16.Location = new System.Drawing.Point(990, 56);
+            this.layoutControlItem16.Location = new System.Drawing.Point(975, 56);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem16.Size = new System.Drawing.Size(332, 28);
+            this.layoutControlItem16.Size = new System.Drawing.Size(326, 28);
             this.layoutControlItem16.Text = "瀹℃牳浜�";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_fsubmit;
-            this.layoutControlItem14.Location = new System.Drawing.Point(990, 0);
+            this.layoutControlItem14.Location = new System.Drawing.Point(975, 0);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(332, 28);
+            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;
-            // 
-            // layoutControlItem18
-            // 
-            this.layoutControlItem18.Control = this.txt_slOrg;
-            this.layoutControlItem18.Location = new System.Drawing.Point(990, 84);
-            this.layoutControlItem18.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem18.Size = new System.Drawing.Size(332, 28);
-            this.layoutControlItem18.Text = "鏀舵枡缁勭粐";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem12
             // 
@@ -1203,104 +1208,93 @@
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem12.Size = new System.Drawing.Size(660, 28);
+            this.layoutControlItem12.Size = new System.Drawing.Size(650, 28);
             this.layoutControlItem12.Text = "澶囨敞璇存槑";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem23
-            // 
-            this.layoutControlItem23.Control = this.txt_freceQty;
-            this.layoutControlItem23.Location = new System.Drawing.Point(660, 112);
-            this.layoutControlItem23.Name = "layoutControlItem23";
-            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem23.Size = new System.Drawing.Size(330, 28);
-            this.layoutControlItem23.Text = "鍒ゅ畾缁撴灉";
-            this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_fcheckResu;
-            this.layoutControlItem10.Location = new System.Drawing.Point(660, 84);
+            this.layoutControlItem10.Location = new System.Drawing.Point(650, 84);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem10.Size = new System.Drawing.Size(325, 28);
             this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_suppName;
-            this.layoutControlItem13.Location = new System.Drawing.Point(330, 84);
+            this.layoutControlItem13.Location = new System.Drawing.Point(325, 84);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem13.Size = new System.Drawing.Size(325, 28);
             this.layoutControlItem13.Text = "渚涘簲鍟�";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem22
             // 
             this.layoutControlItem22.Control = this.txt_checkStates;
-            this.layoutControlItem22.Location = new System.Drawing.Point(660, 56);
+            this.layoutControlItem22.Location = new System.Drawing.Point(650, 56);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem22.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem22.Size = new System.Drawing.Size(325, 28);
             this.layoutControlItem22.Text = "妫�楠岀姸鎬�";
             this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_fbatchQty;
-            this.layoutControlItem9.Location = new System.Drawing.Point(330, 56);
+            this.layoutControlItem9.Location = new System.Drawing.Point(325, 56);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem9.Size = new System.Drawing.Size(325, 28);
             this.layoutControlItem9.Text = "鏀惰揣鏁伴噺";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_fcheckBy;
-            this.layoutControlItem8.Location = new System.Drawing.Point(660, 28);
+            this.layoutControlItem8.Location = new System.Drawing.Point(650, 28);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem8.Size = new System.Drawing.Size(325, 28);
             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(660, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(650, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem2.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem2.Size = new System.Drawing.Size(325, 28);
             this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_lotNo;
-            this.layoutControlItem3.Location = new System.Drawing.Point(330, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(325, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem3.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem3.Size = new System.Drawing.Size(325, 28);
             this.layoutControlItem3.Text = "閫佹鎵瑰彿";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem24
             // 
             this.layoutControlItem24.Control = this.txt_cgdNo;
-            this.layoutControlItem24.Location = new System.Drawing.Point(330, 28);
+            this.layoutControlItem24.Location = new System.Drawing.Point(325, 28);
             this.layoutControlItem24.Name = "layoutControlItem24";
             this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem24.Size = new System.Drawing.Size(330, 28);
+            this.layoutControlItem24.Size = new System.Drawing.Size(325, 28);
             this.layoutControlItem24.Text = "閲囪喘鍗曞彿";
             this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -1310,7 +1304,7 @@
             this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
             this.xtraTabControl2.Name = "xtraTabControl2";
             this.xtraTabControl2.SelectedTabPage = this.tabMxPage1;
-            this.xtraTabControl2.Size = new System.Drawing.Size(1342, 518);
+            this.xtraTabControl2.Size = new System.Drawing.Size(1342, 493);
             this.xtraTabControl2.TabIndex = 3;
             this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1321,7 +1315,7 @@
             this.tabMxPage1.Controls.Add(this.splitMx2);
             this.tabMxPage1.Controls.Add(this.panMsg);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1340, 486);
+            this.tabMxPage1.Size = new System.Drawing.Size(1340, 461);
             this.tabMxPage1.Text = "鎶芥牱淇℃伅";
             // 
             // splitMx2
@@ -1340,7 +1334,7 @@
             // 
             this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
             this.splitMx2.Panel2.Text = "Panel2";
-            this.splitMx2.Size = new System.Drawing.Size(1340, 439);
+            this.splitMx2.Size = new System.Drawing.Size(1340, 414);
             this.splitMx2.SplitterPosition = 287;
             this.splitMx2.TabIndex = 3;
             // 
@@ -1605,7 +1599,7 @@
             // 
             this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
             this.splitYangLi.Panel2.Text = "Panel2";
-            this.splitYangLi.Size = new System.Drawing.Size(1340, 140);
+            this.splitYangLi.Size = new System.Drawing.Size(1340, 115);
             this.splitYangLi.SplitterPosition = 676;
             this.splitYangLi.TabIndex = 4;
             // 
@@ -1615,7 +1609,7 @@
             this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupControl1.Location = new System.Drawing.Point(0, 0);
             this.groupControl1.Name = "groupControl1";
-            this.groupControl1.Size = new System.Drawing.Size(676, 140);
+            this.groupControl1.Size = new System.Drawing.Size(676, 115);
             this.groupControl1.TabIndex = 3;
             this.groupControl1.Text = "妫�娴嬬粨鏋�";
             // 
@@ -1625,7 +1619,7 @@
             this.gcMx2.Location = new System.Drawing.Point(2, 28);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(672, 110);
+            this.gcMx2.Size = new System.Drawing.Size(672, 85);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1713,7 +1707,7 @@
             this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupControl2.Location = new System.Drawing.Point(0, 0);
             this.groupControl2.Name = "groupControl2";
-            this.groupControl2.Size = new System.Drawing.Size(652, 140);
+            this.groupControl2.Size = new System.Drawing.Size(652, 115);
             this.groupControl2.TabIndex = 4;
             this.groupControl2.Text = "鏍锋湰缁撴灉";
             // 
@@ -1723,7 +1717,7 @@
             this.gcMx3.Location = new System.Drawing.Point(2, 28);
             this.gcMx3.MainView = this.gvMx3;
             this.gcMx3.Name = "gcMx3";
-            this.gcMx3.Size = new System.Drawing.Size(648, 110);
+            this.gcMx3.Size = new System.Drawing.Size(648, 85);
             this.gcMx3.TabIndex = 0;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
@@ -1894,10 +1888,10 @@
             columnDefinition6,
             columnDefinition7,
             columnDefinition8});
-            rowDefinition6.Height = 100D;
-            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition6});
+            rowDefinition7});
             this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
             this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43);
             this.layoutControlGroup1.TextVisible = false;
@@ -1993,6 +1987,66 @@
             // 
             this.gridView4.Name = "gridView4";
             // 
+            // txt_fngHandle
+            // 
+            this.txt_fngHandle.Location = new System.Drawing.Point(1059, 124);
+            this.txt_fngHandle.Name = "txt_fngHandle";
+            this.txt_fngHandle.Size = new System.Drawing.Size(250, 24);
+            this.txt_fngHandle.StyleController = this.layoutMx1;
+            this.txt_fngHandle.TabIndex = 812;
+            // 
+            // txt_fmrmode
+            // 
+            this.txt_fmrmode.Location = new System.Drawing.Point(1059, 152);
+            this.txt_fmrmode.Name = "txt_fmrmode";
+            this.txt_fmrmode.Size = new System.Drawing.Size(250, 24);
+            this.txt_fmrmode.StyleController = this.layoutMx1;
+            this.txt_fmrmode.TabIndex = 813;
+            // 
+            // layoutControlItem18
+            // 
+            this.layoutControlItem18.Control = this.txt_slOrg;
+            this.layoutControlItem18.Location = new System.Drawing.Point(650, 112);
+            this.layoutControlItem18.Name = "layoutControlItem18";
+            this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem18.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem18.Text = "鏀舵枡缁勭粐";
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem23
+            // 
+            this.layoutControlItem23.Control = this.txt_freceQty;
+            this.layoutControlItem23.Location = new System.Drawing.Point(975, 84);
+            this.layoutControlItem23.Name = "layoutControlItem23";
+            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem23.Size = new System.Drawing.Size(326, 28);
+            this.layoutControlItem23.Text = "鍒ゅ畾缁撴灉";
+            this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem25
+            // 
+            this.layoutControlItem25.Control = this.txt_fngHandle;
+            this.layoutControlItem25.Location = new System.Drawing.Point(975, 112);
+            this.layoutControlItem25.Name = "layoutControlItem25";
+            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem25.Size = new System.Drawing.Size(326, 28);
+            this.layoutControlItem25.Text = "澶勭悊缁撴灉";
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem26
+            // 
+            this.layoutControlItem26.Control = this.txt_fmrmode;
+            this.layoutControlItem26.Location = new System.Drawing.Point(975, 140);
+            this.layoutControlItem26.Name = "layoutControlItem26";
+            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem26.Size = new System.Drawing.Size(326, 28);
+            this.layoutControlItem26.Text = "閫�鏂欐柟寮�";
+            this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
+            // 
             // Frm_MesQaItemsDetect01
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2054,9 +2108,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
@@ -2105,6 +2157,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2221,7 +2279,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
         private DevExpress.XtraEditors.TextEdit txt_guid;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
@@ -2241,7 +2298,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.XtraEditors.TextEdit txt_cgdNo;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
@@ -2250,5 +2306,11 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
+        private DevExpress.XtraEditors.TextEdit txt_fngHandle;
+        private DevExpress.XtraEditors.TextEdit txt_fmrmode;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
index c59818b..acdabf8 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.Designer.cs
@@ -196,6 +196,8 @@
             this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.rptBtnError = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -289,6 +291,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptBtnError)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -354,6 +357,8 @@
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
+            this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.rptBtnError});
             this.gcMain1.Size = new System.Drawing.Size(1432, 637);
             this.gcMain1.TabIndex = 5;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -393,7 +398,8 @@
             this.gridColumn20,
             this.gridColumn31,
             this.gridColumn32,
-            this.gridColumn33});
+            this.gridColumn33,
+            this.gridColumn34});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -2013,6 +2019,24 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
+            // gridColumn34
+            // 
+            this.gridColumn34.Caption = "寮傚父鎶ュ憡";
+            this.gridColumn34.ColumnEdit = this.rptBtnError;
+            this.gridColumn34.MinWidth = 25;
+            this.gridColumn34.Name = "gridColumn34";
+            this.gridColumn34.Visible = true;
+            this.gridColumn34.VisibleIndex = 27;
+            this.gridColumn34.Width = 94;
+            // 
+            // rptBtnError
+            // 
+            this.rptBtnError.AutoHeight = false;
+            this.rptBtnError.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.rptBtnError.Name = "rptBtnError";
+            this.rptBtnError.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBtnError_ButtonClick);
+            // 
             // Frm_MesQaItemsDetect01Check
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2116,6 +2140,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptBtnError)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2261,5 +2286,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBtnError;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
index f33fd51..f4937ee 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01Check.cs
@@ -680,5 +680,16 @@
                 MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
             }
         }
+
+        public event Action CallMainFormMethod; // 瀹氫箟涓�涓簨浠�
+        /// <summary>
+        /// 鏌ョ湅寮傚父鎶ュ憡
+        /// </summary>
+        /// <param name="sender"></param>
+        /// <param name="e"></param>
+        private void rptBtnError_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
+        {
+            CallMainFormMethod?.Invoke(); // 瑙﹀彂浜嬩欢锛岃皟鐢ㄤ富绐椾綋鐨勬柟娉�
+        }
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
index b78447f..339da27 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -76,9 +76,8 @@
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_remark = new DevExpress.XtraEditors.TextEdit();
-            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
-            this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
-            this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
+            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_fType = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_itemName = new DevExpress.XtraEditors.TextEdit();
@@ -91,36 +90,35 @@
             this.txt_handSuggestion = new DevExpress.XtraEditors.ComboBoxEdit();
             this.txt_chooseType = new DevExpress.XtraEditors.TextEdit();
             this.txt_handResult = new DevExpress.XtraEditors.ComboBoxEdit();
-            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
-            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_guid = new DevExpress.XtraEditors.TextEdit();
             this.txt_fBillNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_chooseGoodQty = new DevExpress.XtraEditors.TextEdit();
             this.txt_chooseBadQty = new DevExpress.XtraEditors.TextEdit();
+            this.txt_workLine = new DevExpress.XtraEditors.TextEdit();
+            this.txt_jydNo = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -134,10 +132,9 @@
             this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
             this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.repositoryItemDateEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
@@ -164,9 +161,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).BeginInit();
@@ -179,46 +175,45 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_chooseType.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_chooseGoodQty.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_chooseBadQty.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_workLine.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_jydNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).BeginInit();
@@ -576,16 +571,15 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1126, 570);
-            this.splitMx1.SplitterPosition = 201;
+            this.splitMx1.SplitterPosition = 185;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_remark);
-            this.layoutMx1.Controls.Add(this.txt_checkUser);
-            this.layoutMx1.Controls.Add(this.txt_checkDate);
-            this.layoutMx1.Controls.Add(this.txt_chkStatus);
+            this.layoutMx1.Controls.Add(this.txt_createBy);
+            this.layoutMx1.Controls.Add(this.txt_createDate);
             this.layoutMx1.Controls.Add(this.txt_fType);
             this.layoutMx1.Controls.Add(this.txt_itemNo);
             this.layoutMx1.Controls.Add(this.txt_itemName);
@@ -598,12 +592,12 @@
             this.layoutMx1.Controls.Add(this.txt_handSuggestion);
             this.layoutMx1.Controls.Add(this.txt_chooseType);
             this.layoutMx1.Controls.Add(this.txt_handResult);
-            this.layoutMx1.Controls.Add(this.txt_createBy);
-            this.layoutMx1.Controls.Add(this.txt_createDate);
             this.layoutMx1.Controls.Add(this.txt_guid);
             this.layoutMx1.Controls.Add(this.txt_fBillNo);
             this.layoutMx1.Controls.Add(this.txt_chooseGoodQty);
             this.layoutMx1.Controls.Add(this.txt_chooseBadQty);
+            this.layoutMx1.Controls.Add(this.txt_workLine);
+            this.layoutMx1.Controls.Add(this.txt_jydNo);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem9,
@@ -612,7 +606,7 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(706, 510, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1126, 201);
+            this.layoutMx1.Size = new System.Drawing.Size(1126, 185);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -627,117 +621,108 @@
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(114, 162);
+            this.txt_remark.Location = new System.Drawing.Point(386, 152);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(446, 24);
+            this.txt_remark.Size = new System.Drawing.Size(435, 24);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 240;
             // 
-            // txt_checkUser
+            // txt_createBy
             // 
-            this.txt_checkUser.Location = new System.Drawing.Point(942, 12);
-            this.txt_checkUser.Name = "txt_checkUser";
-            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(172, 24);
-            this.txt_checkUser.StyleController = this.layoutMx1;
-            this.txt_checkUser.TabIndex = 273;
-            this.txt_checkUser.Tag = "readonly";
+            this.txt_createBy.Location = new System.Drawing.Point(657, 12);
+            this.txt_createBy.Name = "txt_createBy";
+            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
+            this.txt_createBy.Size = new System.Drawing.Size(164, 24);
+            this.txt_createBy.StyleController = this.layoutMx1;
+            this.txt_createBy.TabIndex = 273;
+            this.txt_createBy.Tag = "readonly";
             // 
-            // txt_checkDate
+            // txt_createDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(942, 42);
-            this.txt_checkDate.Name = "txt_checkDate";
-            this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(172, 24);
-            this.txt_checkDate.StyleController = this.layoutMx1;
-            this.txt_checkDate.TabIndex = 267;
-            this.txt_checkDate.Tag = "readonly";
-            // 
-            // txt_chkStatus
-            // 
-            this.txt_chkStatus.Location = new System.Drawing.Point(840, 72);
-            this.txt_chkStatus.Name = "txt_chkStatus";
-            this.txt_chkStatus.Properties.Caption = "瀹℃牳鐘舵��";
-            this.txt_chkStatus.Size = new System.Drawing.Size(274, 24);
-            this.txt_chkStatus.StyleController = this.layoutMx1;
-            this.txt_chkStatus.TabIndex = 461;
+            this.txt_createDate.Location = new System.Drawing.Point(657, 40);
+            this.txt_createDate.Name = "txt_createDate";
+            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
+            this.txt_createDate.Size = new System.Drawing.Size(164, 24);
+            this.txt_createDate.StyleController = this.layoutMx1;
+            this.txt_createDate.TabIndex = 267;
+            this.txt_createDate.Tag = "readonly";
             // 
             // txt_fType
             // 
-            this.txt_fType.Location = new System.Drawing.Point(390, 12);
+            this.txt_fType.Location = new System.Drawing.Point(928, 96);
             this.txt_fType.Name = "txt_fType";
-            this.txt_fType.Size = new System.Drawing.Size(170, 24);
+            this.txt_fType.Size = new System.Drawing.Size(165, 24);
             this.txt_fType.StyleController = this.layoutMx1;
             this.txt_fType.TabIndex = 462;
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(114, 42);
+            this.txt_itemNo.Location = new System.Drawing.Point(386, 68);
             this.txt_itemNo.Name = "txt_itemNo";
-            this.txt_itemNo.Size = new System.Drawing.Size(170, 24);
+            this.txt_itemNo.Size = new System.Drawing.Size(164, 24);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 464;
             // 
             // txt_itemName
             // 
-            this.txt_itemName.Location = new System.Drawing.Point(390, 42);
+            this.txt_itemName.Location = new System.Drawing.Point(657, 68);
             this.txt_itemName.Name = "txt_itemName";
-            this.txt_itemName.Size = new System.Drawing.Size(170, 24);
+            this.txt_itemName.Size = new System.Drawing.Size(164, 24);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 465;
             // 
             // txt_itemModel
             // 
-            this.txt_itemModel.Location = new System.Drawing.Point(666, 42);
+            this.txt_itemModel.Location = new System.Drawing.Point(386, 96);
             this.txt_itemModel.Name = "txt_itemModel";
-            this.txt_itemModel.Size = new System.Drawing.Size(170, 24);
+            this.txt_itemModel.Size = new System.Drawing.Size(435, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
             this.txt_itemModel.TabIndex = 466;
             // 
             // txt_dhdNo
             // 
-            this.txt_dhdNo.Location = new System.Drawing.Point(666, 12);
+            this.txt_dhdNo.Location = new System.Drawing.Point(386, 12);
             this.txt_dhdNo.Name = "txt_dhdNo";
-            this.txt_dhdNo.Size = new System.Drawing.Size(170, 24);
+            this.txt_dhdNo.Size = new System.Drawing.Size(164, 24);
             this.txt_dhdNo.StyleController = this.layoutMx1;
             this.txt_dhdNo.TabIndex = 467;
             // 
             // txt_gysNo
             // 
-            this.txt_gysNo.Location = new System.Drawing.Point(666, 72);
+            this.txt_gysNo.Location = new System.Drawing.Point(386, 124);
             this.txt_gysNo.Name = "txt_gysNo";
-            this.txt_gysNo.Size = new System.Drawing.Size(170, 24);
+            this.txt_gysNo.Size = new System.Drawing.Size(164, 24);
             this.txt_gysNo.StyleController = this.layoutMx1;
             this.txt_gysNo.TabIndex = 468;
             // 
             // txt_gysName
             // 
-            this.txt_gysName.Location = new System.Drawing.Point(666, 102);
+            this.txt_gysName.Location = new System.Drawing.Point(657, 124);
             this.txt_gysName.Name = "txt_gysName";
-            this.txt_gysName.Size = new System.Drawing.Size(170, 24);
+            this.txt_gysName.Size = new System.Drawing.Size(164, 24);
             this.txt_gysName.StyleController = this.layoutMx1;
             this.txt_gysName.TabIndex = 469;
             // 
             // txt_qty
             // 
-            this.txt_qty.Location = new System.Drawing.Point(114, 72);
+            this.txt_qty.Location = new System.Drawing.Point(115, 68);
             this.txt_qty.Name = "txt_qty";
-            this.txt_qty.Size = new System.Drawing.Size(170, 24);
+            this.txt_qty.Size = new System.Drawing.Size(164, 24);
             this.txt_qty.StyleController = this.layoutMx1;
             this.txt_qty.TabIndex = 470;
             // 
             // txt_chooseQty
             // 
-            this.txt_chooseQty.Location = new System.Drawing.Point(114, 102);
+            this.txt_chooseQty.Location = new System.Drawing.Point(115, 96);
             this.txt_chooseQty.Name = "txt_chooseQty";
-            this.txt_chooseQty.Size = new System.Drawing.Size(170, 24);
+            this.txt_chooseQty.Size = new System.Drawing.Size(164, 24);
             this.txt_chooseQty.StyleController = this.layoutMx1;
             this.txt_chooseQty.TabIndex = 471;
             // 
             // txt_handSuggestion
             // 
-            this.txt_handSuggestion.Location = new System.Drawing.Point(390, 72);
+            this.txt_handSuggestion.Location = new System.Drawing.Point(928, 40);
             this.txt_handSuggestion.Name = "txt_handSuggestion";
             this.txt_handSuggestion.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -745,21 +730,21 @@
             "-璇烽�夋嫨-",
             "鍔犱弗",
             "鏀惧"});
-            this.txt_handSuggestion.Size = new System.Drawing.Size(170, 24);
+            this.txt_handSuggestion.Size = new System.Drawing.Size(165, 24);
             this.txt_handSuggestion.StyleController = this.layoutMx1;
             this.txt_handSuggestion.TabIndex = 472;
             // 
             // txt_chooseType
             // 
-            this.txt_chooseType.Location = new System.Drawing.Point(390, 102);
+            this.txt_chooseType.Location = new System.Drawing.Point(928, 68);
             this.txt_chooseType.Name = "txt_chooseType";
-            this.txt_chooseType.Size = new System.Drawing.Size(170, 24);
+            this.txt_chooseType.Size = new System.Drawing.Size(165, 24);
             this.txt_chooseType.StyleController = this.layoutMx1;
             this.txt_chooseType.TabIndex = 473;
             // 
             // txt_handResult
             // 
-            this.txt_handResult.Location = new System.Drawing.Point(666, 132);
+            this.txt_handResult.Location = new System.Drawing.Point(928, 12);
             this.txt_handResult.Name = "txt_handResult";
             this.txt_handResult.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -767,25 +752,9 @@
             "-璇烽�夋嫨-",
             "OK",
             "NG"});
-            this.txt_handResult.Size = new System.Drawing.Size(170, 24);
+            this.txt_handResult.Size = new System.Drawing.Size(165, 24);
             this.txt_handResult.StyleController = this.layoutMx1;
             this.txt_handResult.TabIndex = 474;
-            // 
-            // txt_createBy
-            // 
-            this.txt_createBy.Location = new System.Drawing.Point(942, 102);
-            this.txt_createBy.Name = "txt_createBy";
-            this.txt_createBy.Size = new System.Drawing.Size(172, 24);
-            this.txt_createBy.StyleController = this.layoutMx1;
-            this.txt_createBy.TabIndex = 475;
-            // 
-            // txt_createDate
-            // 
-            this.txt_createDate.Location = new System.Drawing.Point(942, 132);
-            this.txt_createDate.Name = "txt_createDate";
-            this.txt_createDate.Size = new System.Drawing.Size(172, 24);
-            this.txt_createDate.StyleController = this.layoutMx1;
-            this.txt_createDate.TabIndex = 476;
             // 
             // txt_guid
             // 
@@ -797,27 +766,43 @@
             // 
             // txt_fBillNo
             // 
-            this.txt_fBillNo.Location = new System.Drawing.Point(114, 12);
+            this.txt_fBillNo.Location = new System.Drawing.Point(115, 12);
             this.txt_fBillNo.Name = "txt_fBillNo";
-            this.txt_fBillNo.Size = new System.Drawing.Size(170, 24);
+            this.txt_fBillNo.Size = new System.Drawing.Size(164, 24);
             this.txt_fBillNo.StyleController = this.layoutMx1;
             this.txt_fBillNo.TabIndex = 478;
             // 
             // txt_chooseGoodQty
             // 
-            this.txt_chooseGoodQty.Location = new System.Drawing.Point(114, 132);
+            this.txt_chooseGoodQty.Location = new System.Drawing.Point(115, 124);
             this.txt_chooseGoodQty.Name = "txt_chooseGoodQty";
-            this.txt_chooseGoodQty.Size = new System.Drawing.Size(170, 24);
+            this.txt_chooseGoodQty.Size = new System.Drawing.Size(164, 24);
             this.txt_chooseGoodQty.StyleController = this.layoutMx1;
             this.txt_chooseGoodQty.TabIndex = 479;
             // 
             // txt_chooseBadQty
             // 
-            this.txt_chooseBadQty.Location = new System.Drawing.Point(390, 132);
+            this.txt_chooseBadQty.Location = new System.Drawing.Point(115, 152);
             this.txt_chooseBadQty.Name = "txt_chooseBadQty";
-            this.txt_chooseBadQty.Size = new System.Drawing.Size(170, 24);
+            this.txt_chooseBadQty.Size = new System.Drawing.Size(164, 24);
             this.txt_chooseBadQty.StyleController = this.layoutMx1;
             this.txt_chooseBadQty.TabIndex = 480;
+            // 
+            // txt_workLine
+            // 
+            this.txt_workLine.Location = new System.Drawing.Point(386, 40);
+            this.txt_workLine.Name = "txt_workLine";
+            this.txt_workLine.Size = new System.Drawing.Size(164, 24);
+            this.txt_workLine.StyleController = this.layoutMx1;
+            this.txt_workLine.TabIndex = 481;
+            // 
+            // txt_jydNo
+            // 
+            this.txt_jydNo.Location = new System.Drawing.Point(115, 40);
+            this.txt_jydNo.Name = "txt_jydNo";
+            this.txt_jydNo.Size = new System.Drawing.Size(164, 24);
+            this.txt_jydNo.StyleController = this.layoutMx1;
+            this.txt_jydNo.TabIndex = 482;
             // 
             // layoutControlItem9
             // 
@@ -847,27 +832,26 @@
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem5,
-            this.layoutControlItem1,
-            this.layoutControlItem11,
-            this.layoutControlItem12,
-            this.layoutControlItem13,
-            this.layoutControlItem15,
-            this.layoutControlItem16,
             this.layoutControlItem17,
             this.layoutControlItem18,
+            this.layoutControlItem2,
+            this.layoutControlItem25,
+            this.layoutControlItem26,
+            this.layoutControlItem7,
+            this.layoutControlItem15,
+            this.layoutControlItem16,
+            this.layoutControlItem13,
+            this.layoutControlItem12,
+            this.layoutControlItem11,
+            this.layoutControlItem6,
+            this.layoutControlItem14,
+            this.layoutControlItem4,
+            this.layoutControlItem5,
+            this.layoutControlItem3,
+            this.layoutControlItem21,
             this.layoutControlItem19,
             this.layoutControlItem20,
-            this.layoutControlItem21,
-            this.layoutControlItem6,
-            this.layoutControlItem3,
-            this.layoutControlItem14,
-            this.layoutControlItem22,
-            this.layoutControlItem23,
-            this.layoutControlItem2,
-            this.layoutControlItem7,
-            this.layoutControlItem25,
-            this.layoutControlItem26});
+            this.layoutControlItem1});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -902,231 +886,221 @@
             rowDefinition4,
             rowDefinition5,
             rowDefinition6});
-            this.Root.Size = new System.Drawing.Size(1126, 201);
+            this.Root.Size = new System.Drawing.Size(1105, 188);
             this.Root.TextVisible = false;
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txt_checkUser;
-            this.layoutControlItem5.Location = new System.Drawing.Point(828, 0);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem5.Size = new System.Drawing.Size(278, 30);
-            this.layoutControlItem5.Text = "瀹℃牳浜�";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.txt_fType;
-            this.layoutControlItem1.Location = new System.Drawing.Point(276, 0);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem1.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem1.Text = "寮傚父绫诲瀷";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.txt_itemNo;
-            this.layoutControlItem11.Location = new System.Drawing.Point(0, 30);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem11.Text = "鐗╂枡缂栧彿";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txt_itemName;
-            this.layoutControlItem12.Location = new System.Drawing.Point(276, 30);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem12.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem12.Text = "鐗╂枡鍚嶇О";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.txt_itemModel;
-            this.layoutControlItem13.Location = new System.Drawing.Point(552, 30);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem13.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem13.Text = "鐗╂枡瑙勬牸";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem15
-            // 
-            this.layoutControlItem15.Control = this.txt_gysNo;
-            this.layoutControlItem15.Location = new System.Drawing.Point(552, 60);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem15.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem16
-            // 
-            this.layoutControlItem16.Control = this.txt_gysName;
-            this.layoutControlItem16.Location = new System.Drawing.Point(552, 90);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txt_qty;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 60);
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 56);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem17.Size = new System.Drawing.Size(276, 30);
+            this.layoutControlItem17.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem17.Text = "鏉ユ枡鏁伴噺";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(91, 18);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_chooseQty;
-            this.layoutControlItem18.Location = new System.Drawing.Point(0, 90);
+            this.layoutControlItem18.Location = new System.Drawing.Point(0, 84);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem18.Size = new System.Drawing.Size(276, 30);
+            this.layoutControlItem18.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem18.Text = "閫夊埆鏁伴噺";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem19
-            // 
-            this.layoutControlItem19.Control = this.txt_handSuggestion;
-            this.layoutControlItem19.Location = new System.Drawing.Point(276, 60);
-            this.layoutControlItem19.Name = "layoutControlItem19";
-            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem19.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem19.Text = "澶勭疆鎰忚";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem20
-            // 
-            this.layoutControlItem20.Control = this.txt_chooseType;
-            this.layoutControlItem20.Location = new System.Drawing.Point(276, 90);
-            this.layoutControlItem20.Name = "layoutControlItem20";
-            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem20.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem20.Text = "閫夊埆绫诲埆";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem21
-            // 
-            this.layoutControlItem21.Control = this.txt_handResult;
-            this.layoutControlItem21.Location = new System.Drawing.Point(552, 120);
-            this.layoutControlItem21.Name = "layoutControlItem21";
-            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem21.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem21.Text = "鍒ゅ畾";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_chkStatus;
-            this.layoutControlItem6.Location = new System.Drawing.Point(828, 60);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem6.Size = new System.Drawing.Size(278, 30);
-            this.layoutControlItem6.Text = "瀹℃牳鐘舵��";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem6.TextVisible = false;
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_checkDate;
-            this.layoutControlItem3.Location = new System.Drawing.Point(828, 30);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem3.Size = new System.Drawing.Size(278, 30);
-            this.layoutControlItem3.Text = "瀹℃牳鏃ユ湡 ";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_dhdNo;
-            this.layoutControlItem14.Location = new System.Drawing.Point(552, 0);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem14.Text = "鍒拌揣鍗曞彿";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem22
-            // 
-            this.layoutControlItem22.Control = this.txt_createBy;
-            this.layoutControlItem22.Location = new System.Drawing.Point(828, 90);
-            this.layoutControlItem22.Name = "layoutControlItem22";
-            this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem22.Size = new System.Drawing.Size(278, 30);
-            this.layoutControlItem22.Text = "鍒涘缓浜�";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem23
-            // 
-            this.layoutControlItem23.Control = this.txt_createDate;
-            this.layoutControlItem23.Location = new System.Drawing.Point(828, 120);
-            this.layoutControlItem23.Name = "layoutControlItem23";
-            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem23.Size = new System.Drawing.Size(278, 30);
-            this.layoutControlItem23.Text = "鍒涘缓鏃堕棿";
-            this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(91, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_fBillNo;
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem2.Text = "鍗曟嵁缂栧彿";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txt_remark;
-            this.layoutControlItem7.Location = new System.Drawing.Point(0, 150);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem7.Size = new System.Drawing.Size(552, 31);
-            this.layoutControlItem7.Text = "寮傚父澶囨敞";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem2.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem2.Text = "寮傚父缂栧彿";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(91, 18);
             // 
             // layoutControlItem25
             // 
             this.layoutControlItem25.Control = this.txt_chooseGoodQty;
-            this.layoutControlItem25.Location = new System.Drawing.Point(0, 120);
+            this.layoutControlItem25.Location = new System.Drawing.Point(0, 112);
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem25.Size = new System.Drawing.Size(276, 30);
+            this.layoutControlItem25.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem25.Text = "閫夊埆鑹搧鏁�";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(91, 18);
             // 
             // layoutControlItem26
             // 
             this.layoutControlItem26.Control = this.txt_chooseBadQty;
-            this.layoutControlItem26.Location = new System.Drawing.Point(276, 120);
+            this.layoutControlItem26.Location = new System.Drawing.Point(0, 140);
             this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem26.Size = new System.Drawing.Size(276, 30);
+            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem26.Size = new System.Drawing.Size(271, 28);
             this.layoutControlItem26.Text = "閫夊埆涓嶈壇鍝佹暟";
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem26.TextSize = new System.Drawing.Size(91, 18);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_remark;
+            this.layoutControlItem7.CustomizationFormText = "IQC澶囨敞";
+            this.layoutControlItem7.Location = new System.Drawing.Point(271, 140);
+            this.layoutControlItem7.Name = "layoutControlItem7";
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem7.Size = new System.Drawing.Size(542, 28);
+            this.layoutControlItem7.Text = "IQC澶囨敞";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(91, 18);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_gysNo;
+            this.layoutControlItem15.Location = new System.Drawing.Point(271, 112);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem15.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(91, 18);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.txt_gysName;
+            this.layoutControlItem16.Location = new System.Drawing.Point(542, 112);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem16.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(91, 18);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_itemModel;
+            this.layoutControlItem13.Location = new System.Drawing.Point(271, 84);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem13.Size = new System.Drawing.Size(542, 28);
+            this.layoutControlItem13.Text = "鐗╂枡瑙勬牸";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(91, 18);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_itemName;
+            this.layoutControlItem12.Location = new System.Drawing.Point(542, 56);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem12.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem12.Text = "鐗╂枡鍚嶇О";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(91, 18);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_itemNo;
+            this.layoutControlItem11.Location = new System.Drawing.Point(271, 56);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem11.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem11.Text = "鐗╂枡缂栧彿";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(91, 18);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_jydNo;
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 28);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem6.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem6.Text = "妫�楠屽崟鍙�";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(91, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_dhdNo;
+            this.layoutControlItem14.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem14.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem14.Text = "鍒拌揣鍗曞彿";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(91, 18);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_workLine;
+            this.layoutControlItem4.Location = new System.Drawing.Point(271, 28);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem4.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem4.Text = "鍒拌揣鍗曞簭鍙�";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(91, 18);
+            // 
+            // layoutControlItem5
+            // 
+            this.layoutControlItem5.Control = this.txt_createBy;
+            this.layoutControlItem5.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem5.Name = "layoutControlItem5";
+            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem5.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem5.Text = "IQC鎻愪氦浜哄憳";
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(91, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_createDate;
+            this.layoutControlItem3.Location = new System.Drawing.Point(542, 28);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem3.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem3.Text = "IQC鎻愪氦鏃ユ湡 ";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(91, 18);
+            // 
+            // layoutControlItem21
+            // 
+            this.layoutControlItem21.Control = this.txt_handResult;
+            this.layoutControlItem21.Location = new System.Drawing.Point(813, 0);
+            this.layoutControlItem21.Name = "layoutControlItem21";
+            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem21.Size = new System.Drawing.Size(272, 28);
+            this.layoutControlItem21.Text = "鍒ゅ畾缁撴灉";
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(91, 18);
+            // 
+            // layoutControlItem19
+            // 
+            this.layoutControlItem19.Control = this.txt_handSuggestion;
+            this.layoutControlItem19.Location = new System.Drawing.Point(813, 28);
+            this.layoutControlItem19.Name = "layoutControlItem19";
+            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem19.Size = new System.Drawing.Size(272, 28);
+            this.layoutControlItem19.Text = "澶勭悊缁撴灉";
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(91, 18);
+            // 
+            // layoutControlItem20
+            // 
+            this.layoutControlItem20.Control = this.txt_chooseType;
+            this.layoutControlItem20.Location = new System.Drawing.Point(813, 56);
+            this.layoutControlItem20.Name = "layoutControlItem20";
+            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem20.Size = new System.Drawing.Size(272, 28);
+            this.layoutControlItem20.Text = "閫�鏂欐柟寮�";
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(91, 18);
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_fType;
+            this.layoutControlItem1.Location = new System.Drawing.Point(813, 84);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem1.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem1.Size = new System.Drawing.Size(272, 28);
+            this.layoutControlItem1.Text = "寮傚父绫诲瀷";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(91, 18);
             // 
             // tabMx
             // 
@@ -1134,7 +1108,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 357);
+            this.tabMx.Size = new System.Drawing.Size(1126, 373);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -1143,7 +1117,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 325);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 341);
             this.tabMxPage1.Text = "閫夊埆鏄庣粏";
             // 
             // gcMx1
@@ -1158,7 +1132,7 @@
             this.repositoryItemButtonEdit1,
             this.rptJYBZ,
             this.repositoryItemDateEdit3});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 325);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 341);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1177,8 +1151,7 @@
             this.gvMx1daa003,
             this.gvMx1daa004,
             this.gvMx1daa008,
-            this.gvMx1reporttime,
-            this.gvMxDel});
+            this.gvMx1reporttime});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1286,11 +1259,7 @@
             // 
             // gvMx1reporttime
             // 
-            this.gvMx1reporttime.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1reporttime.AppearanceCell.Options.UseFont = true;
-            this.gvMx1reporttime.AppearanceCell.Options.UseForeColor = true;
-            this.gvMx1reporttime.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gvMx1reporttime.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1reporttime.Caption = "澶囨敞";
             this.gvMx1reporttime.FieldName = "remark";
             this.gvMx1reporttime.MinWidth = 50;
@@ -1299,27 +1268,6 @@
             this.gvMx1reporttime.Visible = true;
             this.gvMx1reporttime.VisibleIndex = 6;
             this.gvMx1reporttime.Width = 102;
-            // 
-            // gvMxDel
-            // 
-            this.gvMxDel.Caption = "绉诲嚭";
-            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 80;
-            this.gvMxDel.Name = "gvMxDel";
-            this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 7;
-            this.gvMxDel.Width = 84;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
             // repositoryItemDateEdit1
             // 
@@ -1338,6 +1286,17 @@
             this.repositoryItemDateEdit2.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.repositoryItemDateEdit2.Name = "repositoryItemDateEdit2";
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
             // rptJYBZ
             // 
@@ -1411,9 +1370,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fType.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemName.Properties)).EndInit();
@@ -1426,46 +1384,45 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_chooseType.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fBillNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_chooseGoodQty.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_chooseBadQty.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_workLine.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_jydNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3.CalendarTimeProperties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit3)).EndInit();
@@ -1498,10 +1455,9 @@
         private DevExpress.XtraLayout.LayoutControl layoutMx1;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
         private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.TextEdit txt_checkUser;
-        private DevExpress.XtraEditors.TextEdit txt_checkDate;
+        private DevExpress.XtraEditors.TextEdit txt_createBy;
+        private DevExpress.XtraEditors.TextEdit txt_createDate;
         private DevExpress.XtraEditors.TextEdit txt_remark;
-        private DevExpress.XtraEditors.CheckEdit txt_chkStatus;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -1520,20 +1476,14 @@
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime;
         private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraEditors.TextEdit txt_fType;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
         private DevExpress.XtraEditors.TextEdit txt_itemNo;
         private DevExpress.XtraEditors.TextEdit txt_itemName;
         private DevExpress.XtraEditors.TextEdit txt_itemModel;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
         private DevExpress.XtraEditors.TextEdit txt_dhdNo;
         private DevExpress.XtraEditors.TextEdit txt_gysNo;
         private DevExpress.XtraEditors.TextEdit txt_gysName;
@@ -1541,30 +1491,16 @@
         private DevExpress.XtraEditors.TextEdit txt_chooseQty;
         private DevExpress.XtraEditors.ComboBoxEdit txt_handSuggestion;
         private DevExpress.XtraEditors.TextEdit txt_chooseType;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
         private DevExpress.XtraEditors.ComboBoxEdit txt_handResult;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
-        private DevExpress.XtraEditors.TextEdit txt_createBy;
-        private DevExpress.XtraEditors.TextEdit txt_createDate;
         private DevExpress.XtraEditors.TextEdit txt_guid;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
         private DevExpress.XtraEditors.TextEdit txt_fBillNo;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraEditors.TextEdit txt_chooseGoodQty;
         private DevExpress.XtraEditors.TextEdit txt_chooseBadQty;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
@@ -1576,5 +1512,23 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
         private DevExpress.Utils.ToolTipController tips;
+        private DevExpress.XtraEditors.TextEdit txt_workLine;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraEditors.TextEdit txt_jydNo;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3