From 73d47d0d2ff835761df928c5897a1535b9b4f3bd Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期二, 12 八月 2025 08:41:57 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs |  902 +++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 668 insertions(+), 234 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index 045d8cc..c7a3bc0 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -34,17 +34,28 @@
             DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            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 rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition10 = 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 +95,26 @@
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.layWeight = new DevExpress.XtraLayout.LayoutControl();
+            this.txtW1 = new DevExpress.XtraEditors.TextEdit();
+            this.txtW2 = new DevExpress.XtraEditors.TextEdit();
+            this.txtW3 = new DevExpress.XtraEditors.TextEdit();
+            this.txtW4 = new DevExpress.XtraEditors.TextEdit();
+            this.btnW = new DevExpress.XtraEditors.SimpleButton();
+            this.txtWCurrent = new DevExpress.XtraEditors.TextEdit();
+            this.txtW5 = new DevExpress.XtraEditors.TextEdit();
+            this.btnClean = new DevExpress.XtraEditors.SimpleButton();
+            this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
+            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();
@@ -97,8 +128,8 @@
             this.txt_itemId = new DevExpress.XtraEditors.TextEdit();
             this.txt_fcheckBy = new DevExpress.XtraEditors.TextEdit();
             this.txt_fbatchQty = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fsubmitBy = new DevExpress.XtraEditors.TextEdit();
             this.txt_fsubmitDate = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fsubmitBy = new DevExpress.XtraEditors.TextEdit();
             this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
             this.txt_slOrg = new DevExpress.XtraEditors.TextEdit();
             this.txt_guid = new DevExpress.XtraEditors.TextEdit();
@@ -106,10 +137,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 +161,12 @@
             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.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
             this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx2 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -153,6 +189,7 @@
             this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.splitYangLi = new DevExpress.XtraEditors.SplitContainerControl();
             this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
@@ -210,6 +247,23 @@
             this.splitMx1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
             this.layoutMx1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layWeight)).BeginInit();
+            this.layWeight.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txtW1.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtW2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtW3.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtW4.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWCurrent.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtW5.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).BeginInit();
@@ -222,8 +276,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_slOrg.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
@@ -231,10 +285,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 +309,12 @@
             ((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.layoutControlItem25)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
             this.xtraTabControl2.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -319,7 +378,7 @@
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1344, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1437, 80);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -330,7 +389,7 @@
             this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1344, 720);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1437, 720);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -340,7 +399,7 @@
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1342, 688);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1435, 688);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -361,7 +420,7 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1342, 688);
+            this.split1.Size = new System.Drawing.Size(1435, 688);
             this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 4;
             // 
@@ -371,7 +430,7 @@
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1342, 638);
+            this.gcMain1.Size = new System.Drawing.Size(1435, 638);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -456,7 +515,7 @@
             this.gv_lotNo.OptionsColumn.AllowEdit = false;
             this.gv_lotNo.Tag = "query_a.lot_no";
             this.gv_lotNo.Visible = true;
-            this.gv_lotNo.VisibleIndex = 6;
+            this.gv_lotNo.VisibleIndex = 3;
             this.gv_lotNo.Width = 120;
             // 
             // gv_lifnr
@@ -482,7 +541,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
@@ -494,8 +553,6 @@
             this.gv_itemId.Name = "gv_itemId";
             this.gv_itemId.OptionsColumn.AllowEdit = false;
             this.gv_itemId.Tag = "query_a.item_id";
-            this.gv_itemId.Visible = true;
-            this.gv_itemId.VisibleIndex = 8;
             this.gv_itemId.Width = 30;
             // 
             // gv_itemNo
@@ -508,7 +565,7 @@
             this.gv_itemNo.OptionsColumn.AllowEdit = false;
             this.gv_itemNo.Tag = "query_a.item_no";
             this.gv_itemNo.Visible = true;
-            this.gv_itemNo.VisibleIndex = 9;
+            this.gv_itemNo.VisibleIndex = 8;
             this.gv_itemNo.Width = 136;
             // 
             // gv_boardStyle
@@ -521,7 +578,7 @@
             this.gv_boardStyle.OptionsColumn.AllowEdit = false;
             this.gv_boardStyle.Tag = "query_a.board_style";
             this.gv_boardStyle.Visible = true;
-            this.gv_boardStyle.VisibleIndex = 10;
+            this.gv_boardStyle.VisibleIndex = 9;
             this.gv_boardStyle.Width = 164;
             // 
             // gridColumn14
@@ -532,7 +589,7 @@
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.OptionsColumn.ReadOnly = true;
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 11;
+            this.gridColumn14.VisibleIndex = 10;
             this.gridColumn14.Width = 200;
             // 
             // gv_fbatchQty
@@ -545,7 +602,7 @@
             this.gv_fbatchQty.OptionsColumn.AllowEdit = false;
             this.gv_fbatchQty.Tag = "query_a.fbatch_qty";
             this.gv_fbatchQty.Visible = true;
