From 5c26ea4c8c813ea85acf68fa07e180a12c748f33 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 04 七月 2025 14:21:01 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs |  404 ++++++++++++++++++++++++++++++++++++---------------------
 1 files changed, 253 insertions(+), 151 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 176f228..cd849e8 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -40,11 +40,12 @@
             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.RowDefinition rowDefinition7 = 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 rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
             this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -84,6 +85,8 @@
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.txt_fngDesc = new Gs.DevApp.UserControl.UcDictionary();
+            this.btnYcReport = new DevExpress.XtraEditors.SimpleButton();
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_suppName = new DevExpress.XtraEditors.TextEdit();
             this.txt_remarks = new DevExpress.XtraEditors.TextEdit();
@@ -106,10 +109,12 @@
             this.txt_freceQty = new DevExpress.XtraEditors.TextEdit();
             this.txt_cgdNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_fngHandle = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fmrmode = new DevExpress.XtraEditors.TextEdit();
+            this.txt_xblb = new DevExpress.XtraEditors.MemoEdit();
+            this.txt_xbsl = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -128,9 +133,11 @@
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
             this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -231,10 +238,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_cgdNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xblb.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xbsl.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
@@ -253,9 +262,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
             this.xtraTabControl2.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -482,7 +493,7 @@
             this.gv_releaseNo.OptionsColumn.AllowEdit = false;
             this.gv_releaseNo.Tag = "query_a.release_no";
             this.gv_releaseNo.Visible = true;
-            this.gv_releaseNo.VisibleIndex = 5;
+            this.gv_releaseNo.VisibleIndex = 2;
             this.gv_releaseNo.Width = 100;
             // 
             // gv_itemId
@@ -558,7 +569,7 @@
             this.gv_fcheckResu.OptionsColumn.AllowEdit = false;
             this.gv_fcheckResu.Tag = "query_a.fcheck_resu";
             this.gv_fcheckResu.Visible = true;
-            this.gv_fcheckResu.VisibleIndex = 3;
+            this.gv_fcheckResu.VisibleIndex = 4;
             this.gv_fcheckResu.Width = 50;
             // 
             // gv_fcovertQty
@@ -664,14 +675,14 @@
             // gv_fngHandle
             // 
             this.gv_fngHandle.AppearanceCell.Options.UseFont = true;
-            this.gv_fngHandle.Caption = "涓嶈壇澶勭悊鏂规硶";
+            this.gv_fngHandle.Caption = "澶勭悊鎰忚";
             this.gv_fngHandle.FieldName = "fngHandle";
             this.gv_fngHandle.MinWidth = 30;
             this.gv_fngHandle.Name = "gv_fngHandle";
             this.gv_fngHandle.OptionsColumn.AllowEdit = false;
             this.gv_fngHandle.Tag = "query_a.fng_handle";
             this.gv_fngHandle.Visible = true;
-            this.gv_fngHandle.VisibleIndex = 20;
+            this.gv_fngHandle.VisibleIndex = 5;
             this.gv_fngHandle.Width = 100;
             // 
             // bandedGridColumn1
@@ -682,7 +693,7 @@
             this.bandedGridColumn1.Name = "bandedGridColumn1";
             this.bandedGridColumn1.Tag = "org.fnamber";
             this.bandedGridColumn1.Visible = true;
-            this.bandedGridColumn1.VisibleIndex = 21;
+            this.bandedGridColumn1.VisibleIndex = 20;
             this.bandedGridColumn1.Width = 250;
             // 
             // gridColumn18
@@ -692,7 +703,7 @@
             this.gridColumn18.MinWidth = 25;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 22;
+            this.gridColumn18.VisibleIndex = 21;
             this.gridColumn18.Width = 94;
             // 
             // gridColumn19
@@ -702,7 +713,7 @@
             this.gridColumn19.MinWidth = 25;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 23;
+            this.gridColumn19.VisibleIndex = 22;
             this.gridColumn19.Width = 94;
             // 
             // gridColumn17
@@ -720,7 +731,7 @@
             this.gridColumn23.MinWidth = 25;
             this.gridColumn23.Name = "gridColumn23";
             this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 24;
+            this.gridColumn23.VisibleIndex = 23;
             this.gridColumn23.Width = 94;
             // 
             // gridColumn30
@@ -739,7 +750,7 @@
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.ReadOnly = true;
             this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 2;
+            this.gridColumn5.VisibleIndex = 3;
             this.gridColumn5.Width = 94;
             // 
             // gridColumn6
