From 779c4686f761f526a9a8546d3a2b01a2684fcbe7 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期六, 27 九月 2025 09:17:46 +0800
Subject: [PATCH] 修改工单字段配置

---
 DevApp/Gs.DevApp/Program.cs                        |    4 
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 1177 +++++++++++++++++++++++++++++++---------------------------
 2 files changed, 637 insertions(+), 544 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index f66ae88..2bba5f8 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -517,9 +517,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(3, 2, 3, 2);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1652, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1446, 62);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -527,10 +528,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, 62);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1652, 740);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1446, 576);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -539,8 +541,9 @@
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1650, 708);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1444, 550);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -549,6 +552,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(3, 2, 3, 2);
             this.split1.Name = "split1";
             // 
             // split1.Panel1
@@ -561,17 +565,19 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1650, 708);
+            this.split1.Size = new System.Drawing.Size(1444, 550);
             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(3, 2, 3, 2);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1650, 657);
+            this.gcMain1.Size = new System.Drawing.Size(1444, 510);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -581,7 +587,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 = 39;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn5,
             this.gridColumn7,
@@ -617,8 +623,9 @@
             this.gridColumn24,
             this.gridColumn25,
             this.gridColumn52});
+            this.gridView1.DetailHeight = 272;
             this.gridView1.GridControl = this.gcMain1;
-            this.gridView1.IndicatorWidth = 50;
+            this.gridView1.IndicatorWidth = 44;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -628,185 +635,185 @@
             // 
             this.gridColumn5.Caption = "缁撴鏍囪瘑";
             this.gridColumn5.FieldName = "jabzChk";
-            this.gridColumn5.MaxWidth = 50;
-            this.gridColumn5.MinWidth = 50;
+            this.gridColumn5.MaxWidth = 44;
+            this.gridColumn5.MinWidth = 44;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Tag = "query_a.jabs";
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 0;
-            this.gridColumn5.Width = 50;
+            this.gridColumn5.Width = 44;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "澶囨枡榻愬";
             this.gridColumn7.FieldName = "isQt";
-            this.gridColumn7.MaxWidth = 50;
-            this.gridColumn7.MinWidth = 50;
+            this.gridColumn7.MaxWidth = 44;
+            this.gridColumn7.MinWidth = 44;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Tag = "query_a.jabs";
             this.gridColumn7.Visible = true;
             this.gridColumn7.VisibleIndex = 1;
-            this.gridColumn7.Width = 50;
+            this.gridColumn7.Width = 44;
             // 
             // gridColumn10
             // 
             this.gridColumn10.Caption = "棣栨鍚堟牸";
             this.gridColumn10.FieldName = "isSj";
-            this.gridColumn10.MaxWidth = 50;
-            this.gridColumn10.MinWidth = 50;
+            this.gridColumn10.MaxWidth = 44;
+            this.gridColumn10.MinWidth = 44;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Tag = "query_a.jabs";
             this.gridColumn10.Visible = true;
             this.gridColumn10.VisibleIndex = 2;
-            this.gridColumn10.Width = 50;
+            this.gridColumn10.Width = 44;
             // 
             // gridColumn12
             // 
             this.gridColumn12.Caption = "FQC鍚堟牸";
             this.gridColumn12.FieldName = "fqcHg";
-            this.gridColumn12.MaxWidth = 50;
-            this.gridColumn12.MinWidth = 50;
+            this.gridColumn12.MaxWidth = 44;
+            this.gridColumn12.MinWidth = 44;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Tag = "query_a.jabs";
             this.gridColumn12.Visible = true;
             this.gridColumn12.VisibleIndex = 3;
-            this.gridColumn12.Width = 50;
+            this.gridColumn12.Width = 44;
             // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "閫氱煡澶囨枡";
             this.gridColumn6.FieldName = "tzbs";
-            this.gridColumn6.MaxWidth = 50;
-            this.gridColumn6.MinWidth = 50;
+            this.gridColumn6.MaxWidth = 44;
+            this.gridColumn6.MinWidth = 44;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Tag = "query_a.jabs";
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 4;
-            this.gridColumn6.Width = 50;
+            this.gridColumn6.Width = 44;
             // 
             // gridColumn27
             // 
             this.gridColumn27.Caption = "澶囨枡绾у埆";
             this.gridColumn27.FieldName = "daa022Remark";
-            this.gridColumn27.MinWidth = 25;
+            this.gridColumn27.MinWidth = 22;
             this.gridColumn27.Name = "gridColumn27";
             this.gridColumn27.Visible = true;
             this.gridColumn27.VisibleIndex = 20;
-            this.gridColumn27.Width = 94;
+            this.gridColumn27.Width = 82;
             // 
             // gv_daa018
             // 
             this.gv_daa018.AppearanceCell.Options.UseFont = true;
             this.gv_daa018.Caption = "宸ュ崟鐘舵��";
             this.gv_daa018.FieldName = "daa018Txt";
-            this.gv_daa018.MinWidth = 90;
+            this.gv_daa018.MinWidth = 79;
             this.gv_daa018.Name = "gv_daa018";
             this.gv_daa018.OptionsColumn.AllowEdit = false;
             this.gv_daa018.Tag = "query_a.daa018";
             this.gv_daa018.Visible = true;
             this.gv_daa018.VisibleIndex = 5;
-            this.gv_daa018.Width = 90;
+            this.gv_daa018.Width = 79;
             // 
             // gridColoun100
             // 
             this.gridColoun100.Caption = "鐢熶骇缁勭粐";
             this.gridColoun100.FieldName = "fSubsidiary";
-            this.gridColoun100.MinWidth = 50;
+            this.gridColoun100.MinWidth = 44;
             this.gridColoun100.Name = "gridColoun100";
             this.gridColoun100.Tag = "org.fnamber";
             this.gridColoun100.Visible = true;
             this.gridColoun100.VisibleIndex = 29;
-            this.gridColoun100.Width = 250;
+            this.gridColoun100.Width = 219;
             // 
             // gv_daa001
             // 
             this.gv_daa001.AppearanceCell.Options.UseFont = true;
             this.gv_daa001.Caption = "宸ュ崟鍗曞彿";
             this.gv_daa001.FieldName = "daa001";
-            this.gv_daa001.MinWidth = 50;
+            this.gv_daa001.MinWidth = 44;
             this.gv_daa001.Name = "gv_daa001";
             this.gv_daa001.OptionsColumn.AllowEdit = false;
             this.gv_daa001.Tag = "query_a.daa001";
             this.gv_daa001.Visible = true;
             this.gv_daa001.VisibleIndex = 6;
-            this.gv_daa001.Width = 120;
+            this.gv_daa001.Width = 105;
             // 
             // gv_daa021
             // 
             this.gv_daa021.AppearanceCell.Options.UseFont = true;
             this.gv_daa021.Caption = "鎶曟枡鍗曞彿";
             this.gv_daa021.FieldName = "daa014";
-            this.gv_daa021.MinWidth = 50;
+            this.gv_daa021.MinWidth = 44;
             this.gv_daa021.Name = "gv_daa021";
             this.gv_daa021.OptionsColumn.AllowEdit = false;
             this.gv_daa021.Tag = "query_a.daa021";
             this.gv_daa021.Visible = true;
             this.gv_daa021.VisibleIndex = 7;
-            this.gv_daa021.Width = 100;
+            this.gv_daa021.Width = 87;
             // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "鐗╂枡缂栫爜";
             this.gridColumn3.FieldName = "itemNo";
-            this.gridColumn3.MinWidth = 50;
+            this.gridColumn3.MinWidth = 44;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
             this.gridColumn3.VisibleIndex = 11;
-            this.gridColumn3.Width = 94;
+            this.gridColumn3.Width = 82;
             // 
             // gv_daa003
             // 
             this.gv_daa003.AppearanceCell.Options.UseFont = true;
             this.gv_daa003.Caption = "浜у搧鍚嶇О";
-            this.gv_daa003.FieldName = "daa003";
-            this.gv_daa003.MinWidth = 50;
+            this.gv_daa003.FieldName = "itemName";
+            this.gv_daa003.MinWidth = 44;
             this.gv_daa003.Name = "gv_daa003";
             this.gv_daa003.OptionsColumn.AllowEdit = false;
-            this.gv_daa003.Tag = "query_a.daa003";
+            this.gv_daa003.Tag = "query_s.item_name";
             this.gv_daa003.Visible = true;
             this.gv_daa003.VisibleIndex = 12;
-            this.gv_daa003.Width = 150;
+            this.gv_daa003.Width = 131;
             // 
             // gv_daa004
             // 
             this.gv_daa004.AppearanceCell.Options.UseFont = true;
             this.gv_daa004.Caption = "浜у搧瑙勬牸";
-            this.gv_daa004.FieldName = "daa004";
-            this.gv_daa004.MinWidth = 50;
+            this.gv_daa004.FieldName = "itemModel";
+            this.gv_daa004.MinWidth = 44;
             this.gv_daa004.Name = "gv_daa004";
             this.gv_daa004.OptionsColumn.AllowEdit = false;
-            this.gv_daa004.Tag = "query_a.daa004";
+            this.gv_daa004.Tag = "query_s.item_model";
             this.gv_daa004.Visible = true;
             this.gv_daa004.VisibleIndex = 13;
-            this.gv_daa004.Width = 150;
+            this.gv_daa004.Width = 131;
             // 
             // gv_daa008
             // 
             this.gv_daa008.AppearanceCell.Options.UseFont = true;
             this.gv_daa008.Caption = "宸ュ崟鏁伴噺";
             this.gv_daa008.FieldName = "daa008";
-            this.gv_daa008.MaxWidth = 50;
-            this.gv_daa008.MinWidth = 50;
+            this.gv_daa008.MaxWidth = 44;
+            this.gv_daa008.MinWidth = 44;
             this.gv_daa008.Name = "gv_daa008";
             this.gv_daa008.OptionsColumn.AllowEdit = false;
             this.gv_daa008.Tag = "query_a.daa008";
             this.gv_daa008.Visible = true;
             this.gv_daa008.VisibleIndex = 14;
-            this.gv_daa008.Width = 50;
+            this.gv_daa008.Width = 44;
             // 
             // gv_daa011
             // 
             this.gv_daa011.AppearanceCell.Options.UseFont = true;
             this.gv_daa011.Caption = "宸茬敓浜ч噺";
             this.gv_daa011.FieldName = "daa011";
-            this.gv_daa011.MaxWidth = 50;
-            this.gv_daa011.MinWidth = 50;
+            this.gv_daa011.MaxWidth = 44;
+            this.gv_daa011.MinWidth = 44;
             this.gv_daa011.Name = "gv_daa011";
             this.gv_daa011.OptionsColumn.AllowEdit = false;
             this.gv_daa011.Tag = "query_a.daa011";
             this.gv_daa011.Visible = true;
             this.gv_daa011.VisibleIndex = 15;
-            this.gv_daa011.Width = 50;
+            this.gv_daa011.Width = 44;
             // 
             // gridColumn4
             // 
@@ -816,237 +823,238 @@
             this.gridColumn4.AppearanceHeader.Options.UseForeColor = true;
             this.gridColumn4.Caption = "寰呯敓浜ч噺";
             this.gridColumn4.FieldName = "dscl";
-            this.gridColumn4.MaxWidth = 50;
-            this.gridColumn4.MinWidth = 50;
+            this.gridColumn4.MaxWidth = 44;
+            this.gridColumn4.MinWidth = 44;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 16;
-            this.gridColumn4.Width = 50;
+            this.gridColumn4.Width = 44;
             // 
             // gv_daa010
             // 
             this.gv_daa010.AppearanceCell.Options.UseFont = true;
             this.gv_daa010.Caption = "鍏ュ簱鏁伴噺";
             this.gv_daa010.FieldName = "daa010";
-            this.gv_daa010.MaxWidth = 50;
-            this.gv_daa010.MinWidth = 50;
+            this.gv_daa010.MaxWidth = 44;
+            this.gv_daa010.MinWidth = 44;
             this.gv_daa010.Name = "gv_daa010";
             this.gv_daa010.OptionsColumn.AllowEdit = false;
             this.gv_daa010.Tag = "query_a.daa010";
             this.gv_daa010.Visible = true;
             this.gv_daa010.VisibleIndex = 18;
-            this.gv_daa010.Width = 50;
+            this.gv_daa010.Width = 44;
             // 
             // gv_daa005
             // 
             this.gv_daa005.AppearanceCell.Options.UseFont = true;
             this.gv_daa005.Caption = "鍗曚綅";
             this.gv_daa005.FieldName = "fname";
-            this.gv_daa005.MaxWidth = 50;
-            this.gv_daa005.MinWidth = 50;
+            this.gv_daa005.MaxWidth = 44;
+            this.gv_daa005.MinWidth = 44;
             this.gv_daa005.Name = "gv_daa005";
             this.gv_daa005.OptionsColumn.AllowEdit = false;
             this.gv_daa005.Tag = "query_a.daa005";
             this.gv_daa005.Visible = true;
             this.gv_daa005.VisibleIndex = 19;
-            this.gv_daa005.Width = 50;
+            this.gv_daa005.Width = 44;
             // 
             // gv_cust
             // 
             this.gv_cust.AppearanceCell.Options.UseFont = true;
             this.gv_cust.Caption = "闇�姹傚崟鍙�";
             this.gv_cust.FieldName = "saleNo";
-            this.gv_cust.MinWidth = 50;
+            this.gv_cust.MinWidth = 44;
             this.gv_cust.Name = "gv_cust";
             this.gv_cust.OptionsColumn.AllowEdit = false;
             this.gv_cust.Tag = "query_a.cust";
-            this.gv_cust.Width = 100;
+            this.gv_cust.Width = 87;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鐢熶骇杞﹂棿";
             this.gridColumn1.FieldName = "dptName";
-            this.gridColumn1.MinWidth = 50;
+            this.gridColumn1.MinWidth = 44;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 21;
-            this.gridColumn1.Width = 94;
+            this.gridColumn1.Width = 82;
             // 
             // gv_daa015
             // 
             this.gv_daa015.AppearanceCell.Options.UseFont = true;
             this.gv_daa015.Caption = "鐢熶骇绾垮埆";
             this.gv_daa015.FieldName = "lineName";
-            this.gv_daa015.MinWidth = 50;
+            this.gv_daa015.MinWidth = 44;
             this.gv_daa015.Name = "gv_daa015";
             this.gv_daa015.OptionsColumn.AllowEdit = false;
             this.gv_daa015.Tag = "query_a.daa015";
             this.gv_daa015.Visible = true;
             this.gv_daa015.VisibleIndex = 9;
-            this.gv_daa015.Width = 94;
+            this.gv_daa015.Width = 82;
             // 
             // gv_daa009
             // 
             this.gv_daa009.AppearanceCell.Options.UseFont = true;
             this.gv_daa009.Caption = "澶囨敞";
             this.gv_daa009.FieldName = "daa009";
-            this.gv_daa009.MinWidth = 50;
+            this.gv_daa009.MinWidth = 44;
             this.gv_daa009.Name = "gv_daa009";
             this.gv_daa009.OptionsColumn.AllowEdit = false;
             this.gv_daa009.Tag = "query_a.daa009";
             this.gv_daa009.Visible = true;
             this.gv_daa009.VisibleIndex = 17;
-            this.gv_daa009.Width = 94;
+            this.gv_daa009.Width = 82;
             // 
             // gv_prepareTime
             // 
             this.gv_prepareTime.AppearanceCell.Options.UseFont = true;
             this.gv_prepareTime.Caption = "棰勮澶囨枡鏃堕棿";
             this.gv_prepareTime.FieldName = "prepareTime";
-            this.gv_prepareTime.MinWidth = 50;
+            this.gv_prepareTime.MinWidth = 44;
             this.gv_prepareTime.Name = "gv_prepareTime";
             this.gv_prepareTime.OptionsColumn.AllowEdit = false;
             this.gv_prepareTime.Tag = "query_a.prepare_time";
-            this.gv_prepareTime.Width = 180;
+            this.gv_prepareTime.Width = 157;
             // 
             // gv_daa028
             // 
             this.gv_daa028.AppearanceCell.Options.UseFont = true;
             this.gv_daa028.Caption = "澶囨枡瀹屾垚鏃堕棿";
             this.gv_daa028.FieldName = "daa028";
-            this.gv_daa028.MinWidth = 50;
+            this.gv_daa028.MinWidth = 44;
             this.gv_daa028.Name = "gv_daa028";
             this.gv_daa028.OptionsColumn.AllowEdit = false;
             this.gv_daa028.Tag = "query_a.daa028";
-            this.gv_daa028.Width = 180;
+            this.gv_daa028.Width = 157;
             // 
             // gv_daa016
             // 
             this.gv_daa016.AppearanceCell.Options.UseFont = true;
             this.gv_daa016.Caption = "瀹為檯寮�宸ユ棩";
             this.gv_daa016.FieldName = "daa016";
-            this.gv_daa016.MinWidth = 50;
+            this.gv_daa016.MinWidth = 44;
             this.gv_daa016.Name = "gv_daa016";
             this.gv_daa016.OptionsColumn.AllowEdit = false;
             this.gv_daa016.Tag = "query_a.daa016";
             this.gv_daa016.Visible = true;
             this.gv_daa016.VisibleIndex = 22;