-            this.gv_fbatchQty.VisibleIndex = 12;
+            this.gv_fbatchQty.VisibleIndex = 11;
             this.gv_fbatchQty.Width = 80;
             // 
             // gv_fcheckResu
@@ -558,7 +615,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 = 5;
             this.gv_fcheckResu.Width = 50;
             // 
             // gv_fcovertQty
@@ -583,7 +640,7 @@
             this.gv_remarks.OptionsColumn.AllowEdit = false;
             this.gv_remarks.Tag = "query_a.remarks";
             this.gv_remarks.Visible = true;
-            this.gv_remarks.VisibleIndex = 13;
+            this.gv_remarks.VisibleIndex = 12;
             this.gv_remarks.Width = 100;
             // 
             // gv_fcheckBy
@@ -596,7 +653,7 @@
             this.gv_fcheckBy.OptionsColumn.AllowEdit = false;
             this.gv_fcheckBy.Tag = "query_a.fcheck_by";
             this.gv_fcheckBy.Visible = true;
-            this.gv_fcheckBy.VisibleIndex = 14;
+            this.gv_fcheckBy.VisibleIndex = 13;
             this.gv_fcheckBy.Width = 118;
             // 
             // gv_fcheckDate
@@ -609,7 +666,7 @@
             this.gv_fcheckDate.OptionsColumn.AllowEdit = false;
             this.gv_fcheckDate.Tag = "query_a.fcheck_date";
             this.gv_fcheckDate.Visible = true;
-            this.gv_fcheckDate.VisibleIndex = 16;
+            this.gv_fcheckDate.VisibleIndex = 15;
             this.gv_fcheckDate.Width = 182;
             // 
             // gv_createBy
@@ -622,7 +679,7 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 15;
+            this.gv_createBy.VisibleIndex = 14;
             this.gv_createBy.Width = 67;
             // 
             // gridColumn15
@@ -632,7 +689,7 @@
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 17;
+            this.gridColumn15.VisibleIndex = 16;
             this.gridColumn15.Width = 94;
             // 
             // gv_lastupdateBy
@@ -645,7 +702,7 @@
             this.gv_lastupdateBy.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateBy.Tag = "query_a.lastupdate_by";
             this.gv_lastupdateBy.Visible = true;
-            this.gv_lastupdateBy.VisibleIndex = 18;
+            this.gv_lastupdateBy.VisibleIndex = 17;
             this.gv_lastupdateBy.Width = 60;
             // 
             // gv_lastupdateDate
@@ -658,20 +715,20 @@
             this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
             this.gv_lastupdateDate.Visible = true;
-            this.gv_lastupdateDate.VisibleIndex = 19;
+            this.gv_lastupdateDate.VisibleIndex = 18;
             this.gv_lastupdateDate.Width = 120;
             // 
             // 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 = 6;
             this.gv_fngHandle.Width = 100;
             // 
             // bandedGridColumn1
@@ -682,7 +739,7 @@
             this.bandedGridColumn1.Name = "bandedGridColumn1";
             this.bandedGridColumn1.Tag = "org.fnamber";
             this.bandedGridColumn1.Visible = true;
-            this.bandedGridColumn1.VisibleIndex = 21;
+            this.bandedGridColumn1.VisibleIndex = 19;
             this.bandedGridColumn1.Width = 250;
             // 
             // gridColumn18
@@ -692,7 +749,7 @@
             this.gridColumn18.MinWidth = 25;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 22;
+            this.gridColumn18.VisibleIndex = 20;
             this.gridColumn18.Width = 94;
             // 
             // gridColumn19
@@ -702,7 +759,7 @@
             this.gridColumn19.MinWidth = 25;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 23;
+            this.gridColumn19.VisibleIndex = 21;
             this.gridColumn19.Width = 94;
             // 
             // gridColumn17
@@ -720,7 +777,7 @@
             this.gridColumn23.MinWidth = 25;
             this.gridColumn23.Name = "gridColumn23";
             this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 24;
+            this.gridColumn23.VisibleIndex = 22;
             this.gridColumn23.Width = 94;
             // 
             // gridColumn30
@@ -739,7 +796,7 @@
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.OptionsColumn.ReadOnly = true;
             this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 2;
+            this.gridColumn5.VisibleIndex = 4;
             this.gridColumn5.Width = 94;
             // 
             // gridColumn6
@@ -749,8 +806,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
@@ -761,7 +816,7 @@
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1342, 38);
+            this.pageBar1.Size = new System.Drawing.Size(1435, 38);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
@@ -769,7 +824,7 @@
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1342, 688);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1435, 688);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -789,12 +844,15 @@
             this.splitMx1.Panel2.Controls.Add(this.xtraTabControl2);
             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.Size = new System.Drawing.Size(1435, 688);
