From 64ea6d80a2ca8f6e58424a80ae6be843ef3c99ca Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 31 十月 2025 11:18:57 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs |  508 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 283 insertions(+), 225 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 0e581f6..4e277bb 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -30,48 +30,56 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraGrid.GridLevelNode gridLevelNode2 = new DevExpress.XtraGrid.GridLevelNode();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition31 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition32 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition33 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition34 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition35 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraGrid.GridLevelNode gridLevelNode1 = new DevExpress.XtraGrid.GridLevelNode();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Womdaa));
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition36 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition37 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition38 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition39 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition40 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition41 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition42 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition43 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition44 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition45 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition46 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition47 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition48 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -109,6 +117,8 @@
             this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn66 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -348,6 +358,7 @@
             this.split1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             this.xtraTabPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
@@ -573,6 +584,8 @@
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
+            this.gcMain1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit1});
             this.gcMain1.Size = new System.Drawing.Size(1650, 657);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -615,7 +628,8 @@
             this.gridColumn23,
             this.gridColumn24,
             this.gridColumn25,
-            this.gridColumn52});
+            this.gridColumn52,
+            this.gridColumn66});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -642,7 +656,7 @@
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Tag = "query_a.jabs";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 0;
+            this.gridColumn7.VisibleIndex = 1;
             this.gridColumn7.Width = 50;
             // 
             // gridColumn10
@@ -654,7 +668,7 @@
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Tag = "query_a.jabs";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 1;
+            this.gridColumn10.VisibleIndex = 2;
             this.gridColumn10.Width = 50;
             // 
             // gridColumn12
@@ -676,7 +690,7 @@
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Tag = "query_a.jabs";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 2;
+            this.gridColumn6.VisibleIndex = 3;
             this.gridColumn6.Width = 50;
             // 
             // gridColumn27
@@ -686,7 +700,7 @@
             this.gridColumn27.MinWidth = 25;
             this.gridColumn27.Name = "gridColumn27";
             this.gridColumn27.Visible = true;
-            this.gridColumn27.VisibleIndex = 17;
+            this.gridColumn27.VisibleIndex = 18;
             this.gridColumn27.Width = 94;
             // 
             // gv_daa018
@@ -699,7 +713,7 @@
             this.gv_daa018.OptionsColumn.AllowEdit = false;
             this.gv_daa018.Tag = "query_a.daa018";
             this.gv_daa018.Visible = true;
-            this.gv_daa018.VisibleIndex = 3;
+            this.gv_daa018.VisibleIndex = 4;
             this.gv_daa018.Width = 90;
             // 
             // gridColoun100
@@ -710,7 +724,7 @@
             this.gridColoun100.Name = "gridColoun100";
             this.gridColoun100.Tag = "org.fnamber";
             this.gridColoun100.Visible = true;
-            this.gridColoun100.VisibleIndex = 25;
+            this.gridColoun100.VisibleIndex = 26;
             this.gridColoun100.Width = 250;
             // 
             // gv_daa001
@@ -723,7 +737,7 @@
             this.gv_daa001.OptionsColumn.AllowEdit = false;
             this.gv_daa001.Tag = "query_a.daa001";
             this.gv_daa001.Visible = true;
-            this.gv_daa001.VisibleIndex = 7;
+            this.gv_daa001.VisibleIndex = 8;
             this.gv_daa001.Width = 120;
             // 
             // gv_daa021
@@ -736,7 +750,7 @@
             this.gv_daa021.OptionsColumn.AllowEdit = false;
             this.gv_daa021.Tag = "query_a.daa021";
             this.gv_daa021.Visible = true;
-            this.gv_daa021.VisibleIndex = 19;
+            this.gv_daa021.VisibleIndex = 20;
             this.gv_daa021.Width = 100;
             // 
             // gridColumn3
@@ -746,7 +760,7 @@
             this.gridColumn3.MinWidth = 50;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 10;
+            this.gridColumn3.VisibleIndex = 11;
             this.gridColumn3.Width = 94;
             // 
             // gv_daa003
@@ -759,7 +773,7 @@
             this.gv_daa003.OptionsColumn.AllowEdit = false;
             this.gv_daa003.Tag = "query_a.daa003";
             this.gv_daa003.Visible = true;
-            this.gv_daa003.VisibleIndex = 11;
+            this.gv_daa003.VisibleIndex = 12;
             this.gv_daa003.Width = 150;
             // 
             // gv_daa004
