From cb1acb30bebc175d340e75329c40db0983277579 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 10 四月 2025 15:58:30 +0800
Subject: [PATCH] 调拨

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs |  383 +++++++++++++++++++++++++++---------------------------
 1 files changed, 191 insertions(+), 192 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 221b5a2..c5ff92b 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -29,39 +29,35 @@
         /// </summary>
         private void InitializeComponent()
         {
-            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 rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
-            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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
-            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.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
-            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.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+            this.components = new System.ComponentModel.Container();
+            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.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 columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+            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.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -230,13 +226,13 @@
             this.gcMx3 = new DevExpress.XtraGrid.GridControl();
             this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.panMx98 = new System.Windows.Forms.Panel();
             this.layoutMx98 = new DevExpress.XtraLayout.LayoutControl();
             this.ucBtnPrint98 = new Gs.DevApp.UserControl.UcBtnPrint();
@@ -250,7 +246,7 @@
             this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -342,7 +338,6 @@
             this.xtraTabPage3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
             this.panMx98.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).BeginInit();
             this.layoutMx98.SuspendLayout();
@@ -1290,38 +1285,38 @@
             this.layoutControlItem27});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            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;
+            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[] {
-            columnDefinition16,
-            columnDefinition17,
-            columnDefinition18,
-            columnDefinition19});
-            rowDefinition9.Height = 100D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition10.Height = 100D;
-            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition11.Height = 100D;
-            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
-            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;
+            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[] {
-            rowDefinition9,
-            rowDefinition10,
-            rowDefinition11,
-            rowDefinition12,
-            rowDefinition13,
-            rowDefinition14});
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4,
+            rowDefinition5,
+            rowDefinition6});
             this.Root.Size = new System.Drawing.Size(1105, 188);
             this.Root.TextVisible = false;
             // 
@@ -1928,7 +1923,7 @@
             this.tabMxPage2.Controls.Add(this.panMx99);
             this.tabMxPage2.Name = "tabMxPage2";
             this.tabMxPage2.Size = new System.Drawing.Size(1124, 481);
-            this.tabMxPage2.Text = "鎶ュ伐鏉$爜鏄庣粏";
+            this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�";
             // 
             // gcMx2
             // 
@@ -2008,7 +2003,7 @@
             // gvMx2itemBarcode
             // 
             this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜 ";
+            this.gvMx2itemBarcode.Caption = "鎵樻澘鏉$爜";
             this.gvMx2itemBarcode.FieldName = "itemBarcode";
             this.gvMx2itemBarcode.MinWidth = 50;
             this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
@@ -2020,7 +2015,7 @@
             // gvMx2quantity
             // 
             this.gvMx2quantity.AppearanceCell.Options.UseFont = true;
-            this.gvMx2quantity.Caption = "鏁伴噺 ";
+            this.gvMx2quantity.Caption = "鍐呭寘瑁呮暟閲� ";
             this.gvMx2quantity.FieldName = "quantity";
             this.gvMx2quantity.MinWidth = 50;
             this.gvMx2quantity.Name = "gvMx2quantity";
@@ -2160,10 +2155,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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);
@@ -2188,7 +2183,7 @@
             this.layoutMx99.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx99.Location = new System.Drawing.Point(0, 0);
             this.layoutMx99.Name = "layoutMx99";
-            this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 65, 812, 500);
+            this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(288, 465, 812, 500);
             this.layoutMx99.Root = this.layoutControlGroup1;
             this.layoutMx99.Size = new System.Drawing.Size(1124, 54);
             this.layoutMx99.TabIndex = 0;
@@ -2197,39 +2192,39 @@
             // ucBtnPrint1
             // 
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(932, 12);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(931, 10);
             this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint1.Name = "ucBtnPrint1";
             this.ucBtnPrint1.rptParameter = null;
-            this.ucBtnPrint1.Size = new System.Drawing.Size(180, 30);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(182, 34);
             this.ucBtnPrint1.TabIndex = 464;
             // 
             // txt_iCount_1
             // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(850, 12);