-            this.gv_daa016.Width = 180;
+            this.gv_daa016.Width = 157;
             // 
             // gv_daa017
             // 
             this.gv_daa017.AppearanceCell.Options.UseFont = true;
             this.gv_daa017.Caption = "瀹為檯瀹屽伐鏃�";
             this.gv_daa017.FieldName = "daa017";
-            this.gv_daa017.MinWidth = 50;
+            this.gv_daa017.MinWidth = 44;
             this.gv_daa017.Name = "gv_daa017";
             this.gv_daa017.OptionsColumn.AllowEdit = false;
             this.gv_daa017.Tag = "query_a.daa017";
             this.gv_daa017.Visible = true;
             this.gv_daa017.VisibleIndex = 23;
-            this.gv_daa017.Width = 180;
+            this.gv_daa017.Width = 157;
             // 
             // gv_mesStartProd
             // 
             this.gv_mesStartProd.AppearanceCell.Options.UseFont = true;
             this.gv_mesStartProd.Caption = "MES棰勮寮�宸ユ椂闂�";
             this.gv_mesStartProd.FieldName = "mesStartProd";
-            this.gv_mesStartProd.MinWidth = 50;
+            this.gv_mesStartProd.MinWidth = 44;
             this.gv_mesStartProd.Name = "gv_mesStartProd";
             this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
             this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
             this.gv_mesStartProd.Visible = true;
             this.gv_mesStartProd.VisibleIndex = 24;
-            this.gv_mesStartProd.Width = 180;
+            this.gv_mesStartProd.Width = 157;
             // 
             // gv_mesEndProd
             // 
             this.gv_mesEndProd.AppearanceCell.Options.UseFont = true;
             this.gv_mesEndProd.Caption = "MES棰勮瀹屽伐鏃堕棿";
             this.gv_mesEndProd.FieldName = "mesEndProd";
-            this.gv_mesEndProd.MinWidth = 50;
+            this.gv_mesEndProd.MinWidth = 44;
             this.gv_mesEndProd.Name = "gv_mesEndProd";
             this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
             this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
             this.gv_mesEndProd.Visible = true;
             this.gv_mesEndProd.VisibleIndex = 25;
-            this.gv_mesEndProd.Width = 180;
+            this.gv_mesEndProd.Width = 157;
             // 
             // gridColumn21
             // 
             this.gridColumn21.Caption = "鎺掍骇浜�";
             this.gridColumn21.FieldName = "pcUser";
-            this.gridColumn21.MinWidth = 25;
+            this.gridColumn21.MinWidth = 22;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
             this.gridColumn21.VisibleIndex = 26;
-            this.gridColumn21.Width = 94;
+            this.gridColumn21.Width = 82;
             // 
             // gridColumn22
             // 
             this.gridColumn22.Caption = "鎺掍骇鏃堕棿";
             this.gridColumn22.FieldName = "pcDate";
-            this.gridColumn22.MinWidth = 25;
+            this.gridColumn22.MinWidth = 22;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
             this.gridColumn22.VisibleIndex = 27;
-            this.gridColumn22.Width = 94;
+            this.gridColumn22.Width = 82;
             // 
             // gridColumn23
             // 
             this.gridColumn23.Caption = "涓婚敭GUID";
             this.gridColumn23.FieldName = "guid";
-            this.gridColumn23.MinWidth = 25;
+            this.gridColumn23.MinWidth = 22;
             this.gridColumn23.Name = "gridColumn23";
-            this.gridColumn23.Width = 94;
+            this.gridColumn23.Width = 82;
             // 
             // gridColumn24
             // 
             this.gridColumn24.Caption = "鎺掍骇缂栧彿";
             this.gridColumn24.FieldName = "pcHNo";
-            this.gridColumn24.MinWidth = 25;
+            this.gridColumn24.MinWidth = 22;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
             this.gridColumn24.VisibleIndex = 28;
-            this.gridColumn24.Width = 94;
+            this.gridColumn24.Width = 82;
             // 
             // gridColumn25
             // 
             this.gridColumn25.Caption = "浠诲姟鍗曞彿";
             this.gridColumn25.FieldName = "daa021";
-            this.gridColumn25.MinWidth = 25;
+            this.gridColumn25.MinWidth = 22;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
             this.gridColumn25.VisibleIndex = 8;
-            this.gridColumn25.Width = 94;
+            this.gridColumn25.Width = 82;
             // 
             // gridColumn52
             // 
             this.gridColumn52.Caption = "鐢熶骇绫诲瀷";
             this.gridColumn52.FieldName = "daa025";
-            this.gridColumn52.MinWidth = 25;
+            this.gridColumn52.MinWidth = 22;
             this.gridColumn52.Name = "gridColumn52";
             this.gridColumn52.Visible = true;
             this.gridColumn52.VisibleIndex = 10;
-            this.gridColumn52.Width = 94;
+            this.gridColumn52.Width = 82;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 657);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.pageBar1.Location = new System.Drawing.Point(0, 510);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1650, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1444, 30);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
             // xtraTabPage2
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1650, 708);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1444, 550);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -1054,6 +1062,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(3, 2, 3, 2);
             this.splitMx1.Name = "splitMx1";
             // 
             // splitMx1.Panel1
@@ -1066,8 +1075,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(1650, 708);
-            this.splitMx1.SplitterPosition = 192;
+            this.splitMx1.Size = new System.Drawing.Size(1444, 550);
+            this.splitMx1.SplitterPosition = 149;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -1105,260 +1114,286 @@
             this.layoutControlItem18,
             this.layoutControlItem41});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(797, 526, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1650, 192);
+            this.layoutMx1.Size = new System.Drawing.Size(1444, 149);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
             // txt_daa015
             // 
             this.txt_daa015.IsReadly = false;
-            this.txt_daa015.Location = new System.Drawing.Point(928, 155);
+            this.txt_daa015.Location = new System.Drawing.Point(805, 130);
+            this.txt_daa015.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa015.Name = "txt_daa015";
-            this.txt_daa015.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa015.Size = new System.Drawing.Size(270, 20);
             this.txt_daa015.TabIndex = 478;
             // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(825, 236);
+            this.lbGuid.Location = new System.Drawing.Point(722, 184);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(268, 25);
+            this.lbGuid.Size = new System.Drawing.Size(234, 19);
             this.lbGuid.TabIndex = 1;
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
             // 
             // txt_daa009
             // 
-            this.txt_daa009.Location = new System.Drawing.Point(521, 155);
+            this.txt_daa009.Location = new System.Drawing.Point(449, 130);
+            this.txt_daa009.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa009.Name = "txt_daa009";
             this.txt_daa009.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa009.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa009.Size = new System.Drawing.Size(270, 20);
             this.txt_daa009.StyleController = this.layoutMx1;
             this.txt_daa009.TabIndex = 240;
             this.txt_daa009.Tag = "";
             // 
             // txt_daa013
             // 
-            this.txt_daa013.Location = new System.Drawing.Point(726, 119);
+            this.txt_daa013.Location = new System.Drawing.Point(635, 93);
+            this.txt_daa013.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa013.Name = "txt_daa013";
             this.txt_daa013.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa013.Size = new System.Drawing.Size(200, 24);
+            this.txt_daa013.Size = new System.Drawing.Size(175, 20);
             this.txt_daa013.StyleController = this.layoutMx1;
             this.txt_daa013.TabIndex = 472;
             this.txt_daa013.Tag = "readonly";
             // 
             // txt_daa001
             // 
-            this.txt_daa001.Location = new System.Drawing.Point(114, 12);
+            this.txt_daa001.Location = new System.Drawing.Point(93, 10);
+            this.txt_daa001.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa001.Name = "txt_daa001";
             this.txt_daa001.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa001.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa001.Size = new System.Drawing.Size(270, 20);
             this.txt_daa001.StyleController = this.layoutMx1;
             this.txt_daa001.TabIndex = 216;
             this.txt_daa001.Tag = "readonly";
             // 
             // txt_daa008
             // 
-            this.txt_daa008.Location = new System.Drawing.Point(928, 12);
+            this.txt_daa008.Location = new System.Drawing.Point(805, 10);
+            this.txt_daa008.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa008.Name = "txt_daa008";
             this.txt_daa008.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa008.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa008.Size = new System.Drawing.Size(270, 20);
             this.txt_daa008.StyleController = this.layoutMx1;
             this.txt_daa008.TabIndex = 235;
             this.txt_daa008.Tag = "readonly";
             // 
             // txt_saleOrderNo
             // 
-            this.txt_saleOrderNo.Location = new System.Drawing.Point(928, 126);
+            this.txt_saleOrderNo.Location = new System.Drawing.Point(805, 106);
+            this.txt_saleOrderNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_saleOrderNo.Name = "txt_saleOrderNo";
             this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_saleOrderNo.Size = new System.Drawing.Size(301, 24);
+            this.txt_saleOrderNo.Size = new System.Drawing.Size(270, 20);
             this.txt_saleOrderNo.StyleController = this.layoutMx1;
             this.txt_saleOrderNo.TabIndex = 465;
             this.txt_saleOrderNo.Tag = "readonly";
             // 
             // txt_mesStartProd
             // 
-            this.txt_mesStartProd.Location = new System.Drawing.Point(1335, 12);
+            this.txt_mesStartProd.Location = new System.Drawing.Point(1161, 10);
+            this.txt_mesStartProd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_mesStartProd.Name = "txt_mesStartProd";
             this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesStartProd.Size = new System.Drawing.Size(303, 24);
+            this.txt_mesStartProd.Size = new System.Drawing.Size(272, 20);
             this.txt_mesStartProd.StyleController = this.layoutMx1;
             this.txt_mesStartProd.TabIndex = 336;
             this.txt_mesStartProd.Tag = "readonly";
             // 
             // txt_daa014
             // 
-            this.txt_daa014.Location = new System.Drawing.Point(114, 40);
+            this.txt_daa014.Location = new System.Drawing.Point(93, 34);
+            this.txt_daa014.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa014.Name = "txt_daa014";
             this.txt_daa014.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa014.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa014.Size = new System.Drawing.Size(270, 20);
             this.txt_daa014.StyleController = this.layoutMx1;
             this.txt_daa014.TabIndex = 327;
             this.txt_daa014.Tag = "readonly";
             // 
             // txt_daa022Remark
             // 
-            this.txt_daa022Remark.Location = new System.Drawing.Point(521, 12);
+            this.txt_daa022Remark.Location = new System.Drawing.Point(449, 10);
+            this.txt_daa022Remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa022Remark.Name = "txt_daa022Remark";
             this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa022Remark.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa022Remark.Size = new System.Drawing.Size(270, 20);
             this.txt_daa022Remark.StyleController = this.layoutMx1;
             this.txt_daa022Remark.TabIndex = 462;
             this.txt_daa022Remark.Tag = "readonly";
             // 
             // txt_daa010
             // 
-            this.txt_daa010.Location = new System.Drawing.Point(928, 40);
+            this.txt_daa010.Location = new System.Drawing.Point(805, 34);
+            this.txt_daa010.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa010.Name = "txt_daa010";
             this.txt_daa010.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa010.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa010.Size = new System.Drawing.Size(270, 20);
             this.txt_daa010.StyleController = this.layoutMx1;
             this.txt_daa010.TabIndex = 243;
             this.txt_daa010.Tag = "readonly";
             // 
             // txt_mesEndProd
             // 
-            this.txt_mesEndProd.Location = new System.Drawing.Point(1335, 40);
+            this.txt_mesEndProd.Location = new System.Drawing.Point(1161, 34);
+            this.txt_mesEndProd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_mesEndProd.Name = "txt_mesEndProd";
             this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesEndProd.Size = new System.Drawing.Size(303, 24);
+            this.txt_mesEndProd.Size = new System.Drawing.Size(272, 20);
             this.txt_mesEndProd.StyleController = this.layoutMx1;
             this.txt_mesEndProd.TabIndex = 338;
             this.txt_mesEndProd.Tag = "readonly";
             // 
             // txt_daa011
             // 
-            this.txt_daa011.Location = new System.Drawing.Point(928, 68);
+            this.txt_daa011.Location = new System.Drawing.Point(805, 58);
+            this.txt_daa011.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa011.Name = "txt_daa011";
             this.txt_daa011.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa011.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa011.Size = new System.Drawing.Size(270, 20);
             this.txt_daa011.StyleController = this.layoutMx1;
             this.txt_daa011.TabIndex = 247;
             this.txt_daa011.Tag = "readonly";
             // 
             // txt_dptName
             // 
-            this.txt_dptName.Location = new System.Drawing.Point(521, 40);
+            this.txt_dptName.Location = new System.Drawing.Point(449, 34);
+            this.txt_dptName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_dptName.Name = "txt_dptName";
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(301, 24);
+            this.txt_dptName.Size = new System.Drawing.Size(270, 20);
             this.txt_dptName.StyleController = this.layoutMx1;
             this.txt_dptName.TabIndex = 258;
             this.txt_dptName.Tag = "readonly";
             // 
             // txt_daa016
             // 
-            this.txt_daa016.Location = new System.Drawing.Point(1335, 68);
+            this.txt_daa016.Location = new System.Drawing.Point(1161, 58);
+            this.txt_daa016.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa016.Name = "txt_daa016";
             this.txt_daa016.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa016.Size = new System.Drawing.Size(303, 24);
+            this.txt_daa016.Size = new System.Drawing.Size(272, 20);
             this.txt_daa016.StyleController = this.layoutMx1;
             this.txt_daa016.TabIndex = 273;
             this.txt_daa016.Tag = "readonly";
             // 
             // txt_daa029
             // 
-            this.txt_daa029.Location = new System.Drawing.Point(114, 97);
+            this.txt_daa029.Location = new System.Drawing.Point(93, 82);
+            this.txt_daa029.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa029.Name = "txt_daa029";
             this.txt_daa029.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa029.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa029.Size = new System.Drawing.Size(270, 20);
             this.txt_daa029.StyleController = this.layoutMx1;
             this.txt_daa029.TabIndex = 217;
             this.txt_daa029.Tag = "readonly";
             // 
             // txt_lineName
             // 
-            this.txt_lineName.Location = new System.Drawing.Point(521, 68);
+            this.txt_lineName.Location = new System.Drawing.Point(449, 58);
+            this.txt_lineName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_lineName.Name = "txt_lineName";
             this.txt_lineName.Properties.Appearance.Options.UseFont = true;
-            this.txt_lineName.Size = new System.Drawing.Size(301, 24);
+            this.txt_lineName.Size = new System.Drawing.Size(270, 20);
             this.txt_lineName.StyleController = this.layoutMx1;
             this.txt_lineName.TabIndex = 267;
             this.txt_lineName.Tag = "readonly";
             // 
             // txt_daa017
             // 
-            this.txt_daa017.Location = new System.Drawing.Point(1335, 97);
+            this.txt_daa017.Location = new System.Drawing.Point(1161, 82);
+            this.txt_daa017.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa017.Name = "txt_daa017";
             this.txt_daa017.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa017.Size = new System.Drawing.Size(303, 24);
+            this.txt_daa017.Size = new System.Drawing.Size(272, 20);
             this.txt_daa017.StyleController = this.layoutMx1;
             this.txt_daa017.TabIndex = 280;
             this.txt_daa017.Tag = "readonly";
             // 
             // txt_daa003
             // 
-            this.txt_daa003.Location = new System.Drawing.Point(114, 126);
+            this.txt_daa003.Location = new System.Drawing.Point(93, 106);
+            this.txt_daa003.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa003.Name = "txt_daa003";
             this.txt_daa003.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa003.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa003.Size = new System.Drawing.Size(270, 20);
             this.txt_daa003.StyleController = this.layoutMx1;
             this.txt_daa003.TabIndex = 219;
             this.txt_daa003.Tag = "readonly";
             // 
             // txt_dwName
             // 
-            this.txt_dwName.Location = new System.Drawing.Point(928, 97);
+            this.txt_dwName.Location = new System.Drawing.Point(805, 82);
+            this.txt_dwName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_dwName.Name = "txt_dwName";
             this.txt_dwName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dwName.Size = new System.Drawing.Size(301, 24);
+            this.txt_dwName.Size = new System.Drawing.Size(270, 20);
             this.txt_dwName.StyleController = this.layoutMx1;
             this.txt_dwName.TabIndex = 226;
             this.txt_dwName.Tag = "readonly";
             // 
             // txt_daa004
             // 
-            this.txt_daa004.Location = new System.Drawing.Point(114, 155);
+            this.txt_daa004.Location = new System.Drawing.Point(93, 130);
+            this.txt_daa004.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa004.Name = "txt_daa004";
             this.txt_daa004.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa004.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa004.Size = new System.Drawing.Size(270, 20);
             this.txt_daa004.StyleController = this.layoutMx1;
             this.txt_daa004.TabIndex = 222;
             this.txt_daa004.Tag = "readonly";
             // 
             // txt_lineNo
             // 