@@ -772,7 +786,7 @@
             this.gv_daa004.OptionsColumn.AllowEdit = false;
             this.gv_daa004.Tag = "query_a.daa004";
             this.gv_daa004.Visible = true;
-            this.gv_daa004.VisibleIndex = 14;
+            this.gv_daa004.VisibleIndex = 15;
             this.gv_daa004.Width = 150;
             // 
             // gv_daa008
@@ -786,7 +800,7 @@
             this.gv_daa008.OptionsColumn.AllowEdit = false;
             this.gv_daa008.Tag = "query_a.daa008";
             this.gv_daa008.Visible = true;
-            this.gv_daa008.VisibleIndex = 4;
+            this.gv_daa008.VisibleIndex = 5;
             this.gv_daa008.Width = 50;
             // 
             // gridColumn4
@@ -801,7 +815,7 @@
             this.gridColumn4.MinWidth = 50;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 6;
+            this.gridColumn4.VisibleIndex = 7;
             this.gridColumn4.Width = 50;
             // 
             // gv_daa010
@@ -815,7 +829,7 @@
             this.gv_daa010.OptionsColumn.AllowEdit = false;
             this.gv_daa010.Tag = "query_a.daa010";
             this.gv_daa010.Visible = true;
-            this.gv_daa010.VisibleIndex = 5;
+            this.gv_daa010.VisibleIndex = 6;
             this.gv_daa010.Width = 50;
             // 
             // gv_daa005
@@ -829,7 +843,7 @@
             this.gv_daa005.OptionsColumn.AllowEdit = false;
             this.gv_daa005.Tag = "query_a.daa005";
             this.gv_daa005.Visible = true;
-            this.gv_daa005.VisibleIndex = 16;
+            this.gv_daa005.VisibleIndex = 17;
             this.gv_daa005.Width = 50;
             // 
             // gv_cust
@@ -850,7 +864,7 @@
             this.gridColumn1.MinWidth = 50;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 18;
+            this.gridColumn1.VisibleIndex = 19;
             this.gridColumn1.Width = 94;
             // 
             // gv_daa015
@@ -863,7 +877,7 @@
             this.gv_daa015.OptionsColumn.AllowEdit = false;
             this.gv_daa015.Tag = "query_a.daa015";
             this.gv_daa015.Visible = true;
-            this.gv_daa015.VisibleIndex = 8;
+            this.gv_daa015.VisibleIndex = 9;
             this.gv_daa015.Width = 94;
             // 
             // gv_daa009
@@ -876,7 +890,7 @@
             this.gv_daa009.OptionsColumn.AllowEdit = false;
             this.gv_daa009.Tag = "query_a.daa009";
             this.gv_daa009.Visible = true;
-            this.gv_daa009.VisibleIndex = 15;
+            this.gv_daa009.VisibleIndex = 16;
             this.gv_daa009.Width = 94;
             // 
             // gv_daa016
@@ -889,7 +903,7 @@
             this.gv_daa016.OptionsColumn.AllowEdit = false;
             this.gv_daa016.Tag = "query_a.daa016";
             this.gv_daa016.Visible = true;
-            this.gv_daa016.VisibleIndex = 21;
+            this.gv_daa016.VisibleIndex = 22;
             this.gv_daa016.Width = 180;
             // 
             // gv_daa017
@@ -913,7 +927,7 @@
             this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
             this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
             this.gv_mesStartProd.Visible = true;
-            this.gv_mesStartProd.VisibleIndex = 12;
+            this.gv_mesStartProd.VisibleIndex = 13;
             this.gv_mesStartProd.Width = 180;
             // 
             // gv_mesEndProd
@@ -926,7 +940,7 @@
             this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
             this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
             this.gv_mesEndProd.Visible = true;
-            this.gv_mesEndProd.VisibleIndex = 13;
+            this.gv_mesEndProd.VisibleIndex = 14;
             this.gv_mesEndProd.Width = 180;
             // 
             // gridColumn21
@@ -936,7 +950,7 @@
             this.gridColumn21.MinWidth = 25;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 22;
+            this.gridColumn21.VisibleIndex = 23;
             this.gridColumn21.Width = 94;
             // 
             // gridColumn22
@@ -946,7 +960,7 @@
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 23;
+            this.gridColumn22.VisibleIndex = 24;
             this.gridColumn22.Width = 94;
             // 
             // gridColumn23