+            this.splitMx1.SplitterPosition = 270;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
+            this.layoutMx1.Controls.Add(this.layWeight);
+            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);
@@ -808,8 +866,8 @@
             this.layoutMx1.Controls.Add(this.txt_itemId);
             this.layoutMx1.Controls.Add(this.txt_fcheckBy);
             this.layoutMx1.Controls.Add(this.txt_fbatchQty);
-            this.layoutMx1.Controls.Add(this.txt_fsubmitBy);
             this.layoutMx1.Controls.Add(this.txt_fsubmitDate);
+            this.layoutMx1.Controls.Add(this.txt_fsubmitBy);
             this.layoutMx1.Controls.Add(this.txt_fsubmit);
             this.layoutMx1.Controls.Add(this.txt_slOrg);
             this.layoutMx1.Controls.Add(this.txt_guid);
@@ -817,19 +875,269 @@
             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(569, 547, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1342, 185);
+            this.layoutMx1.Size = new System.Drawing.Size(1435, 270);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
+            // 
+            // layWeight
+            // 
+            this.layWeight.BackColor = System.Drawing.Color.LightBlue;
+            this.layWeight.Controls.Add(this.txtW1);
+            this.layWeight.Controls.Add(this.txtW2);
+            this.layWeight.Controls.Add(this.txtW3);
+            this.layWeight.Controls.Add(this.txtW4);
+            this.layWeight.Controls.Add(this.btnW);
+            this.layWeight.Controls.Add(this.txtWCurrent);
+            this.layWeight.Controls.Add(this.txtW5);
+            this.layWeight.Controls.Add(this.btnClean);
+            this.layWeight.Location = new System.Drawing.Point(10, 227);
+            this.layWeight.Margin = new System.Windows.Forms.Padding(0);
+            this.layWeight.Name = "layWeight";
+            this.layWeight.Root = this.layoutControlGroup2;
+            this.layWeight.Size = new System.Drawing.Size(1061, 33);
+            this.layWeight.TabIndex = 818;
+            this.layWeight.Text = "layoutControl1";
+            // 
+            // txtW1
+            // 
+            this.txtW1.Location = new System.Drawing.Point(52, 2);
+            this.txtW1.Name = "txtW1";
+            this.txtW1.Properties.ReadOnly = true;
+            this.txtW1.Size = new System.Drawing.Size(76, 24);
+            this.txtW1.StyleController = this.layWeight;
+            this.txtW1.TabIndex = 4;
+            // 
+            // txtW2
+            // 
+            this.txtW2.Location = new System.Drawing.Point(182, 2);
+            this.txtW2.Name = "txtW2";
+            this.txtW2.Properties.ReadOnly = true;
+            this.txtW2.Size = new System.Drawing.Size(79, 24);
+            this.txtW2.StyleController = this.layWeight;
+            this.txtW2.TabIndex = 5;
+            // 
+            // txtW3
+            // 
+            this.txtW3.Location = new System.Drawing.Point(315, 2);
+            this.txtW3.Name = "txtW3";
+            this.txtW3.Properties.ReadOnly = true;
+            this.txtW3.Size = new System.Drawing.Size(79, 24);
+            this.txtW3.StyleController = this.layWeight;
+            this.txtW3.TabIndex = 6;
+            // 
+            // txtW4
+            // 
+            this.txtW4.Location = new System.Drawing.Point(448, 2);
+            this.txtW4.Name = "txtW4";
+            this.txtW4.Properties.ReadOnly = true;
+            this.txtW4.Size = new System.Drawing.Size(79, 24);
+            this.txtW4.StyleController = this.layWeight;
+            this.txtW4.TabIndex = 7;
+            // 
+            // btnW
+            // 
+            this.btnW.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
+            this.btnW.Appearance.ForeColor = System.Drawing.Color.White;
+            this.btnW.Appearance.Options.UseBackColor = true;
+            this.btnW.Appearance.Options.UseForeColor = true;
+            this.btnW.Location = new System.Drawing.Point(797, 2);
+            this.btnW.Name = "btnW";
+            this.btnW.Size = new System.Drawing.Size(129, 27);
+            this.btnW.StyleController = this.layWeight;
+            this.btnW.TabIndex = 9;
+            this.btnW.Text = "鑾峰彇";
+            // 
+            // txtWCurrent
+            // 
+            this.txtWCurrent.Location = new System.Drawing.Point(664, 2);
+            this.txtWCurrent.Name = "txtWCurrent";
+            this.txtWCurrent.Properties.ReadOnly = true;
+            this.txtWCurrent.Size = new System.Drawing.Size(129, 24);
+            this.txtWCurrent.StyleController = this.layWeight;
+            this.txtWCurrent.TabIndex = 10;
+            // 
+            // txtW5
+            // 
+            this.txtW5.Location = new System.Drawing.Point(581, 2);
+            this.txtW5.Name = "txtW5";
+            this.txtW5.Properties.ReadOnly = true;
+            this.txtW5.Size = new System.Drawing.Size(79, 24);
+            this.txtW5.StyleController = this.layWeight;
+            this.txtW5.TabIndex = 11;
+            // 
+            // btnClean
+            // 
+            this.btnClean.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Success;
+            this.btnClean.Appearance.Options.UseBackColor = true;
+            this.btnClean.Location = new System.Drawing.Point(930, 2);
+            this.btnClean.Name = "btnClean";
+            this.btnClean.Size = new System.Drawing.Size(129, 27);
+            this.btnClean.StyleController = this.layWeight;
+            this.btnClean.TabIndex = 12;
+            this.btnClean.Text = "娓呯┖";
+            // 
+            // layoutControlGroup2
+            // 
+            this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup2.GroupBordersVisible = false;
+            this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem31,
+            this.layoutControlItem32,
+            this.layoutControlItem33,
+            this.layoutControlItem34,
+            this.layoutControlItem36,
+            this.layoutControlItem37,
+            this.layoutControlItem35,
+            this.layoutControlItem38});
+            this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.layoutControlGroup2.Name = "layoutControlGroup2";
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
+            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7.Width = 100D;
+            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition8.Width = 100D;
+            this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4,
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition1});
+            this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(1061, 33);
+            this.layoutControlGroup2.TextVisible = false;
+            // 
+            // layoutControlItem31
+            // 
+            this.layoutControlItem31.Control = this.txtW1;
+            this.layoutControlItem31.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem31.Name = "layoutControlItem31";
+            this.layoutControlItem31.Size = new System.Drawing.Size(130, 33);
+            this.layoutControlItem31.Text = "閲嶉噺1";
+            this.layoutControlItem31.TextSize = new System.Drawing.Size(38, 18);
+            // 
+            // layoutControlItem32
+            // 
+            this.layoutControlItem32.Control = this.txtW2;
+            this.layoutControlItem32.Location = new System.Drawing.Point(130, 0);
+            this.layoutControlItem32.Name = "layoutControlItem32";
+            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem32.Size = new System.Drawing.Size(133, 33);
+            this.layoutControlItem32.Text = "閲嶉噺2";
+            this.layoutControlItem32.TextSize = new System.Drawing.Size(38, 18);
+            // 
+            // layoutControlItem33
+            // 
+            this.layoutControlItem33.Control = this.txtW3;
+            this.layoutControlItem33.Location = new System.Drawing.Point(263, 0);
+            this.layoutControlItem33.Name = "layoutControlItem33";
+            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem33.Size = new System.Drawing.Size(133, 33);
+            this.layoutControlItem33.Text = "閲嶉噺3";
+            this.layoutControlItem33.TextSize = new System.Drawing.Size(38, 18);
+            // 
+            // layoutControlItem34
+            // 
+            this.layoutControlItem34.Control = this.txtW4;
+            this.layoutControlItem34.Location = new System.Drawing.Point(396, 0);
+            this.layoutControlItem34.Name = "layoutControlItem34";
+            this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem34.Size = new System.Drawing.Size(133, 33);
+            this.layoutControlItem34.Text = "閲嶉噺4";
+            this.layoutControlItem34.TextSize = new System.Drawing.Size(38, 18);
+            // 
+            // layoutControlItem36
+            // 
+            this.layoutControlItem36.Control = this.btnW;
+            this.layoutControlItem36.Location = new System.Drawing.Point(795, 0);
+            this.layoutControlItem36.Name = "layoutControlItem36";
+            this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 6;
+            this.layoutControlItem36.Size = new System.Drawing.Size(133, 33);
+            this.layoutControlItem36.Text = "鑾峰彇";
+            this.layoutControlItem36.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem36.TextVisible = false;
+            // 
+            // layoutControlItem37
+            // 
+            this.layoutControlItem37.Control = this.txtWCurrent;
+            this.layoutControlItem37.Location = new System.Drawing.Point(662, 0);
+            this.layoutControlItem37.Name = "layoutControlItem37";
+            this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 5;
+            this.layoutControlItem37.Size = new System.Drawing.Size(133, 33);
+            this.layoutControlItem37.Text = "瀹炴椂閲嶉噺";
+            this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem37.TextVisible = false;
+            // 
+            // layoutControlItem35
+            // 
+            this.layoutControlItem35.Control = this.txtW5;
+            this.layoutControlItem35.Location = new System.Drawing.Point(529, 0);
+            this.layoutControlItem35.Name = "layoutControlItem35";
+            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 4;
+            this.layoutControlItem35.Size = new System.Drawing.Size(133, 33);
+            this.layoutControlItem35.Text = "绉伴噸5";
+            this.layoutControlItem35.TextSize = new System.Drawing.Size(38, 18);
+            // 
+            // layoutControlItem38
+            // 
+            this.layoutControlItem38.Control = this.btnClean;
+            this.layoutControlItem38.Location = new System.Drawing.Point(928, 0);
+            this.layoutControlItem38.Name = "layoutControlItem38";
+            this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 7;
+            this.layoutControlItem38.Size = new System.Drawing.Size(133, 33);
+            this.layoutControlItem38.Text = "娓呯┖";
+            this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem38.TextVisible = false;
+            // 
+            // txt_fngDesc
+            // 
+            this.txt_fngDesc.BtnTxt = "寮傚父鎻忚堪";
+            this.txt_fngDesc.Location = new System.Drawing.Point(12, 167);
+            this.txt_fngDesc.Name = "txt_fngDesc";
+            this.txt_fngDesc.Size = new System.Drawing.Size(703, 58);
+            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(719, 167);
+            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 +1150,40 @@
             // 
             // txt_suppName
             // 
