From 80573826d4a94f9bca0bba021295405eff813ae0 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 28 四月 2025 16:49:02 +0800
Subject: [PATCH] 异常

---
 DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs |  835 ++++++++++++++++++++--------------------------------------
 1 files changed, 292 insertions(+), 543 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
index 2a8c044..aaece56 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/MesQcExceptional.Designer.cs
@@ -57,28 +57,18 @@
             this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_pba005 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_pba006 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_pba009 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
             this.lbGuid = new System.Windows.Forms.Label();
-            this.txt_remark = new DevExpress.XtraEditors.TextEdit();
-            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();
@@ -86,40 +76,29 @@
             this.txt_dhdNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_gysNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_gysName = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
-            this.txt_chooseQty = new DevExpress.XtraEditors.TextEdit();
             this.txt_fmrmode = 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.txt_dhdDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_handResult = new DevExpress.XtraEditors.TextEdit();
             this.txt_handSuggestion = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fngDesc = new DevExpress.XtraEditors.MemoEdit();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = 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.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem11 = 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.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -127,12 +106,16 @@
             this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.caaGuid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa005 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1daa003 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1daa008 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1reporttime = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
             this.repositoryItemDateEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
@@ -161,9 +144,6 @@
             this.splitMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.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();
@@ -171,40 +151,29 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_dhdNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_chooseQty.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.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.txt_dhdDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).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.layoutControlItem20)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).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.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -305,20 +274,13 @@
             this.gv_checkUser,
             this.gv_checkDate,
             this.gv_pba005,
-            this.gv_pba006,
-            this.gv_pba009,
-            this.gridColumn5,
-            this.gridColumn3,
-            this.gridColumn6,
-            this.gridColumn7,
             this.gridColumn8,
             this.gridColumn9,
             this.gridColumn10,
             this.gridColumn11,
             this.gridColumn12,
             this.gridColumn13,
-            this.gridColumn14,
-            this.gridColumn15});
+            this.gridColumn3});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -404,68 +366,6 @@
             this.gv_pba005.VisibleIndex = 5;
             this.gv_pba005.Width = 94;
             // 
-            // gv_pba006
-            // 
-            this.gv_pba006.AppearanceCell.Options.UseFont = true;
-            this.gv_pba006.Caption = "澶勭悊缁撴灉";
-            this.gv_pba006.FieldName = "handSuggestion";
-            this.gv_pba006.Name = "gv_pba006";
-            this.gv_pba006.OptionsColumn.AllowEdit = false;
-            this.gv_pba006.Tag = "query_a.pba006";
-            this.gv_pba006.Visible = true;
-            this.gv_pba006.VisibleIndex = 7;
-            this.gv_pba006.Width = 180;
-            // 
-            // gv_pba009
-            // 
-            this.gv_pba009.AppearanceCell.Options.UseFont = true;
-            this.gv_pba009.Caption = "閫夊埆绫诲埆";
-            this.gv_pba009.FieldName = "chooseType";
-            this.gv_pba009.Name = "gv_pba009";
-            this.gv_pba009.OptionsColumn.AllowEdit = false;
-            this.gv_pba009.Tag = "query_a.pba009";
-            this.gv_pba009.Visible = true;
-            this.gv_pba009.VisibleIndex = 9;
-            this.gv_pba009.Width = 100;
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "閫夊埆鏁伴噺";
-            this.gridColumn5.FieldName = "chooseQty";
-            this.gridColumn5.MinWidth = 25;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Width = 94;
-            // 
-            // gridColumn3
-            // 
-            this.gridColumn3.Caption = "閫夊埆鑹搧鏁�";
-            this.gridColumn3.FieldName = "chooseGoodQty";
-            this.gridColumn3.MinWidth = 25;
-            this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 10;
-            this.gridColumn3.Width = 94;
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "閫夊埆涓嶈壇鍝佹暟";
-            this.gridColumn6.FieldName = "chooseBadQty";
-            this.gridColumn6.MinWidth = 25;
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 11;
-            this.gridColumn6.Width = 94;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "鍒ゅ畾缁撴灉";
-            this.gridColumn7.FieldName = "handResult";
-            this.gridColumn7.MinWidth = 25;
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 6;
-            this.gridColumn7.Width = 94;
-            // 
             // gridColumn8
             // 
             this.gridColumn8.Caption = "鐗╂枡缂栫爜";