@@ -964,7 +978,7 @@
             this.gridColumn24.MinWidth = 25;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 24;
+            this.gridColumn24.VisibleIndex = 25;
             this.gridColumn24.Width = 94;
             // 
             // gridColumn25
@@ -974,7 +988,7 @@
             this.gridColumn25.MinWidth = 25;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 20;
+            this.gridColumn25.VisibleIndex = 21;
             this.gridColumn25.Width = 94;
             // 
             // gridColumn52
@@ -984,8 +998,37 @@
             this.gridColumn52.MinWidth = 25;
             this.gridColumn52.Name = "gridColumn52";
             this.gridColumn52.Visible = true;
-            this.gridColumn52.VisibleIndex = 9;
+            this.gridColumn52.VisibleIndex = 10;
             this.gridColumn52.Width = 94;
+            // 
+            // gridColumn66
+            // 
+            this.gridColumn66.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn66.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn66.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn66.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn66.Caption = "杩涘叆鐪嬫澘";
+            this.gridColumn66.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gridColumn66.MinWidth = 25;
+            this.gridColumn66.Name = "gridColumn66";
+            this.gridColumn66.Visible = true;
+            this.gridColumn66.VisibleIndex = 0;
+            this.gridColumn66.Width = 94;
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.Appearance.ForeColor = System.Drawing.Color.Blue;
+            this.repositoryItemButtonEdit1.Appearance.Options.UseForeColor = true;
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.boposition2_16x161;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            serializableAppearanceObject1.ForeColor = System.Drawing.Color.Blue;
+            serializableAppearanceObject1.Options.UseForeColor = true;
+            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "杩涘叆鐪嬫澘", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
             // pageBar1
             // 
@@ -1422,38 +1465,38 @@
             this.layoutControlItem8});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition25.Width = 100D;
-            columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition26.Width = 100D;
-            columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition27.Width = 100D;
-            columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition28.Width = 100D;
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition25,
-            columnDefinition26,
-            columnDefinition27,
-            columnDefinition28});
-            rowDefinition12.Height = 100D;
-            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition13.Height = 100D;
-            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition14.Height = 100D;
-            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition15.Height = 100D;
-            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition16.Height = 100D;
-            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition17.Height = 100D;
-            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition12,
-            rowDefinition13,
-            rowDefinition14,
-            rowDefinition15,
-            rowDefinition16,
-            rowDefinition17});
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5,
+            rowDefinition6});
             this.Root.Size = new System.Drawing.Size(1650, 200);
             this.Root.TextVisible = false;
             // 
@@ -2297,9 +2340,9 @@
             // gcMx7
             // 
             this.gcMx7.Dock = System.Windows.Forms.DockStyle.Fill;
-            gridLevelNode2.RelationName = "Level1";
+            gridLevelNode1.RelationName = "Level1";
             this.gcMx7.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
-            gridLevelNode2});
+            gridLevelNode1});
             this.gcMx7.Location = new System.Drawing.Point(0, 0);
             this.gcMx7.MainView = this.gvMx7;
             this.gcMx7.Name = "gcMx7";
@@ -2626,17 +2669,17 @@
             this.layoutControlItem39});
             this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup3.Name = "Root";
-            columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition29.Width = 100D;
-            columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition30.Width = 100D;
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
             this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition29,
-            columnDefinition30});
-            rowDefinition18.Height = 100D;
-            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6});
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition18});
+            rowDefinition7});
             this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
             this.layoutControlGroup3.Size = new System.Drawing.Size(317, 28);
             this.layoutControlGroup3.TextVisible = false;
@@ -2754,29 +2797,29 @@
             this.layoutControlItem36});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
-            columnDefinition31.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition31.Width = 100D;
-            columnDefinition32.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition32.Width = 100D;
-            columnDefinition33.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition33.Width = 100D;
-            columnDefinition34.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition34.Width = 100D;
-            columnDefinition35.SizeType = System.Windows.Forms.SizeType.AutoSize;
-            columnDefinition35.Width = 323D;
+            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7.Width = 100D;
+            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition8.Width = 100D;
+            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition9.Width = 100D;
+            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition10.Width = 100D;
+            columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
+            columnDefinition11.Width = 323D;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition31,
-            columnDefinition32,
-            columnDefinition33,
-            columnDefinition34,
-            columnDefinition35});
-            rowDefinition19.Height = 100D;
-            rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition20.Height = 100D;
-            rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7,
+            columnDefinition8,
+            columnDefinition9,
+            columnDefinition10,
+            columnDefinition11});
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition9.Height = 100D;
+            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition19,
-            rowDefinition20});
+            rowDefinition8,
+            rowDefinition9});
             this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84);
             this.layoutControlGroup1.TextVisible = false;
             // 