-            this.txt_suppName.Location = new System.Drawing.Point(409, 96);
+            this.txt_suppName.Location = new System.Drawing.Point(437, 105);
             this.txt_suppName.Name = "txt_suppName";
-            this.txt_suppName.Size = new System.Drawing.Size(249, 24);
+            this.txt_suppName.Size = new System.Drawing.Size(278, 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, 136);
             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(631, 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(791, 105);
             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(278, 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, 43);
             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(277, 24);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 800;
             this.txt_itemName.Tag = "readonly";
@@ -884,46 +1193,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(277, 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(791, 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(278, 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(437, 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(278, 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, 74);
             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(277, 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, 105);
             this.txt_itemModel.Name = "txt_itemModel";
-            this.txt_itemModel.Size = new System.Drawing.Size(249, 24);
+            this.txt_itemModel.Size = new System.Drawing.Size(277, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
             this.txt_itemModel.TabIndex = 801;
             this.txt_itemModel.Tag = "readonly";
@@ -939,57 +1248,57 @@
             // 
             // txt_fcheckBy
             // 
-            this.txt_fcheckBy.Location = new System.Drawing.Point(734, 40);
+            this.txt_fcheckBy.Location = new System.Drawing.Point(791, 43);
             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(278, 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(437, 74);
             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(278, 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.Name = "txt_fsubmitBy";
-            this.txt_fsubmitBy.Size = new System.Drawing.Size(250, 24);
-            this.txt_fsubmitBy.StyleController = this.layoutMx1;
-            this.txt_fsubmitBy.TabIndex = 804;
-            this.txt_fsubmitBy.Tag = "readonly";
-            // 
             // txt_fsubmitDate
             // 
-            this.txt_fsubmitDate.Location = new System.Drawing.Point(1059, 68);
+            this.txt_fsubmitDate.Location = new System.Drawing.Point(1145, 43);
             this.txt_fsubmitDate.Name = "txt_fsubmitDate";
-            this.txt_fsubmitDate.Size = new System.Drawing.Size(250, 24);
+            this.txt_fsubmitDate.Size = new System.Drawing.Size(278, 24);
             this.txt_fsubmitDate.StyleController = this.layoutMx1;
-            this.txt_fsubmitDate.TabIndex = 805;
+            this.txt_fsubmitDate.TabIndex = 804;
             this.txt_fsubmitDate.Tag = "readonly";
+            // 
+            // txt_fsubmitBy
+            // 
+            this.txt_fsubmitBy.Location = new System.Drawing.Point(1145, 74);
+            this.txt_fsubmitBy.Name = "txt_fsubmitBy";
+            this.txt_fsubmitBy.Size = new System.Drawing.Size(278, 24);
+            this.txt_fsubmitBy.StyleController = this.layoutMx1;
+            this.txt_fsubmitBy.TabIndex = 805;
+            this.txt_fsubmitBy.Tag = "readonly";
             // 
             // txt_fsubmit
             // 
-            this.txt_fsubmit.Location = new System.Drawing.Point(987, 12);
+            this.txt_fsubmit.Location = new System.Drawing.Point(1073, 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(350, 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(791, 136);
             this.txt_slOrg.Name = "txt_slOrg";
-            this.txt_slOrg.Size = new System.Drawing.Size(249, 24);
+            this.txt_slOrg.Size = new System.Drawing.Size(278, 24);
             this.txt_slOrg.StyleController = this.layoutMx1;
             this.txt_slOrg.TabIndex = 807;
             this.txt_slOrg.Tag = "readonly";
@@ -1005,56 +1314,63 @@
             // 
             // txt_checkStates
             // 
-            this.txt_checkStates.Location = new System.Drawing.Point(734, 68);
+            this.txt_checkStates.Location = new System.Drawing.Point(791, 74);
             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(278, 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(437, 43);
             this.txt_cgdNo.Name = "txt_cgdNo";
-            this.txt_cgdNo.Size = new System.Drawing.Size(249, 24);
+            this.txt_cgdNo.Size = new System.Drawing.Size(278, 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(1145, 105);
             this.txt_fngHandle.Name = "txt_fngHandle";
             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(250, 24);
+            this.txt_fngHandle.Size = new System.Drawing.Size(278, 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.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
-            this.txt_fmrmode.Properties.Appearance.Options.UseForeColor = true;
-            this.txt_fmrmode.Size = new System.Drawing.Size(250, 24);
-            this.txt_fmrmode.StyleController = this.layoutMx1;
-            this.txt_fmrmode.TabIndex = 813;
-            this.txt_fmrmode.Tag = "readonly";
+            this.txt_xblb.Location = new System.Drawing.Point(1145, 167);
+            this.txt_xblb.Name = "txt_xblb";
+            this.txt_xblb.Size = new System.Drawing.Size(278, 58);
+            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(1145, 136);
+            this.txt_xbsl.Name = "txt_xbsl";
+            this.txt_xbsl.Size = new System.Drawing.Size(278, 24);
+            this.txt_xbsl.StyleController = this.layoutMx1;
+            this.txt_xbsl.TabIndex = 817;
+            this.txt_xbsl.Tag = "readonly";
             // 
             // layoutControlItem17
             // 
@@ -1089,6 +1405,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;
@@ -1111,26 +1438,27 @@
             this.layoutControlItem3,
             this.layoutControlItem24,
             this.layoutControlItem18,
-            this.layoutControlItem23,
+            this.layoutControlItem28,
             this.layoutControlItem25,
-            this.layoutControlItem26});
+            this.layoutControlItem26,
+            this.layoutControlItem29,
+            this.layoutControlItem30,
+            this.layoutControlItem27});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition1.Width = 100D;
-            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition2.Width = 100D;
-            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition3.Width = 100D;
-            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition4.Width = 100D;
+            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition9.Width = 100D;
+            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition10.Width = 100D;
+            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition11.Width = 100D;
+            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition12.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition1,
-            columnDefinition2,
-            columnDefinition3,
-            columnDefinition4});
-            rowDefinition1.Height = 100D;
-            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition9,
+            columnDefinition10,
+            columnDefinition11,
+            columnDefinition12});
             rowDefinition2.Height = 100D;
             rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition3.Height = 100D;
@@ -1141,14 +1469,22 @@
             rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition6.Height = 100D;
             rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition9.Height = 100D;
+            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
             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,
+            rowDefinition8,
+            rowDefinition9});
+            this.Root.Size = new System.Drawing.Size(1435, 270);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -1156,69 +1492,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(353, 31);
             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, 31);
             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(353, 31);
             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, 62);
             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(353, 31);
             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, 93);
             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(353, 31);
             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.Control = this.txt_fsubmitDate;
