From 2fb710372202d0ef4e64a308892169551d3b5110 Mon Sep 17 00:00:00 2001
From: cnf <3283105747@qq.com>
Date: 星期三, 12 十一月 2025 09:52:10 +0800
Subject: [PATCH] 合并领料

---
 DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs |  406 ++++++++++++++++++++++++++++++++--------------------------
 1 files changed, 224 insertions(+), 182 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
index a45f682..da56e35 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwGd.Designer.cs
@@ -65,6 +65,7 @@
             this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -124,7 +125,7 @@
             this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -188,9 +189,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(1128, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(987, 62);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -198,10 +200,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(1128, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(987, 468);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -210,8 +213,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(1126, 570);
+            this.xtraTabPage1.Size = new System.Drawing.Size(985, 442);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -220,6 +224,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
@@ -232,17 +237,19 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1126, 570);
+            this.split1.Size = new System.Drawing.Size(985, 442);
             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(1126, 519);
+            this.gcMain1.Size = new System.Drawing.Size(985, 402);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -252,7 +259,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.gridColumn13,
             this.gv_daa001,
@@ -275,9 +282,12 @@
             this.gridColumn10,
             this.gridColumn11,
             this.gridColumn12,
-            this.gridColumn20});
+            this.gridColumn20,
+            this.gridColumn21});
+            this.gridView1.CustomizationFormBounds = new System.Drawing.Rectangle(1164, 232, 264, 432);
+            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;
@@ -287,249 +297,260 @@
             // 
             this.gridColumn13.Caption = "涓婚敭Guid";
             this.gridColumn13.FieldName = "guid";
-            this.gridColumn13.MinWidth = 25;
+            this.gridColumn13.MinWidth = 22;
             this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.Width = 94;
+            this.gridColumn13.Width = 82;
             // 
             // 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 = 0;
-            this.gv_daa001.Width = 100;
+            this.gv_daa001.Width = 87;
             // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "鐗╂枡缂栫爜";
             this.gridColumn3.FieldName = "wlbm";
-            this.gridColumn3.MinWidth = 50;
+            this.gridColumn3.MinWidth = 44;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
             this.gridColumn3.VisibleIndex = 4;
-            this.gridColumn3.Width = 94;
+            this.gridColumn3.Width = 82;
             // 
             // gridColumn2
             // 
             this.gridColumn2.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn2.FieldName = "wlmc";
-            this.gridColumn2.MinWidth = 50;
+            this.gridColumn2.MinWidth = 44;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 5;
-            this.gridColumn2.Width = 150;
+            this.gridColumn2.Width = 131;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn1.FieldName = "wlgg";
-            this.gridColumn1.MinWidth = 50;
+            this.gridColumn1.MinWidth = 44;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 6;
-            this.gridColumn1.Width = 150;
+            this.gridColumn1.Width = 131;
             // 
             // gv_daa008
             // 
             this.gv_daa008.AppearanceCell.Options.UseFont = true;
             this.gv_daa008.Caption = "宸ュ崟鏁伴噺 ";
             this.gv_daa008.FieldName = "daa008";
-            this.gv_daa008.MinWidth = 25;
+            this.gv_daa008.MinWidth = 22;
             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 = 7;
-            this.gv_daa008.Width = 50;
+            this.gv_daa008.Width = 44;
             // 
             // gv_unit
             // 
             this.gv_unit.AppearanceCell.Options.UseFont = true;
             this.gv_unit.Caption = "鍗曚綅";
             this.gv_unit.FieldName = "dwName";
-            this.gv_unit.MinWidth = 25;
+            this.gv_unit.MinWidth = 22;
             this.gv_unit.Name = "gv_unit";
             this.gv_unit.OptionsColumn.AllowEdit = false;
             this.gv_unit.Tag = "query_a.unit";
             this.gv_unit.Visible = true;
             this.gv_unit.VisibleIndex = 8;
-            this.gv_unit.Width = 50;
+            this.gv_unit.Width = 44;
             // 
             // gv_daa014
             // 
             this.gv_daa014.AppearanceCell.Options.UseFont = true;
             this.gv_daa014.Caption = "鎶曟枡鍗曞彿 ";
             this.gv_daa014.FieldName = "daa014";
-            this.gv_daa014.MinWidth = 50;
+            this.gv_daa014.MinWidth = 44;
             this.gv_daa014.Name = "gv_daa014";
             this.gv_daa014.OptionsColumn.AllowEdit = false;
             this.gv_daa014.Tag = "query_a.daa014";
             this.gv_daa014.Visible = true;
             this.gv_daa014.VisibleIndex = 3;