@@ -473,7 +373,7 @@
             this.gridColumn8.MinWidth = 25;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 12;
+            this.gridColumn8.VisibleIndex = 6;
             this.gridColumn8.Width = 94;
             // 
             // gridColumn9
@@ -483,7 +383,7 @@
             this.gridColumn9.MinWidth = 25;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 13;
+            this.gridColumn9.VisibleIndex = 7;
             this.gridColumn9.Width = 94;
             // 
             // gridColumn10
@@ -493,7 +393,7 @@
             this.gridColumn10.MinWidth = 25;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 14;
+            this.gridColumn10.VisibleIndex = 8;
             this.gridColumn10.Width = 94;
             // 
             // gridColumn11
@@ -503,7 +403,7 @@
             this.gridColumn11.MinWidth = 25;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 15;
+            this.gridColumn11.VisibleIndex = 9;
             this.gridColumn11.Width = 94;
             // 
             // gridColumn12
@@ -513,7 +413,7 @@
             this.gridColumn12.MinWidth = 25;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 16;
+            this.gridColumn12.VisibleIndex = 10;
             this.gridColumn12.Width = 94;
             // 
             // gridColumn13
@@ -523,28 +423,18 @@
             this.gridColumn13.MinWidth = 25;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 17;
+            this.gridColumn13.VisibleIndex = 11;
             this.gridColumn13.Width = 94;
             // 
-            // gridColumn14
+            // gridColumn3
             // 
-            this.gridColumn14.Caption = "妫�楠屽崟鍙�";
-            this.gridColumn14.FieldName = "jydNo";
-            this.gridColumn14.MinWidth = 25;
-            this.gridColumn14.Name = "gridColumn14";
-            this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 18;
-            this.gridColumn14.Width = 94;
-            // 
-            // gridColumn15
-            // 
-            this.gridColumn15.Caption = "澶勭悊鏂瑰紡";
-            this.gridColumn15.FieldName = "fmrmode";
-            this.gridColumn15.MinWidth = 25;
-            this.gridColumn15.Name = "gridColumn15";
-            this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 8;
-            this.gridColumn15.Width = 94;
+            this.gridColumn3.Caption = "鐗╂枡ID";
+            this.gridColumn3.FieldName = "itemId";
+            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.Name = "gridColumn3";
+            this.gridColumn3.Visible = true;
+            this.gridColumn3.VisibleIndex = 12;
+            this.gridColumn3.Width = 94;
             // 
             // pageBar1
             // 
@@ -583,15 +473,12 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1126, 570);
-            this.splitMx1.SplitterPosition = 202;
+            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_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);
@@ -599,26 +486,22 @@
             this.layoutMx1.Controls.Add(this.txt_dhdNo);
             this.layoutMx1.Controls.Add(this.txt_gysNo);
             this.layoutMx1.Controls.Add(this.txt_gysName);
-            this.layoutMx1.Controls.Add(this.txt_fbatchQty);
-            this.layoutMx1.Controls.Add(this.txt_chooseQty);
             this.layoutMx1.Controls.Add(this.txt_fmrmode);
             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.Controls.Add(this.txt_dhdDate);
             this.layoutMx1.Controls.Add(this.txt_handResult);
             this.layoutMx1.Controls.Add(this.txt_handSuggestion);
+            this.layoutMx1.Controls.Add(this.txt_fngDesc);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem9,
             this.layoutControlItem24});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(706, 510, 812, 500);
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(598, 453, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1126, 202);
+            this.layoutMx1.Size = new System.Drawing.Size(1126, 185);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -631,114 +514,69 @@
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
             // 