+            this.layoutControlItem15.Location = new System.Drawing.Point(1061, 31);
             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(354, 31);
             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.Control = this.txt_fsubmitBy;
+            this.layoutControlItem16.Location = new System.Drawing.Point(1061, 62);
             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(354, 31);
+            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(1061, 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(354, 31);
             this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem14.TextVisible = false;
@@ -1226,143 +1562,185 @@
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_remarks;
-            this.layoutControlItem12.Location = new System.Drawing.Point(0, 112);
+            this.layoutControlItem12.Location = new System.Drawing.Point(0, 124);
             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(707, 31);
+            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(707, 93);
             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(354, 31);
             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(353, 93);
             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(354, 31);
             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(707, 62);
             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(354, 31);
             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(353, 62);
             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(354, 31);
             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(707, 31);
             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(354, 31);
             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(707, 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(354, 31);
             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(353, 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(354, 31);
             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(353, 31);
             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(354, 31);
             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(707, 124);
             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(354, 31);
             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, 155);
+            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(707, 62);
+            this.layoutControlItem28.Text = "寮傚父澶囨敞";
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem28.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(1061, 93);
             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(354, 31);
+            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(1061, 155);
             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(354, 62);
+            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(1061, 124);
+            this.layoutControlItem29.Name = "layoutControlItem29";
+            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem29.Size = new System.Drawing.Size(354, 31);
+            this.layoutControlItem29.Text = "鎸戦�夋暟閲�";
+            this.layoutControlItem29.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem30
+            // 
+            this.layoutControlItem30.Control = this.layWeight;
+            this.layoutControlItem30.Location = new System.Drawing.Point(0, 217);
+            this.layoutControlItem30.Name = "layoutControlItem30";
+            this.layoutControlItem30.OptionsTableLayoutItem.ColumnSpan = 3;
+            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 7;
+            this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            this.layoutControlItem30.Size = new System.Drawing.Size(1061, 33);
+            this.layoutControlItem30.Text = "绉伴噸";
+            this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem30.TextVisible = false;
+            // 
+            // layoutControlItem27
+            // 
+            this.layoutControlItem27.Control = this.btnYcReport;
+            this.layoutControlItem27.Location = new System.Drawing.Point(707, 155);
+            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 = 5;
+            this.layoutControlItem27.Size = new System.Drawing.Size(354, 31);
+            this.layoutControlItem27.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem27.Text = "鏌ョ湅寮傚父鎶ュ憡";
+            this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem27.TextVisible = false;
             // 
             // xtraTabControl2
             // 
@@ -1370,7 +1748,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(1435, 406);
             this.xtraTabControl2.TabIndex = 3;
             this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1381,7 +1759,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(1433, 374);
             this.tabMxPage1.Text = "鎶芥牱淇℃伅";
             // 
             // splitMx2
@@ -1400,7 +1778,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(1433, 327);
             this.splitMx2.SplitterPosition = 287;
             this.splitMx2.TabIndex = 3;
             // 
@@ -1410,7 +1788,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1340, 287);
+            this.gcMx1.Size = new System.Drawing.Size(1433, 287);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1437,7 +1815,8 @@
             this.gvMx1fngQty,
             this.gvMx1sampleSizeNo,
             this.gvMx1fcheckLevel,
-            this.gvMx1facLevel});
+            this.gvMx1facLevel,
+            this.gridColumn7});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1485,9 +1864,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
@@ -1499,7 +1877,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
@@ -1511,7 +1889,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
@@ -1523,7 +1901,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
@@ -1535,7 +1913,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
@@ -1547,7 +1925,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
@@ -1559,7 +1937,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
@@ -1571,7 +1949,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
@@ -1587,7 +1965,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
@@ -1599,7 +1977,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
@@ -1611,7 +1989,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
@@ -1623,7 +2001,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
@@ -1635,7 +2013,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
@@ -1647,8 +2025,16 @@
             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;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "鏍锋湰鏁�";
