From 3eb3fe911d6cd078a03dc833fd8296f5d53b5f21 Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期五, 21 十一月 2025 13:37:15 +0800
Subject: [PATCH] 导出参数调整

---
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs |  715 ++++++++++++++++++++++++++++++++---------------------------
 DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs          |    2 
 DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_YDGZ.cs              |    1 
 3 files changed, 389 insertions(+), 329 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_YDGZ.cs b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_YDGZ.cs
index 5d83e4a..c3bb4eb 100644
--- a/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_YDGZ.cs
+++ b/DevApp/Gs.DevApp/DevFrm/JJGZ/Frm_YDGZ.cs
@@ -220,6 +220,7 @@
                     string _folder = folderBrowserDialog.SelectedPath;
                     var _params = new
                     {
+                        inputOrgId = orgId,
                         inputDate = date
                     };
                     var _obj = new Gs.DevApp.Entity.XlsOutModel("report_YDGZ", "", "", "", _params);
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index a927968..5023ebe 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -350,10 +350,10 @@
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1426, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1782, 98);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -361,10 +361,11 @@
             // xtraTabControl1
             // 
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1426, 624);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1782, 762);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -373,8 +374,9 @@
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1424, 592);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1780, 724);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -383,6 +385,7 @@
             this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.split1.Name = "split1";
             // 
             // split1.Panel1
@@ -395,17 +398,19 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1424, 592);
+            this.split1.Size = new System.Drawing.Size(1780, 724);
             this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1424, 541);
+            this.gcMain1.Size = new System.Drawing.Size(1780, 661);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -415,7 +420,7 @@
             this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gridView1.Appearance.Row.Options.UseFont = true;
-            this.gridView1.ColumnPanelRowHeight = 50;
+            this.gridView1.ColumnPanelRowHeight = 61;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gv_tbl013,
             this.gv_tbl020,
@@ -437,8 +442,9 @@
             this.gridColumn21,
             this.gridColumn24,
             this.gridColumn25});
+            this.gridView1.DetailHeight = 428;
             this.gridView1.GridControl = this.gcMain1;
-            this.gridView1.IndicatorWidth = 50;
+            this.gridView1.IndicatorWidth = 62;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -449,257 +455,258 @@
             this.gv_tbl013.AppearanceCell.Options.UseFont = true;
             this.gv_tbl013.Caption = "鍒跺崟瀹℃牳";
             this.gv_tbl013.FieldName = "isChk";
-            this.gv_tbl013.MaxWidth = 50;
-            this.gv_tbl013.MinWidth = 50;
+            this.gv_tbl013.MaxWidth = 62;
+            this.gv_tbl013.MinWidth = 62;
             this.gv_tbl013.Name = "gv_tbl013";
             this.gv_tbl013.OptionsColumn.AllowEdit = false;
             this.gv_tbl013.Tag = "query_a.tbl013";
             this.gv_tbl013.Visible = true;
             this.gv_tbl013.VisibleIndex = 1;
-            this.gv_tbl013.Width = 50;
+            this.gv_tbl013.Width = 62;
             // 
             // gv_tbl020
             // 
             this.gv_tbl020.AppearanceCell.Options.UseFont = true;
             this.gv_tbl020.Caption = "瀹岀粨鏍囪瘑 ";
             this.gv_tbl020.FieldName = "txtColor";
-            this.gv_tbl020.MaxWidth = 50;
-            this.gv_tbl020.MinWidth = 50;
+            this.gv_tbl020.MaxWidth = 62;
+            this.gv_tbl020.MinWidth = 62;
             this.gv_tbl020.Name = "gv_tbl020";
             this.gv_tbl020.OptionsColumn.AllowEdit = false;
             this.gv_tbl020.Tag = "query_a.tbl020";
             this.gv_tbl020.Visible = true;
             this.gv_tbl020.VisibleIndex = 0;
-            this.gv_tbl020.Width = 50;
+            this.gv_tbl020.Width = 62;
             // 
             // gridColumn5
             // 
             this.gridColumn5.Caption = "鐢熶骇缁勭粐";
             this.gridColumn5.FieldName = "tlOrg";
-            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.MinWidth = 31;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Tag = "org.fnamber";
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 4;
-            this.gridColumn5.Width = 94;
+            this.gridColumn5.Width = 117;
             // 
             // gv_billNo
             // 
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鐢宠鍗曞彿 ";
             this.gv_billNo.FieldName = "billNo";
-            this.gv_billNo.MinWidth = 50;
+            this.gv_billNo.MinWidth = 62;
             this.gv_billNo.Name = "gv_billNo";
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.bill_no";
             this.gv_billNo.Visible = true;
             this.gv_billNo.VisibleIndex = 5;
-            this.gv_billNo.Width = 94;
+            this.gv_billNo.Width = 117;
             // 
             // gv_tbl003
             // 
             this.gv_tbl003.AppearanceCell.Options.UseFont = true;
             this.gv_tbl003.Caption = "浠诲姟鍗曞彿 ";
             this.gv_tbl003.FieldName = "daa021";
-            this.gv_tbl003.MinWidth = 50;
+            this.gv_tbl003.MinWidth = 62;
             this.gv_tbl003.Name = "gv_tbl003";
             this.gv_tbl003.OptionsColumn.AllowEdit = false;
             this.gv_tbl003.Tag = "query_a.tbl003";
             this.gv_tbl003.Visible = true;
             this.gv_tbl003.VisibleIndex = 6;
-            this.gv_tbl003.Width = 94;
+            this.gv_tbl003.Width = 117;
             // 
             // gv_tbl002
             // 
             this.gv_tbl002.AppearanceCell.Options.UseFont = true;
             this.gv_tbl002.Caption = "鐢熶骇宸ュ崟 ";
             this.gv_tbl002.FieldName = "daa001";
-            this.gv_tbl002.MinWidth = 50;
+            this.gv_tbl002.MinWidth = 62;
             this.gv_tbl002.Name = "gv_tbl002";
             this.gv_tbl002.OptionsColumn.AllowEdit = false;
             this.gv_tbl002.Tag = "query_a.tbl002";
             this.gv_tbl002.Visible = true;
             this.gv_tbl002.VisibleIndex = 7;
-            this.gv_tbl002.Width = 94;
+            this.gv_tbl002.Width = 117;
             // 
             // gv_tbl021
             // 
             this.gv_tbl021.AppearanceCell.Options.UseFont = true;
             this.gv_tbl021.Caption = "鐢熶骇杞﹂棿 ";
             this.gv_tbl021.FieldName = "dptName";
-            this.gv_tbl021.MinWidth = 50;
+            this.gv_tbl021.MinWidth = 62;
             this.gv_tbl021.Name = "gv_tbl021";
             this.gv_tbl021.OptionsColumn.AllowEdit = false;
             this.gv_tbl021.Tag = "query_a.tbl021";
             this.gv_tbl021.Visible = true;
             this.gv_tbl021.VisibleIndex = 9;
-            this.gv_tbl021.Width = 94;
+            this.gv_tbl021.Width = 117;
             // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "浜у搧缂栫爜";
             this.gridColumn6.FieldName = "daa029";
-            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.MinWidth = 31;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 10;
-            this.gridColumn6.Width = 94;
+            this.gridColumn6.Width = 117;
             // 
             // gridColumn10
             // 
             this.gridColumn10.Caption = "浜у搧鍚嶇О";
             this.gridColumn10.FieldName = "daa003";
-            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.MinWidth = 31;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
             this.gridColumn10.VisibleIndex = 11;
-            this.gridColumn10.Width = 94;
+            this.gridColumn10.Width = 117;
             // 
             // gv_tbl004
             // 
             this.gv_tbl004.AppearanceCell.Options.UseFont = true;
             this.gv_tbl004.Caption = "浜у搧鍨嬪彿 ";
             this.gv_tbl004.FieldName = "daa004";
-            this.gv_tbl004.MinWidth = 50;
+            this.gv_tbl004.MinWidth = 62;
             this.gv_tbl004.Name = "gv_tbl004";
             this.gv_tbl004.OptionsColumn.AllowEdit = false;
             this.gv_tbl004.Tag = "query_a.tbl004";
             this.gv_tbl004.Visible = true;
             this.gv_tbl004.VisibleIndex = 12;
-            this.gv_tbl004.Width = 94;
+            this.gv_tbl004.Width = 117;
             // 
             // gv_tbl005
             // 
             this.gv_tbl005.AppearanceCell.Options.UseFont = true;
             this.gv_tbl005.Caption = "閫�鏂欑被鍨�";
             this.gv_tbl005.FieldName = "tbl005";
-            this.gv_tbl005.MinWidth = 50;
+            this.gv_tbl005.MinWidth = 62;
             this.gv_tbl005.Name = "gv_tbl005";
             this.gv_tbl005.OptionsColumn.AllowEdit = false;
             this.gv_tbl005.Tag = "query_a.tbl005";
             this.gv_tbl005.Visible = true;
             this.gv_tbl005.VisibleIndex = 13;
-            this.gv_tbl005.Width = 94;
+            this.gv_tbl005.Width = 117;
             // 
             // gv_tbl009
             // 
             this.gv_tbl009.AppearanceCell.Options.UseFont = true;
             this.gv_tbl009.Caption = "鍒涘缓浜� ";
             this.gv_tbl009.FieldName = "cjPeople";
-            this.gv_tbl009.MinWidth = 50;
+            this.gv_tbl009.MinWidth = 62;
             this.gv_tbl009.Name = "gv_tbl009";
             this.gv_tbl009.OptionsColumn.AllowEdit = false;
             this.gv_tbl009.Tag = "query_a.tbl009";
             this.gv_tbl009.Visible = true;
             this.gv_tbl009.VisibleIndex = 14;