@@ -749,8 +760,6 @@
             this.gridColumn6.MinWidth = 25;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.OptionsColumn.ReadOnly = true;
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 4;
             this.gridColumn6.Width = 94;
             // 
             // pageBar1
@@ -790,11 +799,13 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1342, 688);
-            this.splitMx1.SplitterPosition = 185;
+            this.splitMx1.SplitterPosition = 231;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
+            this.layoutMx1.Controls.Add(this.txt_fngDesc);
+            this.layoutMx1.Controls.Add(this.btnYcReport);
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_suppName);
             this.layoutMx1.Controls.Add(this.txt_remarks);
@@ -817,19 +828,42 @@
             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.Controls.Add(this.txt_xblb);
+            this.layoutMx1.Controls.Add(this.txt_xbsl);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem17,
             this.layoutControlItem7,
-            this.layoutControlItem21});
+            this.layoutControlItem21,
+            this.layoutControlItem23});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1094, 495, 812, 500);
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(609, 530, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1342, 185);
+            this.layoutMx1.Size = new System.Drawing.Size(1342, 231);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
+            // 
+            // txt_fngDesc
+            // 
+            this.txt_fngDesc.BtnTxt = "寮傚父鎻忚堪";
+            this.txt_fngDesc.Location = new System.Drawing.Point(12, 162);
+            this.txt_fngDesc.Name = "txt_fngDesc";
+            this.txt_fngDesc.Size = new System.Drawing.Size(656, 57);
+            this.txt_fngDesc.TabIndex = 815;
+            this.txt_fngDesc.TextTxt = "";
+            this.txt_fngDesc.WhereTxt = " a.s_type=\'QC寮傚父鎻忚堪\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
+            // 
+            // btnYcReport
+            // 
+            this.btnYcReport.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttopdf_16x16;
+            this.btnYcReport.Location = new System.Drawing.Point(672, 192);
+            this.btnYcReport.Name = "btnYcReport";
+            this.btnYcReport.Size = new System.Drawing.Size(116, 27);
+            this.btnYcReport.StyleController = this.layoutMx1;
+            this.btnYcReport.TabIndex = 814;
+            this.btnYcReport.Tag = "gvBtnAlawys";
+            this.btnYcReport.Text = "鏌ョ湅寮傚父鎶ュ憡";
             // 
             // lbGuid
             // 
@@ -842,39 +876,40 @@
             // 
             // txt_suppName
             // 
-            this.txt_suppName.Location = new System.Drawing.Point(409, 96);
+            this.txt_suppName.Location = new System.Drawing.Point(414, 102);
             this.txt_suppName.Name = "txt_suppName";
-            this.txt_suppName.Size = new System.Drawing.Size(249, 24);
+            this.txt_suppName.Size = new System.Drawing.Size(254, 24);
             this.txt_suppName.StyleController = this.layoutMx1;
             this.txt_suppName.TabIndex = 801;
             this.txt_suppName.Tag = "readonly";
             // 
             // txt_remarks
             // 
-            this.txt_remarks.Location = new System.Drawing.Point(84, 124);
+            this.txt_remarks.Location = new System.Drawing.Point(84, 132);
             this.txt_remarks.Name = "txt_remarks";
             this.txt_remarks.Properties.Appearance.Options.UseFont = true;
-            this.txt_remarks.Size = new System.Drawing.Size(574, 24);
+            this.txt_remarks.Size = new System.Drawing.Size(584, 24);
             this.txt_remarks.StyleController = this.layoutMx1;
             this.txt_remarks.TabIndex = 797;
+            this.txt_remarks.Tag = "readonly";
             // 
             // txt_fcheckResu
             // 
-            this.txt_fcheckResu.Location = new System.Drawing.Point(734, 96);
+            this.txt_fcheckResu.Location = new System.Drawing.Point(744, 102);
             this.txt_fcheckResu.Name = "txt_fcheckResu";
             this.txt_fcheckResu.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_fcheckResu.Properties.Appearance.Options.UseForeColor = true;
-            this.txt_fcheckResu.Size = new System.Drawing.Size(249, 24);
+            this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
             this.txt_fcheckResu.StyleController = this.layoutMx1;
             this.txt_fcheckResu.TabIndex = 798;
             this.txt_fcheckResu.Tag = "readonly";
             // 
             // txt_itemName
             // 