+            this.gridColumn7.FieldName = "ybsl";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Width = 94;
             // 
             // splitYangLi
             // 
@@ -1665,7 +2051,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(1433, 28);
             this.splitYangLi.SplitterPosition = 676;
             this.splitYangLi.TabIndex = 4;
             // 
@@ -1675,7 +2061,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, 28);
             this.groupControl1.TabIndex = 3;
             this.groupControl1.Text = "妫�娴嬬粨鏋�";
             // 
@@ -1685,7 +2071,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, 0);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1773,7 +2159,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(745, 28);
             this.groupControl2.TabIndex = 4;
             this.groupControl2.Text = "鏍锋湰缁撴灉";
             // 
@@ -1783,7 +2169,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(741, 0);
             this.gcMx3.TabIndex = 0;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
@@ -1884,7 +2270,7 @@
             this.panMsg.Dock = System.Windows.Forms.DockStyle.Top;
             this.panMsg.Location = new System.Drawing.Point(0, 0);
             this.panMsg.Name = "panMsg";
-            this.panMsg.Size = new System.Drawing.Size(1340, 47);
+            this.panMsg.Size = new System.Drawing.Size(1433, 47);
             this.panMsg.TabIndex = 1;
             // 
             // layoutMxMsg
@@ -1897,14 +2283,14 @@
             this.layoutMxMsg.Name = "layoutMxMsg";
             this.layoutMxMsg.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(348, 385, 812, 500);
             this.layoutMxMsg.Root = this.layoutControlGroup1;