-            this.gv_tbl009.Width = 94;
+            this.gv_tbl009.Width = 117;
             // 
             // gv_tbl010
             // 
             this.gv_tbl010.AppearanceCell.Options.UseFont = true;
             this.gv_tbl010.Caption = "鍒涘缓鏃堕棿 ";
             this.gv_tbl010.FieldName = "tbl010";
-            this.gv_tbl010.MinWidth = 50;
+            this.gv_tbl010.MinWidth = 62;
             this.gv_tbl010.Name = "gv_tbl010";
             this.gv_tbl010.OptionsColumn.AllowEdit = false;
             this.gv_tbl010.Tag = "query_a.tbl010";
             this.gv_tbl010.Visible = true;
             this.gv_tbl010.VisibleIndex = 15;
-            this.gv_tbl010.Width = 94;
+            this.gv_tbl010.Width = 117;
             // 
             // gv_tbl011
             // 
             this.gv_tbl011.AppearanceCell.Options.UseFont = true;
             this.gv_tbl011.Caption = "瀹℃牳浜� ";
             this.gv_tbl011.FieldName = "shPeople";
-            this.gv_tbl011.MinWidth = 50;
+            this.gv_tbl011.MinWidth = 62;
             this.gv_tbl011.Name = "gv_tbl011";
             this.gv_tbl011.OptionsColumn.AllowEdit = false;
             this.gv_tbl011.Tag = "query_a.tbl011";
             this.gv_tbl011.Visible = true;
             this.gv_tbl011.VisibleIndex = 16;
-            this.gv_tbl011.Width = 94;
+            this.gv_tbl011.Width = 117;
             // 
             // gv_tbl012
             // 
             this.gv_tbl012.AppearanceCell.Options.UseFont = true;
             this.gv_tbl012.Caption = "瀹℃牳鏃堕棿 ";
             this.gv_tbl012.FieldName = "tbl012";
-            this.gv_tbl012.MinWidth = 50;
+            this.gv_tbl012.MinWidth = 62;
             this.gv_tbl012.Name = "gv_tbl012";
             this.gv_tbl012.OptionsColumn.AllowEdit = false;
             this.gv_tbl012.Tag = "query_a.tbl012";
             this.gv_tbl012.Visible = true;
             this.gv_tbl012.VisibleIndex = 17;
-            this.gv_tbl012.Width = 94;
+            this.gv_tbl012.Width = 117;
             // 
             // gridColumn11
             // 
             this.gridColumn11.Caption = "涓婚敭GUID";
             this.gridColumn11.FieldName = "guid";
-            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.MinWidth = 31;
             this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.Width = 94;
+            this.gridColumn11.Width = 117;
             // 
             // gridColumn12
             // 
             this.gridColumn12.Caption = "鎶曟枡鍗曞彿";
             this.gridColumn12.FieldName = "daa014";
-            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.MinWidth = 31;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
             this.gridColumn12.VisibleIndex = 18;
-            this.gridColumn12.Width = 94;
+            this.gridColumn12.Width = 117;
             // 
             // gridColumn21
             // 
             this.gridColumn21.Caption = "閲囪喘鎵瑰噯";
             this.gridColumn21.FieldName = "tbl024Chk";
-            this.gridColumn21.MaxWidth = 50;
-            this.gridColumn21.MinWidth = 50;
+            this.gridColumn21.MaxWidth = 62;
+            this.gridColumn21.MinWidth = 62;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
             this.gridColumn21.VisibleIndex = 2;
-            this.gridColumn21.Width = 50;
+            this.gridColumn21.Width = 62;
             // 
             // gridColumn24
             // 
             this.gridColumn24.Caption = "鍝佽川瀹℃牳";
             this.gridColumn24.FieldName = "tbl027Chk";
-            this.gridColumn24.MaxWidth = 50;
-            this.gridColumn24.MinWidth = 50;
+            this.gridColumn24.MaxWidth = 62;
+            this.gridColumn24.MinWidth = 62;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
             this.gridColumn24.VisibleIndex = 3;
-            this.gridColumn24.Width = 50;
+            this.gridColumn24.Width = 62;
             // 
             // gridColumn25
             // 
             this.gridColumn25.Caption = "鐢熶骇绾垮埆";
             this.gridColumn25.FieldName = "lineName";
-            this.gridColumn25.MinWidth = 25;
+            this.gridColumn25.MinWidth = 31;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
             this.gridColumn25.VisibleIndex = 8;
-            this.gridColumn25.Width = 94;
+            this.gridColumn25.Width = 117;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 541);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.pageBar1.Location = new System.Drawing.Point(0, 661);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1424, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1780, 48);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
             // xtraTabPage2
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1424, 592);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1780, 724);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -707,6 +714,7 @@
             this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx1.Horizontal = false;
             this.splitMx1.Location = new System.Drawing.Point(0, 0);
+            this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.splitMx1.Name = "splitMx1";
             // 
             // splitMx1.Panel1
@@ -719,8 +727,8 @@
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx1.Size = new System.Drawing.Size(1424, 592);
-            this.splitMx1.SplitterPosition = 232;
+            this.splitMx1.Size = new System.Drawing.Size(1780, 724);
+            this.splitMx1.SplitterPosition = 284;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -759,27 +767,30 @@
             this.layoutControlItem17,
             this.layoutControlItem14});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(55, 282, 812, 616);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1424, 232);
+            this.layoutMx1.Size = new System.Drawing.Size(1780, 284);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
             // ucBtnPrintAll1
             // 
-            this.ucBtnPrintAll1.Location = new System.Drawing.Point(1050, 196);
+            this.ucBtnPrintAll1.Location = new System.Drawing.Point(1310, 242);
+            this.ucBtnPrintAll1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.ucBtnPrintAll1.mxList = null;
             this.ucBtnPrintAll1.Name = "ucBtnPrintAll1";
             this.ucBtnPrintAll1.rptType = null;
-            this.ucBtnPrintAll1.Size = new System.Drawing.Size(343, 27);
+            this.ucBtnPrintAll1.Size = new System.Drawing.Size(430, 32);
             this.ucBtnPrintAll1.TabIndex = 479;
             // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(825, 108);
+            this.lbGuid.Location = new System.Drawing.Point(1031, 132);
+            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(268, 28);
+            this.lbGuid.Size = new System.Drawing.Size(335, 34);
             this.lbGuid.TabIndex = 1;
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
@@ -787,9 +798,10 @@
             // btnSelect
             // 
             this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
-            this.btnSelect.Location = new System.Drawing.Point(10, 165);
+            this.btnSelect.Location = new System.Drawing.Point(14, 204);
+            this.btnSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(96, 27);
+            this.btnSelect.Size = new System.Drawing.Size(121, 34);
             this.btnSelect.StyleController = this.layoutMx1;
             this.btnSelect.TabIndex = 457;
             this.btnSelect.Text = "閫夊彇鐗╂枡";
@@ -797,16 +809,17 @@
             // txt_tbl023
             // 
             this.txt_tbl023.IsReadly = false;
-            this.txt_tbl023.Location = new System.Drawing.Point(110, 41);
-            this.txt_tbl023.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_tbl023.Location = new System.Drawing.Point(137, 52);
+            this.txt_tbl023.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.txt_tbl023.Name = "txt_tbl023";
-            this.txt_tbl023.Size = new System.Drawing.Size(242, 24);
+            this.txt_tbl023.Size = new System.Drawing.Size(305, 28);
             this.txt_tbl023.TabIndex = 462;
             // 
             // txt_tbl005
             // 
             this.txt_tbl005.EditValue = "-璇烽�夋嫨-";
-            this.txt_tbl005.Location = new System.Drawing.Point(110, 103);
+            this.txt_tbl005.Location = new System.Drawing.Point(137, 128);
+            this.txt_tbl005.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_tbl005.Name = "txt_tbl005";
             this.txt_tbl005.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -816,16 +829,17 @@
             "鏉ユ枡涓嶈壇閫�鏂�",
             "浣滀笟涓嶈壇閫�鏂�"});
             this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_tbl005.Size = new System.Drawing.Size(242, 24);
+            this.txt_tbl005.Size = new System.Drawing.Size(305, 28);
             this.txt_tbl005.StyleController = this.layoutMx1;
             this.txt_tbl005.TabIndex = 459;
             // 
             // txt_tbl006
             // 
-            this.txt_tbl006.Location = new System.Drawing.Point(110, 134);
+            this.txt_tbl006.Location = new System.Drawing.Point(137, 166);
+            this.txt_tbl006.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_tbl006.Name = "txt_tbl006";
             this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
-            this.txt_tbl006.Size = new System.Drawing.Size(242, 24);
+            this.txt_tbl006.Size = new System.Drawing.Size(305, 28);
             this.txt_tbl006.StyleController = this.layoutMx1;
             this.txt_tbl006.TabIndex = 226;
             // 
@@ -833,210 +847,231 @@
             // 
             this.txt_tbl002.category = null;
             this.txt_tbl002.IsReadly = false;
-            this.txt_tbl002.Location = new System.Drawing.Point(110, 72);
-            this.txt_tbl002.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_tbl002.Location = new System.Drawing.Point(137, 90);
+            this.txt_tbl002.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.txt_tbl002.Name = "txt_tbl002";
-            this.txt_tbl002.Size = new System.Drawing.Size(242, 24);
+            this.txt_tbl002.Size = new System.Drawing.Size(305, 28);
             this.txt_tbl002.TabIndex = 458;
             // 
             // txt_workName
             // 