-            this.txt_itemName.Location = new System.Drawing.Point(84, 40);
+            this.txt_itemName.Location = new System.Drawing.Point(84, 42);
             this.txt_itemName.Name = "txt_itemName";
             this.txt_itemName.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemName.Size = new System.Drawing.Size(249, 24);
+            this.txt_itemName.Size = new System.Drawing.Size(254, 24);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 800;
             this.txt_itemName.Tag = "readonly";
@@ -884,46 +919,46 @@
             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(249, 24);
+            this.txt_releaseNo.Size = new System.Drawing.Size(254, 24);
             this.txt_releaseNo.StyleController = this.layoutMx1;
             this.txt_releaseNo.TabIndex = 213;
             this.txt_releaseNo.Tag = "readonly";
             // 
             // txt_fcheckDate
             // 
-            this.txt_fcheckDate.Location = new System.Drawing.Point(734, 12);
+            this.txt_fcheckDate.Location = new System.Drawing.Point(744, 12);
             this.txt_fcheckDate.Name = "txt_fcheckDate";
             this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcheckDate.Size = new System.Drawing.Size(249, 24);
+            this.txt_fcheckDate.Size = new System.Drawing.Size(254, 24);
             this.txt_fcheckDate.StyleController = this.layoutMx1;
             this.txt_fcheckDate.TabIndex = 216;
             this.txt_fcheckDate.Tag = "readonly";
             // 
             // txt_lotNo
             // 
-            this.txt_lotNo.Location = new System.Drawing.Point(409, 12);
+            this.txt_lotNo.Location = new System.Drawing.Point(414, 12);
             this.txt_lotNo.Name = "txt_lotNo";
             this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_lotNo.Size = new System.Drawing.Size(249, 24);
+            this.txt_lotNo.Size = new System.Drawing.Size(254, 24);
             this.txt_lotNo.StyleController = this.layoutMx1;
             this.txt_lotNo.TabIndex = 262;
             this.txt_lotNo.Tag = "readonly";
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(84, 68);
+            this.txt_itemNo.Location = new System.Drawing.Point(84, 72);
             this.txt_itemNo.Name = "txt_itemNo";
             this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(249, 24);
+            this.txt_itemNo.Size = new System.Drawing.Size(254, 24);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 789;
             this.txt_itemNo.Tag = "readonly";
             // 
             // txt_itemModel
             // 
-            this.txt_itemModel.Location = new System.Drawing.Point(84, 96);
+            this.txt_itemModel.Location = new System.Drawing.Point(84, 102);
             this.txt_itemModel.Name = "txt_itemModel";
-            this.txt_itemModel.Size = new System.Drawing.Size(249, 24);
+            this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
             this.txt_itemModel.TabIndex = 801;
             this.txt_itemModel.Tag = "readonly";
@@ -939,57 +974,57 @@
             // 
             // txt_fcheckBy
             // 
-            this.txt_fcheckBy.Location = new System.Drawing.Point(734, 40);
+            this.txt_fcheckBy.Location = new System.Drawing.Point(744, 42);
             this.txt_fcheckBy.Name = "txt_fcheckBy";
             this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcheckBy.Size = new System.Drawing.Size(249, 24);
+            this.txt_fcheckBy.Size = new System.Drawing.Size(254, 24);
             this.txt_fcheckBy.StyleController = this.layoutMx1;
             this.txt_fcheckBy.TabIndex = 217;
             this.txt_fcheckBy.Tag = "readonly";
             // 
             // txt_fbatchQty
             // 
-            this.txt_fbatchQty.Location = new System.Drawing.Point(409, 68);
+            this.txt_fbatchQty.Location = new System.Drawing.Point(414, 72);
             this.txt_fbatchQty.Name = "txt_fbatchQty";
             this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
-            this.txt_fbatchQty.Size = new System.Drawing.Size(249, 24);
+            this.txt_fbatchQty.Size = new System.Drawing.Size(254, 24);
             this.txt_fbatchQty.StyleController = this.layoutMx1;
             this.txt_fbatchQty.TabIndex = 222;
             this.txt_fbatchQty.Tag = "readonly";
             // 
             // txt_fsubmitBy
             // 
-            this.txt_fsubmitBy.Location = new System.Drawing.Point(1059, 40);
+            this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 42);
             this.txt_fsubmitBy.Name = "txt_fsubmitBy";
-            this.txt_fsubmitBy.Size = new System.Drawing.Size(250, 24);
+            this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 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(1059, 68);
+            this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 72);
             this.txt_fsubmitDate.Name = "txt_fsubmitDate";