-            this.gv_daa014.Width = 50;
+            this.gv_daa014.Width = 44;
             // 
             // gv_daa011
             // 
             this.gv_daa011.AppearanceCell.Options.UseFont = true;
             this.gv_daa011.Caption = "鐢熶骇鏁� ";
             this.gv_daa011.FieldName = "daa011";
-            this.gv_daa011.MinWidth = 25;
+            this.gv_daa011.MinWidth = 22;
             this.gv_daa011.Name = "gv_daa011";
             this.gv_daa011.OptionsColumn.AllowEdit = false;
             this.gv_daa011.Tag = "query_a.daa011";
-            this.gv_daa011.Width = 50;
+            this.gv_daa011.Width = 44;
             // 
             // gv_blState
             // 
             this.gv_blState.AppearanceCell.Options.UseFont = true;
             this.gv_blState.Caption = "澶囨枡鐘舵�� ";
             this.gv_blState.FieldName = "blStateTxt";
-            this.gv_blState.MinWidth = 50;
+            this.gv_blState.MinWidth = 44;
             this.gv_blState.Name = "gv_blState";
             this.gv_blState.OptionsColumn.AllowEdit = false;
             this.gv_blState.Tag = "query_a.bl_state";
-            this.gv_blState.Width = 50;
+            this.gv_blState.Width = 44;
             // 
             // gv_blTime
             // 
             this.gv_blTime.AppearanceCell.Options.UseFont = true;
             this.gv_blTime.Caption = "澶囨枡鏃堕棿 ";
             this.gv_blTime.FieldName = "blTime";
-            this.gv_blTime.MinWidth = 50;
+            this.gv_blTime.MinWidth = 44;
             this.gv_blTime.Name = "gv_blTime";
             this.gv_blTime.OptionsColumn.AllowEdit = false;
             this.gv_blTime.Tag = "query_a.bl_time";
-            this.gv_blTime.Width = 180;
+            this.gv_blTime.Width = 157;
             // 
             // gv_blUser
             // 
             this.gv_blUser.AppearanceCell.Options.UseFont = true;
             this.gv_blUser.Caption = "澶囨枡浜� ";
             this.gv_blUser.FieldName = "blUser";
-            this.gv_blUser.MinWidth = 50;
+            this.gv_blUser.MinWidth = 44;
             this.gv_blUser.Name = "gv_blUser";
             this.gv_blUser.OptionsColumn.AllowEdit = false;
             this.gv_blUser.Tag = "query_a.bl_user";
-            this.gv_blUser.Width = 94;
+            this.gv_blUser.Width = 82;
             // 
             // gv_daa018
             // 
             this.gv_daa018.AppearanceCell.Options.UseFont = true;
             this.gv_daa018.Caption = "宸ュ崟鐘舵�� ";
             this.gv_daa018.FieldName = "daa018";
-            this.gv_daa018.MinWidth = 50;
+            this.gv_daa018.MinWidth = 44;
             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 = 1;
-            this.gv_daa018.Width = 94;
+            this.gv_daa018.Width = 82;
             // 
             // gv_wgTime
             // 
             this.gv_wgTime.AppearanceCell.Options.UseFont = true;
             this.gv_wgTime.Caption = "瀹屽伐鏃堕棿 ";
             this.gv_wgTime.FieldName = "wgTime";
-            this.gv_wgTime.MinWidth = 50;
+            this.gv_wgTime.MinWidth = 44;
             this.gv_wgTime.Name = "gv_wgTime";
             this.gv_wgTime.OptionsColumn.AllowEdit = false;
             this.gv_wgTime.Tag = "query_a.wg_time";
-            this.gv_wgTime.Width = 180;
+            this.gv_wgTime.Width = 157;
             // 
             // gv_wgUser
             // 
             this.gv_wgUser.AppearanceCell.Options.UseFont = true;
             this.gv_wgUser.Caption = "瀹屽伐浜� ";
             this.gv_wgUser.FieldName = "wgUser";
-            this.gv_wgUser.MinWidth = 50;
+            this.gv_wgUser.MinWidth = 44;
             this.gv_wgUser.Name = "gv_wgUser";
             this.gv_wgUser.OptionsColumn.AllowEdit = false;
             this.gv_wgUser.Tag = "query_a.wg_user";