@@ -3108,7 +3151,7 @@
             this.splitMx98.Panel2.Text = "Panel2";
             this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx98.Size = new System.Drawing.Size(1648, 464);
-            this.splitMx98.SplitterPosition = 52;
+            this.splitMx98.SplitterPosition = 60;
             this.splitMx98.TabIndex = 2;
             // 
             // layoutMx98
@@ -3124,7 +3167,7 @@
             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(1648, 60);
             this.layoutMx98.TabIndex = 0;
             this.layoutMx98.Text = "layoutControl1";
             // 
@@ -3132,44 +3175,44 @@
             // 
             this.ucBtnPrint98.allClickKey = null;
             this.ucBtnPrint98.guidKey = null;
-            this.ucBtnPrint98.Location = new System.Drawing.Point(1365, 10);
+            this.ucBtnPrint98.Location = new System.Drawing.Point(1025, 10);
             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(613, 40);
             this.ucBtnPrint98.TabIndex = 8;
             // 
             // txt_yQty98
             // 
-            this.txt_yQty98.Location = new System.Drawing.Point(385, 12);
+            this.txt_yQty98.Location = new System.Drawing.Point(317, 12);
             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(97, 24);
             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(520, 12);
             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(97, 24);
             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(723, 12);
             this.txt_printRemark98.Name = "txt_printRemark98";
-            this.txt_printRemark98.Size = new System.Drawing.Size(165, 24);
+            this.txt_printRemark98.Size = new System.Drawing.Size(97, 24);
             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(926, 12);
             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(97, 24);
             this.txt_iCount_98.StyleController = this.layoutMx98;
             this.txt_iCount_98.TabIndex = 7;
             // 
@@ -3178,7 +3221,7 @@
             this.txt_zQty98.Location = new System.Drawing.Point(114, 12);
             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(97, 24);
             this.txt_zQty98.StyleController = this.layoutMx98;
             this.txt_zQty98.TabIndex = 9;
             // 
@@ -3195,40 +3238,47 @@
             this.layoutControlItem37});
             this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup2.Name = "Root";
-            columnDefinition36.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition36.Width = 100D;
-            columnDefinition37.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition37.Width = 100D;
-            columnDefinition38.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition38.Width = 100D;
-            columnDefinition39.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition39.Width = 100D;
-            columnDefinition40.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition40.Width = 100D;
-            columnDefinition41.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition41.Width = 100D;
+            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition12.Width = 100D;
+            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition13.Width = 100D;
+            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition14.Width = 100D;
+            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition15.Width = 100D;
+            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition16.Width = 100D;
+            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition17.Width = 100D;
+            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition18.Width = 100D;
+            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition19.Width = 100D;
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition36,
-            columnDefinition37,
-            columnDefinition38,
-            columnDefinition39,
-            columnDefinition40,
-            columnDefinition41});
-            rowDefinition21.Height = 100D;
-            rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition12,
+            columnDefinition13,
+            columnDefinition14,
+            columnDefinition15,
+            columnDefinition16,
+            columnDefinition17,
+            columnDefinition18,
+            columnDefinition19});
+            rowDefinition10.Height = 100D;
+            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition21});
-            this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 52);
+            rowDefinition10});
+            this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 60);
             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(1015, 0);
             this.layoutControlItem34.Name = "layoutControlItem34";
             this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 5;
+            this.layoutControlItem34.OptionsTableLayoutItem.ColumnSpan = 3;
             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(613, 40);
             this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem34.TextVisible = false;
@@ -3236,40 +3286,40 @@
             // layoutControlItem33
             // 
             this.layoutControlItem33.Control = this.txt_iCount_98;