-            // txt_remark
-            // 
-            this.txt_remark.Location = new System.Drawing.Point(391, 162);
-            this.txt_remark.Name = "txt_remark";
-            this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(445, 24);
-            this.txt_remark.StyleController = this.layoutMx1;
-            this.txt_remark.TabIndex = 240;
-            // 
-            // txt_createBy
-            // 
-            this.txt_createBy.Location = new System.Drawing.Point(667, 12);
-            this.txt_createBy.Name = "txt_createBy";
-            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(169, 24);
-            this.txt_createBy.StyleController = this.layoutMx1;
-            this.txt_createBy.TabIndex = 273;
-            this.txt_createBy.Tag = "readonly";
-            // 
-            // txt_createDate
-            // 
-            this.txt_createDate.Location = new System.Drawing.Point(667, 42);
-            this.txt_createDate.Name = "txt_createDate";
-            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(169, 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(943, 102);
+            this.txt_fType.Location = new System.Drawing.Point(912, 96);
             this.txt_fType.Name = "txt_fType";
-            this.txt_fType.Size = new System.Drawing.Size(171, 24);
+            this.txt_fType.Size = new System.Drawing.Size(181, 24);
             this.txt_fType.StyleController = this.layoutMx1;
             this.txt_fType.TabIndex = 462;
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(391, 72);
+            this.txt_itemNo.Location = new System.Drawing.Point(370, 12);
             this.txt_itemNo.Name = "txt_itemNo";
-            this.txt_itemNo.Size = new System.Drawing.Size(169, 24);
+            this.txt_itemNo.Size = new System.Drawing.Size(180, 24);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 464;
             // 
             // txt_itemName
             // 
-            this.txt_itemName.Location = new System.Drawing.Point(667, 72);
+            this.txt_itemName.Location = new System.Drawing.Point(370, 68);
             this.txt_itemName.Name = "txt_itemName";
-            this.txt_itemName.Size = new System.Drawing.Size(169, 24);
+            this.txt_itemName.Size = new System.Drawing.Size(451, 24);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 465;
             // 
             // txt_itemModel
             // 
-            this.txt_itemModel.Location = new System.Drawing.Point(391, 102);
+            this.txt_itemModel.Location = new System.Drawing.Point(370, 40);
             this.txt_itemModel.Name = "txt_itemModel";
-            this.txt_itemModel.Size = new System.Drawing.Size(445, 24);
+            this.txt_itemModel.Size = new System.Drawing.Size(451, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
             this.txt_itemModel.TabIndex = 466;
             // 
             // txt_dhdNo
             // 
-            this.txt_dhdNo.Location = new System.Drawing.Point(391, 12);
+            this.txt_dhdNo.Location = new System.Drawing.Point(99, 40);
             this.txt_dhdNo.Name = "txt_dhdNo";
-            this.txt_dhdNo.Size = new System.Drawing.Size(169, 24);
+            this.txt_dhdNo.Size = new System.Drawing.Size(180, 24);
             this.txt_dhdNo.StyleController = this.layoutMx1;
             this.txt_dhdNo.TabIndex = 467;
             // 
             // txt_gysNo
             // 
-            this.txt_gysNo.Location = new System.Drawing.Point(391, 132);
+            this.txt_gysNo.Location = new System.Drawing.Point(99, 96);
             this.txt_gysNo.Name = "txt_gysNo";
-            this.txt_gysNo.Size = new System.Drawing.Size(169, 24);
+            this.txt_gysNo.Size = new System.Drawing.Size(180, 24);
             this.txt_gysNo.StyleController = this.layoutMx1;
             this.txt_gysNo.TabIndex = 468;
             // 
             // txt_gysName
             // 
-            this.txt_gysName.Location = new System.Drawing.Point(667, 132);
+            this.txt_gysName.Location = new System.Drawing.Point(370, 96);
             this.txt_gysName.Name = "txt_gysName";
-            this.txt_gysName.Size = new System.Drawing.Size(169, 24);
+            this.txt_gysName.Size = new System.Drawing.Size(451, 24);
             this.txt_gysName.StyleController = this.layoutMx1;
             this.txt_gysName.TabIndex = 469;
             // 
-            // txt_fbatchQty
-            // 
-            this.txt_fbatchQty.Location = new System.Drawing.Point(115, 72);
-            this.txt_fbatchQty.Name = "txt_fbatchQty";
-            this.txt_fbatchQty.Size = new System.Drawing.Size(169, 24);
-            this.txt_fbatchQty.StyleController = this.layoutMx1;
-            this.txt_fbatchQty.TabIndex = 470;
-            // 
-            // txt_chooseQty
-            // 
-            this.txt_chooseQty.Location = new System.Drawing.Point(115, 102);
-            this.txt_chooseQty.Name = "txt_chooseQty";
-            this.txt_chooseQty.Size = new System.Drawing.Size(169, 24);
-            this.txt_chooseQty.StyleController = this.layoutMx1;
-            this.txt_chooseQty.TabIndex = 471;
-            // 
             // txt_fmrmode
             // 
-            this.txt_fmrmode.Location = new System.Drawing.Point(943, 72);
+            this.txt_fmrmode.Location = new System.Drawing.Point(912, 68);
             this.txt_fmrmode.Name = "txt_fmrmode";
             this.txt_fmrmode.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_fmrmode.Properties.Appearance.Options.UseForeColor = true;
-            this.txt_fmrmode.Size = new System.Drawing.Size(171, 24);
+            this.txt_fmrmode.Size = new System.Drawing.Size(181, 24);
             this.txt_fmrmode.StyleController = this.layoutMx1;
             this.txt_fmrmode.TabIndex = 473;
             // 
@@ -752,65 +590,49 @@
             // 
             // txt_fBillNo
             // 
-            this.txt_fBillNo.Location = new System.Drawing.Point(115, 12);
+            this.txt_fBillNo.Location = new System.Drawing.Point(99, 12);
             this.txt_fBillNo.Name = "txt_fBillNo";
-            this.txt_fBillNo.Size = new System.Drawing.Size(169, 24);
+            this.txt_fBillNo.Size = new System.Drawing.Size(180, 24);
             this.txt_fBillNo.StyleController = this.layoutMx1;
             this.txt_fBillNo.TabIndex = 478;
             // 
-            // txt_chooseGoodQty
+            // txt_dhdDate
             // 
-            this.txt_chooseGoodQty.Location = new System.Drawing.Point(115, 132);
-            this.txt_chooseGoodQty.Name = "txt_chooseGoodQty";
-            this.txt_chooseGoodQty.Size = new System.Drawing.Size(169, 24);
-            this.txt_chooseGoodQty.StyleController = this.layoutMx1;
-            this.txt_chooseGoodQty.TabIndex = 479;
-            // 
-            // txt_chooseBadQty
-            // 
-            this.txt_chooseBadQty.Location = new System.Drawing.Point(115, 162);
-            this.txt_chooseBadQty.Name = "txt_chooseBadQty";
-            this.txt_chooseBadQty.Size = new System.Drawing.Size(169, 24);
-            this.txt_chooseBadQty.StyleController = this.layoutMx1;
-            this.txt_chooseBadQty.TabIndex = 480;
-            // 
-            // txt_workLine
-            // 
-            this.txt_workLine.Location = new System.Drawing.Point(391, 42);
-            this.txt_workLine.Name = "txt_workLine";
-            this.txt_workLine.Size = new System.Drawing.Size(169, 24);
-            this.txt_workLine.StyleController = this.layoutMx1;
-            this.txt_workLine.TabIndex = 481;
-            // 
-            // txt_jydNo
-            // 
-            this.txt_jydNo.Location = new System.Drawing.Point(115, 42);
-            this.txt_jydNo.Name = "txt_jydNo";
-            this.txt_jydNo.Size = new System.Drawing.Size(169, 24);
-            this.txt_jydNo.StyleController = this.layoutMx1;
-            this.txt_jydNo.TabIndex = 482;
+            this.txt_dhdDate.Location = new System.Drawing.Point(99, 68);
+            this.txt_dhdDate.Name = "txt_dhdDate";
+            this.txt_dhdDate.Size = new System.Drawing.Size(180, 24);
+            this.txt_dhdDate.StyleController = this.layoutMx1;
+            this.txt_dhdDate.TabIndex = 481;
             // 
             // txt_handResult
             // 
-            this.txt_handResult.Location = new System.Drawing.Point(943, 12);
+            this.txt_handResult.Location = new System.Drawing.Point(912, 12);
             this.txt_handResult.Name = "txt_handResult";
             this.txt_handResult.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_handResult.Properties.Appearance.Options.UseForeColor = true;
-            this.txt_handResult.Size = new System.Drawing.Size(171, 24);
+            this.txt_handResult.Size = new System.Drawing.Size(181, 24);
             this.txt_handResult.StyleController = this.layoutMx1;
             this.txt_handResult.TabIndex = 483;
             this.txt_handResult.Tag = "readonly";
             // 
             // txt_handSuggestion
             // 
-            this.txt_handSuggestion.Location = new System.Drawing.Point(943, 42);
+            this.txt_handSuggestion.Location = new System.Drawing.Point(912, 40);
             this.txt_handSuggestion.Name = "txt_handSuggestion";
             this.txt_handSuggestion.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_handSuggestion.Properties.Appearance.Options.UseForeColor = true;
-            this.txt_handSuggestion.Size = new System.Drawing.Size(171, 24);
+            this.txt_handSuggestion.Size = new System.Drawing.Size(181, 24);
             this.txt_handSuggestion.StyleController = this.layoutMx1;
             this.txt_handSuggestion.TabIndex = 484;
             this.txt_handSuggestion.Tag = "readonly";
+            // 
+            // txt_fngDesc
+            // 
+            this.txt_fngDesc.Location = new System.Drawing.Point(99, 124);
+            this.txt_fngDesc.Name = "txt_fngDesc";
+            this.txt_fngDesc.Size = new System.Drawing.Size(994, 52);
+            this.txt_fngDesc.StyleController = this.layoutMx1;
+            this.txt_fngDesc.TabIndex = 485;
             // 
             // layoutControlItem9
             // 
@@ -840,26 +662,19 @@
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem17,
-            this.layoutControlItem18,
             this.layoutControlItem2,
-            this.layoutControlItem25,
-            this.layoutControlItem26,
-            this.layoutControlItem7,
+            this.layoutControlItem20,
+            this.layoutControlItem1,
+            this.layoutControlItem21,
+            this.layoutControlItem19,
+            this.layoutControlItem14,
+            this.layoutControlItem4,
+            this.layoutControlItem11,
             this.layoutControlItem15,
             this.layoutControlItem16,
             this.layoutControlItem13,
             this.layoutControlItem12,
-            this.layoutControlItem11,
-            this.layoutControlItem6,
-            this.layoutControlItem14,
-            this.layoutControlItem4,
-            this.layoutControlItem5,
-            this.layoutControlItem3,
-            this.layoutControlItem20,
-            this.layoutControlItem1,
-            this.layoutControlItem21,
-            this.layoutControlItem19});
+            this.layoutControlItem3});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -894,222 +709,149 @@
             rowDefinition4,
             rowDefinition5,
             rowDefinition6});