-            this.txt_fsubmitDate.Size = new System.Drawing.Size(250, 24);
+            this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
             this.txt_fsubmitDate.StyleController = this.layoutMx1;
             this.txt_fsubmitDate.TabIndex = 805;
             this.txt_fsubmitDate.Tag = "readonly";
             // 
             // txt_fsubmit
             // 
-            this.txt_fsubmit.Location = new System.Drawing.Point(987, 12);
+            this.txt_fsubmit.Location = new System.Drawing.Point(1002, 12);
             this.txt_fsubmit.Name = "txt_fsubmit";
             this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_fsubmit.Size = new System.Drawing.Size(322, 24);
+            this.txt_fsubmit.Size = new System.Drawing.Size(328, 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(734, 124);
+            this.txt_slOrg.Location = new System.Drawing.Point(744, 132);
             this.txt_slOrg.Name = "txt_slOrg";
-            this.txt_slOrg.Size = new System.Drawing.Size(249, 24);
+            this.txt_slOrg.Size = new System.Drawing.Size(254, 24);
             this.txt_slOrg.StyleController = this.layoutMx1;
             this.txt_slOrg.TabIndex = 807;
             this.txt_slOrg.Tag = "readonly";
@@ -1005,50 +1040,63 @@
             // 
             // txt_checkStates
             // 
-            this.txt_checkStates.Location = new System.Drawing.Point(734, 68);
+            this.txt_checkStates.Location = new System.Drawing.Point(744, 72);
             this.txt_checkStates.Name = "txt_checkStates";
             this.txt_checkStates.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_checkStates.Properties.Appearance.Options.UseForeColor = true;
-            this.txt_checkStates.Size = new System.Drawing.Size(249, 24);
+            this.txt_checkStates.Size = new System.Drawing.Size(254, 24);
             this.txt_checkStates.StyleController = this.layoutMx1;
             this.txt_checkStates.TabIndex = 809;
             this.txt_checkStates.Tag = "readonly";
             // 
             // txt_freceQty
             // 
-            this.txt_freceQty.Location = new System.Drawing.Point(1059, 96);
+            this.txt_freceQty.Location = new System.Drawing.Point(1074, 102);
             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(250, 24);
+            this.txt_freceQty.Size = new System.Drawing.Size(256, 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(409, 40);
+            this.txt_cgdNo.Location = new System.Drawing.Point(414, 42);
             this.txt_cgdNo.Name = "txt_cgdNo";
-            this.txt_cgdNo.Size = new System.Drawing.Size(249, 24);
+            this.txt_cgdNo.Size = new System.Drawing.Size(254, 24);
             this.txt_cgdNo.StyleController = this.layoutMx1;
             this.txt_cgdNo.TabIndex = 811;
             this.txt_cgdNo.Tag = "readonly";
             // 
             // txt_fngHandle
             // 
-            this.txt_fngHandle.Location = new System.Drawing.Point(1059, 124);
+            this.txt_fngHandle.Location = new System.Drawing.Point(1074, 102);
             this.txt_fngHandle.Name = "txt_fngHandle";
-            this.txt_fngHandle.Size = new System.Drawing.Size(250, 24);
+            this.txt_fngHandle.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
+            this.txt_fngHandle.Properties.Appearance.Options.UseForeColor = true;
+            this.txt_fngHandle.Size = new System.Drawing.Size(256, 24);
             this.txt_fngHandle.StyleController = this.layoutMx1;
             this.txt_fngHandle.TabIndex = 812;
+            this.txt_fngHandle.Tag = "readonly";
             // 
-            // txt_fmrmode
+            // txt_xblb
             // 
-            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;
+            this.txt_xblb.Location = new System.Drawing.Point(1074, 162);
+            this.txt_xblb.Name = "txt_xblb";
+            this.txt_xblb.Size = new System.Drawing.Size(256, 57);
+            this.txt_xblb.StyleController = this.layoutMx1;
+            this.txt_xblb.TabIndex = 816;
+            this.txt_xblb.Tag = "readonly";
+            // 
+            // txt_xbsl
+            // 
+            this.txt_xbsl.Location = new System.Drawing.Point(1074, 132);
+            this.txt_xbsl.Name = "txt_xbsl";
+            this.txt_xbsl.Size = new System.Drawing.Size(256, 24);
+            this.txt_xbsl.StyleController = this.layoutMx1;
+            this.txt_xbsl.TabIndex = 817;
+            this.txt_xbsl.Tag = "readonly";
             // 
             // layoutControlItem17
             // 
@@ -1083,6 +1131,17 @@
             this.layoutControlItem21.Text = "涓婚敭GUID";
             this.layoutControlItem21.TextSize = new System.Drawing.Size(50, 20);
             // 
+            // layoutControlItem23
+            // 
+            this.layoutControlItem23.Control = this.txt_freceQty;
+            this.layoutControlItem23.Location = new System.Drawing.Point(990, 90);
+            this.layoutControlItem23.Name = "layoutControlItem23";
+            this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem23.Size = new System.Drawing.Size(332, 30);
+            this.layoutControlItem23.Text = "鍒ゅ畾缁撴灉";
+            this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 18);
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -1105,9 +1164,11 @@
             this.layoutControlItem3,
             this.layoutControlItem24,
             this.layoutControlItem18,
-            this.layoutControlItem23,
+            this.layoutControlItem28,
+            this.layoutControlItem27,
             this.layoutControlItem25,
-            this.layoutControlItem26});
+            this.layoutControlItem26,
+            this.layoutControlItem29});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1135,14 +1196,17 @@
             rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition6.Height = 100D;
             rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition7.Height = 31D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.AutoSize;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition1,
             rowDefinition2,
             rowDefinition3,
             rowDefinition4,
             rowDefinition5,