+            this.txt_iCount_1.Location = new System.Drawing.Point(835, 12);
             this.txt_iCount_1.Name = "txt_iCount_1";
             this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(78, 24);
+            this.txt_iCount_1.Size = new System.Drawing.Size(93, 24);
             this.txt_iCount_1.StyleController = this.layoutMx99;
             this.txt_iCount_1.TabIndex = 332;
             this.txt_iCount_1.Tag = "readOnly-1";
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(666, 12);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(651, 12);
             this.txt_psnQty_1.Name = "txt_psnQty_1";
             this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_psnQty_1.Size = new System.Drawing.Size(78, 24);
+            this.txt_psnQty_1.Size = new System.Drawing.Size(93, 24);
             this.txt_psnQty_1.StyleController = this.layoutMx99;
             this.txt_psnQty_1.TabIndex = 330;
             this.txt_psnQty_1.Tag = "readOnly-1";
             // 
             // txt_printRemark
             // 
-            this.txt_printRemark.Location = new System.Drawing.Point(482, 12);
+            this.txt_printRemark.Location = new System.Drawing.Point(467, 12);
             this.txt_printRemark.Name = "txt_printRemark";
             this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_printRemark.Size = new System.Drawing.Size(78, 24);
+            this.txt_printRemark.Size = new System.Drawing.Size(93, 24);
             this.txt_printRemark.StyleController = this.layoutMx99;
             this.txt_printRemark.TabIndex = 334;
             this.txt_printRemark.Tag = "readOnly-1";
@@ -2237,22 +2232,22 @@
             // txt_kQty
             // 
             this.txt_kQty.EditValue = "";
-            this.txt_kQty.Location = new System.Drawing.Point(298, 12);
+            this.txt_kQty.Location = new System.Drawing.Point(283, 12);
             this.txt_kQty.Name = "txt_kQty";
             this.txt_kQty.Properties.Appearance.Options.UseFont = true;
             this.txt_kQty.Properties.ReadOnly = true;
-            this.txt_kQty.Size = new System.Drawing.Size(78, 24);
+            this.txt_kQty.Size = new System.Drawing.Size(93, 24);
             this.txt_kQty.StyleController = this.layoutMx99;
             this.txt_kQty.TabIndex = 472;
             this.txt_kQty.Tag = "readonly";
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(114, 12);
+            this.txt_yQty.Location = new System.Drawing.Point(99, 12);
             this.txt_yQty.Name = "txt_yQty";
             this.txt_yQty.Properties.Appearance.Options.UseFont = true;
             this.txt_yQty.Properties.ReadOnly = true;
-            this.txt_yQty.Size = new System.Drawing.Size(78, 24);
+            this.txt_yQty.Size = new System.Drawing.Size(93, 24);
             this.txt_yQty.StyleController = this.layoutMx99;
             this.txt_yQty.TabIndex = 470;
             this.txt_yQty.Tag = "readonly";
@@ -2270,87 +2265,101 @@
             this.layoutControlItem26});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
-            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;
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
+            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7.Width = 100D;
+            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition8.Width = 100D;
+            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition9.Width = 100D;
+            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition10.Width = 100D;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition20,
-            columnDefinition21,
-            columnDefinition22,
-            columnDefinition23,
-            columnDefinition24,
-            columnDefinition25});
-            rowDefinition15.Height = 100D;
-            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8,
+            columnDefinition9,
+            columnDefinition10});
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition15});
+            rowDefinition7});
             this.layoutControlGroup1.Size = new System.Drawing.Size(1124, 54);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem22
             // 
+            this.layoutControlItem22.AppearanceItemCaption.Options.UseTextOptions = true;
+            this.layoutControlItem22.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem22.Control = this.txt_yQty;
             this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.Size = new System.Drawing.Size(184, 34);
             this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
-            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem23
             // 