-            this.Root.Size = new System.Drawing.Size(1126, 202);
+            this.Root.Size = new System.Drawing.Size(1105, 188);
             this.Root.TextVisible = false;
-            // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.txt_fbatchQty;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 60);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem17.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem17.Text = "鏉ユ枡鏁伴噺";
-            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.Name = "layoutControlItem18";
-            this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem18.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem18.Text = "閫夊埆鏁伴噺";
-            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.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.Name = "layoutControlItem25";
-            this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem25.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem25.Text = "閫夊埆鑹搧鏁�";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(91, 18);
-            // 
-            // layoutControlItem26
-            // 
-            this.layoutControlItem26.Control = this.txt_chooseBadQty;
-            this.layoutControlItem26.Location = new System.Drawing.Point(0, 150);
-            this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem26.Size = new System.Drawing.Size(276, 32);
-            this.layoutControlItem26.Text = "閫夊埆涓嶈壇鍝佹暟";
-            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(276, 150);
-            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(552, 32);
-            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(276, 120);
-            this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem15.Size = new System.Drawing.Size(276, 30);
-            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(552, 120);
-            this.layoutControlItem16.Name = "layoutControlItem16";
-            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem16.Size = new System.Drawing.Size(276, 30);
-            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(276, 90);
-            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(552, 30);
-            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(552, 60);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(276, 30);
-            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(276, 60);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(276, 30);
-            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, 30);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(276, 30);
-            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(276, 0);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem14.Size = new System.Drawing.Size(276, 30);
-            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(276, 30);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(276, 30);
-            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(552, 0);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem5.Size = new System.Drawing.Size(276, 30);
-            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(552, 30);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem3.Size = new System.Drawing.Size(276, 30);
-            this.layoutControlItem3.Text = "IQC鎻愪氦鏃ユ湡 ";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(91, 18);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_fmrmode;
             this.layoutControlItem20.CustomizationFormText = "澶勭悊鏂瑰紡";