-            this.txt_lineNo.Location = new System.Drawing.Point(521, 97);
+            this.txt_lineNo.Location = new System.Drawing.Point(449, 82);
+            this.txt_lineNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_lineNo.Name = "txt_lineNo";
-            this.txt_lineNo.Size = new System.Drawing.Size(301, 24);
+            this.txt_lineNo.Size = new System.Drawing.Size(270, 20);
             this.txt_lineNo.StyleController = this.layoutMx1;
             this.txt_lineNo.TabIndex = 474;
             this.txt_lineNo.Tag = "readonly";
             // 
             // txt_dptNo
             // 
-            this.txt_dptNo.Location = new System.Drawing.Point(521, 68);
+            this.txt_dptNo.Location = new System.Drawing.Point(456, 53);
+            this.txt_dptNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_dptNo.Name = "txt_dptNo";
-            this.txt_dptNo.Size = new System.Drawing.Size(301, 24);
+            this.txt_dptNo.Size = new System.Drawing.Size(263, 20);
             this.txt_dptNo.StyleController = this.layoutMx1;
             this.txt_dptNo.TabIndex = 475;
             this.txt_dptNo.Tag = "readonly";
             // 
             // txt_isQiTao
             // 
-            this.txt_isQiTao.Location = new System.Drawing.Point(1233, 126);
+            this.txt_isQiTao.Location = new System.Drawing.Point(1079, 106);
+            this.txt_isQiTao.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_isQiTao.Name = "txt_isQiTao";
             this.txt_isQiTao.Properties.Caption = "澶囨枡榻愬";
-            this.txt_isQiTao.Size = new System.Drawing.Size(405, 24);
+            this.txt_isQiTao.Size = new System.Drawing.Size(354, 20);
             this.txt_isQiTao.StyleController = this.layoutMx1;
             this.txt_isQiTao.TabIndex = 476;
             this.txt_isQiTao.Tag = "readonly";
             // 
             // txt_daa018
             // 
-            this.txt_daa018.Location = new System.Drawing.Point(521, 126);
+            this.txt_daa018.Location = new System.Drawing.Point(449, 106);
+            this.txt_daa018.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa018.Name = "txt_daa018";
-            this.txt_daa018.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa018.Size = new System.Drawing.Size(270, 20);
             this.txt_daa018.StyleController = this.layoutMx1;
             this.txt_daa018.TabIndex = 477;
             this.txt_daa018.Tag = "readonly";
             // 
             // txt_daa025
             // 
-            this.txt_daa025.Location = new System.Drawing.Point(1335, 155);
+            this.txt_daa025.Location = new System.Drawing.Point(1161, 130);
+            this.txt_daa025.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa025.Name = "txt_daa025";
             this.txt_daa025.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -1370,15 +1405,16 @@
             "G-杩斿伐",
             "O-澶栧彂"});
             this.txt_daa025.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_daa025.Size = new System.Drawing.Size(303, 24);
+            this.txt_daa025.Size = new System.Drawing.Size(272, 20);
             this.txt_daa025.StyleController = this.layoutMx1;
             this.txt_daa025.TabIndex = 479;
             // 
             // txt_daa021
             // 
-            this.txt_daa021.Location = new System.Drawing.Point(114, 68);
+            this.txt_daa021.Location = new System.Drawing.Point(93, 58);
+            this.txt_daa021.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa021.Name = "txt_daa021";
-            this.txt_daa021.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa021.Size = new System.Drawing.Size(270, 20);
             this.txt_daa021.StyleController = this.layoutMx1;
             this.txt_daa021.TabIndex = 480;
             this.txt_daa021.Tag = "readonly";
@@ -1405,7 +1441,7 @@
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
             this.layoutControlItem18.Size = new System.Drawing.Size(306, 28);
             this.layoutControlItem18.Text = "杞﹂棿ID";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(79, 14);
             // 
             // layoutControlItem41
             // 
@@ -1416,7 +1452,7 @@
             this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem41.Size = new System.Drawing.Size(407, 29);
             this.layoutControlItem41.Text = "杞﹂棿缂栫爜";
-            this.layoutControlItem41.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem41.TextSize = new System.Drawing.Size(79, 14);
             // 
             // Root
             // 
@@ -1481,7 +1517,7 @@
             rowDefinition4,
             rowDefinition5,
             rowDefinition6});
-            this.Root.Size = new System.Drawing.Size(1650, 192);
+            this.Root.Size = new System.Drawing.Size(1444, 160);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -1489,169 +1525,169 @@
             this.layoutControlItem1.Control = this.txt_daa001;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(407, 28);
+            this.layoutControlItem1.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem1.Text = "宸ュ崟鍗曞彿";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_daa008;
-            this.layoutControlItem3.Location = new System.Drawing.Point(814, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(712, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(407, 28);
+            this.layoutControlItem3.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_daa014;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 24);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(407, 28);
+            this.layoutControlItem5.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem5.Text = "鎶曟枡鍗曞彿";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_daa010;
-            this.layoutControlItem7.Location = new System.Drawing.Point(814, 28);
+            this.layoutControlItem7.Location = new System.Drawing.Point(712, 24);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(407, 28);
+            this.layoutControlItem7.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_daa011;
-            this.layoutControlItem11.Location = new System.Drawing.Point(814, 56);
+            this.layoutControlItem11.Location = new System.Drawing.Point(712, 48);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem11.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem11.Text = "宸茬敓浜ч噺";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_daa022Remark;
-            this.layoutControlItem6.Location = new System.Drawing.Point(407, 0);
+            this.layoutControlItem6.Location = new System.Drawing.Point(356, 0);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(407, 28);
+            this.layoutControlItem6.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem6.Text = "閫氱煡澶囨枡";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_dptName;
-            this.layoutControlItem20.Location = new System.Drawing.Point(407, 28);
+            this.layoutControlItem20.Location = new System.Drawing.Point(356, 24);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem20.Size = new System.Drawing.Size(407, 28);
+            this.layoutControlItem20.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_dwName;
-            this.layoutControlItem15.Location = new System.Drawing.Point(814, 85);
+            this.layoutControlItem15.Location = new System.Drawing.Point(712, 72);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem15.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem15.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem15.Text = "鍗曚綅";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_mesStartProd;
             this.layoutControlItem4.CustomizationFormText = "Mes棰勮寮�宸�";
-            this.layoutControlItem4.Location = new System.Drawing.Point(1221, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(1068, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem4.Size = new System.Drawing.Size(409, 28);
+            this.layoutControlItem4.Size = new System.Drawing.Size(358, 24);
             this.layoutControlItem4.Text = "Mes棰勮寮�宸�";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_mesEndProd;
-            this.layoutControlItem8.Location = new System.Drawing.Point(1221, 28);
+            this.layoutControlItem8.Location = new System.Drawing.Point(1068, 24);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(409, 28);
+            this.layoutControlItem8.Size = new System.Drawing.Size(358, 24);
             this.layoutControlItem8.Text = "Mes棰勮瀹屽伐";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_daa016;
-            this.layoutControlItem12.Location = new System.Drawing.Point(1221, 56);
+            this.layoutControlItem12.Location = new System.Drawing.Point(1068, 48);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(409, 29);
+            this.layoutControlItem12.Size = new System.Drawing.Size(358, 24);
             this.layoutControlItem12.Text = "瀹為檯寮�宸ユ椂闂�";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_daa017;
-            this.layoutControlItem16.Location = new System.Drawing.Point(1221, 85);
+            this.layoutControlItem16.Location = new System.Drawing.Point(1068, 72);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(409, 29);
+            this.layoutControlItem16.Size = new System.Drawing.Size(358, 24);
             this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
-            this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_saleOrderNo;
-            this.layoutControlItem9.Location = new System.Drawing.Point(814, 114);
+            this.layoutControlItem9.Location = new System.Drawing.Point(712, 96);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem9.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem9.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
             // 
             // txt_daa015label
             // 
             this.txt_daa015label.Control = this.txt_daa015;
-            this.txt_daa015label.Location = new System.Drawing.Point(814, 143);
+            this.txt_daa015label.Location = new System.Drawing.Point(712, 120);
             this.txt_daa015label.Name = "txt_daa015label";
             this.txt_daa015label.OptionsTableLayoutItem.ColumnIndex = 2;
             this.txt_daa015label.OptionsTableLayoutItem.RowIndex = 5;
-            this.txt_daa015label.Size = new System.Drawing.Size(407, 29);
+            this.txt_daa015label.Size = new System.Drawing.Size(356, 24);
             this.txt_daa015label.Text = "绾夸綋鍙樻洿";
-            this.txt_daa015label.TextSize = new System.Drawing.Size(90, 18);
+            this.txt_daa015label.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_lineName;
-            this.layoutControlItem14.Location = new System.Drawing.Point(407, 56);
+            this.layoutControlItem14.Location = new System.Drawing.Point(356, 48);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem14.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem14.Text = "绾垮埆鍚嶇О";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem46
             // 
             this.layoutControlItem46.Control = this.txt_isQiTao;
-            this.layoutControlItem46.Location = new System.Drawing.Point(1221, 114);
+            this.layoutControlItem46.Location = new System.Drawing.Point(1068, 96);
             this.layoutControlItem46.Name = "layoutControlItem46";
             this.layoutControlItem46.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem46.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem46.Size = new System.Drawing.Size(409, 29);
+            this.layoutControlItem46.Size = new System.Drawing.Size(358, 24);
             this.layoutControlItem46.Text = "澶囨枡榻愭稕";
             this.layoutControlItem46.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem46.TextVisible = false;
@@ -1659,94 +1695,95 @@
             // layoutControlItem48
             // 
             this.layoutControlItem48.Control = this.txt_daa018;
-            this.layoutControlItem48.Location = new System.Drawing.Point(407, 114);
+            this.layoutControlItem48.Location = new System.Drawing.Point(356, 96);
             this.layoutControlItem48.Name = "layoutControlItem48";
             this.layoutControlItem48.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem48.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem48.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem48.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem48.Text = "宸ュ崟鐘舵��";
-            this.layoutControlItem48.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem48.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem40
             // 
             this.layoutControlItem40.Control = this.txt_lineNo;
-            this.layoutControlItem40.Location = new System.Drawing.Point(407, 85);
+            this.layoutControlItem40.Location = new System.Drawing.Point(356, 72);
             this.layoutControlItem40.Name = "layoutControlItem40";
             this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem40.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem40.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem40.Text = "绾垮埆缂栫爜";
-            this.layoutControlItem40.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem40.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem27
             // 
             this.layoutControlItem27.Control = this.txt_daa025;
-            this.layoutControlItem27.Location = new System.Drawing.Point(1221, 143);
+            this.layoutControlItem27.Location = new System.Drawing.Point(1068, 120);
             this.layoutControlItem27.Name = "layoutControlItem27";
             this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem27.Size = new System.Drawing.Size(409, 29);
+            this.layoutControlItem27.Size = new System.Drawing.Size(358, 24);
             this.layoutControlItem27.Text = "鐢熶骇绫诲瀷";
-            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem27.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem28
             // 
             this.layoutControlItem28.Control = this.txt_daa009;
-            this.layoutControlItem28.Location = new System.Drawing.Point(407, 143);
+            this.layoutControlItem28.Location = new System.Drawing.Point(356, 120);
             this.layoutControlItem28.Name = "layoutControlItem28";
             this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem28.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem28.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
-            this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txt_daa004;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 143);
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 120);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem17.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem17.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem17.Text = "浜у搧瑙勬牸";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_daa003;
-            this.layoutControlItem19.Location = new System.Drawing.Point(0, 114);
+            this.layoutControlItem19.Location = new System.Drawing.Point(0, 96);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem19.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem19.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem19.Text = "浜у搧鍚嶇О";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_daa029;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 85);
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 72);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem13.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem13.Text = "浜у搧缂栫爜";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem49
             // 
             this.layoutControlItem49.Control = this.txt_daa021;
-            this.layoutControlItem49.Location = new System.Drawing.Point(0, 56);
+            this.layoutControlItem49.Location = new System.Drawing.Point(0, 48);
             this.layoutControlItem49.Name = "layoutControlItem49";
             this.layoutControlItem49.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem49.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem49.Size = new System.Drawing.Size(356, 24);
             this.layoutControlItem49.Text = "浠诲姟鍗曞彿";
-            this.layoutControlItem49.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem49.TextSize = new System.Drawing.Size(72, 14);
             // 
             // tabMx
             // 
             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(3, 2, 3, 2);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1650, 504);
+            this.tabMx.Size = new System.Drawing.Size(1444, 391);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1763,17 +1800,20 @@
             this.tabMxPage1.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
             this.tabMxPage1.Appearance.Header.Options.UseForeColor = true;
             this.tabMxPage1.Controls.Add(this.gcMx1);
+            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1648, 472);
+            this.tabMxPage1.Size = new System.Drawing.Size(1442, 365);
             this.tabMxPage1.Text = "澶囨枡鍗曡韩";
             // 
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1648, 472);
+            this.gcMx1.Size = new System.Drawing.Size(1442, 365);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1782,7 +1822,7 @@
             // 
             this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gvMx1.ColumnPanelRowHeight = 50;
+            this.gvMx1.ColumnPanelRowHeight = 39;
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx1Guid,
             this.gridColumn13,
@@ -1813,6 +1853,7 @@
             this.gvMx1dab022,
             this.gvMx1dab023,
             this.gridColumn58});
+            this.gvMx1.DetailHeight = 272;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1823,334 +1864,337 @@
             // 
             this.gvMx1Guid.Caption = "gvMx1Guid";
             this.gvMx1Guid.FieldName = "guid";
-            this.gvMx1Guid.MinWidth = 25;
+            this.gvMx1Guid.MinWidth = 22;
             this.gvMx1Guid.Name = "gvMx1Guid";
-            this.gvMx1Guid.Width = 94;
+            this.gvMx1Guid.Width = 82;
             // 
             // gridColumn13
             // 
             this.gridColumn13.Caption = "搴忓彿";
             this.gridColumn13.FieldName = "dab002";
-            this.gridColumn13.MinWidth = 25;
+            this.gridColumn13.MinWidth = 22;
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
             this.gridColumn13.VisibleIndex = 0;
-            this.gridColumn13.Width = 89;
+            this.gridColumn13.Width = 78;
             // 
             // gvMx1dab001
             // 
             this.gvMx1dab001.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab001.Caption = "宸ュ崟鍗曞彿";
             this.gvMx1dab001.FieldName = "dab001";
-            this.gvMx1dab001.MinWidth = 50;
+            this.gvMx1dab001.MinWidth = 44;
             this.gvMx1dab001.Name = "gvMx1dab001";
             this.gvMx1dab001.Tag = "query_a.dab001";
             this.gvMx1dab001.Visible = true;
             this.gvMx1dab001.VisibleIndex = 1;
-            this.gvMx1dab001.Width = 89;
+            this.gvMx1dab001.Width = 78;
             // 
             // gvMx1dab003
             // 
             this.gvMx1dab003.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab003.Caption = "鏉愭枡缂栫爜";
             this.gvMx1dab003.FieldName = "itemNo";
-            this.gvMx1dab003.MinWidth = 50;
+            this.gvMx1dab003.MinWidth = 44;
             this.gvMx1dab003.Name = "gvMx1dab003";
             this.gvMx1dab003.Tag = "query_a.dab003";
             this.gvMx1dab003.Visible = true;
             this.gvMx1dab003.VisibleIndex = 2;
-            this.gvMx1dab003.Width = 89;
+            this.gvMx1dab003.Width = 78;
             // 
             // gvMx1dab004
             // 
             this.gvMx1dab004.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab004.Caption = "鏉愭枡鍚嶇О";
             this.gvMx1dab004.FieldName = "itemName";
-            this.gvMx1dab004.MinWidth = 50;
+            this.gvMx1dab004.MinWidth = 44;
             this.gvMx1dab004.Name = "gvMx1dab004";
             this.gvMx1dab004.Tag = "query_a.dab004";
             this.gvMx1dab004.Visible = true;
             this.gvMx1dab004.VisibleIndex = 4;
-            this.gvMx1dab004.Width = 89;
+            this.gvMx1dab004.Width = 78;
             // 
             // gvMx1dab005
             // 
             this.gvMx1dab005.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab005.Caption = "鏉愭枡瑙勬牸";
             this.gvMx1dab005.FieldName = "itemModel";
-            this.gvMx1dab005.MinWidth = 50;
+            this.gvMx1dab005.MinWidth = 44;
             this.gvMx1dab005.Name = "gvMx1dab005";
             this.gvMx1dab005.Tag = "query_a.dab005";
             this.gvMx1dab005.Visible = true;
             this.gvMx1dab005.VisibleIndex = 5;
-            this.gvMx1dab005.Width = 89;
+            this.gvMx1dab005.Width = 78;
             // 
             // gvMx1dab006
             // 
             this.gvMx1dab006.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab006.Caption = "闇�棰嗙敤閲�";
             this.gvMx1dab006.FieldName = "dab006";
-            this.gvMx1dab006.MinWidth = 50;
+            this.gvMx1dab006.MinWidth = 44;
             this.gvMx1dab006.Name = "gvMx1dab006";
             this.gvMx1dab006.Tag = "query_a.dab006";
             this.gvMx1dab006.Visible = true;
             this.gvMx1dab006.VisibleIndex = 6;