-            this.gv_wgUser.Width = 94;
+            this.gv_wgUser.Width = 82;
             // 
             // gv_remark
             // 
             this.gv_remark.AppearanceCell.Options.UseFont = true;
             this.gv_remark.Caption = "澶囨敞";
             this.gv_remark.FieldName = "remark";
-            this.gv_remark.MinWidth = 50;
+            this.gv_remark.MinWidth = 44;
             this.gv_remark.Name = "gv_remark";
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.remark";
             this.gv_remark.Visible = true;
             this.gv_remark.VisibleIndex = 9;
-            this.gv_remark.Width = 94;
+            this.gv_remark.Width = 82;
             // 
             // gridColumn8
             // 
             this.gridColumn8.Caption = "閲囪喘璁㈠崟";
             this.gridColumn8.FieldName = "cgd";
-            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.MinWidth = 22;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
             this.gridColumn8.VisibleIndex = 10;
-            this.gridColumn8.Width = 94;
+            this.gridColumn8.Width = 82;
             // 
             // gridColumn9
             // 
             this.gridColumn9.Caption = "閲囪喘璁㈠崟琛屽彿";
             this.gridColumn9.FieldName = "cgdxh";
-            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.MinWidth = 22;
             this.gridColumn9.Name = "gridColumn9";
-            this.gridColumn9.Width = 94;
+            this.gridColumn9.Width = 82;
             // 
             // gridColumn10
             // 
             this.gridColumn10.Caption = "浠诲姟鍗曞彿";
             this.gridColumn10.FieldName = "erpProductionOrderNo";
-            this.gridColumn10.MinWidth = 25;
+            this.gridColumn10.MinWidth = 22;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
             this.gridColumn10.VisibleIndex = 2;
-            this.gridColumn10.Width = 94;
+            this.gridColumn10.Width = 82;
             // 
             // gridColumn11
             // 
             this.gridColumn11.Caption = "閫氱煡澶囨枡";
             this.gridColumn11.FieldName = "tzbs";
-            this.gridColumn11.MinWidth = 25;
+            this.gridColumn11.MinWidth = 22;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
             this.gridColumn11.VisibleIndex = 11;
-            this.gridColumn11.Width = 94;
+            this.gridColumn11.Width = 82;
             // 
             // gridColumn12
             // 
             this.gridColumn12.Caption = "澶囨枡鎯呭喌";
             this.gridColumn12.FieldName = "daa022Remark";
-            this.gridColumn12.MinWidth = 25;
+            this.gridColumn12.MinWidth = 22;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
             this.gridColumn12.VisibleIndex = 12;
-            this.gridColumn12.Width = 94;
+            this.gridColumn12.Width = 82;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.Caption = "鍏ュ簱璐т富";
+            this.gridColumn20.FieldName = "stockownerName";
+            this.gridColumn20.MinWidth = 22;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 13;
+            this.gridColumn20.Width = 82;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 519);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
+            this.pageBar1.Location = new System.Drawing.Point(0, 402);
+            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(1126, 39);
+            this.pageBar1.Size = new System.Drawing.Size(985, 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(1126, 570);
+            this.xtraTabPage2.Size = new System.Drawing.Size(985, 442);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -537,6 +558,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
@@ -549,8 +571,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(1126, 570);
-            this.splitMx1.SplitterPosition = 135;
+            this.splitMx1.Size = new System.Drawing.Size(985, 442);
+            this.splitMx1.SplitterPosition = 105;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -573,143 +595,157 @@
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem16});
             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(1108, 0, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1126, 135);
+            this.layoutMx1.Size = new System.Drawing.Size(985, 105);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(825, 108);
+            this.lbGuid.Location = new System.Drawing.Point(722, 84);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(268, 28);
+            this.lbGuid.Size = new System.Drawing.Size(234, 22);
             this.lbGuid.TabIndex = 1;
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(116, 98);
+            this.txt_remark.Location = new System.Drawing.Point(94, 82);
+            this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
             this.txt_remark.Properties.ReadOnly = true;
-            this.txt_remark.Size = new System.Drawing.Size(444, 24);
+            this.txt_remark.Size = new System.Drawing.Size(387, 20);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 312;
             // 
             // txt_daa001
             // 