-            this.layoutControlItem20.Location = new System.Drawing.Point(828, 60);
+            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(278, 30);
+            this.layoutControlItem20.Size = new System.Drawing.Size(272, 28);
             this.layoutControlItem20.Text = "閫�鏂欐柟寮�";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(91, 18);
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.txt_fType;
-            this.layoutControlItem1.Location = new System.Drawing.Point(828, 90);
+            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(278, 30);
+            this.layoutControlItem1.Size = new System.Drawing.Size(272, 28);
             this.layoutControlItem1.Text = "寮傚父绫诲瀷";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(91, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem21
             // 
             this.layoutControlItem21.Control = this.txt_handResult;
-            this.layoutControlItem21.Location = new System.Drawing.Point(828, 0);
+            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(278, 30);
+            this.layoutControlItem21.Size = new System.Drawing.Size(272, 28);
             this.layoutControlItem21.Text = "鍒ゅ畾缁撴灉";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(91, 18);
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_handSuggestion;
-            this.layoutControlItem19.Location = new System.Drawing.Point(828, 30);
+            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(278, 30);
+            this.layoutControlItem19.Size = new System.Drawing.Size(272, 28);
             this.layoutControlItem19.Text = "澶勭悊缁撴灉";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(91, 18);
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_dhdNo;
+            this.layoutControlItem14.Location = new System.Drawing.Point(0, 28);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem14.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem14.Text = "鍒拌揣鍗曞彿";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_dhdDate;
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem4.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem4.Text = "鍒拌揣鍗曟棩鏈�";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txt_itemNo;
+            this.layoutControlItem11.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem11.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem11.Text = "鐗╂枡缂栧彿";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem15
+            // 
+            this.layoutControlItem15.Control = this.txt_gysNo;
+            this.layoutControlItem15.Location = new System.Drawing.Point(0, 84);
+            this.layoutControlItem15.Name = "layoutControlItem15";
+            this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem15.Size = new System.Drawing.Size(271, 28);
+            this.layoutControlItem15.Text = "渚涘簲鍟嗙紪鍙�";
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem16
+            // 
+            this.layoutControlItem16.Control = this.txt_gysName;
+            this.layoutControlItem16.Location = new System.Drawing.Point(271, 84);
+            this.layoutControlItem16.Name = "layoutControlItem16";
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem16.Size = new System.Drawing.Size(542, 28);
+            this.layoutControlItem16.Text = "渚涘簲鍟嗗悕绉�";
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_itemModel;
+            this.layoutControlItem13.Location = new System.Drawing.Point(271, 28);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem13.Size = new System.Drawing.Size(542, 28);
+            this.layoutControlItem13.Text = "鐗╂枡瑙勬牸";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem12
+            // 
+            this.layoutControlItem12.Control = this.txt_itemName;
+            this.layoutControlItem12.Location = new System.Drawing.Point(271, 56);
+            this.layoutControlItem12.Name = "layoutControlItem12";
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem12.Size = new System.Drawing.Size(542, 28);
+            this.layoutControlItem12.Text = "鐗╂枡鍚嶇О";
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem3
+            // 
+            this.layoutControlItem3.Control = this.txt_fngDesc;
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 112);
+            this.layoutControlItem3.Name = "layoutControlItem3";
+            this.layoutControlItem3.OptionsTableLayoutItem.ColumnSpan = 4;
+            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem3.OptionsTableLayoutItem.RowSpan = 2;
+            this.layoutControlItem3.Size = new System.Drawing.Size(1085, 56);
+            this.layoutControlItem3.Text = "涓嶅悎鏍兼弿杩�";
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(75, 18);
             // 
             // tabMx
             // 