-            this.txt_workName.Location = new System.Drawing.Point(456, 41);
+            this.txt_workName.Location = new System.Drawing.Point(569, 52);
+            this.txt_workName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_workName.Name = "txt_workName";
             this.txt_workName.Properties.Appearance.Options.UseFont = true;
-            this.txt_workName.Size = new System.Drawing.Size(243, 24);
+            this.txt_workName.Size = new System.Drawing.Size(305, 28);
             this.txt_workName.StyleController = this.layoutMx1;
             this.txt_workName.TabIndex = 298;
             this.txt_workName.Tag = "readonly";
             // 
             // txt_tbl012
             // 
-            this.txt_tbl012.Location = new System.Drawing.Point(803, 134);
+            this.txt_tbl012.Location = new System.Drawing.Point(1001, 166);
+            this.txt_tbl012.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_tbl012.Name = "txt_tbl012";
             this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
-            this.txt_tbl012.Size = new System.Drawing.Size(243, 24);
+            this.txt_tbl012.Size = new System.Drawing.Size(305, 28);
             this.txt_tbl012.StyleController = this.layoutMx1;
             this.txt_tbl012.TabIndex = 247;
             this.txt_tbl012.Tag = "readonly";
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(110, 10);
+            this.txt_billNo.Location = new System.Drawing.Point(137, 14);
+            this.txt_billNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(242, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(305, 28);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             this.txt_billNo.Tag = "readonly";
             // 
             // txt_rwd
             // 
-            this.txt_rwd.Location = new System.Drawing.Point(456, 10);
+            this.txt_rwd.Location = new System.Drawing.Point(569, 14);
+            this.txt_rwd.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_rwd.Name = "txt_rwd";
             this.txt_rwd.Properties.Appearance.Options.UseFont = true;
-            this.txt_rwd.Size = new System.Drawing.Size(243, 24);
+            this.txt_rwd.Size = new System.Drawing.Size(305, 28);
             this.txt_rwd.StyleController = this.layoutMx1;
             this.txt_rwd.TabIndex = 217;
             this.txt_rwd.Tag = "readonly";
             // 
             // txt_tbl011Name
             // 
-            this.txt_tbl011Name.Location = new System.Drawing.Point(803, 103);
+            this.txt_tbl011Name.Location = new System.Drawing.Point(1001, 128);
+            this.txt_tbl011Name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_tbl011Name.Name = "txt_tbl011Name";
             this.txt_tbl011Name.Properties.Appearance.Options.UseFont = true;
-            this.txt_tbl011Name.Size = new System.Drawing.Size(243, 24);
+            this.txt_tbl011Name.Size = new System.Drawing.Size(305, 28);
             this.txt_tbl011Name.StyleController = this.layoutMx1;
             this.txt_tbl011Name.TabIndex = 243;
             this.txt_tbl011Name.Tag = "readonly";
             // 
             // txt_itemName
             // 
-            this.txt_itemName.Location = new System.Drawing.Point(456, 103);
+            this.txt_itemName.Location = new System.Drawing.Point(569, 128);
+            this.txt_itemName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_itemName.Name = "txt_itemName";
             this.txt_itemName.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemName.Size = new System.Drawing.Size(243, 24);
+            this.txt_itemName.Size = new System.Drawing.Size(305, 28);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 219;
             this.txt_itemName.Tag = "readonly";
             // 
             // txt_tbl013
             // 
-            this.txt_tbl013.Location = new System.Drawing.Point(703, 165);
+            this.txt_tbl013.Location = new System.Drawing.Point(878, 204);
+            this.txt_tbl013.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_tbl013.Name = "txt_tbl013";
             this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
             this.txt_tbl013.RightToLeft = System.Windows.Forms.RightToLeft.No;
-            this.txt_tbl013.Size = new System.Drawing.Size(343, 24);
+            this.txt_tbl013.Size = new System.Drawing.Size(428, 27);
             this.txt_tbl013.StyleController = this.layoutMx1;
             this.txt_tbl013.TabIndex = 463;
             this.txt_tbl013.Tag = "readonly";
             // 
             // txt_tbl009Name
             // 
-            this.txt_tbl009Name.Location = new System.Drawing.Point(803, 10);
+            this.txt_tbl009Name.Location = new System.Drawing.Point(1001, 14);
+            this.txt_tbl009Name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_tbl009Name.Name = "txt_tbl009Name";
-            this.txt_tbl009Name.Size = new System.Drawing.Size(243, 24);
+            this.txt_tbl009Name.Size = new System.Drawing.Size(305, 28);
             this.txt_tbl009Name.StyleController = this.layoutMx1;
             this.txt_tbl009Name.TabIndex = 464;
             this.txt_tbl009Name.Tag = "readonly";
             // 
             // txt_tbl010
             // 
-            this.txt_tbl010.Location = new System.Drawing.Point(803, 41);
+            this.txt_tbl010.Location = new System.Drawing.Point(1001, 52);
+            this.txt_tbl010.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_tbl010.Name = "txt_tbl010";
-            this.txt_tbl010.Size = new System.Drawing.Size(243, 24);
+            this.txt_tbl010.Size = new System.Drawing.Size(305, 28);
             this.txt_tbl010.StyleController = this.layoutMx1;
             this.txt_tbl010.TabIndex = 465;
             this.txt_tbl010.Tag = "readonly";
             // 
             // txt_tbl020
             // 
-            this.txt_tbl020.Location = new System.Drawing.Point(825, 105);
+            this.txt_tbl020.Location = new System.Drawing.Point(1031, 128);
+            this.txt_tbl020.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_tbl020.Name = "txt_tbl020";
             this.txt_tbl020.Properties.Caption = "瀹岀粨鏍囪瘑";
-            this.txt_tbl020.Size = new System.Drawing.Size(268, 24);
+            this.txt_tbl020.Size = new System.Drawing.Size(335, 27);
             this.txt_tbl020.StyleController = this.layoutMx1;
             this.txt_tbl020.TabIndex = 466;
             this.txt_tbl020.Tag = "readonly";
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(803, 72);
+            this.txt_itemNo.Location = new System.Drawing.Point(1001, 90);
+            this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_itemNo.Name = "txt_itemNo";
-            this.txt_itemNo.Size = new System.Drawing.Size(243, 24);
+            this.txt_itemNo.Size = new System.Drawing.Size(305, 28);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 467;
             this.txt_itemNo.Tag = "readonly";
             // 
             // txt_id
             // 
-            this.txt_id.Location = new System.Drawing.Point(632, 108);
+            this.txt_id.Location = new System.Drawing.Point(790, 132);
+            this.txt_id.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_id.Name = "txt_id";
-            this.txt_id.Size = new System.Drawing.Size(189, 24);
+            this.txt_id.Size = new System.Drawing.Size(236, 28);
             this.txt_id.StyleController = this.layoutMx1;
             this.txt_id.TabIndex = 468;
             this.txt_id.Tag = "readonly";
             // 
             // txt_daa014
             // 
-            this.txt_daa014.Location = new System.Drawing.Point(456, 134);
+            this.txt_daa014.Location = new System.Drawing.Point(569, 166);
+            this.txt_daa014.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_daa014.Name = "txt_daa014";
-            this.txt_daa014.Size = new System.Drawing.Size(243, 24);
+            this.txt_daa014.Size = new System.Drawing.Size(305, 28);
             this.txt_daa014.StyleController = this.layoutMx1;
             this.txt_daa014.TabIndex = 469;
             this.txt_daa014.Tag = "readonly";
             // 
             // txt_tbl026Name
             // 
-            this.txt_tbl026Name.Location = new System.Drawing.Point(1150, 103);
+            this.txt_tbl026Name.Location = new System.Drawing.Point(1433, 128);
+            this.txt_tbl026Name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_tbl026Name.Name = "txt_tbl026Name";
-            this.txt_tbl026Name.Size = new System.Drawing.Size(243, 24);
+            this.txt_tbl026Name.Size = new System.Drawing.Size(307, 28);
             this.txt_tbl026Name.StyleController = this.layoutMx1;
             this.txt_tbl026Name.TabIndex = 470;
             this.txt_tbl026Name.Tag = "readonly";
             // 
             // txt_tbl025
             // 
-            this.txt_tbl025.Location = new System.Drawing.Point(1150, 134);
+            this.txt_tbl025.Location = new System.Drawing.Point(1433, 166);
+            this.txt_tbl025.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_tbl025.Name = "txt_tbl025";
-            this.txt_tbl025.Size = new System.Drawing.Size(243, 24);
+            this.txt_tbl025.Size = new System.Drawing.Size(307, 28);
             this.txt_tbl025.StyleController = this.layoutMx1;
             this.txt_tbl025.TabIndex = 471;
             this.txt_tbl025.Tag = "readonly";
             // 
             // txt_chkOut
             // 
-            this.txt_chkOut.Location = new System.Drawing.Point(356, 165);
+            this.txt_chkOut.Location = new System.Drawing.Point(446, 204);
+            this.txt_chkOut.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_chkOut.Name = "txt_chkOut";
             this.txt_chkOut.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_chkOut.Properties.Appearance.Options.UseForeColor = true;
             this.txt_chkOut.Properties.Caption = "鏄惁鑷姩鐢熸垚琛ユ枡鍗�";
-            this.txt_chkOut.Size = new System.Drawing.Size(343, 24);
+            this.txt_chkOut.Size = new System.Drawing.Size(428, 27);
             this.txt_chkOut.StyleController = this.layoutMx1;
             this.txt_chkOut.TabIndex = 472;
             // 
             // txt_tbl024
             // 
-            this.txt_tbl024.Location = new System.Drawing.Point(1050, 165);
+            this.txt_tbl024.Location = new System.Drawing.Point(1310, 204);
+            this.txt_tbl024.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_tbl024.Name = "txt_tbl024";
             this.txt_tbl024.Properties.Caption = "鎵瑰噯鐘舵��";
-            this.txt_tbl024.Size = new System.Drawing.Size(343, 24);
+            this.txt_tbl024.Size = new System.Drawing.Size(430, 27);
             this.txt_tbl024.StyleController = this.layoutMx1;
             this.txt_tbl024.TabIndex = 473;
             this.txt_tbl024.Tag = "readonly";
             // 
             // txt_tbl028
             // 
-            this.txt_tbl028.Location = new System.Drawing.Point(1150, 41);
+            this.txt_tbl028.Location = new System.Drawing.Point(1433, 52);
+            this.txt_tbl028.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_tbl028.Name = "txt_tbl028";
-            this.txt_tbl028.Size = new System.Drawing.Size(243, 24);
+            this.txt_tbl028.Size = new System.Drawing.Size(307, 28);
             this.txt_tbl028.StyleController = this.layoutMx1;
             this.txt_tbl028.TabIndex = 475;
             this.txt_tbl028.Tag = "readonly";
             // 
             // txt_tbl029Name
             // 
-            this.txt_tbl029Name.Location = new System.Drawing.Point(1150, 10);
+            this.txt_tbl029Name.Location = new System.Drawing.Point(1433, 14);
+            this.txt_tbl029Name.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_tbl029Name.Name = "txt_tbl029Name";
-            this.txt_tbl029Name.Size = new System.Drawing.Size(243, 24);
+            this.txt_tbl029Name.Size = new System.Drawing.Size(307, 28);
             this.txt_tbl029Name.StyleController = this.layoutMx1;
             this.txt_tbl029Name.TabIndex = 476;
             this.txt_tbl029Name.Tag = "readonly";
             // 
             // txt_tbl027
             // 
-            this.txt_tbl027.Location = new System.Drawing.Point(1050, 72);
+            this.txt_tbl027.Location = new System.Drawing.Point(1310, 90);
+            this.txt_tbl027.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_tbl027.Name = "txt_tbl027";
             this.txt_tbl027.Properties.Caption = "鍝佽川瀹℃牳鐘舵��";
-            this.txt_tbl027.Size = new System.Drawing.Size(343, 24);
+            this.txt_tbl027.Size = new System.Drawing.Size(430, 27);
             this.txt_tbl027.StyleController = this.layoutMx1;
             this.txt_tbl027.TabIndex = 477;
             this.txt_tbl027.Tag = "readonly";
             // 
             // txt_line
             // 
-            this.txt_line.Location = new System.Drawing.Point(456, 72);
+            this.txt_line.Location = new System.Drawing.Point(569, 90);
+            this.txt_line.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_line.Name = "txt_line";
-            this.txt_line.Size = new System.Drawing.Size(243, 24);
+            this.txt_line.Size = new System.Drawing.Size(305, 28);
             this.txt_line.StyleController = this.layoutMx1;
             this.txt_line.TabIndex = 478;
             this.txt_line.Tag = "readonly";
@@ -1050,7 +1085,7 @@
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem7.Text = "涓婚敭GUID";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(66, 18);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(82, 22);
             // 
             // layoutControlItem17
             // 
@@ -1133,7 +1168,7 @@
             rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition6.Height = 100D;
             rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition7.Height = 31D;
+            rowDefinition7.Height = 36D;
             rowDefinition7.SizeType = System.Windows.Forms.SizeType.AutoSize;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition1,
@@ -1143,131 +1178,131 @@
             rowDefinition5,
             rowDefinition6,
             rowDefinition7});