+            this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
+            this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem23.Control = this.txt_kQty;
             this.layoutControlItem23.Location = new System.Drawing.Point(184, 0);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem23.Size = new System.Drawing.Size(184, 34);
             this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
-            this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem21
             // 
+            this.layoutControlItem21.AppearanceItemCaption.Options.UseTextOptions = true;
+            this.layoutControlItem21.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem21.Control = this.txt_printRemark;
             this.layoutControlItem21.Location = new System.Drawing.Point(368, 0);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem21.Size = new System.Drawing.Size(184, 34);
             this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem24
             // 
+            this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true;
+            this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem24.Control = this.txt_psnQty_1;
+            this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
             this.layoutControlItem24.Location = new System.Drawing.Point(552, 0);
             this.layoutControlItem24.Name = "layoutControlItem24";
             this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem24.Size = new System.Drawing.Size(184, 34);
-            this.layoutControlItem24.Text = "姣忓紶鏉$爜鏁伴噺";
-            this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
+            this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem25
             // 
+            this.layoutControlItem25.AppearanceItemCaption.Options.UseTextOptions = true;
+            this.layoutControlItem25.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem25.Control = this.txt_iCount_1;
             this.layoutControlItem25.Location = new System.Drawing.Point(736, 0);
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 4;
             this.layoutControlItem25.Size = new System.Drawing.Size(184, 34);
-            this.layoutControlItem25.Text = "鎵撳嵃鏉$爜寮犳暟";
-            this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem25.Text = "鎵撳嵃寮犳暟";
+            this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem26
             // 
+            this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
+            this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem26.Control = this.ucBtnPrint1;
             this.layoutControlItem26.Location = new System.Drawing.Point(920, 0);
             this.layoutControlItem26.Name = "layoutControlItem26";
             this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 5;
+            this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
             this.layoutControlItem26.Size = new System.Drawing.Size(184, 34);
             this.layoutControlItem26.Text = "鎶ュ伐鎵撳嵃";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
@@ -2362,17 +2371,15 @@
             this.xtraTabPage3.Controls.Add(this.panMx98);
             this.xtraTabPage3.Name = "xtraTabPage3";
             this.xtraTabPage3.Size = new System.Drawing.Size(1124, 481);
-            this.xtraTabPage3.Text = "宸ュ崟杩芥函鐮�";
+            this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
             // 
             // gcMx3
             // 
             this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx3.Location = new System.Drawing.Point(0, 48);
+            this.gcMx3.Location = new System.Drawing.Point(0, 54);
             this.gcMx3.MainView = this.gvMx3;
             this.gcMx3.Name = "gcMx3";
-            this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit2});
-            this.gcMx3.Size = new System.Drawing.Size(1124, 433);
+            this.gcMx3.Size = new System.Drawing.Size(1124, 427);
             this.gcMx3.TabIndex = 1;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
@@ -2386,12 +2393,12 @@
             this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn33,
             this.gridColumn38,
-            this.gridColumn34,
             this.gridColumn36,
             this.gridColumn37,
             this.gridColumn42,
             this.gridColumn43,
-            this.gridColumn49});
+            this.gridColumn34,
+            this.gridColumn35});
             this.gvMx3.GridControl = this.gcMx3;
             this.gvMx3.Name = "gvMx3";
             this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -2407,6 +2414,18 @@
             this.gridColumn33.Name = "gridColumn33";
             this.gridColumn33.Tag = "query_a.guid";
             this.gridColumn33.Width = 94;
+            // 
+            // gridColumn38
+            // 
+            this.gridColumn38.AppearanceCell.Options.UseFont = true;
+            this.gridColumn38.Caption = "宸ュ崟鍙�";
+            this.gridColumn38.FieldName = "daa001";
+            this.gridColumn38.MinWidth = 50;
+            this.gridColumn38.Name = "gridColumn38";
+            this.gridColumn38.Tag = "query_a.UNIT";
+            this.gridColumn38.Visible = true;
+            this.gridColumn38.VisibleIndex = 0;
+            this.gridColumn38.Width = 94;
             // 
             // gridColumn36
             // 