@@ -1117,7 +859,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, 356);
+            this.tabMx.Size = new System.Drawing.Size(1126, 373);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -1126,8 +868,8 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 324);
-            this.tabMxPage1.Text = "閫夊埆鏄庣粏";
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 341);
+            this.tabMxPage1.Text = "寮傚父鏄庣粏";
             // 
             // gcMx1
             // 
@@ -1141,7 +883,7 @@
             this.repositoryItemButtonEdit1,
             this.rptJYBZ,
             this.repositoryItemDateEdit3});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 324);
+            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});
@@ -1155,12 +897,16 @@
             this.gvMx1guid,
             this.caaGuid,
             this.gvMx1daa002,
-            this.gvMx1daa010,
+            this.gridColumn5,
+            this.gridColumn6,
             this.gvMx1daa005,
-            this.gvMx1daa003,
+            this.gridColumn7,
             this.gvMx1daa004,
             this.gvMx1daa008,
-            this.gvMx1reporttime});
+            this.gvMx1reporttime,
+            this.gridColumn14,
+            this.gridColumn15,
+            this.gridColumn16});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1200,18 +946,25 @@
             this.gvMx1daa002.VisibleIndex = 0;
             this.gvMx1daa002.Width = 50;
             // 
-            // gvMx1daa010
+            // gridColumn5
             // 