-            this.Root.Size = new System.Drawing.Size(1403, 233);
+            this.Root.Size = new System.Drawing.Size(1754, 288);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_tbl009Name;
-            this.layoutControlItem12.Location = new System.Drawing.Point(693, 0);
+            this.layoutControlItem12.Location = new System.Drawing.Point(864, 0);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem12.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem12.Text = "鍒跺崟浜哄憳";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_tbl010;
-            this.layoutControlItem13.Location = new System.Drawing.Point(693, 31);
+            this.layoutControlItem13.Location = new System.Drawing.Point(864, 38);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem13.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem13.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem13.Text = "鍒跺崟鏃堕棿";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_tbl005;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 93);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 114);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem5.Size = new System.Drawing.Size(346, 31);
+            this.layoutControlItem5.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem5.Text = "閫�鏂欑被鍨�";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_tbl002;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 62);
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 76);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem4.Size = new System.Drawing.Size(346, 31);
+            this.layoutControlItem4.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem4.Text = "鐢熶骇宸ュ崟";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_tbl023;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 31);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 38);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem3.Size = new System.Drawing.Size(346, 31);
+            this.layoutControlItem3.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem3.Text = "鐢熶骇缁勭粐";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_itemNo;
-            this.layoutControlItem18.Location = new System.Drawing.Point(693, 62);
+            this.layoutControlItem18.Location = new System.Drawing.Point(864, 76);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem18.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem18.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem18.Text = "浜у搧缂栧彿";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem1
             // 
             this.layoutControlItem1.Control = this.txt_billNo;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(346, 31);
+            this.layoutControlItem1.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem1.Text = "鐢宠鍗曞彿";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_workName;
-            this.layoutControlItem6.Location = new System.Drawing.Point(346, 31);
+            this.layoutControlItem6.Location = new System.Drawing.Point(432, 38);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem6.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem6.Text = "鐢熶骇杞﹂棿";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_rwd;
-            this.layoutControlItem2.Location = new System.Drawing.Point(346, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(432, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem2.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem2.Text = "浠诲姟鍗曞彿";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_tbl011Name;
-            this.layoutControlItem9.Location = new System.Drawing.Point(693, 93);
+            this.layoutControlItem9.Location = new System.Drawing.Point(864, 114);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem9.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem9.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem9.Text = "鍒跺崟瀹℃牳浜哄憳";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_tbl012;
-            this.layoutControlItem10.Location = new System.Drawing.Point(693, 124);
+            this.layoutControlItem10.Location = new System.Drawing.Point(864, 152);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem10.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem10.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem10.Text = "鍒跺崟瀹℃牳鏃堕棿";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_tbl013;
-            this.layoutControlItem11.Location = new System.Drawing.Point(693, 155);
+            this.layoutControlItem11.Location = new System.Drawing.Point(864, 190);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem11.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem11.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem11.Text = "瀹℃牳鐘舵��";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
@@ -1275,12 +1310,12 @@
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.btnSelect;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 155);
-            this.layoutControlItem16.MaxSize = new System.Drawing.Size(100, 31);
-            this.layoutControlItem16.MinSize = new System.Drawing.Size(30, 31);
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 190);
+            this.layoutControlItem16.MaxSize = new System.Drawing.Size(125, 38);
+            this.layoutControlItem16.MinSize = new System.Drawing.Size(37, 38);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem16.Size = new System.Drawing.Size(346, 31);
+            this.layoutControlItem16.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem16.Text = "閫夊彇鐗╂枡";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -1289,130 +1324,130 @@
             // layoutControlItem36
             // 
             this.layoutControlItem36.Control = this.txt_tbl029Name;
-            this.layoutControlItem36.Location = new System.Drawing.Point(1040, 0);
+            this.layoutControlItem36.Location = new System.Drawing.Point(1296, 0);
             this.layoutControlItem36.Name = "layoutControlItem36";
             this.layoutControlItem36.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem36.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem36.Size = new System.Drawing.Size(434, 38);
             this.layoutControlItem36.Text = "鍝佽川瀹℃牳浜哄憳";
-            this.layoutControlItem36.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem36.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem37
             // 
             this.layoutControlItem37.Control = this.txt_tbl028;
-            this.layoutControlItem37.Location = new System.Drawing.Point(1040, 31);
+            this.layoutControlItem37.Location = new System.Drawing.Point(1296, 38);
             this.layoutControlItem37.Name = "layoutControlItem37";
             this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem37.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem37.Size = new System.Drawing.Size(434, 38);
             this.layoutControlItem37.Text = "鍝佽川瀹℃牳鏃堕棿";
-            this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem37.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem38
             // 
             this.layoutControlItem38.Control = this.txt_tbl027;
-            this.layoutControlItem38.Location = new System.Drawing.Point(1040, 62);
+            this.layoutControlItem38.Location = new System.Drawing.Point(1296, 76);
             this.layoutControlItem38.Name = "layoutControlItem38";
             this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem38.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem38.Size = new System.Drawing.Size(434, 38);
             this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem38.TextVisible = false;
             // 
             // layoutControlItem35
             // 
             this.layoutControlItem35.Control = this.txt_tbl024;
-            this.layoutControlItem35.Location = new System.Drawing.Point(1040, 155);
+            this.layoutControlItem35.Location = new System.Drawing.Point(1296, 190);
             this.layoutControlItem35.Name = "layoutControlItem35";
             this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem35.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem35.Size = new System.Drawing.Size(434, 38);
             this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem35.TextVisible = false;
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_tbl025;
-            this.layoutControlItem20.Location = new System.Drawing.Point(1040, 124);
+            this.layoutControlItem20.Location = new System.Drawing.Point(1296, 152);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem20.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem20.Size = new System.Drawing.Size(434, 38);
             this.layoutControlItem20.Text = "鎵瑰噯鏃堕棿";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_tbl026Name;