-            this.layoutControlItem33.Location = new System.Drawing.Point(1084, 0);
+            this.layoutControlItem33.Location = new System.Drawing.Point(812, 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(203, 40);
             this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟";
             this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem32
             // 
             this.layoutControlItem32.Control = this.txt_printRemark98;
-            this.layoutControlItem32.Location = new System.Drawing.Point(813, 0);
+            this.layoutControlItem32.Location = new System.Drawing.Point(609, 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(203, 40);
             this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
             this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem31
             // 
             this.layoutControlItem31.Control = this.txt_kQty98;
-            this.layoutControlItem31.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem31.Location = new System.Drawing.Point(406, 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(203, 40);
             this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
             this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem30
             // 
             this.layoutControlItem30.Control = this.txt_yQty98;
-            this.layoutControlItem30.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem30.Location = new System.Drawing.Point(203, 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(203, 40);
             this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
             this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3278,7 +3328,7 @@
             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(203, 40);
             this.layoutControlItem37.Text = "宸ュ崟鎬婚噺";
             this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3288,7 +3338,7 @@
             this.gcMx3.Location = new System.Drawing.Point(0, 0);
             this.gcMx3.MainView = this.gvMx3;
             this.gcMx3.Name = "gcMx3";
-            this.gcMx3.Size = new System.Drawing.Size(1648, 400);
+            this.gcMx3.Size = new System.Drawing.Size(1648, 392);
             this.gcMx3.TabIndex = 1;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
@@ -3449,7 +3499,7 @@
             this.splitMx100.Panel2.Text = "Panel2";
             this.splitMx100.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx100.Size = new System.Drawing.Size(1648, 464);
-            this.splitMx100.SplitterPosition = 52;
+            this.splitMx100.SplitterPosition = 60;
             this.splitMx100.TabIndex = 3;
             // 
             // layMx100
@@ -3464,9 +3514,9 @@
             this.layMx100.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layMx100.Location = new System.Drawing.Point(0, 0);
             this.layMx100.Name = "layMx100";
-            this.layMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(274, 530, 812, 500);
+            this.layMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(476, 530, 812, 500);
             this.layMx100.Root = this.layoutControlGroup4;
-            this.layMx100.Size = new System.Drawing.Size(1648, 52);
+            this.layMx100.Size = new System.Drawing.Size(1648, 60);
             this.layMx100.TabIndex = 2;
             this.layMx100.Text = "dataLayoutControl1";
             // 
@@ -3474,11 +3524,11 @@
             // 
             this.ucBtnPrint100.allClickKey = null;
             this.ucBtnPrint100.guidKey = null;
-            this.ucBtnPrint100.Location = new System.Drawing.Point(1096, 10);
+            this.ucBtnPrint100.Location = new System.Drawing.Point(914, 10);
             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(454, 40);
             this.ucBtnPrint100.TabIndex = 0;
             // 
             // btnIn
@@ -3496,33 +3546,33 @@
             this.txt_zQty100.Location = new System.Drawing.Point(114, 12);
             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(120, 24);
             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(340, 12);
             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(120, 24);
             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(566, 12);
             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(120, 24);
             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(792, 12);
             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(120, 24);
             this.txt_iCount_100.StyleController = this.layMx100;
             this.txt_iCount_100.TabIndex = 7;
             // 
@@ -3550,33 +3600,36 @@
             this.layoutControlItem47});
             this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup4.Name = "Root";
-            columnDefinition42.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition42.Width = 100D;
-            columnDefinition43.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition43.Width = 100D;
-            columnDefinition44.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition44.Width = 100D;
-            columnDefinition45.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition45.Width = 100D;
-            columnDefinition46.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition46.Width = 100D;
-            columnDefinition47.SizeType = System.Windows.Forms.SizeType.Absolute;
-            columnDefinition47.Width = 120D;
-            columnDefinition48.SizeType = System.Windows.Forms.SizeType.Absolute;
-            columnDefinition48.Width = 150D;
+            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition20.Width = 100D;
+            columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition21.Width = 100D;
+            columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition22.Width = 100D;
+            columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition23.Width = 100D;
+            columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition24.Width = 100D;
+            columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition25.Width = 100D;
+            columnDefinition26.SizeType = System.Windows.Forms.SizeType.Absolute;
+            columnDefinition26.Width = 120D;
+            columnDefinition27.SizeType = System.Windows.Forms.SizeType.Absolute;
+            columnDefinition27.Width = 150D;
             this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition42,
-            columnDefinition43,
-            columnDefinition44,
-            columnDefinition45,
-            columnDefinition46,
-            columnDefinition47,
-            columnDefinition48});
-            rowDefinition22.Height = 100D;
-            rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition20,
+            columnDefinition21,
+            columnDefinition22,
+            columnDefinition23,
+            columnDefinition24,
+            columnDefinition25,
+            columnDefinition26,
+            columnDefinition27});
+            rowDefinition11.Height = 100D;
+            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition22});
-            this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 52);
+            rowDefinition11});
+            this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 60);
             this.layoutControlGroup4.TextVisible = false;
             // 
             // layoutControlItem42