-            this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa010.Caption = "鎵规";
-            this.gvMx1daa010.FieldName = "batch";
-            this.gvMx1daa010.MinWidth = 50;
-            this.gvMx1daa010.Name = "gvMx1daa010";
-            this.gvMx1daa010.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa010.Tag = "query_a.daa010";
-            this.gvMx1daa010.Visible = true;
-            this.gvMx1daa010.VisibleIndex = 1;
-            this.gvMx1daa010.Width = 50;
+            this.gridColumn5.Caption = "妫�楠屽崟鍙�";
+            this.gridColumn5.FieldName = "releaseNo";
+            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 1;
+            this.gridColumn5.Width = 94;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "妫�楠屾棩鏈�";
+            this.gridColumn6.FieldName = "jyDate";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 4;
+            this.gridColumn6.Width = 94;
             // 
             // gvMx1daa005
             // 
@@ -1226,18 +979,15 @@
             this.gvMx1daa005.VisibleIndex = 2;
             this.gvMx1daa005.Width = 50;
             // 
-            // gvMx1daa003
+            // gridColumn7
             // 
-            this.gvMx1daa003.AppearanceCell.Options.UseFont = true;
-            this.gvMx1daa003.Caption = "涓嶈壇椤圭洰";
-            this.gvMx1daa003.FieldName = "badItem";
-            this.gvMx1daa003.MinWidth = 50;
-            this.gvMx1daa003.Name = "gvMx1daa003";
-            this.gvMx1daa003.OptionsColumn.ReadOnly = true;
-            this.gvMx1daa003.Tag = "query_a.daa003";
-            this.gvMx1daa003.Visible = true;
-            this.gvMx1daa003.VisibleIndex = 3;
-            this.gvMx1daa003.Width = 50;
+            this.gridColumn7.Caption = "鎶芥牱鏁�";
+            this.gridColumn7.FieldName = "chouQty";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 3;
+            this.gridColumn7.Width = 94;
             // 
             // gvMx1daa004
             // 
@@ -1249,7 +999,7 @@
             this.gvMx1daa004.OptionsColumn.ReadOnly = true;
             this.gvMx1daa004.Tag = "query_a.daa004";
             this.gvMx1daa004.Visible = true;
-            this.gvMx1daa004.VisibleIndex = 4;
+            this.gvMx1daa004.VisibleIndex = 5;
             this.gvMx1daa004.Width = 50;
             // 
             // gvMx1daa008