@@ -2432,18 +2451,6 @@
             this.gridColumn37.VisibleIndex = 2;
             this.gridColumn37.Width = 94;
             // 
-            // gridColumn38
-            // 
-            this.gridColumn38.AppearanceCell.Options.UseFont = true;
-            this.gridColumn38.Caption = "宸ュ崟鍙�";
-            this.gridColumn38.FieldName = "daa001";
-            this.gridColumn38.MinWidth = 50;
-            this.gridColumn38.Name = "gridColumn38";
-            this.gridColumn38.Tag = "query_a.UNIT";
-            this.gridColumn38.Visible = true;
-            this.gridColumn38.VisibleIndex = 0;
-            this.gridColumn38.Width = 94;
-            // 
             // gridColumn42
             // 
             this.gridColumn42.AppearanceCell.Options.UseFont = true;
@@ -2468,25 +2475,25 @@
             this.gridColumn43.VisibleIndex = 4;
             this.gridColumn43.Width = 94;
             // 
-            // gridColumn49
+            // gridColumn34
             // 
-            this.gridColumn49.Caption = "绉诲嚭";
-            this.gridColumn49.ColumnEdit = this.repositoryItemButtonEdit2;
-            this.gridColumn49.MinWidth = 25;
-            this.gridColumn49.Name = "gridColumn49";
-            this.gridColumn49.Visible = true;
-            this.gridColumn49.VisibleIndex = 6;
-            this.gridColumn49.Width = 94;
+            this.gridColumn34.Caption = "绾垮埆ID";
+            this.gridColumn34.FieldName = "lineId";
+            this.gridColumn34.MinWidth = 25;
+            this.gridColumn34.Name = "gridColumn34";
+            this.gridColumn34.Visible = true;
+            this.gridColumn34.VisibleIndex = 5;
+            this.gridColumn34.Width = 94;
             // 
-            // repositoryItemButtonEdit2
+            // gridColumn35
             // 
-            this.repositoryItemButtonEdit2.AutoHeight = false;
-            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
-            this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.gridColumn35.Caption = "绾垮埆鍚嶇О";
+            this.gridColumn35.FieldName = "xtName";
+            this.gridColumn35.MinWidth = 25;
+            this.gridColumn35.Name = "gridColumn35";
+            this.gridColumn35.Visible = true;
+            this.gridColumn35.VisibleIndex = 6;
+            this.gridColumn35.Width = 94;
             // 
             // panMx98
             // 
@@ -2494,7 +2501,7 @@
             this.panMx98.Dock = System.Windows.Forms.DockStyle.Top;
             this.panMx98.Location = new System.Drawing.Point(0, 0);
             this.panMx98.Name = "panMx98";
-            this.panMx98.Size = new System.Drawing.Size(1124, 48);
+            this.panMx98.Size = new System.Drawing.Size(1124, 54);
             this.panMx98.TabIndex = 0;
             // 
             // layoutMx98
@@ -2507,19 +2514,20 @@
             this.layoutMx98.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx98.Location = new System.Drawing.Point(0, 0);
             this.layoutMx98.Name = "layoutMx98";
+            this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(199, 178, 812, 500);
             this.layoutMx98.Root = this.layoutControlGroup2;
-            this.layoutMx98.Size = new System.Drawing.Size(1124, 48);
+            this.layoutMx98.Size = new System.Drawing.Size(1124, 54);
             this.layoutMx98.TabIndex = 0;
             this.layoutMx98.Text = "layoutControl1";
             // 
             // ucBtnPrint98
             // 
             this.ucBtnPrint98.guidKey = null;