-            this.txt_daa001.Location = new System.Drawing.Point(116, 12);
+            this.txt_daa001.Location = new System.Drawing.Point(94, 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.Properties.ReadOnly = true;
-            this.txt_daa001.Size = new System.Drawing.Size(168, 24);
+            this.txt_daa001.Size = new System.Drawing.Size(150, 20);
             this.txt_daa001.StyleController = this.layoutMx1;
             this.txt_daa001.TabIndex = 216;
             // 
             // txt_wgTime
             // 
-            this.txt_wgTime.Location = new System.Drawing.Point(944, 69);
+            this.txt_wgTime.Location = new System.Drawing.Point(805, 58);
+            this.txt_wgTime.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_wgTime.Name = "txt_wgTime";
             this.txt_wgTime.Properties.Appearance.Options.UseFont = true;
             this.txt_wgTime.Properties.ReadOnly = true;
-            this.txt_wgTime.Size = new System.Drawing.Size(170, 24);
+            this.txt_wgTime.Size = new System.Drawing.Size(152, 20);
             this.txt_wgTime.StyleController = this.layoutMx1;
             this.txt_wgTime.TabIndex = 258;
             // 
             // txt_kgTime
             // 
-            this.txt_kgTime.Location = new System.Drawing.Point(944, 40);
+            this.txt_kgTime.Location = new System.Drawing.Point(805, 34);
+            this.txt_kgTime.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_kgTime.Name = "txt_kgTime";
             this.txt_kgTime.Properties.Appearance.Options.UseFont = true;
             this.txt_kgTime.Properties.ReadOnly = true;
-            this.txt_kgTime.Size = new System.Drawing.Size(170, 24);
+            this.txt_kgTime.Size = new System.Drawing.Size(152, 20);
             this.txt_kgTime.StyleController = this.layoutMx1;
             this.txt_kgTime.TabIndex = 262;
             // 
             // txt_daa014
             // 
-            this.txt_daa014.Location = new System.Drawing.Point(668, 12);
+            this.txt_daa014.Location = new System.Drawing.Point(568, 10);
+            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.Properties.ReadOnly = true;
-            this.txt_daa014.Size = new System.Drawing.Size(168, 24);
+            this.txt_daa014.Size = new System.Drawing.Size(150, 20);
             this.txt_daa014.StyleController = this.layoutMx1;
             this.txt_daa014.TabIndex = 226;
             // 
             // txt_daa018
             // 
-            this.txt_daa018.Location = new System.Drawing.Point(944, 12);
+            this.txt_daa018.Location = new System.Drawing.Point(805, 10);
+            this.txt_daa018.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa018.Name = "txt_daa018";
             this.txt_daa018.Properties.Appearance.Options.UseFont = true;
             this.txt_daa018.Properties.ReadOnly = true;
-            this.txt_daa018.Size = new System.Drawing.Size(170, 24);
+            this.txt_daa018.Size = new System.Drawing.Size(152, 20);
             this.txt_daa018.StyleController = this.layoutMx1;
             this.txt_daa018.TabIndex = 252;
             // 
             // txt_blStateTxt
             // 
-            this.txt_blStateTxt.Location = new System.Drawing.Point(668, 69);
+            this.txt_blStateTxt.Location = new System.Drawing.Point(568, 58);
+            this.txt_blStateTxt.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_blStateTxt.Name = "txt_blStateTxt";
             this.txt_blStateTxt.Properties.Appearance.Options.UseFont = true;
             this.txt_blStateTxt.Properties.ReadOnly = true;
-            this.txt_blStateTxt.Size = new System.Drawing.Size(168, 24);
+            this.txt_blStateTxt.Size = new System.Drawing.Size(150, 20);
             this.txt_blStateTxt.StyleController = this.layoutMx1;
             this.txt_blStateTxt.TabIndex = 240;
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(116, 40);
+            this.txt_itemNo.Location = new System.Drawing.Point(94, 34);
+            this.txt_itemNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_itemNo.Name = "txt_itemNo";
             this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
             this.txt_itemNo.Properties.ReadOnly = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(168, 24);
+            this.txt_itemNo.Size = new System.Drawing.Size(150, 20);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 217;
             // 
             // txt_daa008
             // 
-            this.txt_daa008.Location = new System.Drawing.Point(392, 40);
+            this.txt_daa008.Location = new System.Drawing.Point(331, 34);
+            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.Properties.ReadOnly = true;
-            this.txt_daa008.Size = new System.Drawing.Size(168, 24);
+            this.txt_daa008.Size = new System.Drawing.Size(150, 20);
             this.txt_daa008.StyleController = this.layoutMx1;
             this.txt_daa008.TabIndex = 219;
             // 
             // txt_dwName
             // 
-            this.txt_dwName.Location = new System.Drawing.Point(668, 40);
+            this.txt_dwName.Location = new System.Drawing.Point(568, 34);
+            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.Properties.ReadOnly = true;
-            this.txt_dwName.Size = new System.Drawing.Size(168, 24);
+            this.txt_dwName.Size = new System.Drawing.Size(150, 20);
             this.txt_dwName.StyleController = this.layoutMx1;
             this.txt_dwName.TabIndex = 222;
             // 
             // txt_cgd
             // 
-            this.txt_cgd.Location = new System.Drawing.Point(116, 69);
+            this.txt_cgd.Location = new System.Drawing.Point(94, 58);
+            this.txt_cgd.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_cgd.Name = "txt_cgd";
-            this.txt_cgd.Size = new System.Drawing.Size(168, 24);
+            this.txt_cgd.Size = new System.Drawing.Size(150, 20);
             this.txt_cgd.StyleController = this.layoutMx1;
             this.txt_cgd.TabIndex = 313;
             // 
             // txt_cgdxh
             // 
-            this.txt_cgdxh.Location = new System.Drawing.Point(392, 69);
+            this.txt_cgdxh.Location = new System.Drawing.Point(331, 58);
+            this.txt_cgdxh.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_cgdxh.Name = "txt_cgdxh";
-            this.txt_cgdxh.Size = new System.Drawing.Size(168, 24);
+            this.txt_cgdxh.Size = new System.Drawing.Size(150, 20);
             this.txt_cgdxh.StyleController = this.layoutMx1;
             this.txt_cgdxh.TabIndex = 314;
             // 
             // txt_erpProductionOrderNo
             // 
-            this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(392, 12);
+            this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(331, 10);
+            this.txt_erpProductionOrderNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
-            this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(168, 24);
+            this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(150, 20);
             this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
             this.txt_erpProductionOrderNo.TabIndex = 315;
             // 
@@ -771,7 +807,7 @@
             rowDefinition2,
             rowDefinition3,
             rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1126, 135);