@@ -1263,20 +1013,50 @@
             this.gvMx1daa008.OptionsColumn.ReadOnly = true;
             this.gvMx1daa008.Tag = "query_a.daa008";
             this.gvMx1daa008.Visible = true;
-            this.gvMx1daa008.VisibleIndex = 5;
+            this.gvMx1daa008.VisibleIndex = 6;
             this.gvMx1daa008.Width = 50;
             // 
             // gvMx1reporttime
             // 
             this.gvMx1reporttime.AppearanceCell.Options.UseFont = true;
-            this.gvMx1reporttime.Caption = "澶囨敞";
-            this.gvMx1reporttime.FieldName = "remark";
+            this.gvMx1reporttime.Caption = "閫夊埆绫诲瀷";
+            this.gvMx1reporttime.FieldName = "chooseType";
             this.gvMx1reporttime.MinWidth = 50;
             this.gvMx1reporttime.Name = "gvMx1reporttime";
             this.gvMx1reporttime.Tag = "edit";
             this.gvMx1reporttime.Visible = true;
-            this.gvMx1reporttime.VisibleIndex = 6;
+            this.gvMx1reporttime.VisibleIndex = 7;
             this.gvMx1reporttime.Width = 102;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.Caption = "澶勭疆鎰忚";
+            this.gridColumn14.FieldName = "handResult";
+            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 8;
+            this.gridColumn14.Width = 94;
+            // 
+            // gridColumn15
+            // 
+            this.gridColumn15.Caption = "閫夊埆鏁伴噺";
+            this.gridColumn15.FieldName = "chooseQty";
+            this.gridColumn15.MinWidth = 25;
+            this.gridColumn15.Name = "gridColumn15";
+            this.gridColumn15.Visible = true;
+            this.gridColumn15.VisibleIndex = 9;
+            this.gridColumn15.Width = 94;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.Caption = "涓嶅悎鏍兼弿杩�";
+            this.gridColumn16.FieldName = "fngDesc";
+            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 10;
+            this.gridColumn16.Width = 94;
             // 
             // repositoryItemDateEdit1
             // 
@@ -1377,9 +1157,6 @@
             this.splitMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txt_remark.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();
@@ -1387,40 +1164,29 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_dhdNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_gysName.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_chooseQty.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.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.txt_dhdDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_handResult.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_handSuggestion.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fngDesc.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).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.layoutControlItem20)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).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.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -1455,17 +1221,12 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_checkUser;
         private DevExpress.XtraGrid.Columns.GridColumn gv_checkDate;
         private DevExpress.XtraGrid.Columns.GridColumn gv_pba005;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_pba006;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_pba009;
         private UserControls.Data.UcPageBar pageBar1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
         private DevExpress.XtraEditors.SplitContainerControl splitMx1;
         private DevExpress.XtraLayout.LayoutControl layoutMx1;
         private DevExpress.XtraLayout.LayoutControlGroup Root;
         private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.TextEdit txt_createBy;
-        private DevExpress.XtraEditors.TextEdit txt_createDate;
-        private DevExpress.XtraEditors.TextEdit txt_remark;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -1477,15 +1238,12 @@
         private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit3;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa002;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa005;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa003;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa010;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa008;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1reporttime;
         private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraEditors.TextEdit txt_fType;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
@@ -1495,49 +1253,40 @@
         private DevExpress.XtraEditors.TextEdit txt_dhdNo;
         private DevExpress.XtraEditors.TextEdit txt_gysNo;
         private DevExpress.XtraEditors.TextEdit txt_gysName;
-        private DevExpress.XtraEditors.TextEdit txt_fbatchQty;
-        private DevExpress.XtraEditors.TextEdit txt_chooseQty;
         private DevExpress.XtraEditors.TextEdit txt_fmrmode;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
         private DevExpress.XtraEditors.TextEdit txt_guid;
         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 layoutControlItem25;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
         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.XtraEditors.TextEdit txt_dhdDate;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraEditors.TextEdit txt_handResult;
         private DevExpress.XtraEditors.TextEdit txt_handSuggestion;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraEditors.MemoEdit txt_fngDesc;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3