-            rowDefinition6});
-            this.Root.Size = new System.Drawing.Size(1321, 188);
+            rowDefinition6,
+            rowDefinition7});
+            this.Root.Size = new System.Drawing.Size(1342, 231);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -1150,69 +1214,69 @@
             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(325, 28);
+            this.layoutControlItem1.Size = new System.Drawing.Size(330, 30);
             this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_itemName;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 28);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 30);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem4.Size = new System.Drawing.Size(330, 30);
             this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_itemNo;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 60);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem5.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem5.Size = new System.Drawing.Size(330, 30);
             this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_itemModel;
-            this.layoutControlItem6.Location = new System.Drawing.Point(0, 84);
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 90);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem6.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem6.Size = new System.Drawing.Size(330, 30);
             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(975, 28);
+            this.layoutControlItem15.Location = new System.Drawing.Point(990, 30);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem15.Size = new System.Drawing.Size(326, 28);
+            this.layoutControlItem15.Size = new System.Drawing.Size(332, 30);
             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(975, 56);
+            this.layoutControlItem16.Location = new System.Drawing.Point(990, 60);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem16.Size = new System.Drawing.Size(326, 28);
-            this.layoutControlItem16.Text = "瀹℃牳浜�";
+            this.layoutControlItem16.Size = new System.Drawing.Size(332, 30);
+            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(975, 0);
+            this.layoutControlItem14.Location = new System.Drawing.Point(990, 0);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(326, 28);
+            this.layoutControlItem14.Size = new System.Drawing.Size(332, 30);
             this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem14.TextVisible = false;
@@ -1220,143 +1284,172 @@
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_remarks;
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 112);
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 120);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem12.Size = new System.Drawing.Size(650, 28);
-            this.layoutControlItem12.Text = "澶囨敞璇存槑";
+            this.layoutControlItem12.Size = new System.Drawing.Size(660, 30);
+            this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_fcheckResu;
-            this.layoutControlItem10.Location = new System.Drawing.Point(650, 84);
+            this.layoutControlItem10.Location = new System.Drawing.Point(660, 90);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem10.Size = new System.Drawing.Size(330, 30);
             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(325, 84);
+            this.layoutControlItem13.Location = new System.Drawing.Point(330, 90);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem13.Size = new System.Drawing.Size(330, 30);
             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(650, 56);
+            this.layoutControlItem22.Location = new System.Drawing.Point(660, 60);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem22.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem22.Size = new System.Drawing.Size(330, 30);
             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(325, 56);
+            this.layoutControlItem9.Location = new System.Drawing.Point(330, 60);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem9.Size = new System.Drawing.Size(330, 30);
             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(650, 28);