-            this.gvMx1dab006.Width = 89;
+            this.gvMx1dab006.Width = 78;
             // 
             // gvMx1dab007
             // 
             this.gvMx1dab007.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab007.Caption = "宸查鐢ㄩ噺";
             this.gvMx1dab007.FieldName = "ylQty";
-            this.gvMx1dab007.MinWidth = 50;
+            this.gvMx1dab007.MinWidth = 44;
             this.gvMx1dab007.Name = "gvMx1dab007";
             this.gvMx1dab007.Tag = "query_a.dab007";
             this.gvMx1dab007.Visible = true;
             this.gvMx1dab007.VisibleIndex = 7;
-            this.gvMx1dab007.Width = 89;
+            this.gvMx1dab007.Width = 78;
             // 
             // gridColumn14
             // 
             this.gridColumn14.Caption = "鍓╀綑鍙";
             this.gridColumn14.FieldName = "klQty";
-            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.MinWidth = 22;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
             this.gridColumn14.VisibleIndex = 8;
-            this.gridColumn14.Width = 89;
+            this.gridColumn14.Width = 78;
             // 
             // gvMx1dab014
             // 
             this.gvMx1dab014.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab014.Caption = "鏄惁鏇挎枡";
             this.gvMx1dab014.FieldName = "dab014Txt";
-            this.gvMx1dab014.MinWidth = 50;
+            this.gvMx1dab014.MinWidth = 44;
             this.gvMx1dab014.Name = "gvMx1dab014";
             this.gvMx1dab014.Tag = "query_a.dab014";
             this.gvMx1dab014.Visible = true;
             this.gvMx1dab014.VisibleIndex = 9;
-            this.gvMx1dab014.Width = 89;
+            this.gvMx1dab014.Width = 78;
             // 
             // gridColumn15
             // 
             this.gridColumn15.Caption = "寤鸿浠撳簱";
             this.gridColumn15.FieldName = "erpCk";
-            this.gridColumn15.MinWidth = 25;
+            this.gridColumn15.MinWidth = 22;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
             this.gridColumn15.VisibleIndex = 10;
-            this.gridColumn15.Width = 89;
+            this.gridColumn15.Width = 78;
             // 
             // gridColumn16
             // 
             this.gridColumn16.Caption = "鍙戞枡鏂瑰紡";
             this.gridColumn16.FieldName = "issueType";
-            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.MinWidth = 22;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
             this.gridColumn16.VisibleIndex = 11;
-            this.gridColumn16.Width = 89;
+            this.gridColumn16.Width = 78;
             // 
             // gvMx1dab012
             // 
             this.gvMx1dab012.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab012.Caption = "缁勬垚鐢ㄩ噺";
             this.gvMx1dab012.FieldName = "dab012";
-            this.gvMx1dab012.MinWidth = 50;
+            this.gvMx1dab012.MinWidth = 44;
             this.gvMx1dab012.Name = "gvMx1dab012";
             this.gvMx1dab012.Tag = "query_a.dab012";
             this.gvMx1dab012.Visible = true;
             this.gvMx1dab012.VisibleIndex = 12;
-            this.gvMx1dab012.Width = 89;
+            this.gvMx1dab012.Width = 78;
             // 
             // gvMx1dab009
             // 
             this.gvMx1dab009.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab009.Caption = "鍗曚綅";
             this.gvMx1dab009.FieldName = "dwName";
-            this.gvMx1dab009.MinWidth = 50;
+            this.gvMx1dab009.MinWidth = 44;
             this.gvMx1dab009.Name = "gvMx1dab009";
             this.gvMx1dab009.Tag = "query_a.dab009";
             this.gvMx1dab009.Visible = true;
             this.gvMx1dab009.VisibleIndex = 13;
-            this.gvMx1dab009.Width = 246;
+            this.gvMx1dab009.Width = 215;
             // 
             // gvMx1scrapqty
             // 
             this.gvMx1scrapqty.AppearanceCell.Options.UseFont = true;
             this.gvMx1scrapqty.Caption = "鍥哄畾鎹熻��";
             this.gvMx1scrapqty.FieldName = "scrapqty";
-            this.gvMx1scrapqty.MinWidth = 50;
+            this.gvMx1scrapqty.MinWidth = 44;
             this.gvMx1scrapqty.Name = "gvMx1scrapqty";
             this.gvMx1scrapqty.Tag = "query_a.scrapqty";
-            this.gvMx1scrapqty.Width = 94;
+            this.gvMx1scrapqty.Width = 82;
             // 
             // gvMx1scraprate
             // 
             this.gvMx1scraprate.AppearanceCell.Options.UseFont = true;
             this.gvMx1scraprate.Caption = "鍙樺姩鎹熻�楃巼";
             this.gvMx1scraprate.FieldName = "scraprate";
-            this.gvMx1scraprate.MinWidth = 50;
+            this.gvMx1scraprate.MinWidth = 44;
             this.gvMx1scraprate.Name = "gvMx1scraprate";
             this.gvMx1scraprate.Tag = "query_a.scraprate";
-            this.gvMx1scraprate.Width = 94;
+            this.gvMx1scraprate.Width = 82;
             // 
             // gvMx1zyBl
             // 
             this.gvMx1zyBl.AppearanceCell.Options.UseFont = true;
             this.gvMx1zyBl.Caption = "浣滀笟涓嶈壇閫�鏂�";
             this.gvMx1zyBl.FieldName = "zyBl";
-            this.gvMx1zyBl.MinWidth = 50;
+            this.gvMx1zyBl.MinWidth = 44;
             this.gvMx1zyBl.Name = "gvMx1zyBl";
             this.gvMx1zyBl.Tag = "query_a.zy_bl";
             this.gvMx1zyBl.Visible = true;
             this.gvMx1zyBl.VisibleIndex = 18;
-            this.gvMx1zyBl.Width = 72;
+            this.gvMx1zyBl.Width = 63;
             // 
             // gvMx1llBl
             // 
             this.gvMx1llBl.AppearanceCell.Options.UseFont = true;
             this.gvMx1llBl.Caption = "鏉ユ枡涓嶈壇閫�鏂�";
             this.gvMx1llBl.FieldName = "llBl";
-            this.gvMx1llBl.MinWidth = 50;
+            this.gvMx1llBl.MinWidth = 44;
             this.gvMx1llBl.Name = "gvMx1llBl";
             this.gvMx1llBl.Tag = "query_a.ll_bl";
             this.gvMx1llBl.Visible = true;
             this.gvMx1llBl.VisibleIndex = 16;
-            this.gvMx1llBl.Width = 58;
+            this.gvMx1llBl.Width = 51;
             // 
             // gvMx1lpTl
             // 
             this.gvMx1lpTl.AppearanceCell.Options.UseFont = true;
             this.gvMx1lpTl.Caption = "鑹搧閫�鏂�";
             this.gvMx1lpTl.FieldName = "lpTl";
-            this.gvMx1lpTl.MinWidth = 50;
+            this.gvMx1lpTl.MinWidth = 44;
             this.gvMx1lpTl.Name = "gvMx1lpTl";
             this.gvMx1lpTl.Tag = "query_a.lp_tl";
             this.gvMx1lpTl.Visible = true;
             this.gvMx1lpTl.VisibleIndex = 17;
-            this.gvMx1lpTl.Width = 58;
+            this.gvMx1lpTl.Width = 51;
             // 
             // gvMx1dab021
             // 
             this.gvMx1dab021.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab021.Caption = "琛ユ枡鏁伴噺";
             this.gvMx1dab021.FieldName = "blQty";
-            this.gvMx1dab021.MinWidth = 50;
+            this.gvMx1dab021.MinWidth = 44;
             this.gvMx1dab021.Name = "gvMx1dab021";
             this.gvMx1dab021.Tag = "query_a.dab021";
             this.gvMx1dab021.Visible = true;
             this.gvMx1dab021.VisibleIndex = 14;
-            this.gvMx1dab021.Width = 58;
+            this.gvMx1dab021.Width = 51;
             // 
             // gvMx1dab010
             // 
             this.gvMx1dab010.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab010.Caption = "鏉愭枡绫诲瀷";
             this.gvMx1dab010.FieldName = "dab010";
-            this.gvMx1dab010.MinWidth = 50;
+            this.gvMx1dab010.MinWidth = 44;
             this.gvMx1dab010.Name = "gvMx1dab010";
             this.gvMx1dab010.Tag = "query_a.dab010";
-            this.gvMx1dab010.Width = 94;
+            this.gvMx1dab010.Width = 82;
             // 
             // gvMx1dab011
             // 
             this.gvMx1dab011.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab011.Caption = "涓绘枡";
             this.gvMx1dab011.FieldName = "dab011";
-            this.gvMx1dab011.MinWidth = 50;
+            this.gvMx1dab011.MinWidth = 44;
             this.gvMx1dab011.Name = "gvMx1dab011";
             this.gvMx1dab011.Tag = "query_a.dab011";
-            this.gvMx1dab011.Width = 94;
+            this.gvMx1dab011.Width = 82;
             // 
             // gvMx1dab013
             // 
             this.gvMx1dab013.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab013.Caption = "搴曟暟";
             this.gvMx1dab013.FieldName = "dab013";
-            this.gvMx1dab013.MinWidth = 50;
+            this.gvMx1dab013.MinWidth = 44;
             this.gvMx1dab013.Name = "gvMx1dab013";
             this.gvMx1dab013.Tag = "query_a.dab013";
-            this.gvMx1dab013.Width = 94;
+            this.gvMx1dab013.Width = 82;
             // 
             // gvMx1dab015
             // 
             this.gvMx1dab015.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab015.Caption = "鐐逛綅";
             this.gvMx1dab015.FieldName = "dab015";
-            this.gvMx1dab015.MinWidth = 50;
+            this.gvMx1dab015.MinWidth = 44;
             this.gvMx1dab015.Name = "gvMx1dab015";
             this.gvMx1dab015.Tag = "query_a.dab015";
-            this.gvMx1dab015.Width = 94;
+            this.gvMx1dab015.Width = 82;
             // 
             // gvMx1dab019
             // 
             this.gvMx1dab019.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab019.Caption = "棰嗘枡鏂瑰紡";
             this.gvMx1dab019.FieldName = "dab019";
-            this.gvMx1dab019.MinWidth = 50;
+            this.gvMx1dab019.MinWidth = 44;
             this.gvMx1dab019.Name = "gvMx1dab019";
             this.gvMx1dab019.Tag = "query_a.dab019";
-            this.gvMx1dab019.Width = 94;
+            this.gvMx1dab019.Width = 82;
             // 
             // gvMx1dab020
             // 
             this.gvMx1dab020.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab020.Caption = "瀹為鐢ㄩ噺";
             this.gvMx1dab020.FieldName = "dab020";
-            this.gvMx1dab020.MinWidth = 50;
+            this.gvMx1dab020.MinWidth = 44;
             this.gvMx1dab020.Name = "gvMx1dab020";
             this.gvMx1dab020.Tag = "query_a.dab020";
-            this.gvMx1dab020.Width = 94;
+            this.gvMx1dab020.Width = 82;
             // 
             // gvMx1dab022
             // 
             this.gvMx1dab022.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab022.Caption = "閫�鏂欐�绘暟";
             this.gvMx1dab022.FieldName = "ztsl";
-            this.gvMx1dab022.MinWidth = 50;
+            this.gvMx1dab022.MinWidth = 44;
             this.gvMx1dab022.Name = "gvMx1dab022";
             this.gvMx1dab022.Tag = "query_a.dab022";
-            this.gvMx1dab022.Width = 94;
+            this.gvMx1dab022.Width = 82;
             // 
             // gvMx1dab023
             // 
             this.gvMx1dab023.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab023.Caption = "瓒呴鏁伴噺";
             this.gvMx1dab023.FieldName = "clQty";
-            this.gvMx1dab023.MinWidth = 50;
+            this.gvMx1dab023.MinWidth = 44;
             this.gvMx1dab023.Name = "gvMx1dab023";
             this.gvMx1dab023.Tag = "query_a.dab023";
             this.gvMx1dab023.Visible = true;
             this.gvMx1dab023.VisibleIndex = 15;
-            this.gvMx1dab023.Width = 58;
+            this.gvMx1dab023.Width = 51;
             // 
             // gridColumn58
             // 
             this.gridColumn58.Caption = "棰嗘枡杩涘害";
             this.gridColumn58.FieldName = "barbl";
-            this.gridColumn58.MinWidth = 25;
+            this.gridColumn58.MinWidth = 22;
             this.gridColumn58.Name = "gridColumn58";
             this.gridColumn58.Visible = true;
             this.gridColumn58.VisibleIndex = 3;
-            this.gridColumn58.Width = 94;
+            this.gridColumn58.Width = 82;
             // 
             // xtraTabPage6
             // 
             this.xtraTabPage6.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
             this.xtraTabPage6.Appearance.Header.Options.UseForeColor = true;
             this.xtraTabPage6.Controls.Add(this.gcMx6);
+            this.xtraTabPage6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage6.Name = "xtraTabPage6";
-            this.xtraTabPage6.Size = new System.Drawing.Size(1648, 472);
+            this.xtraTabPage6.Size = new System.Drawing.Size(1442, 368);
             this.xtraTabPage6.Text = "澶囨枡鏄庣粏";
             // 
             // gcMx6
             // 
             this.gcMx6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx6.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx6.Location = new System.Drawing.Point(0, 0);
             this.gcMx6.MainView = this.gvMx6;
+            this.gcMx6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx6.Name = "gcMx6";
-            this.gcMx6.Size = new System.Drawing.Size(1648, 472);
+            this.gcMx6.Size = new System.Drawing.Size(1442, 368);
             this.gcMx6.TabIndex = 1;
             this.gcMx6.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx6});
@@ -2159,7 +2203,7 @@
             // 
             this.gvMx6.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gvMx6.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gvMx6.ColumnPanelRowHeight = 50;
+            this.gvMx6.ColumnPanelRowHeight = 39;
             this.gvMx6.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn2,
             this.gridColumn9,
@@ -2172,6 +2216,7 @@
             this.gridColumn8,
             this.gridColumn50,
             this.gridColumn51});
+            this.gvMx6.DetailHeight = 272;
             this.gvMx6.GridControl = this.gcMx6;
             this.gvMx6.Name = "gvMx6";
             this.gvMx6.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -2182,137 +2227,140 @@
             // 
             this.gridColumn2.Caption = "gvMx1Guid";
             this.gridColumn2.FieldName = "guid";
-            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.MinWidth = 22;
             this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.Width = 94;
+            this.gridColumn2.Width = 82;
             // 
             // gridColumn9
             // 
             this.gridColumn9.AppearanceCell.Options.UseFont = true;
             this.gridColumn9.Caption = "宸ュ崟鍗曞彿";
             this.gridColumn9.FieldName = "daa001";
-            this.gridColumn9.MinWidth = 50;
+            this.gridColumn9.MinWidth = 44;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Tag = "query_a.dab001";
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 0;
-            this.gridColumn9.Width = 94;
+            this.gridColumn9.Width = 82;
             // 
             // gridColumn11
             // 
             this.gridColumn11.AppearanceCell.Options.UseFont = true;
             this.gridColumn11.Caption = "鏉愭枡缂栫爜";
             this.gridColumn11.FieldName = "itemNo";
-            this.gridColumn11.MinWidth = 50;
+            this.gridColumn11.MinWidth = 44;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Tag = "query_a.dab003";
             this.gridColumn11.Visible = true;
             this.gridColumn11.VisibleIndex = 1;
-            this.gridColumn11.Width = 94;
+            this.gridColumn11.Width = 82;
             // 
             // gridColumn20
             // 
             this.gridColumn20.AppearanceCell.Options.UseFont = true;
             this.gridColumn20.Caption = "鏉愭枡鍚嶇О";
             this.gridColumn20.FieldName = "itemName";
-            this.gridColumn20.MinWidth = 50;
+            this.gridColumn20.MinWidth = 44;
             this.gridColumn20.Name = "gridColumn20";
             this.gridColumn20.Tag = "query_a.dab004";
             this.gridColumn20.Visible = true;
             this.gridColumn20.VisibleIndex = 2;
-            this.gridColumn20.Width = 94;
+            this.gridColumn20.Width = 82;
             // 
             // gridColumn26
             // 
             this.gridColumn26.AppearanceCell.Options.UseFont = true;
             this.gridColumn26.Caption = "鏉愭枡瑙勬牸";
             this.gridColumn26.FieldName = "itemModel";
-            this.gridColumn26.MinWidth = 50;
+            this.gridColumn26.MinWidth = 44;
             this.gridColumn26.Name = "gridColumn26";
             this.gridColumn26.Tag = "query_a.dab005";
             this.gridColumn26.Visible = true;
             this.gridColumn26.VisibleIndex = 3;
-            this.gridColumn26.Width = 94;
+            this.gridColumn26.Width = 82;
             // 
             // gridColumn28
             // 
             this.gridColumn28.Caption = "鐗╂枡鏉$爜";
             this.gridColumn28.FieldName = "itemBarcode";