+            this.Root.Size = new System.Drawing.Size(968, 112);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -780,145 +816,146 @@
             this.layoutControlItem1.CustomizationFormText = "濮斿宸ュ崟鍙�";
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(276, 28);
+            this.layoutControlItem1.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem1.Text = "濮斿宸ュ崟鍙�";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(92, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(73, 14);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_itemNo;
-            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(276, 29);
+            this.layoutControlItem5.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(92, 18);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(73, 14);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_daa008;
-            this.layoutControlItem6.Location = new System.Drawing.Point(276, 28);
+            this.layoutControlItem6.Location = new System.Drawing.Point(237, 24);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem6.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem6.Text = "宸ュ崟鏁伴噺";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(92, 18);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(73, 14);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txt_cgd;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 57);
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 48);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem17.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem17.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem17.Text = "閲囪喘鍗曞彿";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(92, 18);
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(73, 14);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_daa018;
-            this.layoutControlItem3.Location = new System.Drawing.Point(828, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(711, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem3.Size = new System.Drawing.Size(278, 28);
+            this.layoutControlItem3.Size = new System.Drawing.Size(239, 24);
             this.layoutControlItem3.Text = "宸ュ崟鐘舵�� ";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(92, 18);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(73, 14);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_kgTime;
             this.layoutControlItem7.CustomizationFormText = "Mes寮�宸ユ椂闂�";
-            this.layoutControlItem7.Location = new System.Drawing.Point(828, 28);
+            this.layoutControlItem7.Location = new System.Drawing.Point(711, 24);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(278, 29);
+            this.layoutControlItem7.Size = new System.Drawing.Size(239, 24);
             this.layoutControlItem7.Text = "Mes寮�宸ユ椂闂�";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(92, 18);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(73, 14);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_wgTime;
-            this.layoutControlItem11.Location = new System.Drawing.Point(828, 57);
+            this.layoutControlItem11.Location = new System.Drawing.Point(711, 48);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(278, 29);
+            this.layoutControlItem11.Size = new System.Drawing.Size(239, 24);
             this.layoutControlItem11.Text = "Mes瀹屽伐鏃堕棿 ";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(92, 18);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(73, 14);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_cgdxh;
-            this.layoutControlItem18.Location = new System.Drawing.Point(276, 57);
+            this.layoutControlItem18.Location = new System.Drawing.Point(237, 48);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem18.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem18.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem18.Text = "閲囪喘鍗曡鍙�";
-            this.layoutControlItem18.TextSize = new System.Drawing.Size(92, 18);
+            this.layoutControlItem18.TextSize = new System.Drawing.Size(73, 14);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_remark;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 86);
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 72);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(552, 29);
+            this.layoutControlItem13.Size = new System.Drawing.Size(474, 24);
             this.layoutControlItem13.Text = "澶囨敞澶囨敞";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(92, 18);
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(73, 14);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_dwName;
-            this.layoutControlItem10.Location = new System.Drawing.Point(552, 28);
+            this.layoutControlItem10.Location = new System.Drawing.Point(474, 24);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem10.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem10.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem10.Text = "鍗曚綅";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(92, 18);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(73, 14);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_blStateTxt;
-            this.layoutControlItem12.Location = new System.Drawing.Point(552, 57);
+            this.layoutControlItem12.Location = new System.Drawing.Point(474, 48);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(276, 29);
+            this.layoutControlItem12.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem12.Text = "閫氱煡澶囨枡";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(92, 18);
+            this.layoutControlItem12.TextSize = new System.Drawing.Size(73, 14);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_erpProductionOrderNo;
-            this.layoutControlItem19.Location = new System.Drawing.Point(276, 0);
+            this.layoutControlItem19.Location = new System.Drawing.Point(237, 0);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem19.Size = new System.Drawing.Size(276, 28);
+            this.layoutControlItem19.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem19.Text = "浠诲姟鍗曞彿";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(92, 18);
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(73, 14);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_daa014;
-            this.layoutControlItem2.Location = new System.Drawing.Point(552, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(474, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
+            this.layoutControlItem2.Size = new System.Drawing.Size(237, 24);
             this.layoutControlItem2.Text = "濮斿璁㈠崟鍙�";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(92, 18);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(73, 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(1126, 423);
+            this.tabMx.Size = new System.Drawing.Size(985, 327);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -926,17 +963,20 @@
             // tabMxPage1
             // 
             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(1124, 391);
+            this.tabMxPage1.Size = new System.Drawing.Size(983, 301);
             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(1124, 391);
+            this.gcMx1.Size = new System.Drawing.Size(983, 301);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -946,7 +986,7 @@
             this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gvMx1.Appearance.Row.Options.UseFont = true;
-            this.gvMx1.ColumnPanelRowHeight = 50;
+            this.gvMx1.ColumnPanelRowHeight = 39;
             this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx1id,
             this.gvMx1pid,
@@ -969,6 +1009,7 @@
             this.gridColumn17,
             this.gridColumn18,
             this.gridColumn19});
+            this.gvMx1.DetailHeight = 272;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -980,240 +1021,240 @@
             this.gvMx1id.AppearanceCell.Options.UseFont = true;
             this.gvMx1id.Caption = "鏄庣粏涓婚敭";
             this.gvMx1id.FieldName = "id";
-            this.gvMx1id.MinWidth = 50;
+            this.gvMx1id.MinWidth = 44;
             this.gvMx1id.Name = "gvMx1id";
             this.gvMx1id.Tag = "query_a.id";
-            this.gvMx1id.Width = 94;
+            this.gvMx1id.Width = 82;
             // 
             // gvMx1pid
             // 
             this.gvMx1pid.AppearanceCell.Options.UseFont = true;
             this.gvMx1pid.Caption = "涓昏〃涓婚敭";
             this.gvMx1pid.FieldName = "pid";
-            this.gvMx1pid.MinWidth = 50;
+            this.gvMx1pid.MinWidth = 44;
             this.gvMx1pid.Name = "gvMx1pid";
             this.gvMx1pid.Tag = "query_a.pid";
-            this.gvMx1pid.Width = 94;
+            this.gvMx1pid.Width = 82;
             // 
             // gvMx1erpid
             // 
             this.gvMx1erpid.AppearanceCell.Options.UseFont = true;
             this.gvMx1erpid.Caption = "erpId";
             this.gvMx1erpid.FieldName = "erpid";
-            this.gvMx1erpid.MinWidth = 50;
+            this.gvMx1erpid.MinWidth = 44;
             this.gvMx1erpid.Name = "gvMx1erpid";
             this.gvMx1erpid.Tag = "query_a.erpid";
-            this.gvMx1erpid.Width = 94;
+            this.gvMx1erpid.Width = 82;
             // 
             // gvMx1eid
             // 
             this.gvMx1eid.AppearanceCell.Options.UseFont = true;
             this.gvMx1eid.Caption = "eId";
             this.gvMx1eid.FieldName = "eid";
-            this.gvMx1eid.MinWidth = 50;
+            this.gvMx1eid.MinWidth = 44;
             this.gvMx1eid.Name = "gvMx1eid";
             this.gvMx1eid.Tag = "query_a.eid";
-            this.gvMx1eid.Width = 94;
+            this.gvMx1eid.Width = 82;
             // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "鐗╂枡缂栧彿";
             this.gridColumn6.FieldName = "itemNo";
-            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.MinWidth = 22;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 1;
-            this.gridColumn6.Width = 94;
+            this.gridColumn6.Width = 82;
             // 
             // gridColumn5
             // 
             this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn5.FieldName = "itemName";
-            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.MinWidth = 22;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 2;
-            this.gridColumn5.Width = 94;
+            this.gridColumn5.Width = 82;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn4.FieldName = "itemModel";
-            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.MinWidth = 22;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 3;
-            this.gridColumn4.Width = 94;
+            this.gridColumn4.Width = 82;
             // 
             // gvMx1dab006
             // 
             this.gvMx1dab006.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab006.Caption = "闇�棰嗙敤閲�";
             this.gvMx1dab006.FieldName = "dab006";
-            this.gvMx1dab006.MinWidth = 25;
+            this.gvMx1dab006.MinWidth = 22;
             this.gvMx1dab006.Name = "gvMx1dab006";
             this.gvMx1dab006.Tag = "query_a.dab006";
             this.gvMx1dab006.Visible = true;
             this.gvMx1dab006.VisibleIndex = 5;
-            this.gvMx1dab006.Width = 50;
+            this.gvMx1dab006.Width = 44;
             // 
             // gvMx1dab007
             // 
             this.gvMx1dab007.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab007.Caption = "宸查鐢ㄩ噺";
             this.gvMx1dab007.FieldName = "ylQty";
-            this.gvMx1dab007.MinWidth = 25;
+            this.gvMx1dab007.MinWidth = 22;
             this.gvMx1dab007.Name = "gvMx1dab007";
             this.gvMx1dab007.Tag = "query_a.dab007";
             this.gvMx1dab007.Visible = true;
             this.gvMx1dab007.VisibleIndex = 6;
-            this.gvMx1dab007.Width = 50;
+            this.gvMx1dab007.Width = 44;
             // 
             // gvMx1dab021
             // 
             this.gvMx1dab021.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab021.Caption = "鍓╀綑鍙";
             this.gvMx1dab021.FieldName = "klQty";
-            this.gvMx1dab021.MinWidth = 25;
+            this.gvMx1dab021.MinWidth = 22;
             this.gvMx1dab021.Name = "gvMx1dab021";
             this.gvMx1dab021.Tag = "query_a.dab021";
             this.gvMx1dab021.Visible = true;
             this.gvMx1dab021.VisibleIndex = 7;
-            this.gvMx1dab021.Width = 50;
+            this.gvMx1dab021.Width = 44;
             // 
             // gvMx1dab009
             // 
             this.gvMx1dab009.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab009.Caption = "鍗曚綅 ";
             this.gvMx1dab009.FieldName = "dwName";
-            this.gvMx1dab009.MinWidth = 25;
+            this.gvMx1dab009.MinWidth = 22;
             this.gvMx1dab009.Name = "gvMx1dab009";
             this.gvMx1dab009.Tag = "query_a.dab009";
             this.gvMx1dab009.Visible = true;
             this.gvMx1dab009.VisibleIndex = 8;
-            this.gvMx1dab009.Width = 50;
+            this.gvMx1dab009.Width = 44;
             // 
             // 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 = 9;
-            this.gvMx1dab001.Width = 94;
+            this.gvMx1dab001.Width = 82;
             // 
             // gvMx1dab012
             // 
             this.gvMx1dab012.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab012.Caption = "缁勬垚鐢ㄩ噺 ";
             this.gvMx1dab012.FieldName = "dab012";
-            this.gvMx1dab012.MinWidth = 25;
+            this.gvMx1dab012.MinWidth = 22;
             this.gvMx1dab012.Name = "gvMx1dab012";
             this.gvMx1dab012.Tag = "query_a.dab012";
             this.gvMx1dab012.Visible = true;
             this.gvMx1dab012.VisibleIndex = 10;
-            this.gvMx1dab012.Width = 50;
+            this.gvMx1dab012.Width = 44;
             // 
             // gvMx1dab002
             // 
             this.gvMx1dab002.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab002.Caption = "搴忓彿 ";
             this.gvMx1dab002.FieldName = "dab002";
-            this.gvMx1dab002.MinWidth = 25;
+            this.gvMx1dab002.MinWidth = 22;
             this.gvMx1dab002.Name = "gvMx1dab002";
             this.gvMx1dab002.Tag = "query_a.dab002";
             this.gvMx1dab002.Visible = true;
             this.gvMx1dab002.VisibleIndex = 0;
-            this.gvMx1dab002.Width = 50;
+            this.gvMx1dab002.Width = 44;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "琛ユ枡鏁伴噺";
             this.gridColumn7.FieldName = "blQty";
-            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.MinWidth = 22;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Visible = true;
             this.gridColumn7.VisibleIndex = 11;
-            this.gridColumn7.Width = 94;
+            this.gridColumn7.Width = 82;
             // 
             // gridColumn14
             // 
             this.gridColumn14.Caption = "瓒呴鏁伴噺";
             this.gridColumn14.FieldName = "clQty";
-            this.gridColumn14.MinWidth = 25;
+            this.gridColumn14.MinWidth = 22;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
             this.gridColumn14.VisibleIndex = 12;
-            this.gridColumn14.Width = 94;
+            this.gridColumn14.Width = 82;
             // 
             // gridColumn15
             // 
             this.gridColumn15.Caption = "鏉ユ枡涓嶈壇閫�鏂�";
             this.gridColumn15.FieldName = "llBl";
-            this.gridColumn15.MinWidth = 25;
+            this.gridColumn15.MinWidth = 22;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
             this.gridColumn15.VisibleIndex = 13;
-            this.gridColumn15.Width = 94;
+            this.gridColumn15.Width = 82;
             // 
             // gridColumn16
             // 
             this.gridColumn16.Caption = "鑹搧閫�鏂�";
             this.gridColumn16.FieldName = "lpTl";
-            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.MinWidth = 22;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
             this.gridColumn16.VisibleIndex = 14;
-            this.gridColumn16.Width = 94;
+            this.gridColumn16.Width = 82;
             // 
             // gridColumn17
             // 
             this.gridColumn17.Caption = "浣滀笟涓嶈壇閫�鏂�";
             this.gridColumn17.FieldName = "zyBl";
-            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.MinWidth = 22;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
             this.gridColumn17.VisibleIndex = 15;
-            this.gridColumn17.Width = 94;
+            this.gridColumn17.Width = 82;
             // 
             // gridColumn18
             // 
             this.gridColumn18.Caption = "閫�鏂欐�绘暟";
             this.gridColumn18.FieldName = "ztsl";
-            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.MinWidth = 22;
             this.gridColumn18.Name = "gridColumn18";
-            this.gridColumn18.Width = 94;
+            this.gridColumn18.Width = 82;
             // 
             // gridColumn19
             // 
             this.gridColumn19.Caption = "棰嗘枡杩涘害";
             this.gridColumn19.FieldName = "barbl";
-            this.gridColumn19.MinWidth = 25;
+            this.gridColumn19.MinWidth = 22;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
             this.gridColumn19.VisibleIndex = 4;
-            this.gridColumn19.Width = 94;
+            this.gridColumn19.Width = 82;
             // 
-            // gridColumn20
+            // gridColumn21
             // 
-            this.gridColumn20.Caption = "鍏ュ簱璐т富";
-            this.gridColumn20.FieldName = "stockownerName";
-            this.gridColumn20.MinWidth = 25;
-            this.gridColumn20.Name = "gridColumn20";
-            this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 13;
-            this.gridColumn20.Width = 94;
+            this.gridColumn21.Caption = "闇�姹傚崟鎹彿";
+            this.gridColumn21.FieldName = "xqdj";
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 14;
+            this.gridColumn21.Width = 66;
             // 
             // Frm_WwGd
             // 
-            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(1128, 682);
+            this.ClientSize = new System.Drawing.Size(987, 530);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.Name = "Frm_WwGd";
             this.Text = "濮斿宸ュ崟";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1359,5 +1400,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3