+            this.layoutControlItem8.Location = new System.Drawing.Point(660, 30);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem8.Size = new System.Drawing.Size(330, 30);
             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(650, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(660, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem2.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem2.Size = new System.Drawing.Size(330, 30);
             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(325, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(330, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem3.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem3.Size = new System.Drawing.Size(330, 30);
             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(325, 28);
+            this.layoutControlItem24.Location = new System.Drawing.Point(330, 30);
             this.layoutControlItem24.Name = "layoutControlItem24";
             this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem24.Size = new System.Drawing.Size(325, 28);
+            this.layoutControlItem24.Size = new System.Drawing.Size(330, 30);
             this.layoutControlItem24.Text = "閲囪喘鍗曞彿";
             this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_slOrg;
-            this.layoutControlItem18.Location = new System.Drawing.Point(650, 112);
+            this.layoutControlItem18.Location = new System.Drawing.Point(660, 120);
             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.Size = new System.Drawing.Size(330, 30);
             this.layoutControlItem18.Text = "鏀舵枡缁勭粐";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
             // 
-            // layoutControlItem23
+            // layoutControlItem28
             // 
-            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);
+            this.layoutControlItem28.Control = this.txt_fngDesc;
+            this.layoutControlItem28.Location = new System.Drawing.Point(0, 150);
+            this.layoutControlItem28.Name = "layoutControlItem28";
+            this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem28.OptionsTableLayoutItem.RowSpan = 2;
+            this.layoutControlItem28.Size = new System.Drawing.Size(660, 61);
+            this.layoutControlItem28.Text = "寮傚父澶囨敞";
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem28.TextVisible = false;
+            // 
+            // layoutControlItem27
+            // 
+            this.layoutControlItem27.Control = this.btnYcReport;
+            this.layoutControlItem27.Location = new System.Drawing.Point(660, 180);
+            this.layoutControlItem27.MaxSize = new System.Drawing.Size(120, 31);
+            this.layoutControlItem27.MinSize = new System.Drawing.Size(120, 31);
+            this.layoutControlItem27.Name = "layoutControlItem27";
+            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 6;
+            this.layoutControlItem27.Size = new System.Drawing.Size(330, 31);
+            this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
+            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem27.TextVisible = false;
             // 
             // layoutControlItem25
             // 
             this.layoutControlItem25.Control = this.txt_fngHandle;
-            this.layoutControlItem25.Location = new System.Drawing.Point(975, 112);
+            this.layoutControlItem25.Location = new System.Drawing.Point(990, 90);
             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.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem25.Size = new System.Drawing.Size(332, 30);
+            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.Control = this.txt_xblb;
+            this.layoutControlItem26.Location = new System.Drawing.Point(990, 150);
             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.OptionsTableLayoutItem.RowSpan = 2;
+            this.layoutControlItem26.Size = new System.Drawing.Size(332, 61);
+            this.layoutControlItem26.Text = "閫夊埆绫诲埆";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem29
+            // 
+            this.layoutControlItem29.Control = this.txt_xbsl;
+            this.layoutControlItem29.Location = new System.Drawing.Point(990, 120);
+            this.layoutControlItem29.Name = "layoutControlItem29";
+            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem29.Size = new System.Drawing.Size(332, 30);
+            this.layoutControlItem29.Text = "鎸戦�夋暟閲�";
+            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
             // 
             // xtraTabControl2
             // 
@@ -1364,7 +1457,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, 491);
+            this.xtraTabControl2.Size = new System.Drawing.Size(1342, 445);
             this.xtraTabControl2.TabIndex = 3;
             this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1375,7 +1468,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, 459);
+            this.tabMxPage1.Size = new System.Drawing.Size(1340, 413);
             this.tabMxPage1.Text = "鎶芥牱淇℃伅";
             // 
             // splitMx2
@@ -1394,7 +1487,7 @@
             // 
             this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
             this.splitMx2.Panel2.Text = "Panel2";
-            this.splitMx2.Size = new System.Drawing.Size(1340, 412);
+            this.splitMx2.Size = new System.Drawing.Size(1340, 366);
             this.splitMx2.SplitterPosition = 287;
             this.splitMx2.TabIndex = 3;
             // 
@@ -1479,9 +1572,8 @@
             this.gvMx1fcheckItemDesc.FieldName = "fcheckItemDesc";
             this.gvMx1fcheckItemDesc.MinWidth = 50;
             this.gvMx1fcheckItemDesc.Name = "gvMx1fcheckItemDesc";
+            this.gvMx1fcheckItemDesc.OptionsEditForm.Visible = DevExpress.Utils.DefaultBoolean.False;
             this.gvMx1fcheckItemDesc.Tag = "query_a.fcheck_item_desc";
-            this.gvMx1fcheckItemDesc.Visible = true;
-            this.gvMx1fcheckItemDesc.VisibleIndex = 2;
             this.gvMx1fcheckItemDesc.Width = 120;
             // 
             // gvMx1fspecRequ
@@ -1493,7 +1585,7 @@
             this.gvMx1fspecRequ.Name = "gvMx1fspecRequ";
             this.gvMx1fspecRequ.Tag = "query_a.fspec_requ";
             this.gvMx1fspecRequ.Visible = true;
-            this.gvMx1fspecRequ.VisibleIndex = 3;
+            this.gvMx1fspecRequ.VisibleIndex = 2;
             this.gvMx1fspecRequ.Width = 120;
             // 
             // gvMx1fupAllow
@@ -1505,7 +1597,7 @@
             this.gvMx1fupAllow.Name = "gvMx1fupAllow";
             this.gvMx1fupAllow.Tag = "query_a.fup_allow";
             this.gvMx1fupAllow.Visible = true;
-            this.gvMx1fupAllow.VisibleIndex = 4;
+            this.gvMx1fupAllow.VisibleIndex = 3;
             this.gvMx1fupAllow.Width = 50;
             // 
             // gvMx1fstand
@@ -1517,7 +1609,7 @@
             this.gvMx1fstand.Name = "gvMx1fstand";
             this.gvMx1fstand.Tag = "query_a.fstand";
             this.gvMx1fstand.Visible = true;
-            this.gvMx1fstand.VisibleIndex = 5;
+            this.gvMx1fstand.VisibleIndex = 4;
             this.gvMx1fstand.Width = 70;
             // 
             // gvMx1fdownAllow
@@ -1529,7 +1621,7 @@
             this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
             this.gvMx1fdownAllow.Tag = "query_a.fdown_allow";
             this.gvMx1fdownAllow.Visible = true;
-            this.gvMx1fdownAllow.VisibleIndex = 6;
+            this.gvMx1fdownAllow.VisibleIndex = 5;
             this.gvMx1fdownAllow.Width = 50;
             // 
             // gvMx1freQty
@@ -1541,7 +1633,7 @@
             this.gvMx1freQty.Name = "gvMx1freQty";
             this.gvMx1freQty.Tag = "query_a.fre_qty";
             this.gvMx1freQty.Visible = true;
-            this.gvMx1freQty.VisibleIndex = 7;
+            this.gvMx1freQty.VisibleIndex = 6;
             this.gvMx1freQty.Width = 50;
             // 
             // gvMx1checkQyt
@@ -1553,7 +1645,7 @@
             this.gvMx1checkQyt.Name = "gvMx1checkQyt";
             this.gvMx1checkQyt.Tag = "query_a.check_qyt";
             this.gvMx1checkQyt.Visible = true;
-            this.gvMx1checkQyt.VisibleIndex = 8;
+            this.gvMx1checkQyt.VisibleIndex = 7;
             this.gvMx1checkQyt.Width = 60;
             // 
             // gvMx1fenterQty
@@ -1565,7 +1657,7 @@
             this.gvMx1fenterQty.Name = "gvMx1fenterQty";
             this.gvMx1fenterQty.Tag = "query_a.fenter_qty";
             this.gvMx1fenterQty.Visible = true;
-            this.gvMx1fenterQty.VisibleIndex = 9;
+            this.gvMx1fenterQty.VisibleIndex = 8;
             this.gvMx1fenterQty.Width = 60;
             // 
             // gvMx1fcheckResu
@@ -1581,7 +1673,7 @@
             this.gvMx1fcheckResu.Name = "gvMx1fcheckResu";
             this.gvMx1fcheckResu.Tag = "query_a.fcheck_resu";
             this.gvMx1fcheckResu.Visible = true;
-            this.gvMx1fcheckResu.VisibleIndex = 10;
+            this.gvMx1fcheckResu.VisibleIndex = 9;
             this.gvMx1fcheckResu.Width = 94;
             // 
             // gvMx1fngRate
@@ -1593,7 +1685,7 @@
             this.gvMx1fngRate.Name = "gvMx1fngRate";
             this.gvMx1fngRate.Tag = "query_a.fng_rate";
             this.gvMx1fngRate.Visible = true;
-            this.gvMx1fngRate.VisibleIndex = 11;
+            this.gvMx1fngRate.VisibleIndex = 10;
             this.gvMx1fngRate.Width = 94;
             // 
             // gvMx1fngQty
@@ -1605,7 +1697,7 @@
             this.gvMx1fngQty.Name = "gvMx1fngQty";
             this.gvMx1fngQty.Tag = "query_a.fng_qty";
             this.gvMx1fngQty.Visible = true;
-            this.gvMx1fngQty.VisibleIndex = 12;
+            this.gvMx1fngQty.VisibleIndex = 11;
             this.gvMx1fngQty.Width = 50;
             // 
             // gvMx1sampleSizeNo
@@ -1617,7 +1709,7 @@
             this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
             this.gvMx1sampleSizeNo.Tag = "query_a.sample_size_no";
             this.gvMx1sampleSizeNo.Visible = true;
-            this.gvMx1sampleSizeNo.VisibleIndex = 13;
+            this.gvMx1sampleSizeNo.VisibleIndex = 12;
             this.gvMx1sampleSizeNo.Width = 200;
             // 
             // gvMx1fcheckLevel
@@ -1629,7 +1721,7 @@
             this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
             this.gvMx1fcheckLevel.Tag = "query_a.fcheck_level";
             this.gvMx1fcheckLevel.Visible = true;
-            this.gvMx1fcheckLevel.VisibleIndex = 14;
+            this.gvMx1fcheckLevel.VisibleIndex = 13;
             this.gvMx1fcheckLevel.Width = 200;
             // 
             // gvMx1facLevel
@@ -1641,7 +1733,7 @@
             this.gvMx1facLevel.Name = "gvMx1facLevel";
             this.gvMx1facLevel.Tag = "query_a.fac_level";
             this.gvMx1facLevel.Visible = true;
-            this.gvMx1facLevel.VisibleIndex = 15;
+            this.gvMx1facLevel.VisibleIndex = 14;
             this.gvMx1facLevel.Width = 200;
             // 
             // splitYangLi
@@ -1659,7 +1751,7 @@
             // 
             this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
             this.splitYangLi.Panel2.Text = "Panel2";
-            this.splitYangLi.Size = new System.Drawing.Size(1340, 113);
+            this.splitYangLi.Size = new System.Drawing.Size(1340, 67);
             this.splitYangLi.SplitterPosition = 676;
             this.splitYangLi.TabIndex = 4;
             // 
@@ -1669,7 +1761,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, 113);
+            this.groupControl1.Size = new System.Drawing.Size(676, 67);
             this.groupControl1.TabIndex = 3;
             this.groupControl1.Text = "妫�娴嬬粨鏋�";
             // 