@@ -3584,17 +3637,17 @@
             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(226, 40);
             this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
             this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem43
             // 
             this.layoutControlItem43.Control = this.txt_yQty100;
-            this.layoutControlItem43.Location = new System.Drawing.Point(270, 0);
+            this.layoutControlItem43.Location = new System.Drawing.Point(226, 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(226, 40);
             this.layoutControlItem43.Text = "宸叉墦鍗版暟";
             this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3602,10 +3655,10 @@
             // 
             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(452, 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(226, 40);
             this.layoutControlItem44.Text = "鍙墦鍗版暟瀛�";
             this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3614,8 +3667,8 @@
             this.layoutControlItem2.Control = this.btnIn;
             this.layoutControlItem2.Location = new System.Drawing.Point(1358, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5;
-            this.layoutControlItem2.Size = new System.Drawing.Size(120, 32);
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 6;
+            this.layoutControlItem2.Size = new System.Drawing.Size(120, 40);
             this.layoutControlItem2.Text = "瀵煎叆鎸夐挳";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem2.TextVisible = false;
@@ -3623,11 +3676,12 @@
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.ucBtnPrint100;
-            this.layoutControlItem10.Location = new System.Drawing.Point(1086, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(904, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 4;
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnSpan = 2;
             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(454, 40);
             this.layoutControlItem10.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -3635,10 +3689,10 @@
             // layoutControlItem45
             // 
             this.layoutControlItem45.Control = this.txt_iCount_100;
-            this.layoutControlItem45.Location = new System.Drawing.Point(814, 0);
+            this.layoutControlItem45.Location = new System.Drawing.Point(678, 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(226, 40);
             this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
             this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3647,8 +3701,9 @@
             this.layoutControlItem47.Control = this.btnDesign;
             this.layoutControlItem47.Location = new System.Drawing.Point(1478, 0);
             this.layoutControlItem47.Name = "layoutControlItem47";
-            this.layoutControlItem47.OptionsTableLayoutItem.ColumnIndex = 6;
-            this.layoutControlItem47.Size = new System.Drawing.Size(150, 32);
+            this.layoutControlItem47.OptionsTableLayoutItem.ColumnIndex = 7;
+            this.layoutControlItem47.Size = new System.Drawing.Size(150, 40);
+            this.layoutControlItem47.Text = "瀹㈡埛妯℃澘";
             this.layoutControlItem47.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem47.TextVisible = false;
             // 
@@ -3658,7 +3713,7 @@
             this.gcMx4.Location = new System.Drawing.Point(0, 0);
             this.gcMx4.MainView = this.gvMx4;
             this.gcMx4.Name = "gcMx4";
-            this.gcMx4.Size = new System.Drawing.Size(1648, 400);
+            this.gcMx4.Size = new System.Drawing.Size(1648, 392);
             this.gcMx4.TabIndex = 2;
             this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx4});
@@ -3801,7 +3856,7 @@
             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(581, 32);
             this.ucBtnPrint101.TabIndex = 0;
             // 
             // Frm_Womdaa
@@ -3823,6 +3878,7 @@
             this.split1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             this.xtraTabPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
             this.splitMx1.Panel1.ResumeLayout(false);
@@ -4191,7 +4247,6 @@
         private DevExpress.XtraEditors.SplitContainerControl splitMx98;
         private DevExpress.XtraEditors.SplitContainerControl splitMx100;
         private DevExpress.XtraEditors.SimpleButton btnDesign;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem47;
         private DevExpress.XtraEditors.TextEdit txt_daa018;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage6;
         private DevExpress.XtraGrid.GridControl gcMx6;
@@ -4253,5 +4308,8 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private System.Windows.Forms.Panel panel1;
         private DevExpress.XtraEditors.SimpleButton btnXls;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem47;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn66;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3