-            this.gridColumn28.MinWidth = 25;
+            this.gridColumn28.MinWidth = 22;
             this.gridColumn28.Name = "gridColumn28";
             this.gridColumn28.Visible = true;
             this.gridColumn28.VisibleIndex = 4;
-            this.gridColumn28.Width = 94;
+            this.gridColumn28.Width = 82;
             // 
             // gridColumn29
             // 
             this.gridColumn29.Caption = "鏉$爜鏁伴噺";
             this.gridColumn29.FieldName = "quantity";
-            this.gridColumn29.MinWidth = 25;
+            this.gridColumn29.MinWidth = 22;
             this.gridColumn29.Name = "gridColumn29";
             this.gridColumn29.Visible = true;
             this.gridColumn29.VisibleIndex = 5;
-            this.gridColumn29.Width = 94;
+            this.gridColumn29.Width = 82;
             // 
             // gridColumn49
             // 
             this.gridColumn49.Caption = "澶囨枡璇︽儏";
             this.gridColumn49.FieldName = "blDetail";
-            this.gridColumn49.MinWidth = 25;
+            this.gridColumn49.MinWidth = 22;
             this.gridColumn49.Name = "gridColumn49";
             this.gridColumn49.Visible = true;
             this.gridColumn49.VisibleIndex = 6;
-            this.gridColumn49.Width = 94;
+            this.gridColumn49.Width = 82;
             // 
             // gridColumn8
             // 
             this.gridColumn8.Caption = "鏀舵枡璇︽儏";
             this.gridColumn8.FieldName = "slDetail";
-            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.MinWidth = 22;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
             this.gridColumn8.VisibleIndex = 7;
-            this.gridColumn8.Width = 94;
+            this.gridColumn8.Width = 82;
             // 
             // gridColumn50
             // 
             this.gridColumn50.Caption = "鎶曟枡璇︽儏";
             this.gridColumn50.FieldName = "tlDetail";
-            this.gridColumn50.MinWidth = 25;
+            this.gridColumn50.MinWidth = 22;
             this.gridColumn50.Name = "gridColumn50";
             this.gridColumn50.Visible = true;
             this.gridColumn50.VisibleIndex = 8;
-            this.gridColumn50.Width = 94;
+            this.gridColumn50.Width = 82;
             // 
             // gridColumn51
             // 
             this.gridColumn51.Caption = "閫�鏂欒鎯�";
             this.gridColumn51.FieldName = "tuiDetail";
-            this.gridColumn51.MinWidth = 25;
+            this.gridColumn51.MinWidth = 22;
             this.gridColumn51.Name = "gridColumn51";
             this.gridColumn51.Visible = true;
             this.gridColumn51.VisibleIndex = 9;
-            this.gridColumn51.Width = 94;
+            this.gridColumn51.Width = 82;
             // 
             // xtraTabPage7
             // 
             this.xtraTabPage7.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
             this.xtraTabPage7.Appearance.Header.Options.UseForeColor = true;
             this.xtraTabPage7.Controls.Add(this.gcMx7);
+            this.xtraTabPage7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage7.Name = "xtraTabPage7";
-            this.xtraTabPage7.Size = new System.Drawing.Size(1648, 472);
+            this.xtraTabPage7.Size = new System.Drawing.Size(1442, 368);
             this.xtraTabPage7.Text = "宸ュ簭鏄庣粏";
             // 
             // gcMx7
             // 
             this.gcMx7.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx7.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             gridLevelNode1.RelationName = "Level1";
             this.gcMx7.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
             gridLevelNode1});
             this.gcMx7.Location = new System.Drawing.Point(0, 0);
             this.gcMx7.MainView = this.gvMx7;
+            this.gcMx7.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx7.Name = "gcMx7";
-            this.gcMx7.Size = new System.Drawing.Size(1648, 472);
+            this.gcMx7.Size = new System.Drawing.Size(1442, 368);
             this.gcMx7.TabIndex = 1;
             this.gcMx7.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx7});
@@ -2321,7 +2369,7 @@
             // 
             this.gvMx7.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gvMx7.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gvMx7.ColumnPanelRowHeight = 50;
+            this.gvMx7.ColumnPanelRowHeight = 39;
             this.gvMx7.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx1daa002,
             this.gvMx1daa010,
@@ -2329,6 +2377,7 @@
             this.gridColumn63,
             this.gridColumn64,
             this.gridColumn65});
+            this.gvMx7.DetailHeight = 272;
             this.gvMx7.GridControl = this.gcMx7;
             this.gvMx7.Name = "gvMx7";
             this.gvMx7.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -2340,92 +2389,95 @@
             this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
             this.gvMx1daa002.Caption = "搴忓彿";
             this.gvMx1daa002.FieldName = "fSeq";
-            this.gvMx1daa002.MinWidth = 50;
+            this.gvMx1daa002.MinWidth = 44;
             this.gvMx1daa002.Name = "gvMx1daa002";
             this.gvMx1daa002.OptionsColumn.ReadOnly = true;
             this.gvMx1daa002.Tag = "query_a.daa010";
             this.gvMx1daa002.Visible = true;
             this.gvMx1daa002.VisibleIndex = 0;
-            this.gvMx1daa002.Width = 54;
+            this.gvMx1daa002.Width = 47;
             // 
             // gvMx1daa010
             // 
             this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
             this.gvMx1daa010.Caption = "宸ュ簭";
             this.gvMx1daa010.FieldName = "processNo";
-            this.gvMx1daa010.MinWidth = 50;
+            this.gvMx1daa010.MinWidth = 44;
             this.gvMx1daa010.Name = "gvMx1daa010";
             this.gvMx1daa010.OptionsColumn.ReadOnly = true;
             this.gvMx1daa010.Tag = "query_a.daa010";
             this.gvMx1daa010.Visible = true;
             this.gvMx1daa010.VisibleIndex = 1;
-            this.gvMx1daa010.Width = 129;
+            this.gvMx1daa010.Width = 113;
             // 
             // gvMx1daa004
             // 
             this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
             this.gvMx1daa004.Caption = "涓婂伐搴�";
             this.gvMx1daa004.FieldName = "frontProcessNo";
-            this.gvMx1daa004.MinWidth = 150;
+            this.gvMx1daa004.MinWidth = 131;
             this.gvMx1daa004.Name = "gvMx1daa004";
             this.gvMx1daa004.OptionsColumn.ReadOnly = true;
             this.gvMx1daa004.Tag = "query_a.daa010";
             this.gvMx1daa004.Visible = true;
             this.gvMx1daa004.VisibleIndex = 2;
-            this.gvMx1daa004.Width = 150;
+            this.gvMx1daa004.Width = 131;
             // 
             // gridColumn63
             // 
             this.gridColumn63.Caption = "鏄惁鍙繑宸�";
             this.gridColumn63.FieldName = "isBack";
-            this.gridColumn63.MinWidth = 25;
+            this.gridColumn63.MinWidth = 22;
             this.gridColumn63.Name = "gridColumn63";
             this.gridColumn63.OptionsColumn.ReadOnly = true;
             this.gridColumn63.Tag = "query_a.daa010";
             this.gridColumn63.Visible = true;
             this.gridColumn63.VisibleIndex = 3;
-            this.gridColumn63.Width = 94;
+            this.gridColumn63.Width = 82;
             // 
             // gridColumn64
             // 
             this.gridColumn64.Caption = "鏄惁杩旇拷婧爜";
             this.gridColumn64.FieldName = "isZsm";
-            this.gridColumn64.MinWidth = 25;
+            this.gridColumn64.MinWidth = 22;
             this.gridColumn64.Name = "gridColumn64";
             this.gridColumn64.OptionsColumn.ReadOnly = true;
             this.gridColumn64.Tag = "query_a.daa010";
             this.gridColumn64.Visible = true;
             this.gridColumn64.VisibleIndex = 4;
-            this.gridColumn64.Width = 94;
+            this.gridColumn64.Width = 82;
             // 
             // gridColumn65
             // 
             this.gridColumn65.Caption = "鏄惁杩旀墭鏉跨爜";
             this.gridColumn65.FieldName = "isTbm";
-            this.gridColumn65.MinWidth = 25;
+            this.gridColumn65.MinWidth = 22;
             this.gridColumn65.Name = "gridColumn65";
             this.gridColumn65.OptionsColumn.ReadOnly = true;
             this.gridColumn65.Tag = "query_a.daa010";
             this.gridColumn65.Visible = true;
             this.gridColumn65.VisibleIndex = 5;
-            this.gridColumn65.Width = 94;
+            this.gridColumn65.Width = 82;
             // 
             // xtraTabPage8
             // 
             this.xtraTabPage8.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
             this.xtraTabPage8.Appearance.Header.Options.UseForeColor = true;
             this.xtraTabPage8.Controls.Add(this.gcMx8);
+            this.xtraTabPage8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage8.Name = "xtraTabPage8";
-            this.xtraTabPage8.Size = new System.Drawing.Size(1648, 472);
+            this.xtraTabPage8.Size = new System.Drawing.Size(1442, 368);
             this.xtraTabPage8.Text = "鏁版嵁閲囬泦鏄庣粏";
             // 
             // gcMx8
             // 
             this.gcMx8.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx8.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx8.Location = new System.Drawing.Point(0, 0);
             this.gcMx8.MainView = this.gvMx8;
+            this.gcMx8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx8.Name = "gcMx8";
-            this.gcMx8.Size = new System.Drawing.Size(1648, 472);
+            this.gcMx8.Size = new System.Drawing.Size(1442, 368);
             this.gcMx8.TabIndex = 1;
             this.gcMx8.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx8});
@@ -2443,6 +2495,7 @@
             this.gridColumn60,
             this.gridColumn61,
             this.gridColumn62});
+            this.gvMx8.DetailHeight = 272;
             this.gvMx8.GridControl = this.gcMx8;
             this.gvMx8.Name = "gvMx8";
             this.gvMx8.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -2453,107 +2506,109 @@
             // 
             this.gridColumn53.Caption = "guid";
             this.gridColumn53.FieldName = "guid";
-            this.gridColumn53.MinWidth = 25;
+            this.gridColumn53.MinWidth = 22;
             this.gridColumn53.Name = "gridColumn53";
             this.gridColumn53.OptionsColumn.ReadOnly = true;
-            this.gridColumn53.Width = 94;
+            this.gridColumn53.Width = 82;
             // 
             // gvMx2status
             // 
             this.gvMx2status.AppearanceCell.Options.UseFont = true;
             this.gvMx2status.Caption = "宸ュ崟缂栧彿";
             this.gvMx2status.FieldName = "gdbh";
-            this.gvMx2status.MinWidth = 10;
+            this.gvMx2status.MinWidth = 9;
             this.gvMx2status.Name = "gvMx2status";
             this.gvMx2status.OptionsColumn.ReadOnly = true;
             this.gvMx2status.Tag = "query_a.status";
             this.gvMx2status.Visible = true;
             this.gvMx2status.VisibleIndex = 0;
-            this.gvMx2status.Width = 50;
+            this.gvMx2status.Width = 44;
             // 
             // gvMx2pbillNo
             // 
             this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
             this.gvMx2pbillNo.Caption = "杩芥函鐮�";
             this.gvMx2pbillNo.FieldName = "barCode";
+            this.gvMx2pbillNo.MinWidth = 17;
             this.gvMx2pbillNo.Name = "gvMx2pbillNo";
             this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
             this.gvMx2pbillNo.Tag = "query_a.pbill_no";
             this.gvMx2pbillNo.Visible = true;
             this.gvMx2pbillNo.VisibleIndex = 1;
-            this.gvMx2pbillNo.Width = 94;
+            this.gvMx2pbillNo.Width = 82;
             // 
             // gridColumn56
             // 
             this.gridColumn56.Caption = "鏁伴噺";
             this.gridColumn56.FieldName = "quantity";
-            this.gridColumn56.MinWidth = 25;
+            this.gridColumn56.MinWidth = 22;
             this.gridColumn56.Name = "gridColumn56";
             this.gridColumn56.OptionsColumn.ReadOnly = true;
             this.gridColumn56.Visible = true;
             this.gridColumn56.VisibleIndex = 2;
-            this.gridColumn56.Width = 94;
+            this.gridColumn56.Width = 82;
             // 
             // gridColumn57
             // 
             this.gridColumn57.Caption = "宸ュ簭";
             this.gridColumn57.FieldName = "processNo";
-            this.gridColumn57.MinWidth = 25;
+            this.gridColumn57.MinWidth = 22;
             this.gridColumn57.Name = "gridColumn57";
             this.gridColumn57.OptionsColumn.ReadOnly = true;
             this.gridColumn57.Visible = true;
             this.gridColumn57.VisibleIndex = 3;
-            this.gridColumn57.Width = 94;
+            this.gridColumn57.Width = 82;
             // 
             // gridColumn59
             // 
             this.gridColumn59.Caption = "缁撴灉";
             this.gridColumn59.FieldName = "checkResult";
-            this.gridColumn59.MinWidth = 25;
+            this.gridColumn59.MinWidth = 22;
             this.gridColumn59.Name = "gridColumn59";
             this.gridColumn59.OptionsColumn.ReadOnly = true;
             this.gridColumn59.Visible = true;
             this.gridColumn59.VisibleIndex = 4;
-            this.gridColumn59.Width = 94;
+            this.gridColumn59.Width = 82;
             // 
             // gridColumn60
             // 
             this.gridColumn60.Caption = "涓婃姤浜�";
             this.gridColumn60.FieldName = "createBy";
-            this.gridColumn60.MinWidth = 25;
+            this.gridColumn60.MinWidth = 22;
             this.gridColumn60.Name = "gridColumn60";
             this.gridColumn60.OptionsColumn.ReadOnly = true;
             this.gridColumn60.Visible = true;
             this.gridColumn60.VisibleIndex = 5;
-            this.gridColumn60.Width = 94;
+            this.gridColumn60.Width = 82;
             // 
             // gridColumn61
             // 
             this.gridColumn61.Caption = "鏈�鍚庝笂鎶ユ椂闂�";
             this.gridColumn61.FieldName = "createDate";
-            this.gridColumn61.MinWidth = 25;
+            this.gridColumn61.MinWidth = 22;
             this.gridColumn61.Name = "gridColumn61";
             this.gridColumn61.OptionsColumn.ReadOnly = true;
             this.gridColumn61.Visible = true;
             this.gridColumn61.VisibleIndex = 6;
-            this.gridColumn61.Width = 94;
+            this.gridColumn61.Width = 82;
             // 
             // gridColumn62
             // 
             this.gridColumn62.Caption = "鏁版嵁鐘舵��";
             this.gridColumn62.FieldName = "bRemark";
-            this.gridColumn62.MinWidth = 25;
+            this.gridColumn62.MinWidth = 22;
             this.gridColumn62.Name = "gridColumn62";
             this.gridColumn62.OptionsColumn.ReadOnly = true;
             this.gridColumn62.Visible = true;
             this.gridColumn62.VisibleIndex = 7;
-            this.gridColumn62.Width = 94;
+            this.gridColumn62.Width = 82;
             // 
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.splitMx99);
+            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1648, 472);
+            this.tabMxPage2.Size = new System.Drawing.Size(1442, 368);
             this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�";
             // 
             // splitMx99
@@ -2561,6 +2616,7 @@
             this.splitMx99.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx99.Horizontal = false;
             this.splitMx99.Location = new System.Drawing.Point(0, 0);
+            this.splitMx99.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.splitMx99.Name = "splitMx99";
             // 
             // splitMx99.Panel1
@@ -2573,8 +2629,8 @@
             this.splitMx99.Panel2.Controls.Add(this.gcMx2);
             this.splitMx99.Panel2.Text = "Panel2";
             this.splitMx99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx99.Size = new System.Drawing.Size(1648, 472);
-            this.splitMx99.SplitterPosition = 83;
+            this.splitMx99.Size = new System.Drawing.Size(1442, 368);
+            this.splitMx99.SplitterPosition = 65;
             this.splitMx99.TabIndex = 2;
             // 
             // layoutMx99
@@ -2589,10 +2645,11 @@
             this.layoutMx99.Controls.Add(this.txt_zQty);
             this.layoutMx99.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx99.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx99.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.layoutMx99.Name = "layoutMx99";
             this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(475, 530, 812, 500);
             this.layoutMx99.Root = this.layoutControlGroup1;
-            this.layoutMx99.Size = new System.Drawing.Size(1648, 83);
+            this.layoutMx99.Size = new System.Drawing.Size(1442, 65);
             this.layoutMx99.TabIndex = 0;
             this.layoutMx99.Text = "layoutControl1";
             // 
@@ -2600,29 +2657,32 @@
             // 
             this.layShuLiang.Controls.Add(this.txt_iCount_1);
             this.layShuLiang.Controls.Add(this.txt_yuliang_1);
-            this.layShuLiang.Location = new System.Drawing.Point(662, 44);
+            this.layShuLiang.Location = new System.Drawing.Point(579, 38);
+            this.layShuLiang.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.layShuLiang.Name = "layShuLiang";
             this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500);
             this.layShuLiang.Root = this.layoutControlGroup3;