@@ -1679,7 +1771,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, 83);
+            this.gcMx2.Size = new System.Drawing.Size(672, 37);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1767,7 +1859,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, 113);
+            this.groupControl2.Size = new System.Drawing.Size(652, 67);
             this.groupControl2.TabIndex = 4;
             this.groupControl2.Text = "鏍锋湰缁撴灉";
             // 
@@ -1777,7 +1869,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, 83);
+            this.gcMx3.Size = new System.Drawing.Size(648, 37);
             this.gcMx3.TabIndex = 0;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
@@ -1948,10 +2040,10 @@
             columnDefinition6,
             columnDefinition7,
             columnDefinition8});
-            rowDefinition7.Height = 100D;
-            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition7});
+            rowDefinition8});
             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;
@@ -2001,7 +2093,7 @@
             // 
             this.tabMxPage2.Controls.Add(this.ucUpFileList1);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1340, 461);
+            this.tabMxPage2.Size = new System.Drawing.Size(1340, 413);
             this.tabMxPage2.Text = "闄勪欢淇℃伅";
             // 
             // ucUpFileList1
@@ -2011,7 +2103,7 @@
             this.ucUpFileList1.Name = "ucUpFileList1";
             this.ucUpFileList1.parentGroup = null;
             this.ucUpFileList1.pGuid = null;
-            this.ucUpFileList1.Size = new System.Drawing.Size(1340, 461);
+            this.ucUpFileList1.Size = new System.Drawing.Size(1340, 413);
             this.ucUpFileList1.TabIndex = 0;
             // 
             // repositoryItemComboBox2
@@ -2098,10 +2190,12 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_freceQty.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_cgdNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fngHandle.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fmrmode.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xblb.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_xbsl.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
@@ -2120,9 +2214,11 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
             this.xtraTabControl2.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -2307,10 +2403,16 @@
         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.XtraEditors.SimpleButton btnYcReport;
+        private UserControl.UcDictionary txt_fngDesc;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+        private DevExpress.XtraEditors.MemoEdit txt_xblb;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+        private DevExpress.XtraEditors.TextEdit txt_xbsl;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3