-            this.layoutMxMsg.Size = new System.Drawing.Size(1336, 43);
+            this.layoutMxMsg.Size = new System.Drawing.Size(1429, 43);
             this.layoutMxMsg.TabIndex = 0;
             this.layoutMxMsg.Text = "layoutControl1";
             // 
             // btnIpt
             // 
             this.btnIpt.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.calculatenow_32x32;
-            this.btnIpt.Location = new System.Drawing.Point(1228, 2);
+            this.btnIpt.Location = new System.Drawing.Point(1321, 2);
             this.btnIpt.Name = "btnIpt";
             this.btnIpt.Size = new System.Drawing.Size(106, 36);
             this.btnIpt.StyleController = this.layoutMxMsg;
@@ -1914,7 +2300,7 @@
             // btnLoad
             // 
             this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.refresh_32x321;
-            this.btnLoad.Location = new System.Drawing.Point(1062, 2);
+            this.btnLoad.Location = new System.Drawing.Point(1155, 2);
             this.btnLoad.Name = "btnLoad";
             this.btnLoad.Size = new System.Drawing.Size(162, 36);
             this.btnLoad.StyleController = this.layoutMxMsg;
@@ -1927,7 +2313,7 @@
             this.txtJianYan.Name = "txtJianYan";
             this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
             this.txtJianYan.Properties.Appearance.Options.UseFont = true;
-            this.txtJianYan.Size = new System.Drawing.Size(594, 36);
+            this.txtJianYan.Size = new System.Drawing.Size(656, 36);
             this.txtJianYan.StyleController = this.layoutMxMsg;
             this.txtJianYan.TabIndex = 2;
             // 
@@ -1941,25 +2327,25 @@
             this.layoutControlItem19});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