-            this.layShuLiang.Size = new System.Drawing.Size(321, 28);
+            this.layShuLiang.Size = new System.Drawing.Size(280, 24);
             this.layShuLiang.TabIndex = 475;
             this.layShuLiang.Text = "dataLayoutControl1";
             // 
             // txt_iCount_1
             // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(89, 2);
+            this.txt_iCount_1.Location = new System.Drawing.Point(72, 2);
+            this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_iCount_1.Name = "txt_iCount_1";
             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(66, 20);
             this.txt_iCount_1.StyleController = this.layShuLiang;
             this.txt_iCount_1.TabIndex = 5;
             // 
             // txt_yuliang_1
             // 
-            this.txt_yuliang_1.Location = new System.Drawing.Point(249, 2);
+            this.txt_yuliang_1.Location = new System.Drawing.Point(212, 2);
+            this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             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(66, 20);
             this.txt_yuliang_1.StyleController = this.layShuLiang;
             this.txt_yuliang_1.TabIndex = 6;
             // 
@@ -2647,7 +2707,7 @@
             this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition7});
             this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28);
+            this.layoutControlGroup3.Size = new System.Drawing.Size(280, 24);
             this.layoutControlGroup3.TextVisible = false;
             // 
             // layoutControlItem25
@@ -2655,24 +2715,24 @@
             this.layoutControlItem25.Control = this.txt_iCount_1;
             this.layoutControlItem25.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem25.Name = "layoutControlItem25";
-            this.layoutControlItem25.Size = new System.Drawing.Size(160, 28);
+            this.layoutControlItem25.Size = new System.Drawing.Size(140, 24);
             this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(60, 14);
             // 
             // layoutControlItem39
             // 
             this.layoutControlItem39.Control = this.txt_yuliang_1;
             this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
-            this.layoutControlItem39.Location = new System.Drawing.Point(160, 0);
+            this.layoutControlItem39.Location = new System.Drawing.Point(140, 0);
             this.layoutControlItem39.Name = "layoutControlItem39";
             this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem39.Size = new System.Drawing.Size(161, 28);
+            this.layoutControlItem39.Size = new System.Drawing.Size(140, 24);
             this.layoutControlItem39.Text = "鎵撳嵃浣欐暟";
-            this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem39.TextSize = new System.Drawing.Size(60, 14);
             // 
             // radOut
             // 
-            this.radOut.Location = new System.Drawing.Point(985, 10);
+            this.radOut.Location = new System.Drawing.Point(861, 8);
             this.radOut.Margin = new System.Windows.Forms.Padding(0);
             this.radOut.Name = "radOut";
             this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2681,7 +2741,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(325, 32);
+            this.radOut.Size = new System.Drawing.Size(284, 28);
             this.radOut.StyleController = this.layoutMx99;
             this.radOut.TabIndex = 473;
             // 
@@ -2689,29 +2749,31 @@
             // 
             this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(985, 42);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(861, 36);
             this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint1.Name = "ucBtnPrint1";
             this.ucBtnPrint1.rptParameter = null;
-            this.ucBtnPrint1.Size = new System.Drawing.Size(325, 32);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(284, 28);
             this.ucBtnPrint1.TabIndex = 464;
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(749, 12);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(649, 10);
+            this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             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(234, 24);
+            this.txt_psnQty_1.Size = new System.Drawing.Size(210, 20);
             this.txt_psnQty_1.StyleController = this.layoutMx99;
             this.txt_psnQty_1.TabIndex = 330;
             this.txt_psnQty_1.Tag = "readOnly-1";
             // 
             // txt_printRemark
             // 
-            this.txt_printRemark.Location = new System.Drawing.Point(424, 44);
+            this.txt_printRemark.Location = new System.Drawing.Point(365, 38);
+            this.txt_printRemark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_printRemark.Name = "txt_printRemark";
             this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_printRemark.Size = new System.Drawing.Size(234, 24);
+            this.txt_printRemark.Size = new System.Drawing.Size(210, 20);
             this.txt_printRemark.StyleController = this.layoutMx99;
             this.txt_printRemark.TabIndex = 334;
             this.txt_printRemark.Tag = "readOnly-1";
@@ -2719,32 +2781,35 @@
             // txt_kQty
             // 
             this.txt_kQty.EditValue = "";
-            this.txt_kQty.Location = new System.Drawing.Point(424, 12);
+            this.txt_kQty.Location = new System.Drawing.Point(365, 10);
+            this.txt_kQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_kQty.Name = "txt_kQty";
             this.txt_kQty.Properties.Appearance.Options.UseFont = true;
             this.txt_kQty.Properties.ReadOnly = true;
-            this.txt_kQty.Size = new System.Drawing.Size(234, 24);
+            this.txt_kQty.Size = new System.Drawing.Size(210, 20);
             this.txt_kQty.StyleController = this.layoutMx99;
             this.txt_kQty.TabIndex = 472;
             this.txt_kQty.Tag = "readonly";
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(99, 44);
+            this.txt_yQty.Location = new System.Drawing.Point(81, 38);
+            this.txt_yQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             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(234, 24);
+            this.txt_yQty.Size = new System.Drawing.Size(210, 20);
             this.txt_yQty.StyleController = this.layoutMx99;
             this.txt_yQty.TabIndex = 470;
             this.txt_yQty.Tag = "readonly";
             // 
             // txt_zQty
             // 
-            this.txt_zQty.Location = new System.Drawing.Point(99, 12);
+            this.txt_zQty.Location = new System.Drawing.Point(81, 10);
+            this.txt_zQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_zQty.Name = "txt_zQty";
             this.txt_zQty.Properties.ReadOnly = true;
-            this.txt_zQty.Size = new System.Drawing.Size(234, 24);
+            this.txt_zQty.Size = new System.Drawing.Size(210, 20);
             this.txt_zQty.StyleController = this.layoutMx99;
             this.txt_zQty.TabIndex = 474;
             // 
@@ -2772,7 +2837,7 @@
             columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
             columnDefinition10.Width = 100D;
             columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
-            columnDefinition11.Width = 328D;
+            columnDefinition11.Width = 288D;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
             columnDefinition7,
             columnDefinition8,
@@ -2786,7 +2851,7 @@
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition8,
             rowDefinition9});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1442, 72);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem23
@@ -2794,21 +2859,21 @@
             this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
             this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem23.Control = this.txt_kQty;
-            this.layoutControlItem23.Location = new System.Drawing.Point(325, 0);
+            this.layoutControlItem23.Location = new System.Drawing.Point(284, 0);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem23.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem23.Size = new System.Drawing.Size(284, 28);
             this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
-            this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem23.TextSize = new System.Drawing.Size(60, 14);
             // 
             // layoutControlItem35
             // 
             this.layoutControlItem35.Control = this.radOut;
-            this.layoutControlItem35.Location = new System.Drawing.Point(975, 0);
+            this.layoutControlItem35.Location = new System.Drawing.Point(852, 0);
             this.layoutControlItem35.Name = "layoutControlItem35";
             this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem35.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem35.Size = new System.Drawing.Size(284, 28);
             this.layoutControlItem35.Text = "鑷姩璁$畻";
             this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem35.TextVisible = false;
@@ -2818,12 +2883,12 @@
             this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
             this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem26.Control = this.ucBtnPrint1;
-            this.layoutControlItem26.Location = new System.Drawing.Point(975, 32);
+            this.layoutControlItem26.Location = new System.Drawing.Point(852, 28);
             this.layoutControlItem26.Name = "layoutControlItem26";
             this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem26.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem26.Size = new System.Drawing.Size(284, 28);
             this.layoutControlItem26.Text = "鎵樻澘鎵撳嵃";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem26.TextVisible = false;
@@ -2833,23 +2898,23 @@
             this.layoutControlItem22.AppearanceItemCaption.Options.UseTextOptions = true;
             this.layoutControlItem22.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem22.Control = this.txt_yQty;
-            this.layoutControlItem22.Location = new System.Drawing.Point(0, 32);
+            this.layoutControlItem22.Location = new System.Drawing.Point(0, 28);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem22.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem22.Size = new System.Drawing.Size(284, 28);
             this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(60, 14);
             // 
             // layoutControlItem21
             // 
             this.layoutControlItem21.Control = this.txt_printRemark;
-            this.layoutControlItem21.Location = new System.Drawing.Point(325, 32);
+            this.layoutControlItem21.Location = new System.Drawing.Point(284, 28);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem21.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem21.Size = new System.Drawing.Size(284, 28);
             this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 14);
             // 
             // layoutControlItem24
             // 
@@ -2857,21 +2922,21 @@
             this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem24.Control = this.txt_psnQty_1;
             this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
-            this.layoutControlItem24.Location = new System.Drawing.Point(650, 0);
+            this.layoutControlItem24.Location = new System.Drawing.Point(568, 0);
             this.layoutControlItem24.Name = "layoutControlItem24";
             this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem24.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem24.Size = new System.Drawing.Size(284, 28);
             this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
-            this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem24.TextSize = new System.Drawing.Size(60, 14);
             // 
             // layoutControlItem38
             // 
             this.layoutControlItem38.Control = this.layShuLiang;
-            this.layoutControlItem38.Location = new System.Drawing.Point(650, 32);
+            this.layoutControlItem38.Location = new System.Drawing.Point(568, 28);
             this.layoutControlItem38.Name = "layoutControlItem38";
             this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem38.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem38.Size = new System.Drawing.Size(284, 28);
             this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺";
             this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem38.TextVisible = false;
@@ -2881,19 +2946,21 @@
             this.layoutControlItem36.Control = this.txt_zQty;
             this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem36.Name = "layoutControlItem36";
-            this.layoutControlItem36.Size = new System.Drawing.Size(325, 32);
+            this.layoutControlItem36.Size = new System.Drawing.Size(284, 28);
             this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
-            this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
+            this.layoutControlItem36.TextSize = new System.Drawing.Size(60, 14);
             // 
             // gcMx2
             // 
             this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
+            this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx2.Name = "gcMx2";
             this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.rptTuoBanNbz});
-            this.gcMx2.Size = new System.Drawing.Size(1648, 377);
+            this.gcMx2.Size = new System.Drawing.Size(1442, 293);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -2903,7 +2970,7 @@
             this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gvMx2.Appearance.Row.Options.UseFont = true;
-            this.gvMx2.ColumnPanelRowHeight = 50;
+            this.gvMx2.ColumnPanelRowHeight = 39;
             this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx2guid,
             this.gridColumn19,
@@ -2919,6 +2986,7 @@
             this.gridColumn31,
             this.gridColumn32,
             this.gridColumn54});
+            this.gvMx2.DetailHeight = 272;
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -2931,155 +2999,155 @@
             this.gvMx2guid.AppearanceCell.Options.UseFont = true;
             this.gvMx2guid.Caption = "guid ";
             this.gvMx2guid.FieldName = "guid";
-            this.gvMx2guid.MinWidth = 50;
+            this.gvMx2guid.MinWidth = 44;
             this.gvMx2guid.Name = "gvMx2guid";
             this.gvMx2guid.Tag = "query_a.guid";
-            this.gvMx2guid.Width = 94;
+            this.gvMx2guid.Width = 82;
             // 
             // gridColumn19
             // 
             this.gridColumn19.Caption = "鍏ュ簱鏍囪瘑";
             this.gridColumn19.FieldName = "isRk";
-            this.gridColumn19.MaxWidth = 50;
-            this.gridColumn19.MinWidth = 50;
+            this.gridColumn19.MaxWidth = 44;
+            this.gridColumn19.MinWidth = 44;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
             this.gridColumn19.VisibleIndex = 0;
-            this.gridColumn19.Width = 50;
+            this.gridColumn19.Width = 44;
             // 
             // gvMx2itemBarcode
             // 
             this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemBarcode.Caption = "鎵樻澘鏉$爜";
             this.gvMx2itemBarcode.FieldName = "itemBarcode";
-            this.gvMx2itemBarcode.MinWidth = 50;
+            this.gvMx2itemBarcode.MinWidth = 44;
             this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
             this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx2itemBarcode.Visible = true;
             this.gvMx2itemBarcode.VisibleIndex = 1;
-            this.gvMx2itemBarcode.Width = 94;
+            this.gvMx2itemBarcode.Width = 82;
             // 
             // gvMx2quantity
             // 
             this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
             this.gvMx2quantity.Caption = "鍐呭寘瑁呮暟閲� ";
             this.gvMx2quantity.FieldName = "quantity";
-            this.gvMx2quantity.MinWidth = 50;
+            this.gvMx2quantity.MinWidth = 44;
             this.gvMx2quantity.Name = "gvMx2quantity";
             this.gvMx2quantity.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
             new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣锛歿0:0.##}")});
             this.gvMx2quantity.Tag = "query_a.QUANTITY";
             this.gvMx2quantity.Visible = true;
             this.gvMx2quantity.VisibleIndex = 2;
-            this.gvMx2quantity.Width = 94;
+            this.gvMx2quantity.Width = 82;
             // 
             // gvMx2unit
             // 
             this.gvMx2unit.AppearanceCell.Options.UseFont = true;
             this.gvMx2unit.Caption = "鍗曚綅 ";
             this.gvMx2unit.FieldName = "dwName";
-            this.gvMx2unit.MinWidth = 50;
+            this.gvMx2unit.MinWidth = 44;
             this.gvMx2unit.Name = "gvMx2unit";
             this.gvMx2unit.Tag = "query_a.UNIT";
             this.gvMx2unit.Visible = true;
             this.gvMx2unit.VisibleIndex = 3;
-            this.gvMx2unit.Width = 94;
+            this.gvMx2unit.Width = 82;
             // 
             // gridColumn18
             // 
             this.gridColumn18.Caption = "鐗╂枡缂栫爜";
             this.gridColumn18.FieldName = "itemNo";
-            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.MinWidth = 22;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
             this.gridColumn18.VisibleIndex = 4;
-            this.gridColumn18.Width = 94;
+            this.gridColumn18.Width = 82;
             // 
             // gvMx2itemSname
             // 
             this.gvMx2itemSname.AppearanceCell.Options.UseFont = true;
             this.gvMx2itemSname.Caption = "鐗╂枡鍚嶇О ";
             this.gvMx2itemSname.FieldName = "itemName";
-            this.gvMx2itemSname.MinWidth = 50;
+            this.gvMx2itemSname.MinWidth = 44;
             this.gvMx2itemSname.Name = "gvMx2itemSname";
             this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
             this.gvMx2itemSname.Visible = true;
             this.gvMx2itemSname.VisibleIndex = 5;
-            this.gvMx2itemSname.Width = 94;
+            this.gvMx2itemSname.Width = 82;
             // 
             // gridColumn17
             // 
             this.gridColumn17.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn17.FieldName = "itemModel";
-            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.MinWidth = 22;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
             this.gridColumn17.VisibleIndex = 6;
-            this.gridColumn17.Width = 94;
+            this.gridColumn17.Width = 82;
             // 
             // gvMx2createBy
             // 
             this.gvMx2createBy.AppearanceCell.Options.UseFont = true;
             this.gvMx2createBy.Caption = "鍒涘缓浜� ";
             this.gvMx2createBy.FieldName = "createBy";
-            this.gvMx2createBy.MinWidth = 50;
+            this.gvMx2createBy.MinWidth = 44;
             this.gvMx2createBy.Name = "gvMx2createBy";
             this.gvMx2createBy.Tag = "query_a.CREATE_BY";
             this.gvMx2createBy.Visible = true;
             this.gvMx2createBy.VisibleIndex = 7;
-            this.gvMx2createBy.Width = 94;
+            this.gvMx2createBy.Width = 82;
             // 
             // gvMx2createDate
             // 
             this.gvMx2createDate.AppearanceCell.Options.UseFont = true;
             this.gvMx2createDate.Caption = "鍒涘缓鏃堕棿 ";
             this.gvMx2createDate.FieldName = "createDate";
-            this.gvMx2createDate.MinWidth = 50;
+            this.gvMx2createDate.MinWidth = 44;
             this.gvMx2createDate.Name = "gvMx2createDate";
             this.gvMx2createDate.Tag = "query_a.CREATE_DATE";
             this.gvMx2createDate.Visible = true;
             this.gvMx2createDate.VisibleIndex = 8;
-            this.gvMx2createDate.Width = 94;
+            this.gvMx2createDate.Width = 82;
             // 
             // gridColumn30
             // 
             this.gridColumn30.Caption = "鍏ュ簱浜�";
             this.gridColumn30.FieldName = "rkUser";
-            this.gridColumn30.MinWidth = 25;
+            this.gridColumn30.MinWidth = 22;
             this.gridColumn30.Name = "gridColumn30";
             this.gridColumn30.Visible = true;
             this.gridColumn30.VisibleIndex = 9;
-            this.gridColumn30.Width = 94;
+            this.gridColumn30.Width = 82;
             // 
             // gridColumn31
             // 
             this.gridColumn31.Caption = "鍏ュ簱鏃ユ湡";
             this.gridColumn31.FieldName = "rkDate";
-            this.gridColumn31.MinWidth = 25;
+            this.gridColumn31.MinWidth = 22;
             this.gridColumn31.Name = "gridColumn31";
             this.gridColumn31.Visible = true;
             this.gridColumn31.VisibleIndex = 10;