-            this.layoutControlItem19.Location = new System.Drawing.Point(1040, 93);
+            this.layoutControlItem19.Location = new System.Drawing.Point(1296, 114);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem19.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem19.Size = new System.Drawing.Size(434, 38);
             this.layoutControlItem19.Text = "鎵瑰噯浜哄憳";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_tbl006;
-            this.layoutControlItem15.Location = new System.Drawing.Point(0, 124);
+            this.layoutControlItem15.Location = new System.Drawing.Point(0, 152);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem15.Size = new System.Drawing.Size(346, 31);
+            this.layoutControlItem15.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem15.Text = "澶囨敞璇存槑";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem34
             // 
             this.layoutControlItem34.Control = this.txt_chkOut;
-            this.layoutControlItem34.Location = new System.Drawing.Point(346, 155);
+            this.layoutControlItem34.Location = new System.Drawing.Point(432, 190);
             this.layoutControlItem34.Name = "layoutControlItem34";
             this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem34.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem34.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem34.TextVisible = false;
             // 
             // lab_daa014
             // 
             this.lab_daa014.Control = this.txt_daa014;
-            this.lab_daa014.Location = new System.Drawing.Point(346, 124);
+            this.lab_daa014.Location = new System.Drawing.Point(432, 152);
             this.lab_daa014.Name = "lab_daa014";
             this.lab_daa014.OptionsTableLayoutItem.ColumnIndex = 1;
             this.lab_daa014.OptionsTableLayoutItem.RowIndex = 4;
-            this.lab_daa014.Size = new System.Drawing.Size(347, 31);
+            this.lab_daa014.Size = new System.Drawing.Size(432, 38);
             this.lab_daa014.Text = "鎶曟枡鍗曞彿";
-            this.lab_daa014.TextSize = new System.Drawing.Size(90, 18);
+            this.lab_daa014.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_itemName;
-            this.layoutControlItem8.Location = new System.Drawing.Point(346, 93);
+            this.layoutControlItem8.Location = new System.Drawing.Point(432, 114);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem8.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem8.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem8.Text = "浜у搧鍚嶇О";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem39
             // 
             this.layoutControlItem39.Control = this.txt_line;
-            this.layoutControlItem39.Location = new System.Drawing.Point(346, 62);
+            this.layoutControlItem39.Location = new System.Drawing.Point(432, 76);
             this.layoutControlItem39.Name = "layoutControlItem39";
             this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem39.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem39.Size = new System.Drawing.Size(432, 38);
             this.layoutControlItem39.Text = "鐢熶骇绾垮埆";
-            this.layoutControlItem39.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem39.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem40
             // 
             this.layoutControlItem40.Control = this.ucBtnPrintAll1;
-            this.layoutControlItem40.Location = new System.Drawing.Point(1040, 186);
+            this.layoutControlItem40.Location = new System.Drawing.Point(1296, 228);
             this.layoutControlItem40.Name = "layoutControlItem40";
             this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 6;
-            this.layoutControlItem40.Size = new System.Drawing.Size(347, 31);
+            this.layoutControlItem40.Size = new System.Drawing.Size(434, 36);
             this.layoutControlItem40.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem40.TextVisible = false;
             // 
@@ -1420,9 +1455,10 @@
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabMx.Location = new System.Drawing.Point(0, 0);
+            this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1424, 348);
+            this.tabMx.Size = new System.Drawing.Size(1780, 425);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1431,8 +1467,9 @@
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.split99);
+            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1422, 316);
+            this.tabMxPage1.Size = new System.Drawing.Size(1778, 387);
             this.tabMxPage1.Text = "閫�鏂欐槑缁�";
             // 
             // split99
@@ -1440,6 +1477,7 @@
             this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
             this.split99.Horizontal = false;
             this.split99.Location = new System.Drawing.Point(0, 0);
+            this.split99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.split99.Name = "split99";
             // 
             // split99.Panel1
@@ -1452,8 +1490,8 @@
             this.split99.Panel2.Controls.Add(this.gcMx1);
             this.split99.Panel2.Text = "Panel2";
             this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split99.Size = new System.Drawing.Size(1422, 316);
-            this.split99.SplitterPosition = 138;
+            this.split99.Size = new System.Drawing.Size(1778, 387);
+            this.split99.SplitterPosition = 169;
             this.split99.TabIndex = 1;
             // 
             // lay99
@@ -1473,18 +1511,20 @@
             this.lay99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem33});
             this.lay99.Location = new System.Drawing.Point(0, 0);
+            this.lay99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.lay99.Name = "lay99";
             this.lay99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(306, 272, 812, 500);
             this.lay99.Root = this.layoutControlGroup1;
-            this.lay99.Size = new System.Drawing.Size(1422, 138);
+            this.lay99.Size = new System.Drawing.Size(1778, 169);
             this.lay99.TabIndex = 0;
             this.lay99.Text = "layoutControl1";
             // 
             // lbMxGuid
             // 
-            this.lbMxGuid.Location = new System.Drawing.Point(1032, 84);
+            this.lbMxGuid.Location = new System.Drawing.Point(1290, 103);
+            this.lbMxGuid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.lbMxGuid.Name = "lbMxGuid";
-            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
+            this.lbMxGuid.Size = new System.Drawing.Size(72, 22);
             this.lbMxGuid.StyleController = this.lay99;
             this.lbMxGuid.TabIndex = 479;
             this.lbMxGuid.Text = "lbMxGuid";
@@ -1493,16 +1533,16 @@
             // 
             this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(1063, 50);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(1328, 62);
             this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint1.Name = "ucBtnPrint1";
             this.ucBtnPrint1.rptParameter = null;
-            this.ucBtnPrint1.Size = new System.Drawing.Size(349, 37);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(436, 44);
             this.ucBtnPrint1.TabIndex = 478;
             // 
             // radOut
             // 
-            this.radOut.Location = new System.Drawing.Point(1063, 10);
+            this.radOut.Location = new System.Drawing.Point(1328, 14);
             this.radOut.Margin = new System.Windows.Forms.Padding(0);
             this.radOut.Name = "radOut";
             this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1511,7 +1551,7 @@
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
             this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
-            this.radOut.Size = new System.Drawing.Size(349, 36);
+            this.radOut.Size = new System.Drawing.Size(436, 44);
             this.radOut.StyleController = this.lay99;
             this.radOut.TabIndex = 477;
             // 
@@ -1519,30 +1559,33 @@
             // 
             this.dataLayoutControl1.Controls.Add(this.txt_iCount_1);
             this.dataLayoutControl1.Controls.Add(this.txt_yuliang_1);
-            this.dataLayoutControl1.Location = new System.Drawing.Point(712, 91);
+            this.dataLayoutControl1.Location = new System.Drawing.Point(890, 110);
+            this.dataLayoutControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.dataLayoutControl1.Name = "dataLayoutControl1";
             this.dataLayoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 186, 812, 500);
             this.dataLayoutControl1.Root = this.layoutControlGroup2;
-            this.dataLayoutControl1.Size = new System.Drawing.Size(347, 37);
+            this.dataLayoutControl1.Size = new System.Drawing.Size(434, 45);
             this.dataLayoutControl1.TabIndex = 227;
             this.dataLayoutControl1.Text = "dataLayoutControl1";
             // 
             // txt_iCount_1
             // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(102, 2);
+            this.txt_iCount_1.Location = new System.Drawing.Point(125, 2);
+            this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_iCount_1.Name = "txt_iCount_1";
             this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
             this.txt_iCount_1.Properties.ReadOnly = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(69, 24);
+            this.txt_iCount_1.Size = new System.Drawing.Size(90, 28);
             this.txt_iCount_1.StyleController = this.dataLayoutControl1;
             this.txt_iCount_1.TabIndex = 228;
             // 
             // txt_yuliang_1
             // 
-            this.txt_yuliang_1.Location = new System.Drawing.Point(275, 2);
+            this.txt_yuliang_1.Location = new System.Drawing.Point(342, 2);
+            this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_yuliang_1.Name = "txt_yuliang_1";
             this.txt_yuliang_1.Properties.ReadOnly = true;
-            this.txt_yuliang_1.Size = new System.Drawing.Size(70, 24);
+            this.txt_yuliang_1.Size = new System.Drawing.Size(90, 28);
             this.txt_yuliang_1.StyleController = this.dataLayoutControl1;
             this.txt_yuliang_1.TabIndex = 229;
             // 
@@ -1567,7 +1610,7 @@
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition8});
             this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup2.Size = new System.Drawing.Size(347, 37);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(434, 45);
             this.layoutControlGroup2.TextVisible = false;
             // 
             // layoutControlItem30
@@ -1575,12 +1618,12 @@
             this.layoutControlItem30.Control = this.txt_yuliang_1;
             this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem30.CustomizationFormText = "鎵撳嵃浣欐暟";
-            this.layoutControlItem30.Location = new System.Drawing.Point(173, 0);
+            this.layoutControlItem30.Location = new System.Drawing.Point(217, 0);
             this.layoutControlItem30.Name = "layoutControlItem30";
             this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem30.Size = new System.Drawing.Size(174, 37);
+            this.layoutControlItem30.Size = new System.Drawing.Size(217, 45);
             this.layoutControlItem30.Text = "鎵撳嵃浣欐暟";
-            this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem30.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem29
             // 
@@ -1589,78 +1632,85 @@
             this.layoutControlItem29.CustomizationFormText = "鎵撳嵃鏁村紶鏁板��";
             this.layoutControlItem29.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem29.Name = "layoutControlItem29";
-            this.layoutControlItem29.Size = new System.Drawing.Size(173, 37);
+            this.layoutControlItem29.Size = new System.Drawing.Size(217, 45);
             this.layoutControlItem29.Text = "鎵撳嵃鏁村紶鏁板��";