-            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition5.Width = 100D;
-            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition6.Width = 100D;
-            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition7.Width = 100D;
-            columnDefinition8.SizeType = System.Windows.Forms.SizeType.AutoSize;
-            columnDefinition8.Width = 110D;
+            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition13.Width = 100D;
+            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition14.Width = 100D;
+            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition15.Width = 100D;
+            columnDefinition16.SizeType = System.Windows.Forms.SizeType.AutoSize;
+            columnDefinition16.Width = 110D;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6,
-            columnDefinition7,
-            columnDefinition8});
-            rowDefinition7.Height = 100D;
-            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition13,
+            columnDefinition14,
+            columnDefinition15,
+            columnDefinition16});
+            rowDefinition10.Height = 100D;
+            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition7});
+            rowDefinition10});
             this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 43);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1429, 43);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem11
@@ -1969,7 +2355,7 @@
             this.layoutControlItem11.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(817, 43);
+            this.layoutControlItem11.Size = new System.Drawing.Size(879, 43);
             this.layoutControlItem11.Text = "褰曞叆妫�楠岀粨鏋滐紙OK-19,NG-19锛�";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(207, 18);
             // 
@@ -1977,7 +2363,7 @@
             // 
             this.layoutControlItem20.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
             this.layoutControlItem20.Control = this.btnIpt;
-            this.layoutControlItem20.Location = new System.Drawing.Point(1226, 0);
+            this.layoutControlItem20.Location = new System.Drawing.Point(1319, 0);
             this.layoutControlItem20.MaxSize = new System.Drawing.Size(110, 40);
             this.layoutControlItem20.MinSize = new System.Drawing.Size(110, 40);
             this.layoutControlItem20.Name = "layoutControlItem20";
@@ -1992,12 +2378,12 @@
             // 
             this.layoutControlItem19.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
             this.layoutControlItem19.Control = this.btnLoad;
-            this.layoutControlItem19.Location = new System.Drawing.Point(817, 0);
+            this.layoutControlItem19.Location = new System.Drawing.Point(879, 0);
             this.layoutControlItem19.MaxSize = new System.Drawing.Size(166, 40);
             this.layoutControlItem19.MinSize = new System.Drawing.Size(166, 40);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem19.Size = new System.Drawing.Size(409, 43);
+            this.layoutControlItem19.Size = new System.Drawing.Size(440, 43);
             this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem19.Text = "閲嶆柊鍔犺浇";
             this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
@@ -2007,7 +2393,7 @@
             // 
             this.tabMxPage2.Controls.Add(this.ucUpFileList1);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1340, 459);
+            this.tabMxPage2.Size = new System.Drawing.Size(1433, 374);
             this.tabMxPage2.Text = "闄勪欢淇℃伅";
             // 
             // ucUpFileList1
@@ -2017,7 +2403,7 @@
             this.ucUpFileList1.Name = "ucUpFileList1";
             this.ucUpFileList1.parentGroup = null;
             this.ucUpFileList1.pGuid = null;
-            this.ucUpFileList1.Size = new System.Drawing.Size(1340, 459);
+            this.ucUpFileList1.Size = new System.Drawing.Size(1433, 374);
             this.ucUpFileList1.TabIndex = 0;
             // 
             // repositoryItemComboBox2
@@ -2057,7 +2443,7 @@
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1344, 800);
+            this.ClientSize = new System.Drawing.Size(1437, 800);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
@@ -2083,6 +2469,23 @@
             this.splitMx1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
             this.layoutMx1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layWeight)).EndInit();
+            this.layWeight.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txtW1.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtW2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtW3.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtW4.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtWCurrent.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtW5.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_suppName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remarks.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckResu.Properties)).EndInit();
@@ -2095,8 +2498,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fcheckBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fbatchQty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitBy.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_slOrg.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
@@ -2104,10 +2507,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();
@@ -2126,9 +2531,12 @@
             ((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.layoutControlItem25)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
             this.xtraTabControl2.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -2226,8 +2634,8 @@
         private DevExpress.XtraEditors.TextEdit txt_itemId;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraEditors.TextEdit txt_fsubmitBy;
         private DevExpress.XtraEditors.TextEdit txt_fsubmitDate;
+        private DevExpress.XtraEditors.TextEdit txt_fsubmitBy;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
         private DevExpress.XtraEditors.CheckEdit txt_fsubmit;
@@ -2313,10 +2721,36 @@
         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.XtraEditors.TextEdit txt_xbsl;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraLayout.LayoutControl layWeight;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+        private DevExpress.XtraEditors.TextEdit txtW1;
+        private DevExpress.XtraEditors.TextEdit txtW2;
+        private DevExpress.XtraEditors.TextEdit txtW3;
+        private DevExpress.XtraEditors.TextEdit txtW4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+        private DevExpress.XtraEditors.SimpleButton btnW;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
+        private DevExpress.XtraEditors.TextEdit txtWCurrent;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+        private DevExpress.XtraEditors.TextEdit txtW5;
+        private DevExpress.XtraEditors.SimpleButton btnClean;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3