-            this.gridColumn31.Width = 94;
+            this.gridColumn31.Width = 82;
             // 
             // gridColumn32
             // 
             this.gridColumn32.Caption = "鍏ュ簱浣�";
             this.gridColumn32.FieldName = "rkPositon";
-            this.gridColumn32.MinWidth = 25;
+            this.gridColumn32.MinWidth = 22;
             this.gridColumn32.Name = "gridColumn32";
             this.gridColumn32.Visible = true;
             this.gridColumn32.VisibleIndex = 11;
-            this.gridColumn32.Width = 94;
+            this.gridColumn32.Width = 82;
             // 
             // gridColumn54
             // 
             this.gridColumn54.Caption = "鍙樻洿鍐呭寘瑁呮暟閲�";
             this.gridColumn54.ColumnEdit = this.rptTuoBanNbz;
-            this.gridColumn54.MinWidth = 25;
+            this.gridColumn54.MinWidth = 22;
             this.gridColumn54.Name = "gridColumn54";
             this.gridColumn54.Visible = true;
             this.gridColumn54.VisibleIndex = 12;
-            this.gridColumn54.Width = 94;
+            this.gridColumn54.Width = 82;
             // 
             // rptTuoBanNbz
             // 
@@ -3095,8 +3163,9 @@
             // xtraTabPage3
             // 
             this.xtraTabPage3.Controls.Add(this.splitMx98);
+            this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1648, 472);
+            this.xtraTabPage3.Size = new System.Drawing.Size(1442, 368);
             this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
             // 
             // splitMx98
@@ -3104,6 +3173,7 @@
             this.splitMx98.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx98.Horizontal = false;
             this.splitMx98.Location = new System.Drawing.Point(0, 0);
+            this.splitMx98.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.splitMx98.Name = "splitMx98";
             // 
             // splitMx98.Panel1
@@ -3116,8 +3186,8 @@
             this.splitMx98.Panel2.Controls.Add(this.gcMx3);
             this.splitMx98.Panel2.Text = "Panel2";
             this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx98.Size = new System.Drawing.Size(1648, 472);
-            this.splitMx98.SplitterPosition = 52;
+            this.splitMx98.Size = new System.Drawing.Size(1442, 368);
+            this.splitMx98.SplitterPosition = 40;
             this.splitMx98.TabIndex = 2;
             // 
             // layoutMx98
@@ -3130,10 +3200,11 @@
             this.layoutMx98.Controls.Add(this.txt_zQty98);
             this.layoutMx98.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx98.Location = new System.Drawing.Point(0, 0);
+            this.layoutMx98.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.layoutMx98.Name = "layoutMx98";
             this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(96, 530, 812, 500);
             this.layoutMx98.Root = this.layoutControlGroup2;
-            this.layoutMx98.Size = new System.Drawing.Size(1648, 52);
+            this.layoutMx98.Size = new System.Drawing.Size(1442, 40);
             this.layoutMx98.TabIndex = 0;
             this.layoutMx98.Text = "layoutControl1";
             // 
@@ -3141,53 +3212,58 @@
             // 
             this.ucBtnPrint98.allClickKey = null;
             this.ucBtnPrint98.guidKey = null;
-            this.ucBtnPrint98.Location = new System.Drawing.Point(1365, 10);
+            this.ucBtnPrint98.Location = new System.Drawing.Point(1194, 8);
             this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint98.Name = "ucBtnPrint98";
             this.ucBtnPrint98.rptParameter = null;
-            this.ucBtnPrint98.Size = new System.Drawing.Size(273, 32);
+            this.ucBtnPrint98.Size = new System.Drawing.Size(239, 24);
             this.ucBtnPrint98.TabIndex = 8;
             // 
             // txt_yQty98
             // 
-            this.txt_yQty98.Location = new System.Drawing.Point(385, 12);
+            this.txt_yQty98.Location = new System.Drawing.Point(330, 10);
+            this.txt_yQty98.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_yQty98.Name = "txt_yQty98";
             this.txt_yQty98.Properties.ReadOnly = true;
-            this.txt_yQty98.Size = new System.Drawing.Size(165, 24);
+            this.txt_yQty98.Size = new System.Drawing.Size(151, 20);
             this.txt_yQty98.StyleController = this.layoutMx98;
             this.txt_yQty98.TabIndex = 4;
             // 
             // txt_kQty98
             // 
-            this.txt_kQty98.Location = new System.Drawing.Point(656, 12);
+            this.txt_kQty98.Location = new System.Drawing.Point(567, 10);
+            this.txt_kQty98.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_kQty98.Name = "txt_kQty98";
             this.txt_kQty98.Properties.ReadOnly = true;
-            this.txt_kQty98.Size = new System.Drawing.Size(165, 24);
+            this.txt_kQty98.Size = new System.Drawing.Size(151, 20);
             this.txt_kQty98.StyleController = this.layoutMx98;
             this.txt_kQty98.TabIndex = 5;
             // 
             // txt_printRemark98
             // 
-            this.txt_printRemark98.Location = new System.Drawing.Point(927, 12);
+            this.txt_printRemark98.Location = new System.Drawing.Point(804, 10);
+            this.txt_printRemark98.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_printRemark98.Name = "txt_printRemark98";
-            this.txt_printRemark98.Size = new System.Drawing.Size(165, 24);
+            this.txt_printRemark98.Size = new System.Drawing.Size(151, 20);
             this.txt_printRemark98.StyleController = this.layoutMx98;
             this.txt_printRemark98.TabIndex = 6;
             // 
             // txt_iCount_98
             // 
-            this.txt_iCount_98.Location = new System.Drawing.Point(1198, 12);
+            this.txt_iCount_98.Location = new System.Drawing.Point(1041, 10);
+            this.txt_iCount_98.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_iCount_98.Name = "txt_iCount_98";
-            this.txt_iCount_98.Size = new System.Drawing.Size(165, 24);
+            this.txt_iCount_98.Size = new System.Drawing.Size(151, 20);
             this.txt_iCount_98.StyleController = this.layoutMx98;
             this.txt_iCount_98.TabIndex = 7;
             // 
             // txt_zQty98
             // 
-            this.txt_zQty98.Location = new System.Drawing.Point(114, 12);
+            this.txt_zQty98.Location = new System.Drawing.Point(93, 10);
+            this.txt_zQty98.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_zQty98.Name = "txt_zQty98";
             this.txt_zQty98.Properties.ReadOnly = true;
-            this.txt_zQty98.Size = new System.Drawing.Size(165, 24);
+            this.txt_zQty98.Size = new System.Drawing.Size(151, 20);
             this.txt_zQty98.StyleController = this.layoutMx98;
             this.txt_zQty98.TabIndex = 9;
             // 
@@ -3227,17 +3303,17 @@
             rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition10});
-            this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 52);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(1442, 40);
             this.layoutControlGroup2.TextVisible = false;
             // 
             // layoutControlItem34
             // 
             this.layoutControlItem34.Control = this.ucBtnPrint98;
-            this.layoutControlItem34.Location = new System.Drawing.Point(1355, 0);
+            this.layoutControlItem34.Location = new System.Drawing.Point(1185, 0);
             this.layoutControlItem34.Name = "layoutControlItem34";
             this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 5;
             this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem34.Size = new System.Drawing.Size(273, 32);
+            this.layoutControlItem34.Size = new System.Drawing.Size(239, 24);
             this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem34.TextVisible = false;
@@ -3245,59 +3321,61 @@
             // layoutControlItem33
             // 
             this.layoutControlItem33.Control = this.txt_iCount_98;
-            this.layoutControlItem33.Location = new System.Drawing.Point(1084, 0);
+            this.layoutControlItem33.Location = new System.Drawing.Point(948, 0);
             this.layoutControlItem33.Name = "layoutControlItem33";
             this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 4;
-            this.layoutControlItem33.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem33.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟";
-            this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem33.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem32
             // 
             this.layoutControlItem32.Control = this.txt_printRemark98;
-            this.layoutControlItem32.Location = new System.Drawing.Point(813, 0);
+            this.layoutControlItem32.Location = new System.Drawing.Point(711, 0);
             this.layoutControlItem32.Name = "layoutControlItem32";
             this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem32.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem32.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
-            this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem32.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem31
             // 
             this.layoutControlItem31.Control = this.txt_kQty98;
-            this.layoutControlItem31.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem31.Location = new System.Drawing.Point(474, 0);
             this.layoutControlItem31.Name = "layoutControlItem31";
             this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem31.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem31.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
-            this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem31.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem30
             // 
             this.layoutControlItem30.Control = this.txt_yQty98;
-            this.layoutControlItem30.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem30.Location = new System.Drawing.Point(237, 0);
             this.layoutControlItem30.Name = "layoutControlItem30";
             this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem30.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem30.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
-            this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem30.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem37
             // 
             this.layoutControlItem37.Control = this.txt_zQty98;
             this.layoutControlItem37.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem37.Name = "layoutControlItem37";
-            this.layoutControlItem37.Size = new System.Drawing.Size(271, 32);
+            this.layoutControlItem37.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem37.Text = "宸ュ崟鎬婚噺";
-            this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem37.TextSize = new System.Drawing.Size(72, 14);
             // 
             // gcMx3
             // 
             this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx3.Location = new System.Drawing.Point(0, 0);
             this.gcMx3.MainView = this.gvMx3;
+            this.gcMx3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx3.Name = "gcMx3";
-            this.gcMx3.Size = new System.Drawing.Size(1648, 408);
+            this.gcMx3.Size = new System.Drawing.Size(1442, 318);
             this.gcMx3.TabIndex = 1;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
@@ -3307,7 +3385,7 @@
             this.gvMx3.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gvMx3.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gvMx3.Appearance.Row.Options.UseFont = true;
-            this.gvMx3.ColumnPanelRowHeight = 50;
+            this.gvMx3.ColumnPanelRowHeight = 39;
             this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn33,
             this.gridColumn38,
@@ -3318,6 +3396,7 @@
             this.gridColumn34,
             this.gridColumn35,
             this.gridColumn55});
+            this.gvMx3.DetailHeight = 272;
             this.gvMx3.GridControl = this.gcMx3;
             this.gvMx3.Name = "gvMx3";
             this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -3330,44 +3409,44 @@
             this.gridColumn33.AppearanceCell.Options.UseFont = true;
             this.gridColumn33.Caption = "guid ";
             this.gridColumn33.FieldName = "guid";
-            this.gridColumn33.MinWidth = 50;
+            this.gridColumn33.MinWidth = 44;
             this.gridColumn33.Name = "gridColumn33";
             this.gridColumn33.OptionsColumn.ReadOnly = true;
             this.gridColumn33.Tag = "query_a.guid";
-            this.gridColumn33.Width = 94;
+            this.gridColumn33.Width = 82;
             // 
             // gridColumn38
             // 
             this.gridColumn38.AppearanceCell.Options.UseFont = true;
             this.gridColumn38.Caption = "宸ュ崟鍙�";
             this.gridColumn38.FieldName = "daa001";
-            this.gridColumn38.MinWidth = 50;
+            this.gridColumn38.MinWidth = 44;
             this.gridColumn38.Name = "gridColumn38";
             this.gridColumn38.OptionsColumn.ReadOnly = true;
             this.gridColumn38.Tag = "query_a.UNIT";
             this.gridColumn38.Visible = true;
             this.gridColumn38.VisibleIndex = 0;
-            this.gridColumn38.Width = 94;
+            this.gridColumn38.Width = 82;
             // 
             // gridColumn36
             // 
             this.gridColumn36.AppearanceCell.Options.UseFont = true;
             this.gridColumn36.Caption = "杩芥函鐮�";
             this.gridColumn36.FieldName = "barCode";
-            this.gridColumn36.MinWidth = 50;
+            this.gridColumn36.MinWidth = 44;
             this.gridColumn36.Name = "gridColumn36";
             this.gridColumn36.OptionsColumn.ReadOnly = true;
             this.gridColumn36.Tag = "query_a.ITEM_BARCODE";
             this.gridColumn36.Visible = true;
             this.gridColumn36.VisibleIndex = 1;
-            this.gridColumn36.Width = 94;
+            this.gridColumn36.Width = 82;
             // 
             // gridColumn37
             // 
             this.gridColumn37.AppearanceCell.Options.UseFont = true;
             this.gridColumn37.Caption = "鏁伴噺 ";
             this.gridColumn37.FieldName = "quantity";
-            this.gridColumn37.MinWidth = 50;
+            this.gridColumn37.MinWidth = 44;
             this.gridColumn37.Name = "gridColumn37";
             this.gridColumn37.OptionsColumn.ReadOnly = true;
             this.gridColumn37.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
@@ -3375,69 +3454,70 @@
             this.gridColumn37.Tag = "query_a.QUANTITY";
             this.gridColumn37.Visible = true;
             this.gridColumn37.VisibleIndex = 2;
-            this.gridColumn37.Width = 94;
+            this.gridColumn37.Width = 82;
             // 
             // gridColumn42
             // 
             this.gridColumn42.AppearanceCell.Options.UseFont = true;
             this.gridColumn42.Caption = "鍒涘缓浜� ";
             this.gridColumn42.FieldName = "createBy";
-            this.gridColumn42.MinWidth = 50;
+            this.gridColumn42.MinWidth = 44;
             this.gridColumn42.Name = "gridColumn42";
             this.gridColumn42.OptionsColumn.ReadOnly = true;
             this.gridColumn42.Tag = "query_a.CREATE_BY";
             this.gridColumn42.Visible = true;
             this.gridColumn42.VisibleIndex = 3;
-            this.gridColumn42.Width = 94;
+            this.gridColumn42.Width = 82;
             // 
             // gridColumn43
             // 
             this.gridColumn43.AppearanceCell.Options.UseFont = true;
             this.gridColumn43.Caption = "鍒涘缓鏃堕棿 ";
             this.gridColumn43.FieldName = "createDate";
-            this.gridColumn43.MinWidth = 50;
+            this.gridColumn43.MinWidth = 44;
             this.gridColumn43.Name = "gridColumn43";
             this.gridColumn43.OptionsColumn.ReadOnly = true;
             this.gridColumn43.Tag = "query_a.CREATE_DATE";
             this.gridColumn43.Visible = true;
             this.gridColumn43.VisibleIndex = 4;
-            this.gridColumn43.Width = 94;
+            this.gridColumn43.Width = 82;
             // 
             // gridColumn34
             // 
             this.gridColumn34.Caption = "绾垮埆ID";
             this.gridColumn34.FieldName = "lineId";
-            this.gridColumn34.MinWidth = 25;
+            this.gridColumn34.MinWidth = 22;
             this.gridColumn34.Name = "gridColumn34";
             this.gridColumn34.OptionsColumn.ReadOnly = true;
-            this.gridColumn34.Width = 94;
+            this.gridColumn34.Width = 82;
             // 
             // gridColumn35
             // 
             this.gridColumn35.Caption = "绾垮埆鍚嶇О";
             this.gridColumn35.FieldName = "xtName";
-            this.gridColumn35.MinWidth = 25;
+            this.gridColumn35.MinWidth = 22;
             this.gridColumn35.Name = "gridColumn35";
             this.gridColumn35.OptionsColumn.ReadOnly = true;
             this.gridColumn35.Visible = true;
             this.gridColumn35.VisibleIndex = 5;
-            this.gridColumn35.Width = 94;
+            this.gridColumn35.Width = 82;
             // 
             // gridColumn55
             // 
             this.gridColumn55.Caption = "鏁版嵁鐘舵��";
             this.gridColumn55.FieldName = "bRemark";
-            this.gridColumn55.MinWidth = 25;
+            this.gridColumn55.MinWidth = 22;
             this.gridColumn55.Name = "gridColumn55";
             this.gridColumn55.Visible = true;
             this.gridColumn55.VisibleIndex = 6;
-            this.gridColumn55.Width = 94;
+            this.gridColumn55.Width = 82;
             // 
             // xtraTabPage4
             // 
             this.xtraTabPage4.Controls.Add(this.splitMx100);
+            this.xtraTabPage4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage4.Name = "xtraTabPage4";
-            this.xtraTabPage4.Size = new System.Drawing.Size(1648, 472);
+            this.xtraTabPage4.Size = new System.Drawing.Size(1442, 368);
             this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�";
             // 
             // splitMx100
@@ -3445,6 +3525,7 @@
             this.splitMx100.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx100.Horizontal = false;
             this.splitMx100.Location = new System.Drawing.Point(0, 0);
+            this.splitMx100.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.splitMx100.Name = "splitMx100";
             // 
             // splitMx100.Panel1
@@ -3457,8 +3538,8 @@
             this.splitMx100.Panel2.Controls.Add(this.gcMx4);
             this.splitMx100.Panel2.Text = "Panel2";
             this.splitMx100.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx100.Size = new System.Drawing.Size(1648, 472);
-            this.splitMx100.SplitterPosition = 52;
+            this.splitMx100.Size = new System.Drawing.Size(1442, 368);
+            this.splitMx100.SplitterPosition = 40;
             this.splitMx100.TabIndex = 3;
             // 
             // layMx100