-            this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem29.TextSize = new System.Drawing.Size(108, 22);
             // 
             // txtWlid
             // 
-            this.txtWlid.Location = new System.Drawing.Point(110, 10);
+            this.txtWlid.Location = new System.Drawing.Point(137, 14);
+            this.txtWlid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtWlid.Name = "txtWlid";
             this.txtWlid.Properties.Appearance.Options.UseFont = true;
             this.txtWlid.Properties.ReadOnly = true;
-            this.txtWlid.Size = new System.Drawing.Size(247, 24);
+            this.txtWlid.Size = new System.Drawing.Size(311, 28);
             this.txtWlid.StyleController = this.lay99;
             this.txtWlid.TabIndex = 214;
             // 
             // txtQuantity
             // 
-            this.txtQuantity.Location = new System.Drawing.Point(461, 10);
+            this.txtQuantity.Location = new System.Drawing.Point(575, 14);
+            this.txtQuantity.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtQuantity.Name = "txtQuantity";
             this.txtQuantity.Properties.Appearance.Options.UseFont = true;
             this.txtQuantity.Properties.ReadOnly = true;
-            this.txtQuantity.Size = new System.Drawing.Size(247, 24);
+            this.txtQuantity.Size = new System.Drawing.Size(311, 28);
             this.txtQuantity.StyleController = this.lay99;
             this.txtQuantity.TabIndex = 220;
             // 
             // txt_kQty
             // 
-            this.txt_kQty.Location = new System.Drawing.Point(812, 10);
+            this.txt_kQty.Location = new System.Drawing.Point(1013, 14);
+            this.txt_kQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_kQty.Name = "txt_kQty";
             this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_kQty.Properties.Appearance.Options.UseFont = true;
             this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
             this.txt_kQty.Properties.ReadOnly = true;
-            this.txt_kQty.Size = new System.Drawing.Size(247, 24);
+            this.txt_kQty.Size = new System.Drawing.Size(311, 28);
             this.txt_kQty.StyleController = this.lay99;
             this.txt_kQty.TabIndex = 224;
             // 
             // txtWlmc
             // 
-            this.txtWlmc.Location = new System.Drawing.Point(110, 50);
+            this.txtWlmc.Location = new System.Drawing.Point(137, 62);
+            this.txtWlmc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtWlmc.Name = "txtWlmc";
             this.txtWlmc.Properties.Appearance.Options.UseFont = true;
             this.txtWlmc.Properties.ReadOnly = true;
-            this.txtWlmc.Size = new System.Drawing.Size(247, 24);
+            this.txtWlmc.Size = new System.Drawing.Size(311, 28);
             this.txtWlmc.StyleController = this.lay99;
             this.txtWlmc.TabIndex = 216;
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(461, 50);
+            this.txt_yQty.Location = new System.Drawing.Point(575, 62);
+            this.txt_yQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_yQty.Name = "txt_yQty";
             this.txt_yQty.Properties.Appearance.Options.UseFont = true;
             this.txt_yQty.Properties.ReadOnly = true;
-            this.txt_yQty.Size = new System.Drawing.Size(247, 24);
+            this.txt_yQty.Size = new System.Drawing.Size(311, 28);
             this.txt_yQty.StyleController = this.lay99;
             this.txt_yQty.TabIndex = 222;
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(812, 50);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(1013, 62);
+            this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_psnQty_1.Name = "txt_psnQty_1";
             this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_psnQty_1.Size = new System.Drawing.Size(247, 24);
+            this.txt_psnQty_1.Size = new System.Drawing.Size(311, 28);
             this.txt_psnQty_1.StyleController = this.lay99;
             this.txt_psnQty_1.TabIndex = 226;
             // 
             // txtWlgg
             // 
-            this.txtWlgg.Location = new System.Drawing.Point(110, 91);
+            this.txtWlgg.Location = new System.Drawing.Point(137, 110);
+            this.txtWlgg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txtWlgg.Name = "txtWlgg";
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
             this.txtWlgg.Properties.ReadOnly = true;
-            this.txtWlgg.Size = new System.Drawing.Size(598, 24);
+            this.txtWlgg.Size = new System.Drawing.Size(749, 28);
             this.txtWlgg.StyleController = this.lay99;
             this.txtWlgg.TabIndex = 218;
             // 
@@ -1716,7 +1766,7 @@
             rowDefinition9,
             rowDefinition10,
             rowDefinition11});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1422, 138);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1778, 169);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem22
@@ -1724,84 +1774,84 @@
             this.layoutControlItem22.Control = this.txtQuantity;
             this.layoutControlItem22.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem22.CustomizationFormText = "鏈鐢宠鎬婚噺";
-            this.layoutControlItem22.Location = new System.Drawing.Point(351, 0);
+            this.layoutControlItem22.Location = new System.Drawing.Point(438, 0);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem22.Size = new System.Drawing.Size(351, 40);
+            this.layoutControlItem22.Size = new System.Drawing.Size(438, 48);
             this.layoutControlItem22.Text = "鏈鐢宠鎬婚噺";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem23
             // 
             this.layoutControlItem23.Control = this.txt_kQty;
             this.layoutControlItem23.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem23.CustomizationFormText = "鍙墦鍗版�绘暟";
-            this.layoutControlItem23.Location = new System.Drawing.Point(702, 0);
+            this.layoutControlItem23.Location = new System.Drawing.Point(876, 0);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem23.Size = new System.Drawing.Size(351, 40);
+            this.layoutControlItem23.Size = new System.Drawing.Size(438, 48);
             this.layoutControlItem23.Text = "鍙墦鍗版�绘暟";
-            this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem23.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem27
             // 
             this.layoutControlItem27.Control = this.txtWlgg;
             this.layoutControlItem27.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem27.CustomizationFormText = "鐗╂枡瑙勬牸";
-            this.layoutControlItem27.Location = new System.Drawing.Point(0, 81);
+            this.layoutControlItem27.Location = new System.Drawing.Point(0, 96);
             this.layoutControlItem27.Name = "layoutControlItem27";
             this.layoutControlItem27.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem27.Size = new System.Drawing.Size(702, 41);
+            this.layoutControlItem27.Size = new System.Drawing.Size(876, 49);
             this.layoutControlItem27.Text = "鐗╂枡瑙勬牸";
-            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem27.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem24
             // 
             this.layoutControlItem24.Control = this.txtWlmc;
             this.layoutControlItem24.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem24.CustomizationFormText = "鐗╂枡鍚嶇О";
-            this.layoutControlItem24.Location = new System.Drawing.Point(0, 40);
+            this.layoutControlItem24.Location = new System.Drawing.Point(0, 48);
             this.layoutControlItem24.Name = "layoutControlItem24";
             this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem24.Size = new System.Drawing.Size(351, 41);
+            this.layoutControlItem24.Size = new System.Drawing.Size(438, 48);
             this.layoutControlItem24.Text = "鐗╂枡鍚嶇О";
-            this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem24.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem25
             // 
             this.layoutControlItem25.Control = this.txt_yQty;
             this.layoutControlItem25.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem25.CustomizationFormText = "宸叉墦鍗版�婚噺";
-            this.layoutControlItem25.Location = new System.Drawing.Point(351, 40);
+            this.layoutControlItem25.Location = new System.Drawing.Point(438, 48);
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem25.Size = new System.Drawing.Size(351, 41);
+            this.layoutControlItem25.Size = new System.Drawing.Size(438, 48);
             this.layoutControlItem25.Text = "宸叉墦鍗版�婚噺";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem26
             // 
             this.layoutControlItem26.Control = this.txt_psnQty_1;
             this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem26.CustomizationFormText = "姣忓紶鏉$爜鏁伴噺";
-            this.layoutControlItem26.Location = new System.Drawing.Point(702, 40);
+            this.layoutControlItem26.Location = new System.Drawing.Point(876, 48);
             this.layoutControlItem26.Name = "layoutControlItem26";
             this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem26.Size = new System.Drawing.Size(351, 41);
+            this.layoutControlItem26.Size = new System.Drawing.Size(438, 48);
             this.layoutControlItem26.Text = "姣忓紶鏉$爜鏁伴噺";
-            this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem26.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem28
             // 
             this.layoutControlItem28.Control = this.dataLayoutControl1;
-            this.layoutControlItem28.Location = new System.Drawing.Point(702, 81);
+            this.layoutControlItem28.Location = new System.Drawing.Point(876, 96);
             this.layoutControlItem28.Name = "layoutControlItem28";
             this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem28.Size = new System.Drawing.Size(351, 41);
+            this.layoutControlItem28.Size = new System.Drawing.Size(438, 49);
             this.layoutControlItem28.Text = "鎵撳嵃寮犳暟";
             this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem28.TextVisible = false;
@@ -1809,10 +1859,10 @@
             // layoutControlItem31
             // 
             this.layoutControlItem31.Control = this.radOut;
-            this.layoutControlItem31.Location = new System.Drawing.Point(1053, 0);
+            this.layoutControlItem31.Location = new System.Drawing.Point(1314, 0);
             this.layoutControlItem31.Name = "layoutControlItem31";
             this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem31.Size = new System.Drawing.Size(353, 40);
+            this.layoutControlItem31.Size = new System.Drawing.Size(440, 48);
             this.layoutControlItem31.Text = "鑷姩璁$畻";
             this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem31.TextVisible = false;
@@ -1824,18 +1874,18 @@
             this.layoutControlItem21.CustomizationFormText = "鐗╂枡缂栫爜";
             this.layoutControlItem21.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem21.Name = "layoutControlItem21";