-            this.ucBtnPrint98.Location = new System.Drawing.Point(895, 12);
+            this.ucBtnPrint98.Location = new System.Drawing.Point(894, 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(217, 24);
+            this.ucBtnPrint98.Size = new System.Drawing.Size(219, 34);
             this.ucBtnPrint98.TabIndex = 8;
             // 
             // txt_yQty98
@@ -2567,28 +2575,28 @@
             this.layoutControlItem33,
             this.layoutControlItem34});
             this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
-            this.layoutControlGroup2.Name = "layoutControlGroup2";
-            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;
-            columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition29.Width = 100D;
-            columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition30.Width = 100D;
+            this.layoutControlGroup2.Name = "Root";
+            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition11.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;
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition26,
-            columnDefinition27,
-            columnDefinition28,
-            columnDefinition29,
-            columnDefinition30});
-            rowDefinition16.Height = 100D;
-            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition11,
+            columnDefinition12,
+            columnDefinition13,
+            columnDefinition14,
+            columnDefinition15});
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition16});
-            this.layoutControlGroup2.Size = new System.Drawing.Size(1124, 48);
+            rowDefinition8});
+            this.layoutControlGroup2.Size = new System.Drawing.Size(1124, 54);
             this.layoutControlGroup2.TextVisible = false;
             // 
             // layoutControlItem30
@@ -2596,7 +2604,7 @@
             this.layoutControlItem30.Control = this.txt_yQty98;
             this.layoutControlItem30.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem30.Name = "layoutControlItem30";
-            this.layoutControlItem30.Size = new System.Drawing.Size(220, 28);
+            this.layoutControlItem30.Size = new System.Drawing.Size(220, 34);
             this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
             this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -2606,7 +2614,7 @@
             this.layoutControlItem31.Location = new System.Drawing.Point(220, 0);
             this.layoutControlItem31.Name = "layoutControlItem31";
             this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem31.Size = new System.Drawing.Size(221, 28);
+            this.layoutControlItem31.Size = new System.Drawing.Size(221, 34);
             this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
             this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -2616,7 +2624,7 @@
             this.layoutControlItem32.Location = new System.Drawing.Point(441, 0);
             this.layoutControlItem32.Name = "layoutControlItem32";
             this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem32.Size = new System.Drawing.Size(221, 28);
+            this.layoutControlItem32.Size = new System.Drawing.Size(221, 34);
             this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
             this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -2626,7 +2634,7 @@
             this.layoutControlItem33.Location = new System.Drawing.Point(662, 0);
             this.layoutControlItem33.Name = "layoutControlItem33";
             this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem33.Size = new System.Drawing.Size(221, 28);
+            this.layoutControlItem33.Size = new System.Drawing.Size(221, 34);
             this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟";
             this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -2636,19 +2644,11 @@
             this.layoutControlItem34.Location = new System.Drawing.Point(883, 0);
             this.layoutControlItem34.Name = "layoutControlItem34";
             this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 4;
-            this.layoutControlItem34.Size = new System.Drawing.Size(221, 28);
+            this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
+            this.layoutControlItem34.Size = new System.Drawing.Size(221, 34);
+            this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem34.TextVisible = false;
-            // 
-            // gridColumn34
-            // 
-            this.gridColumn34.Caption = "绾垮埆";
-            this.gridColumn34.FieldName = "lineId";
-            this.gridColumn34.MinWidth = 25;
-            this.gridColumn34.Name = "gridColumn34";
-            this.gridColumn34.Visible = true;
-            this.gridColumn34.VisibleIndex = 1;
-            this.gridColumn34.Width = 94;
             // 
             // Frm_Womdaa
             // 
@@ -2750,7 +2750,6 @@
             this.xtraTabPage3.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
             this.panMx98.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).EndInit();
             this.layoutMx98.ResumeLayout(false);
@@ -2941,8 +2940,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn49;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
         private System.Windows.Forms.Panel panMx98;
         private DevExpress.XtraLayout.LayoutControl layoutMx98;
         private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
@@ -2957,5 +2954,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
+        private DevExpress.Utils.ToolTipController tips;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3