@@ -3472,10 +3553,11 @@
             this.layMx100.Controls.Add(this.btnDesign);
             this.layMx100.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layMx100.Location = new System.Drawing.Point(0, 0);
+            this.layMx100.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.layMx100.Name = "layMx100";
             this.layMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(274, 530, 812, 500);
             this.layMx100.Root = this.layoutControlGroup4;
-            this.layMx100.Size = new System.Drawing.Size(1648, 52);
+            this.layMx100.Size = new System.Drawing.Size(1442, 40);
             this.layMx100.TabIndex = 2;
             this.layMx100.Text = "dataLayoutControl1";
             // 
@@ -3483,64 +3565,70 @@
             // 
             this.ucBtnPrint100.allClickKey = null;
             this.ucBtnPrint100.guidKey = null;
-            this.ucBtnPrint100.Location = new System.Drawing.Point(1096, 10);
+            this.ucBtnPrint100.Location = new System.Drawing.Point(959, 8);
             this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint100.Name = "ucBtnPrint100";
             this.ucBtnPrint100.rptParameter = null;
-            this.ucBtnPrint100.Size = new System.Drawing.Size(272, 32);
+            this.ucBtnPrint100.Size = new System.Drawing.Size(238, 26);
             this.ucBtnPrint100.TabIndex = 0;
             // 
             // btnIn
             // 
             this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16;
-            this.btnIn.Location = new System.Drawing.Point(1370, 12);
+            this.btnIn.Location = new System.Drawing.Point(1199, 10);
+            this.btnIn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnIn.Name = "btnIn";
-            this.btnIn.Size = new System.Drawing.Size(116, 27);
+            this.btnIn.Size = new System.Drawing.Size(101, 22);
             this.btnIn.StyleController = this.layMx100;
             this.btnIn.TabIndex = 1;
             this.btnIn.Text = "瀵煎叆鍚庣洊鐮�";
             // 
             // txt_zQty100
             // 
-            this.txt_zQty100.Location = new System.Drawing.Point(114, 12);
+            this.txt_zQty100.Location = new System.Drawing.Point(93, 10);
+            this.txt_zQty100.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_zQty100.Name = "txt_zQty100";
             this.txt_zQty100.Properties.ReadOnly = true;
-            this.txt_zQty100.Size = new System.Drawing.Size(164, 24);
+            this.txt_zQty100.Size = new System.Drawing.Size(150, 20);
             this.txt_zQty100.StyleController = this.layMx100;
             this.txt_zQty100.TabIndex = 4;
             // 
             // txt_yQty100
             // 
-            this.txt_yQty100.Location = new System.Drawing.Point(384, 12);
+            this.txt_yQty100.Location = new System.Drawing.Point(329, 10);
+            this.txt_yQty100.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_yQty100.Name = "txt_yQty100";
             this.txt_yQty100.Properties.ReadOnly = true;
-            this.txt_yQty100.Size = new System.Drawing.Size(166, 24);
+            this.txt_yQty100.Size = new System.Drawing.Size(152, 20);
             this.txt_yQty100.StyleController = this.layMx100;
             this.txt_yQty100.TabIndex = 5;
             // 
             // txt_kQty100
             // 
-            this.txt_kQty100.Location = new System.Drawing.Point(656, 12);
+            this.txt_kQty100.Location = new System.Drawing.Point(567, 10);
+            this.txt_kQty100.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_kQty100.Name = "txt_kQty100";
             this.txt_kQty100.Properties.ReadOnly = true;
-            this.txt_kQty100.Size = new System.Drawing.Size(166, 24);
+            this.txt_kQty100.Size = new System.Drawing.Size(152, 20);
             this.txt_kQty100.StyleController = this.layMx100;
             this.txt_kQty100.TabIndex = 6;
             // 
             // txt_iCount_100
             // 
-            this.txt_iCount_100.Location = new System.Drawing.Point(928, 12);
+            this.txt_iCount_100.Location = new System.Drawing.Point(805, 10);
+            this.txt_iCount_100.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_iCount_100.Name = "txt_iCount_100";
-            this.txt_iCount_100.Size = new System.Drawing.Size(166, 24);
+            this.txt_iCount_100.Size = new System.Drawing.Size(152, 20);
             this.txt_iCount_100.StyleController = this.layMx100;
             this.txt_iCount_100.TabIndex = 7;
             // 
             // btnDesign
             // 
             this.btnDesign.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.print_16x16;
-            this.btnDesign.Location = new System.Drawing.Point(1490, 12);
+            this.btnDesign.Location = new System.Drawing.Point(1304, 10);
+            this.btnDesign.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnDesign.Name = "btnDesign";
-            this.btnDesign.Size = new System.Drawing.Size(146, 27);
+            this.btnDesign.Size = new System.Drawing.Size(127, 22);
             this.btnDesign.StyleController = this.layMx100;
             this.btnDesign.TabIndex = 8;
             this.btnDesign.Text = "缁存姢瀹㈡埛妯℃澘";
@@ -3570,9 +3658,9 @@
             columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
             columnDefinition22.Width = 100D;
             columnDefinition23.SizeType = System.Windows.Forms.SizeType.Absolute;
-            columnDefinition23.Width = 120D;
+            columnDefinition23.Width = 105D;
             columnDefinition24.SizeType = System.Windows.Forms.SizeType.Absolute;
-            columnDefinition24.Width = 150D;
+            columnDefinition24.Width = 131D;
             this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
             columnDefinition18,
             columnDefinition19,
@@ -3585,7 +3673,7 @@
             rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition11});
-            this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 52);
+            this.layoutControlGroup4.Size = new System.Drawing.Size(1442, 42);
             this.layoutControlGroup4.TextVisible = false;
             // 
             // layoutControlItem42
@@ -3593,38 +3681,38 @@
             this.layoutControlItem42.Control = this.txt_zQty100;
             this.layoutControlItem42.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem42.Name = "layoutControlItem42";
-            this.layoutControlItem42.Size = new System.Drawing.Size(270, 32);
+            this.layoutControlItem42.Size = new System.Drawing.Size(236, 26);
             this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
-            this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem42.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem43
             // 
             this.layoutControlItem43.Control = this.txt_yQty100;
-            this.layoutControlItem43.Location = new System.Drawing.Point(270, 0);
+            this.layoutControlItem43.Location = new System.Drawing.Point(236, 0);
             this.layoutControlItem43.Name = "layoutControlItem43";
             this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem43.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem43.Size = new System.Drawing.Size(238, 26);
             this.layoutControlItem43.Text = "宸叉墦鍗版暟";
-            this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem43.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem44
             // 
             this.layoutControlItem44.Control = this.txt_kQty100;
             this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟";
-            this.layoutControlItem44.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem44.Location = new System.Drawing.Point(474, 0);
             this.layoutControlItem44.Name = "layoutControlItem44";
             this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem44.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem44.Size = new System.Drawing.Size(238, 26);
             this.layoutControlItem44.Text = "鍙墦鍗版暟瀛�";
-            this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem44.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.btnIn;
-            this.layoutControlItem2.Location = new System.Drawing.Point(1358, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(1188, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5;
-            this.layoutControlItem2.Size = new System.Drawing.Size(120, 32);
+            this.layoutControlItem2.Size = new System.Drawing.Size(105, 26);
             this.layoutControlItem2.Text = "瀵煎叆鎸夐挳";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem2.TextVisible = false;
@@ -3632,11 +3720,11 @@
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.ucBtnPrint100;
-            this.layoutControlItem10.Location = new System.Drawing.Point(1086, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(950, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 4;
             this.layoutControlItem10.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem10.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem10.Size = new System.Drawing.Size(238, 26);
             this.layoutControlItem10.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -3644,30 +3732,32 @@
             // layoutControlItem45
             // 
             this.layoutControlItem45.Control = this.txt_iCount_100;
-            this.layoutControlItem45.Location = new System.Drawing.Point(814, 0);
+            this.layoutControlItem45.Location = new System.Drawing.Point(712, 0);
             this.layoutControlItem45.Name = "layoutControlItem45";
             this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem45.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem45.Size = new System.Drawing.Size(238, 26);
             this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
-            this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem45.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem47
             // 
             this.layoutControlItem47.Control = this.btnDesign;
-            this.layoutControlItem47.Location = new System.Drawing.Point(1478, 0);
+            this.layoutControlItem47.Location = new System.Drawing.Point(1293, 0);
             this.layoutControlItem47.Name = "layoutControlItem47";
             this.layoutControlItem47.OptionsTableLayoutItem.ColumnIndex = 6;
-            this.layoutControlItem47.Size = new System.Drawing.Size(150, 32);
+            this.layoutControlItem47.Size = new System.Drawing.Size(131, 26);
             this.layoutControlItem47.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem47.TextVisible = false;
             // 
             // gcMx4
             // 
             this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx4.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx4.Location = new System.Drawing.Point(0, 0);
             this.gcMx4.MainView = this.gvMx4;
+            this.gcMx4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx4.Name = "gcMx4";
-            this.gcMx4.Size = new System.Drawing.Size(1648, 408);
+            this.gcMx4.Size = new System.Drawing.Size(1442, 318);
             this.gcMx4.TabIndex = 2;
             this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx4});
@@ -3677,7 +3767,7 @@
             this.gvMx4.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gvMx4.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gvMx4.Appearance.Row.Options.UseFont = true;
-            this.gvMx4.ColumnPanelRowHeight = 50;
+            this.gvMx4.ColumnPanelRowHeight = 39;
             this.gvMx4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn39,
             this.gridColumn40,
@@ -3687,6 +3777,7 @@
             this.gridColumn46,
             this.gridColumn47,
             this.gridColumn48});
+            this.gvMx4.DetailHeight = 272;
             this.gvMx4.GridControl = this.gcMx4;
             this.gvMx4.Name = "gvMx4";
             this.gvMx4.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -3699,44 +3790,44 @@
             this.gridColumn39.AppearanceCell.Options.UseFont = true;
             this.gridColumn39.Caption = "guid ";
             this.gridColumn39.FieldName = "guid";
-            this.gridColumn39.MinWidth = 50;
+            this.gridColumn39.MinWidth = 44;
             this.gridColumn39.Name = "gridColumn39";
             this.gridColumn39.OptionsColumn.ReadOnly = true;
             this.gridColumn39.Tag = "query_a.guid";
-            this.gridColumn39.Width = 94;
+            this.gridColumn39.Width = 82;
             // 
             // gridColumn40
             // 
             this.gridColumn40.AppearanceCell.Options.UseFont = true;
             this.gridColumn40.Caption = "宸ュ崟鍙�";
             this.gridColumn40.FieldName = "daa001";
-            this.gridColumn40.MinWidth = 50;
+            this.gridColumn40.MinWidth = 44;
             this.gridColumn40.Name = "gridColumn40";
             this.gridColumn40.OptionsColumn.ReadOnly = true;
             this.gridColumn40.Tag = "query_a.UNIT";
             this.gridColumn40.Visible = true;
             this.gridColumn40.VisibleIndex = 0;
-            this.gridColumn40.Width = 94;
+            this.gridColumn40.Width = 82;
             // 
             // gridColumn41
             // 
             this.gridColumn41.AppearanceCell.Options.UseFont = true;
             this.gridColumn41.Caption = "鍚庣洊鐮�";
             this.gridColumn41.FieldName = "itemBarcode";
-            this.gridColumn41.MinWidth = 50;
+            this.gridColumn41.MinWidth = 44;
             this.gridColumn41.Name = "gridColumn41";
             this.gridColumn41.OptionsColumn.ReadOnly = true;
             this.gridColumn41.Tag = "query_a.ITEM_BARCODE";
             this.gridColumn41.Visible = true;
             this.gridColumn41.VisibleIndex = 1;
-            this.gridColumn41.Width = 94;
+            this.gridColumn41.Width = 82;
             // 
             // gridColumn44
             // 
             this.gridColumn44.AppearanceCell.Options.UseFont = true;
             this.gridColumn44.Caption = "鏁伴噺 ";
             this.gridColumn44.FieldName = "quantity";
-            this.gridColumn44.MinWidth = 50;
+            this.gridColumn44.MinWidth = 44;
             this.gridColumn44.Name = "gridColumn44";
             this.gridColumn44.OptionsColumn.ReadOnly = true;
             this.gridColumn44.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
@@ -3744,82 +3835,84 @@
             this.gridColumn44.Tag = "query_a.QUANTITY";
             this.gridColumn44.Visible = true;
             this.gridColumn44.VisibleIndex = 2;
-            this.gridColumn44.Width = 94;
+            this.gridColumn44.Width = 82;
             // 
             // gridColumn45
             // 
             this.gridColumn45.AppearanceCell.Options.UseFont = true;
             this.gridColumn45.Caption = "鍒涘缓浜� ";
             this.gridColumn45.FieldName = "createBy";
-            this.gridColumn45.MinWidth = 50;
+            this.gridColumn45.MinWidth = 44;
             this.gridColumn45.Name = "gridColumn45";
             this.gridColumn45.OptionsColumn.ReadOnly = true;
             this.gridColumn45.Tag = "query_a.CREATE_BY";
             this.gridColumn45.Visible = true;
             this.gridColumn45.VisibleIndex = 3;
-            this.gridColumn45.Width = 94;
+            this.gridColumn45.Width = 82;
             // 
             // gridColumn46
             // 
             this.gridColumn46.AppearanceCell.Options.UseFont = true;
             this.gridColumn46.Caption = "鍒涘缓鏃堕棿 ";
             this.gridColumn46.FieldName = "createDate";
-            this.gridColumn46.MinWidth = 50;
+            this.gridColumn46.MinWidth = 44;
             this.gridColumn46.Name = "gridColumn46";
             this.gridColumn46.OptionsColumn.ReadOnly = true;
             this.gridColumn46.Tag = "query_a.CREATE_DATE";
             this.gridColumn46.Visible = true;
             this.gridColumn46.VisibleIndex = 4;
-            this.gridColumn46.Width = 94;
+            this.gridColumn46.Width = 82;
             // 
             // gridColumn47
             // 
             this.gridColumn47.Caption = "宸茬粦鎵樻澘鐮�";
             this.gridColumn47.FieldName = "aboutTbBarcode";
-            this.gridColumn47.MinWidth = 25;
+            this.gridColumn47.MinWidth = 22;
             this.gridColumn47.Name = "gridColumn47";
             this.gridColumn47.OptionsColumn.ReadOnly = true;
             this.gridColumn47.Visible = true;
             this.gridColumn47.VisibleIndex = 5;
-            this.gridColumn47.Width = 94;
+            this.gridColumn47.Width = 82;
             // 
             // gridColumn48
             // 
             this.gridColumn48.Caption = "宸茬粦杩芥函鐮�";
             this.gridColumn48.FieldName = "aboutTracBarcode";
-            this.gridColumn48.MinWidth = 25;
+            this.gridColumn48.MinWidth = 22;
             this.gridColumn48.Name = "gridColumn48";
             this.gridColumn48.OptionsColumn.ReadOnly = true;
             this.gridColumn48.Visible = true;
             this.gridColumn48.VisibleIndex = 6;
-            this.gridColumn48.Width = 94;
+            this.gridColumn48.Width = 82;
             // 
             // xtraTabPage5
             // 
             this.xtraTabPage5.Controls.Add(this.ucBtnPrint101);
+            this.xtraTabPage5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage5.Name = "xtraTabPage5";
             this.xtraTabPage5.PageVisible = false;
-            this.xtraTabPage5.Size = new System.Drawing.Size(1648, 472);
+            this.xtraTabPage5.Size = new System.Drawing.Size(1442, 368);
             this.xtraTabPage5.Text = "鐗╂枡榻愬鏍囪瘑鍗�";
             // 
             // ucBtnPrint101
             // 
             this.ucBtnPrint101.allClickKey = null;
             this.ucBtnPrint101.guidKey = null;
-            this.ucBtnPrint101.Location = new System.Drawing.Point(7, 19);
+            this.ucBtnPrint101.Location = new System.Drawing.Point(6, 15);
             this.ucBtnPrint101.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint101.Name = "ucBtnPrint101";
             this.ucBtnPrint101.rptParameter = null;
-            this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32);
+            this.ucBtnPrint101.Size = new System.Drawing.Size(203, 25);
             this.ucBtnPrint101.TabIndex = 0;
             // 
             // Frm_Womdaa
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1652, 820);
+            this.ClientSize = new System.Drawing.Size(1446, 638);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Frm_Womdaa";
             this.Text = "鐢熶骇宸ュ崟";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
diff --git a/DevApp/Gs.DevApp/Program.cs b/DevApp/Gs.DevApp/Program.cs
index 3e43b38..1220f48 100644
--- a/DevApp/Gs.DevApp/Program.cs
+++ b/DevApp/Gs.DevApp/Program.cs
@@ -53,8 +53,8 @@
                 fmLogin.ShowDialog();
                 if (fmLogin.DialogResult == DialogResult.OK)
                 {
-                    Application.Run(new DevFrm.User.SysMenu());
-                    return;
+                    //Application.Run(new DevFrm.User.SysMenu());
+                    //return;
                     Application.Run(new FrmMain());
                 }
             }

--
Gitblit v1.9.3