-            this.layoutControlItem21.Size = new System.Drawing.Size(351, 40);
+            this.layoutControlItem21.Size = new System.Drawing.Size(438, 48);
             this.layoutControlItem21.Text = "鐗╂枡缂栫爜";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(108, 22);
             // 
             // layoutControlItem32
             // 
             this.layoutControlItem32.Control = this.ucBtnPrint1;
-            this.layoutControlItem32.Location = new System.Drawing.Point(1053, 40);
+            this.layoutControlItem32.Location = new System.Drawing.Point(1314, 48);
             this.layoutControlItem32.Name = "layoutControlItem32";
             this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem32.Size = new System.Drawing.Size(353, 41);
+            this.layoutControlItem32.Size = new System.Drawing.Size(440, 48);
             this.layoutControlItem32.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem32.TextVisible = false;
@@ -1843,13 +1893,15 @@
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1,
             this.rptBl});
-            this.gcMx1.Size = new System.Drawing.Size(1422, 166);
+            this.gcMx1.Size = new System.Drawing.Size(1778, 203);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1878,6 +1930,7 @@
             this.gridColumn22,
             this.gridColumn23,
             this.gridColumn26});
+            this.gvMx1.DetailHeight = 428;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1889,66 +1942,66 @@
             this.gvMx1tlid.AppearanceCell.Options.UseFont = true;
             this.gvMx1tlid.Caption = "鐢宠鏄庣粏琛ㄤ富閿�";
             this.gvMx1tlid.FieldName = "tlid";
-            this.gvMx1tlid.MinWidth = 50;
+            this.gvMx1tlid.MinWidth = 62;
             this.gvMx1tlid.Name = "gvMx1tlid";
             this.gvMx1tlid.Tag = "query_a.tlid";
-            this.gvMx1tlid.Width = 94;
+            this.gvMx1tlid.Width = 117;
             // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "dabGuid";
             this.gridColumn3.FieldName = "aboutGuid";
-            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.MinWidth = 31;
             this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.Width = 94;
+            this.gridColumn3.Width = 117;
             // 
             // gvMx1tld001
             // 
             this.gvMx1tld001.AppearanceCell.Options.UseFont = true;
             this.gvMx1tld001.Caption = "宸ュ崟鍙�";
             this.gvMx1tld001.FieldName = "tld001";
-            this.gvMx1tld001.MinWidth = 50;
+            this.gvMx1tld001.MinWidth = 62;
             this.gvMx1tld001.Name = "gvMx1tld001";
             this.gvMx1tld001.Tag = "query_a.tld001";
             this.gvMx1tld001.Visible = true;
             this.gvMx1tld001.VisibleIndex = 0;
-            this.gvMx1tld001.Width = 78;
+            this.gvMx1tld001.Width = 97;
             // 
             // gvMx1tld002
             // 
             this.gvMx1tld002.AppearanceCell.Options.UseFont = true;
             this.gvMx1tld002.Caption = "鐗╂枡缂栫爜";
             this.gvMx1tld002.FieldName = "tld002";
-            this.gvMx1tld002.MinWidth = 50;
+            this.gvMx1tld002.MinWidth = 62;
             this.gvMx1tld002.Name = "gvMx1tld002";
             this.gvMx1tld002.Tag = "query_a.tld002";
             this.gvMx1tld002.Visible = true;
             this.gvMx1tld002.VisibleIndex = 1;
-            this.gvMx1tld002.Width = 78;
+            this.gvMx1tld002.Width = 97;
             // 
             // gvMx1tld003
             // 
             this.gvMx1tld003.AppearanceCell.Options.UseFont = true;
             this.gvMx1tld003.Caption = "鐗╂枡鍚嶇О";
             this.gvMx1tld003.FieldName = "tld003";
-            this.gvMx1tld003.MinWidth = 50;
+            this.gvMx1tld003.MinWidth = 62;
             this.gvMx1tld003.Name = "gvMx1tld003";
             this.gvMx1tld003.Tag = "query_a.tld003";
             this.gvMx1tld003.Visible = true;
             this.gvMx1tld003.VisibleIndex = 2;
-            this.gvMx1tld003.Width = 78;
+            this.gvMx1tld003.Width = 97;
             // 
             // gvMx1tld004
             // 
             this.gvMx1tld004.AppearanceCell.Options.UseFont = true;
             this.gvMx1tld004.Caption = "瑙勬牸鍨嬪彿";
             this.gvMx1tld004.FieldName = "tld004";
-            this.gvMx1tld004.MinWidth = 50;
+            this.gvMx1tld004.MinWidth = 62;
             this.gvMx1tld004.Name = "gvMx1tld004";
             this.gvMx1tld004.Tag = "query_a.tld004";
             this.gvMx1tld004.Visible = true;
             this.gvMx1tld004.VisibleIndex = 12;
-            this.gvMx1tld004.Width = 78;
+            this.gvMx1tld004.Width = 97;
             // 
             // gvMx1tld005
             // 
@@ -1959,86 +2012,86 @@
             this.gvMx1tld005.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1tld005.Caption = "鐢宠鏁伴噺";
             this.gvMx1tld005.FieldName = "tld005";
-            this.gvMx1tld005.MinWidth = 50;
+            this.gvMx1tld005.MinWidth = 62;
             this.gvMx1tld005.Name = "gvMx1tld005";
             this.gvMx1tld005.Tag = "yz_quantity_0_edit";
             this.gvMx1tld005.Visible = true;
             this.gvMx1tld005.VisibleIndex = 3;
-            this.gvMx1tld005.Width = 78;
+            this.gvMx1tld005.Width = 97;
             // 
             // gridColumn13
             // 
             this.gridColumn13.Caption = "宸查鏁伴噺";
             this.gridColumn13.FieldName = "ylsl";
-            this.gridColumn13.MinWidth = 25;
+            this.gridColumn13.MinWidth = 31;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
             this.gridColumn13.VisibleIndex = 7;
-            this.gridColumn13.Width = 84;
+            this.gridColumn13.Width = 105;
             // 
             // gvMx1tld006
             // 
             this.gvMx1tld006.AppearanceCell.Options.UseFont = true;
             this.gvMx1tld006.Caption = "宸查��鏁伴噺";
             this.gvMx1tld006.FieldName = "ytsl";
-            this.gvMx1tld006.MinWidth = 50;
+            this.gvMx1tld006.MinWidth = 62;
             this.gvMx1tld006.Name = "gvMx1tld006";
             this.gvMx1tld006.Tag = "query_a.tld006";
             this.gvMx1tld006.Visible = true;
             this.gvMx1tld006.VisibleIndex = 8;
-            this.gvMx1tld006.Width = 84;
+            this.gvMx1tld006.Width = 105;
             // 
             // gvMx1tld007
             // 
             this.gvMx1tld007.AppearanceCell.Options.UseFont = true;
             this.gvMx1tld007.Caption = "鍗曚綅";
             this.gvMx1tld007.FieldName = "dwName";
-            this.gvMx1tld007.MinWidth = 50;
+            this.gvMx1tld007.MinWidth = 62;
             this.gvMx1tld007.Name = "gvMx1tld007";
             this.gvMx1tld007.Tag = "query_a.tld007";
             this.gvMx1tld007.Visible = true;
             this.gvMx1tld007.VisibleIndex = 9;
-            this.gvMx1tld007.Width = 84;
+            this.gvMx1tld007.Width = 105;
             // 
             // gvMx1tld009
             // 
             this.gvMx1tld009.AppearanceCell.Options.UseFont = true;
             this.gvMx1tld009.Caption = "鐗╂枡id";
             this.gvMx1tld009.FieldName = "tld009";
-            this.gvMx1tld009.MinWidth = 50;
+            this.gvMx1tld009.MinWidth = 62;
             this.gvMx1tld009.Name = "gvMx1tld009";
             this.gvMx1tld009.Tag = "query_a.tld009";
-            this.gvMx1tld009.Width = 94;
+            this.gvMx1tld009.Width = 117;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "宸叉墦鍗版暟閲�";
             this.gridColumn1.FieldName = "ydy";
-            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.MinWidth = 31;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 10;
-            this.gridColumn1.Width = 84;
+            this.gridColumn1.Width = 105;
             // 
             // gridColumn2
             // 
             this.gridColumn2.Caption = "鍙墦鍗版暟閲�";
             this.gridColumn2.FieldName = "kdy";
-            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.MinWidth = 31;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 11;
-            this.gridColumn2.Width = 84;
+            this.gridColumn2.Width = 105;
             // 
             // gvMxDel
             // 
             this.gvMxDel.Caption = "绉诲嚭";
             this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 25;
+            this.gvMxDel.MinWidth = 31;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
             this.gvMxDel.VisibleIndex = 13;
-            this.gvMxDel.Width = 88;
+            this.gvMxDel.Width = 110;
             // 
             // repositoryItemButtonEdit1
             // 
@@ -2059,12 +2112,12 @@
             this.gridColumn18.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn18.Caption = "澶囨敞";
             this.gridColumn18.FieldName = "tld014";
-            this.gridColumn18.MinWidth = 80;
+            this.gridColumn18.MinWidth = 100;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Tag = "edit";
             this.gridColumn18.Visible = true;
             this.gridColumn18.VisibleIndex = 4;
-            this.gridColumn18.Width = 80;
+            this.gridColumn18.Width = 100;
             // 
             // gridColumn19
             // 
@@ -2075,12 +2128,12 @@
             this.gridColumn19.Caption = "閫夋嫨閫�鏂欎笉鑹被鍒�";
             this.gridColumn19.ColumnEdit = this.rptBl;
             this.gridColumn19.FieldName = "tld015";
-            this.gridColumn19.MinWidth = 100;
+            this.gridColumn19.MinWidth = 125;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Tag = "edit";
             this.gridColumn19.Visible = true;
             this.gridColumn19.VisibleIndex = 5;
-            this.gridColumn19.Width = 100;
+            this.gridColumn19.Width = 125;
             // 
             // rptBl
             // 
@@ -2099,9 +2152,9 @@
             this.gridColumn20.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn20.Caption = "绱鐢宠閲�";
             this.gridColumn20.FieldName = "sqQty";
-            this.gridColumn20.MinWidth = 25;
+            this.gridColumn20.MinWidth = 31;
             this.gridColumn20.Name = "gridColumn20";
-            this.gridColumn20.Width = 94;
+            this.gridColumn20.Width = 117;
             // 
             // gridColumn22
             // 
@@ -2111,9 +2164,9 @@
             this.gridColumn22.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn22.Caption = "绱Н閫�閲�";
             this.gridColumn22.FieldName = "tQty";
-            this.gridColumn22.MinWidth = 25;
+            this.gridColumn22.MinWidth = 31;
             this.gridColumn22.Name = "gridColumn22";
-            this.gridColumn22.Width = 94;
+            this.gridColumn22.Width = 117;
             // 
             // gridColumn23
             // 
@@ -2123,9 +2176,9 @@
             this.gridColumn23.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn23.Caption = "绱琛ラ噺";
             this.gridColumn23.FieldName = "bQty";
-            this.gridColumn23.MinWidth = 25;
+            this.gridColumn23.MinWidth = 31;
             this.gridColumn23.Name = "gridColumn23";
-            this.gridColumn23.Width = 94;
+            this.gridColumn23.Width = 117;
             // 
             // gridColumn26
             // 
@@ -2135,26 +2188,29 @@
             this.gridColumn26.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn26.Caption = "Mes/Erp搴撳瓨";
             this.gridColumn26.FieldName = "kcQty";
-            this.gridColumn26.MinWidth = 25;
+            this.gridColumn26.MinWidth = 31;
             this.gridColumn26.Name = "gridColumn26";
             this.gridColumn26.Visible = true;
             this.gridColumn26.VisibleIndex = 6;
-            this.gridColumn26.Width = 94;
+            this.gridColumn26.Width = 117;
             // 
             // xtraTabPage3
             // 
             this.xtraTabPage3.Controls.Add(this.gcMx2);
+            this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1422, 318);
+            this.xtraTabPage3.Size = new System.Drawing.Size(1778, 384);
             this.xtraTabPage3.Text = "宸叉墦鏉$爜鏄庣粏";
             // 
             // gcMx2
             // 
             this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
+            this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1422, 318);
+            this.gcMx2.Size = new System.Drawing.Size(1778, 384);
             this.gcMx2.TabIndex = 1;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -2176,6 +2232,7 @@
             this.gridColumn14,
             this.gridColumn17,
             this.gridColumn16});
+            this.gvMx2.DetailHeight = 428;
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -2187,145 +2244,146 @@
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
             this.gvMx1guid.Caption = "guid";
             this.gvMx1guid.FieldName = "guid";
-            this.gvMx1guid.MinWidth = 50;
+            this.gvMx1guid.MinWidth = 62;
             this.gvMx1guid.Name = "gvMx1guid";
             this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Width = 94;
+            this.gvMx1guid.Width = 117;
             // 
             // gridColumn15
             // 
             this.gridColumn15.Caption = "鏄惁鍏ュ簱";
             this.gridColumn15.FieldName = "isRk";
-            this.gridColumn15.MinWidth = 25;
+            this.gridColumn15.MinWidth = 31;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
             this.gridColumn15.VisibleIndex = 0;
-            this.gridColumn15.Width = 94;
+            this.gridColumn15.Width = 117;
             // 
             // gvMx1itemBarcode
             // 
             this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemBarcode.Caption = "鐗╂枡鏉$爜";
             this.gvMx1itemBarcode.FieldName = "itemBarcode";
-            this.gvMx1itemBarcode.MinWidth = 300;
+            this.gvMx1itemBarcode.MinWidth = 375;
             this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";
             this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx1itemBarcode.Visible = true;
             this.gvMx1itemBarcode.VisibleIndex = 1;
-            this.gvMx1itemBarcode.Width = 300;
+            this.gvMx1itemBarcode.Width = 375;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "鐗╂枡缂栫爜";
             this.gridColumn4.FieldName = "itemNo";
-            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.MinWidth = 31;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 2;
-            this.gridColumn4.Width = 94;
+            this.gridColumn4.Width = 117;
             // 
             // gridColumn9
             // 
             this.gridColumn9.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn9.FieldName = "itemName";
-            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.MinWidth = 31;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 3;
-            this.gridColumn9.Width = 94;
+            this.gridColumn9.Width = 117;
             // 
             // gridColumn8
             // 
             this.gridColumn8.Caption = "瑙勬牸鍨嬪彿";
             this.gridColumn8.FieldName = "itemModel";
-            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.MinWidth = 31;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
             this.gridColumn8.VisibleIndex = 4;
-            this.gridColumn8.Width = 94;
+            this.gridColumn8.Width = 117;
             // 
             // gvMx1quantity
             // 
             this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
             this.gvMx1quantity.Caption = "鏁伴噺";
             this.gvMx1quantity.FieldName = "quantity";
-            this.gvMx1quantity.MinWidth = 50;
+            this.gvMx1quantity.MinWidth = 62;
             this.gvMx1quantity.Name = "gvMx1quantity";
             this.gvMx1quantity.Tag = "query_a.QUANTITY";
             this.gvMx1quantity.Visible = true;
             this.gvMx1quantity.VisibleIndex = 5;
-            this.gvMx1quantity.Width = 94;
+            this.gvMx1quantity.Width = 117;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "鍗曚綅";
             this.gridColumn7.FieldName = "dwName";
-            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.MinWidth = 31;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
             this.gridColumn7.VisibleIndex = 6;
-            this.gridColumn7.Width = 94;
+            this.gridColumn7.Width = 117;
             // 
             // gvMx1createBy
             // 
             this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
             this.gvMx1createBy.Caption = "鍒涘缓浜�";
             this.gvMx1createBy.FieldName = "createBy";
-            this.gvMx1createBy.MinWidth = 50;
+            this.gvMx1createBy.MinWidth = 62;
             this.gvMx1createBy.Name = "gvMx1createBy";
             this.gvMx1createBy.Tag = "query_a.CREATE_BY";
             this.gvMx1createBy.Visible = true;
             this.gvMx1createBy.VisibleIndex = 7;
-            this.gvMx1createBy.Width = 94;
+            this.gvMx1createBy.Width = 117;
             // 
             // gvMx1lotDate
             // 
             this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;
             this.gvMx1lotDate.Caption = "鍒涘缓鏃ユ湡";
             this.gvMx1lotDate.FieldName = "createDate";
-            this.gvMx1lotDate.MinWidth = 50;
+            this.gvMx1lotDate.MinWidth = 62;
             this.gvMx1lotDate.Name = "gvMx1lotDate";
             this.gvMx1lotDate.Tag = "query_a.LOT_DATE";
             this.gvMx1lotDate.Visible = true;
             this.gvMx1lotDate.VisibleIndex = 8;
-            this.gvMx1lotDate.Width = 94;
+            this.gvMx1lotDate.Width = 117;
             // 
             // gridColumn14
             // 
             this.gridColumn14.Caption = "鍏ュ簱浜�";
             this.gridColumn14.FieldName = "rkUser";
-            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.MinWidth = 31;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
             this.gridColumn14.VisibleIndex = 9;
-            this.gridColumn14.Width = 94;
+            this.gridColumn14.Width = 117;
             // 
             // gridColumn17
             // 
             this.gridColumn17.Caption = "鍏ュ簱浣�";
             this.gridColumn17.FieldName = "rkPositon";
-            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.MinWidth = 31;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
             this.gridColumn17.VisibleIndex = 10;
-            this.gridColumn17.Width = 94;
+            this.gridColumn17.Width = 117;
             // 
             // gridColumn16
             // 
             this.gridColumn16.Caption = "鍏ュ簱鏃ユ湡";
             this.gridColumn16.FieldName = "rkDate";
-            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.MinWidth = 31;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
             this.gridColumn16.VisibleIndex = 11;
-            this.gridColumn16.Width = 94;
+            this.gridColumn16.Width = 117;
             // 
             // picCheckBox
             // 
             this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(1016, 45);
+            this.picCheckBox.Location = new System.Drawing.Point(1270, 55);
+            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+            this.picCheckBox.Size = new System.Drawing.Size(125, 61);
             this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.picCheckBox.TabIndex = 5;
             this.picCheckBox.TabStop = false;
@@ -2333,12 +2391,13 @@
             // 
             // Frm_MesItemTbl
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1426, 704);
+            this.ClientSize = new System.Drawing.Size(1782, 860);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Frm_MesItemTbl";
             this.Text = "鐢熶骇閫�鏂欑敵璇�";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index 885cc74..5c87515 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -192,7 +192,7 @@
                 DataTable dt = (DataTable)gcMx1.DataSource;
                 foreach (DataRow row in dt.Rows)
                 {
-                    string guid = row["guid"].ToString();
+                    string guid = row["tlid"].ToString();
                     string psnQty = row["kdy"].ToString();
                     if (string.IsNullOrEmpty(psnQty))
                     {

--
Gitblit v1.9.3