From 11a9814b18140e9116e3150e046d825030b93270 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期六, 09 八月 2025 17:14:29 +0800
Subject: [PATCH] 1、工具栏新增合并按钮

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 1333 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 884 insertions(+), 449 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 6333fff..10f30a4 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -30,24 +30,34 @@
         private void InitializeComponent()
         {
             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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = 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.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
             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.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
-            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.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -133,28 +143,7 @@
             this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
-            this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvAbtGuid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -175,17 +164,63 @@
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
             this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.lay99 = new DevExpress.XtraLayout.LayoutControl();
+            this.layoutControl2 = new DevExpress.XtraLayout.LayoutControl();
+            this.txt_iCount_2 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_yuliang_2 = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.radOut2 = new DevExpress.XtraEditors.RadioGroup();
+            this.ucBtnPrint2 = new Gs.DevApp.UserControl.UcBtnPrint();
+            this.txtItemNo = new DevExpress.XtraEditors.TextEdit();
+            this.txtItemName = new DevExpress.XtraEditors.TextEdit();
+            this.txt_kQtyHb = new DevExpress.XtraEditors.TextEdit();
+            this.txt_psnQty_2 = new DevExpress.XtraEditors.TextEdit();
+            this.txtItemModel = new DevExpress.XtraEditors.TextEdit();
+            this.txtQuantityHb = new DevExpress.XtraEditors.TextEdit();
+            this.txt_yQtyHb = new DevExpress.XtraEditors.TextEdit();
+            this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
             this.gcMx3 = new DevExpress.XtraGrid.GridControl();
             this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn35 = 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.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -200,13 +235,13 @@
             this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn50 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -290,25 +325,56 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             this.xtraTabPage3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
+            this.splitContainerControl1.Panel1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
             this.splitContainerControl1.Panel2.SuspendLayout();
             this.splitContainerControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.lay99)).BeginInit();
+            this.lay99.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl2)).BeginInit();
+            this.layoutControl2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.radOut2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtItemNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtItemName.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kQtyHb.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_2.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtItemModel.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtQuantityHb.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yQtyHb.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -839,32 +905,32 @@
             this.layoutControlItem13});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.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;
+            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[] {
-            columnDefinition11,
-            columnDefinition12,
-            columnDefinition13,
-            columnDefinition14});
-            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;
+            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;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition9,
-            rowDefinition10,
-            rowDefinition11,
-            rowDefinition12});
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4});
             this.Root.Size = new System.Drawing.Size(1159, 116);
             this.Root.TextVisible = false;
             // 
@@ -1037,7 +1103,7 @@
             this.split99.Panel2.Text = "Panel2";
             this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split99.Size = new System.Drawing.Size(1174, 297);
-            this.split99.SplitterPosition = 115;
+            this.split99.SplitterPosition = 144;
             this.split99.TabIndex = 2;
             // 
             // layout99
@@ -1061,7 +1127,7 @@
             this.layout99.Name = "layout99";
             this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(31, 355, 812, 500);
             this.layout99.Root = this.layoutControlGroup1;
-            this.layout99.Size = new System.Drawing.Size(1174, 115);
+            this.layout99.Size = new System.Drawing.Size(1174, 144);
             this.layout99.TabIndex = 0;
             this.layout99.Text = "layoutControl1";
             // 
@@ -1069,11 +1135,11 @@
             // 
             this.layoutControl1.Controls.Add(this.txt_iCount_1);
             this.layoutControl1.Controls.Add(this.txt_yuliang_1);
-            this.layoutControl1.Location = new System.Drawing.Point(588, 75);
+            this.layoutControl1.Location = new System.Drawing.Point(588, 94);
             this.layoutControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.layoutControl1.Name = "layoutControl1";
             this.layoutControl1.Root = this.layoutControlGroup2;
-            this.layoutControl1.Size = new System.Drawing.Size(284, 28);
+            this.layoutControl1.Size = new System.Drawing.Size(284, 38);
             this.layoutControl1.TabIndex = 477;
             this.layoutControl1.Text = "layoutControl1";
             // 
@@ -1110,19 +1176,19 @@
             this.layoutControlItem27});
             this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup2.Name = "Root";
-            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition15.Width = 100D;
-            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition16.Width = 100D;
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition15,
-            columnDefinition16});
-            rowDefinition13.Height = 100D;
-            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6});
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition13});
+            rowDefinition5});
             this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup2.Size = new System.Drawing.Size(284, 28);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(284, 38);
             this.layoutControlGroup2.TextVisible = false;
             // 
             // layoutControlItem26
@@ -1130,7 +1196,7 @@
             this.layoutControlItem26.Control = this.txt_iCount_1;
             this.layoutControlItem26.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem26.Name = "layoutControlItem26";
-            this.layoutControlItem26.Size = new System.Drawing.Size(142, 28);
+            this.layoutControlItem26.Size = new System.Drawing.Size(142, 38);
             this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -1140,7 +1206,7 @@
             this.layoutControlItem27.Location = new System.Drawing.Point(142, 0);
             this.layoutControlItem27.Name = "layoutControlItem27";
             this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem27.Size = new System.Drawing.Size(142, 28);
+            this.layoutControlItem27.Size = new System.Drawing.Size(142, 38);
             this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
             this.layoutControlItem27.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -1159,11 +1225,11 @@
             // 
             this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(875, 41);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(875, 51);
             this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint1.Name = "ucBtnPrint1";
             this.ucBtnPrint1.rptParameter = "rpt_daa";
-            this.ucBtnPrint1.Size = new System.Drawing.Size(288, 32);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(288, 41);
             this.ucBtnPrint1.TabIndex = 232;
             // 
             // radOut
@@ -1177,13 +1243,13 @@
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
             this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
-            this.radOut.Size = new System.Drawing.Size(287, 31);
+            this.radOut.Size = new System.Drawing.Size(287, 41);
             this.radOut.StyleController = this.layout99;
             this.radOut.TabIndex = 476;
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(672, 43);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(672, 53);
             this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_psnQty_1.Name = "txt_psnQty_1";
             this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
@@ -1207,7 +1273,7 @@
             // 
             // txtWlmc
             // 
-            this.txtWlmc.Location = new System.Drawing.Point(96, 43);
+            this.txtWlmc.Location = new System.Drawing.Point(96, 53);
             this.txtWlmc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txtWlmc.Name = "txtWlmc";
             this.txtWlmc.Properties.Appearance.Options.UseFont = true;
@@ -1218,7 +1284,7 @@
             // 
             // txtWlgg
             // 
-            this.txtWlgg.Location = new System.Drawing.Point(96, 75);
+            this.txtWlgg.Location = new System.Drawing.Point(96, 94);
             this.txtWlgg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txtWlgg.Name = "txtWlgg";
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
@@ -1253,7 +1319,7 @@
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(384, 43);
+            this.txt_yQty.Location = new System.Drawing.Point(384, 53);
             this.txt_yQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_yQty.Name = "txt_yQty";
             this.txt_yQty.Properties.Appearance.Options.UseFont = true;
@@ -1291,30 +1357,30 @@
             this.layoutControlItem25});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
-            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;
-            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition20.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[] {
-            columnDefinition17,
-            columnDefinition18,
-            columnDefinition19,
-            columnDefinition20});
-            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;
+            columnDefinition7,
+            columnDefinition8,
+            columnDefinition9,
+            columnDefinition10});
+            rowDefinition6.Height = 100D;
+            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition7.Height = 100D;
+            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition8.Height = 100D;
+            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition14,
-            rowDefinition15,
-            rowDefinition16});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1174, 115);
+            rowDefinition6,
+            rowDefinition7,
+            rowDefinition8});
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1174, 144);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem15
@@ -1322,28 +1388,28 @@
             this.layoutControlItem15.Control = this.txtWlid;
             this.layoutControlItem15.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem15.Name = "layoutControlItem15";
-            this.layoutControlItem15.Size = new System.Drawing.Size(288, 31);
+            this.layoutControlItem15.Size = new System.Drawing.Size(288, 41);
             this.layoutControlItem15.Text = "鐗╂枡缂栧彿";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txtWlmc;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 31);
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 41);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem16.Size = new System.Drawing.Size(288, 32);
+            this.layoutControlItem16.Size = new System.Drawing.Size(288, 41);
             this.layoutControlItem16.Text = "鐗╂枡鍚嶇О";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txtWlgg;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 63);
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 82);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem17.Size = new System.Drawing.Size(576, 32);
+            this.layoutControlItem17.Size = new System.Drawing.Size(576, 42);
             this.layoutControlItem17.Text = "鐗╂枡瑙勬牸";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -1353,18 +1419,18 @@
             this.layoutControlItem18.Location = new System.Drawing.Point(288, 0);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem18.Size = new System.Drawing.Size(288, 31);
+            this.layoutControlItem18.Size = new System.Drawing.Size(288, 41);
             this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_yQty;
-            this.layoutControlItem19.Location = new System.Drawing.Point(288, 31);
+            this.layoutControlItem19.Location = new System.Drawing.Point(288, 41);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem19.Size = new System.Drawing.Size(288, 32);
+            this.layoutControlItem19.Size = new System.Drawing.Size(288, 41);
             this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
             this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -1374,18 +1440,18 @@
             this.layoutControlItem20.Location = new System.Drawing.Point(576, 0);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem20.Size = new System.Drawing.Size(288, 31);
+            this.layoutControlItem20.Size = new System.Drawing.Size(288, 41);
             this.layoutControlItem20.Text = "鍙墦鍗版�绘暟";
             this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem21
             // 
             this.layoutControlItem21.Control = this.txt_psnQty_1;
-            this.layoutControlItem21.Location = new System.Drawing.Point(576, 31);
+            this.layoutControlItem21.Location = new System.Drawing.Point(576, 41);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem21.Size = new System.Drawing.Size(288, 32);
+            this.layoutControlItem21.Size = new System.Drawing.Size(288, 41);
             this.layoutControlItem21.Text = "姣忓紶鏉$爜鏁伴噺";
             this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -1396,7 +1462,7 @@
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
-            this.layoutControlItem22.Size = new System.Drawing.Size(290, 31);
+            this.layoutControlItem22.Size = new System.Drawing.Size(290, 41);
             this.layoutControlItem22.Text = "鑷姩璁$畻";
             this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem22.TextVisible = false;
@@ -1404,12 +1470,12 @@
             // layoutControlItem23
             // 
             this.layoutControlItem23.Control = this.ucBtnPrint1;
-            this.layoutControlItem23.Location = new System.Drawing.Point(864, 31);
+            this.layoutControlItem23.Location = new System.Drawing.Point(864, 41);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
-            this.layoutControlItem23.Size = new System.Drawing.Size(290, 32);
+            this.layoutControlItem23.Size = new System.Drawing.Size(290, 41);
             this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem23.TextVisible = false;
@@ -1417,236 +1483,31 @@
             // layoutControlItem25
             // 
             this.layoutControlItem25.Control = this.layoutControl1;
-            this.layoutControlItem25.Location = new System.Drawing.Point(576, 63);
+            this.layoutControlItem25.Location = new System.Drawing.Point(576, 82);
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem25.Size = new System.Drawing.Size(288, 32);
+            this.layoutControlItem25.Size = new System.Drawing.Size(288, 42);
             this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
             this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem25.TextVisible = false;
             // 
-            // tabMxPage2
+            // gcMx1
             // 
-            this.tabMxPage2.Controls.Add(this.gcMx2);
-            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1174, 297);
-            this.tabMxPage2.Text = "宸叉墦鏉$爜鏄庣粏";
-            // 
-            // gcMx2
-            // 
-            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.gcMx2.Location = new System.Drawing.Point(0, 0);
-            this.gcMx2.MainView = this.gvMx2;
-            this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1174, 297);
-            this.gcMx2.TabIndex = 0;
-            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx2});
-            // 
-            // gvMx2
-            // 
-            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
-            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gvMx2.Appearance.Row.Options.UseFont = true;
-            this.gvMx2.ColumnPanelRowHeight = 39;
-            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx2guid,
-            this.gridColumn16,
-            this.gvMx2itemBarcode,
-            this.gvMx2itemNo,
-            this.gridColumn18,
-            this.gridColumn14,
-            this.gvMx2oldqty,
-            this.gridColumn21,
-            this.gridColumn20,
-            this.gridColumn17,
-            this.gridColumn22,
-            this.gridColumn23,
-            this.gridColumn24,
-            this.gridColumn32});
-            this.gvMx2.DetailHeight = 272;
-            this.gvMx2.GridControl = this.gcMx2;
-            this.gvMx2.Name = "gvMx2";
-            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
-            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx2.OptionsView.ShowGroupPanel = false;
-            // 
-            // gvMx2guid
-            // 
-            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx2guid.Caption = "guid ";
-            this.gvMx2guid.FieldName = "guid";
-            this.gvMx2guid.MinWidth = 44;
-            this.gvMx2guid.Name = "gvMx2guid";
-            this.gvMx2guid.Tag = "query_a.guid";
-            this.gvMx2guid.Width = 82;
-            // 
-            // gridColumn16
-            // 
-            this.gridColumn16.Caption = "鏄惁鍏ュ簱";
-            this.gridColumn16.FieldName = "isRk";
-            this.gridColumn16.MaxWidth = 44;
-            this.gridColumn16.MinWidth = 44;
-            this.gridColumn16.Name = "gridColumn16";
-            this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 0;
-            this.gridColumn16.Width = 44;
-            // 
-            // gvMx2itemBarcode
-            // 
-            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
-            this.gvMx2itemBarcode.FieldName = "itemBarcode";
-            this.gvMx2itemBarcode.MinWidth = 44;
-            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
-            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
-            this.gvMx2itemBarcode.Visible = true;
-            this.gvMx2itemBarcode.VisibleIndex = 1;
-            this.gvMx2itemBarcode.Width = 262;
-            // 
-            // gvMx2itemNo
-            // 
-            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
-            this.gvMx2itemNo.FieldName = "itemNo";
-            this.gvMx2itemNo.MinWidth = 44;
-            this.gvMx2itemNo.Name = "gvMx2itemNo";
-            this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
-            this.gvMx2itemNo.Visible = true;
-            this.gvMx2itemNo.VisibleIndex = 2;
-            this.gvMx2itemNo.Width = 87;
-            // 
-            // gridColumn18
-            // 
-            this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn18.FieldName = "itemName";
-            this.gridColumn18.MinWidth = 44;
-            this.gridColumn18.Name = "gridColumn18";
-            this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 3;
-            this.gridColumn18.Width = 131;
-            // 
-            // gridColumn14
-            // 
-            this.gridColumn14.Caption = "瑙勬牸鍨嬪彿";
-            this.gridColumn14.FieldName = "itemModel";
-            this.gridColumn14.MinWidth = 44;
-            this.gridColumn14.Name = "gridColumn14";
-            this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 4;
-            this.gridColumn14.Width = 131;
-            // 
-            // gvMx2oldqty
-            // 
-            this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
-            this.gvMx2oldqty.Caption = "鏁伴噺";
-            this.gvMx2oldqty.FieldName = "quantity";
-            this.gvMx2oldqty.MinWidth = 44;
-            this.gvMx2oldqty.Name = "gvMx2oldqty";
-            this.gvMx2oldqty.Tag = "query_a.OLDQTY";
-            this.gvMx2oldqty.Visible = true;
-            this.gvMx2oldqty.VisibleIndex = 5;
-            this.gvMx2oldqty.Width = 82;
-            // 
-            // gridColumn21
-            // 
-            this.gridColumn21.Caption = "鍗曚綅";
-            this.gridColumn21.FieldName = "dwName";
-            this.gridColumn21.MinWidth = 22;
-            this.gridColumn21.Name = "gridColumn21";
-            this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 6;
-            this.gridColumn21.Width = 82;
-            // 
-            // gridColumn20
-            // 
-            this.gridColumn20.Caption = "鎵撶爜浜�";
-            this.gridColumn20.FieldName = "createBy";
-            this.gridColumn20.MinWidth = 22;
-            this.gridColumn20.Name = "gridColumn20";
-            this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 7;
-            this.gridColumn20.Width = 82;
-            // 
-            // gridColumn17
-            // 
-            this.gridColumn17.Caption = "鎵撶爜鏃ユ湡";
-            this.gridColumn17.FieldName = "createDate";
-            this.gridColumn17.MinWidth = 10;
-            this.gridColumn17.Name = "gridColumn17";
-            this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 8;
-            this.gridColumn17.Width = 157;
-            // 
-            // gridColumn22
-            // 
-            this.gridColumn22.Caption = "鍏ュ簱浜�";
-            this.gridColumn22.FieldName = "rkUser";
-            this.gridColumn22.MinWidth = 22;
-            this.gridColumn22.Name = "gridColumn22";
-            this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 9;
-            this.gridColumn22.Width = 82;
-            // 
-            // gridColumn23
-            // 
-            this.gridColumn23.Caption = "鍏ュ簱鏃ユ湡";
-            this.gridColumn23.FieldName = "rkDate";
-            this.gridColumn23.MinWidth = 22;
-            this.gridColumn23.Name = "gridColumn23";
-            this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 10;
-            this.gridColumn23.Width = 82;
-            // 
-            // gridColumn24
-            // 
-            this.gridColumn24.Caption = "鍏ュ簱浣�";
-            this.gridColumn24.FieldName = "rkPositon";
-            this.gridColumn24.MinWidth = 22;
-            this.gridColumn24.Name = "gridColumn24";
-            this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 11;
-            this.gridColumn24.Width = 82;
-            // 
-            // gridColumn32
-            // 
-            this.gridColumn32.Caption = "鍏ュ簱绫诲瀷";
-            this.gridColumn32.FieldName = "cgrkType";
-            this.gridColumn32.Name = "gridColumn32";
-            this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 12;
-            // 
-            // xtraTabPage3
-            // 
-            this.xtraTabPage3.Controls.Add(this.splitContainerControl1);
-            this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1174, 297);
-            this.xtraTabPage3.Text = "鍚堝苟鏄庣粏";
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            // 
-            // repositoryItemButtonEdit2
-            // 
-            this.repositoryItemButtonEdit2.AutoHeight = false;
-            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
-            // 
-            // repositoryItemComboBox1
-            // 
-            this.repositoryItemComboBox1.AutoHeight = false;
-            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx1.Location = new System.Drawing.Point(0, 0);
+            this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx1.Name = "gcMx1";
+            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit1,
+            this.repositoryItemButtonEdit2,
+            this.repositoryItemComboBox1});
+            this.gcMx1.Size = new System.Drawing.Size(1174, 143);
+            this.gcMx1.TabIndex = 1;
+            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx1});
             // 
             // gvMx1
             // 
@@ -1891,6 +1752,13 @@
             this.gridColumn28.VisibleIndex = 16;
             this.gridColumn28.Width = 66;
             // 
+            // repositoryItemComboBox1
+            // 
+            this.repositoryItemComboBox1.AutoHeight = false;
+            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+            // 
             // gridColumn29
             // 
             this.gridColumn29.Caption = "浠撳簱缂栫爜";
@@ -1915,22 +1783,220 @@
             this.gridColumn31.Visible = true;
             this.gridColumn31.VisibleIndex = 15;
             // 
-            // gcMx1
+            // repositoryItemButtonEdit1
             // 
-            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.gcMx1.Location = new System.Drawing.Point(0, 0);
-            this.gcMx1.MainView = this.gvMx1;
-            this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.gcMx1.Name = "gcMx1";
-            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit1,
-            this.repositoryItemButtonEdit2,
-            this.repositoryItemComboBox1});
-            this.gcMx1.Size = new System.Drawing.Size(1174, 172);
-            this.gcMx1.TabIndex = 1;
-            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx1});
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            // 
+            // repositoryItemButtonEdit2
+            // 
+            this.repositoryItemButtonEdit2.AutoHeight = false;
+            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+            // 
+            // tabMxPage2
+            // 
+            this.tabMxPage2.Controls.Add(this.gcMx2);
+            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.tabMxPage2.Name = "tabMxPage2";
+            this.tabMxPage2.Size = new System.Drawing.Size(1174, 297);
+            this.tabMxPage2.Text = "宸叉墦鏉$爜鏄庣粏";
+            // 
+            // gcMx2
+            // 
+            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx2.Location = new System.Drawing.Point(0, 0);
+            this.gcMx2.MainView = this.gvMx2;
+            this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx2.Name = "gcMx2";
+            this.gcMx2.Size = new System.Drawing.Size(1174, 297);
+            this.gcMx2.TabIndex = 0;
+            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx2});
+            // 
+            // gvMx2
+            // 
+            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx2.Appearance.Row.Options.UseFont = true;
+            this.gvMx2.ColumnPanelRowHeight = 39;
+            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx2guid,
+            this.gridColumn16,
+            this.gvMx2itemBarcode,
+            this.gvMx2itemNo,
+            this.gridColumn18,
+            this.gridColumn14,
+            this.gvMx2oldqty,
+            this.gridColumn21,
+            this.gridColumn20,
+            this.gridColumn17,
+            this.gridColumn22,
+            this.gridColumn23,
+            this.gridColumn24,
+            this.gridColumn32});
+            this.gvMx2.DetailHeight = 272;
+            this.gvMx2.GridControl = this.gcMx2;
+            this.gvMx2.Name = "gvMx2";
+            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx2.OptionsView.ShowGroupPanel = false;
+            // 
+            // gvMx2guid
+            // 
+            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
+            this.gvMx2guid.Caption = "guid ";
+            this.gvMx2guid.FieldName = "guid";
+            this.gvMx2guid.MinWidth = 44;
+            this.gvMx2guid.Name = "gvMx2guid";
+            this.gvMx2guid.Tag = "query_a.guid";
+            this.gvMx2guid.Width = 82;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.Caption = "鏄惁鍏ュ簱";
+            this.gridColumn16.FieldName = "isRk";
+            this.gridColumn16.MaxWidth = 44;
+            this.gridColumn16.MinWidth = 44;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 0;
+            this.gridColumn16.Width = 44;
+            // 
+            // gvMx2itemBarcode
+            // 
+            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
+            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
+            this.gvMx2itemBarcode.FieldName = "itemBarcode";
+            this.gvMx2itemBarcode.MinWidth = 44;
+            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
+            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
+            this.gvMx2itemBarcode.Visible = true;
+            this.gvMx2itemBarcode.VisibleIndex = 1;
+            this.gvMx2itemBarcode.Width = 262;
+            // 
+            // gvMx2itemNo
+            // 
+            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
+            this.gvMx2itemNo.FieldName = "itemNo";
+            this.gvMx2itemNo.MinWidth = 44;
+            this.gvMx2itemNo.Name = "gvMx2itemNo";
+            this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
+            this.gvMx2itemNo.Visible = true;
+            this.gvMx2itemNo.VisibleIndex = 2;
+            this.gvMx2itemNo.Width = 87;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn18.FieldName = "itemName";
+            this.gridColumn18.MinWidth = 44;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 3;
+            this.gridColumn18.Width = 131;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.Caption = "瑙勬牸鍨嬪彿";
+            this.gridColumn14.FieldName = "itemModel";
+            this.gridColumn14.MinWidth = 44;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 4;
+            this.gridColumn14.Width = 131;
+            // 
+            // gvMx2oldqty
+            // 
+            this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
+            this.gvMx2oldqty.Caption = "鏁伴噺";
+            this.gvMx2oldqty.FieldName = "quantity";
+            this.gvMx2oldqty.MinWidth = 44;
+            this.gvMx2oldqty.Name = "gvMx2oldqty";
+            this.gvMx2oldqty.Tag = "query_a.OLDQTY";
+            this.gvMx2oldqty.Visible = true;
+            this.gvMx2oldqty.VisibleIndex = 5;
+            this.gvMx2oldqty.Width = 82;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "鍗曚綅";
+            this.gridColumn21.FieldName = "dwName";
+            this.gridColumn21.MinWidth = 22;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 6;
+            this.gridColumn21.Width = 82;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.Caption = "鎵撶爜浜�";
+            this.gridColumn20.FieldName = "createBy";
+            this.gridColumn20.MinWidth = 22;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 7;
+            this.gridColumn20.Width = 82;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.Caption = "鎵撶爜鏃ユ湡";
+            this.gridColumn17.FieldName = "createDate";
+            this.gridColumn17.MinWidth = 10;
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 8;
+            this.gridColumn17.Width = 157;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.Caption = "鍏ュ簱浜�";
+            this.gridColumn22.FieldName = "rkUser";
+            this.gridColumn22.MinWidth = 22;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 9;
+            this.gridColumn22.Width = 82;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "鍏ュ簱鏃ユ湡";
+            this.gridColumn23.FieldName = "rkDate";
+            this.gridColumn23.MinWidth = 22;
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 10;
+            this.gridColumn23.Width = 82;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.Caption = "鍏ュ簱浣�";
+            this.gridColumn24.FieldName = "rkPositon";
+            this.gridColumn24.MinWidth = 22;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 11;
+            this.gridColumn24.Width = 82;
+            // 
+            // gridColumn32
+            // 
+            this.gridColumn32.Caption = "鍏ュ簱绫诲瀷";
+            this.gridColumn32.FieldName = "cgrkType";
+            this.gridColumn32.Name = "gridColumn32";
+            this.gridColumn32.Visible = true;
+            this.gridColumn32.VisibleIndex = 12;
+            // 
+            // xtraTabPage3
+            // 
+            this.xtraTabPage3.Controls.Add(this.splitContainerControl1);
+            this.xtraTabPage3.Name = "xtraTabPage3";
+            this.xtraTabPage3.Size = new System.Drawing.Size(1174, 297);
+            this.xtraTabPage3.Text = "鍚堝苟鏄庣粏";
             // 
             // splitContainerControl1
             // 
@@ -1941,6 +2007,7 @@
             // 
             // splitContainerControl1.Panel1
             // 
+            this.splitContainerControl1.Panel1.Controls.Add(this.lay99);
             this.splitContainerControl1.Panel1.Text = "Panel1";
             // 
             // splitContainerControl1.Panel2
@@ -1948,7 +2015,371 @@
             this.splitContainerControl1.Panel2.Controls.Add(this.gcMx3);
             this.splitContainerControl1.Panel2.Text = "Panel2";
             this.splitContainerControl1.Size = new System.Drawing.Size(1174, 297);
+            this.splitContainerControl1.SplitterPosition = 109;
             this.splitContainerControl1.TabIndex = 0;
+            // 
+            // lay99
+            // 
+            this.lay99.Controls.Add(this.layoutControl2);
+            this.lay99.Controls.Add(this.radOut2);
+            this.lay99.Controls.Add(this.ucBtnPrint2);
+            this.lay99.Controls.Add(this.txtItemNo);
+            this.lay99.Controls.Add(this.txtItemName);
+            this.lay99.Controls.Add(this.txt_kQtyHb);
+            this.lay99.Controls.Add(this.txt_psnQty_2);
+            this.lay99.Controls.Add(this.txtItemModel);
+            this.lay99.Controls.Add(this.txtQuantityHb);
+            this.lay99.Controls.Add(this.txt_yQtyHb);
+            this.lay99.Controls.Add(this.txt_releaseNo);
+            this.lay99.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.lay99.Location = new System.Drawing.Point(0, 0);
+            this.lay99.Name = "lay99";
+            this.lay99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(684, 503, 650, 400);
+            this.lay99.Root = this.layoutControlGroup3;
+            this.lay99.Size = new System.Drawing.Size(1174, 109);
+            this.lay99.TabIndex = 0;
+            this.lay99.Text = "layoutControl2";
+            // 
+            // layoutControl2
+            // 
+            this.layoutControl2.Controls.Add(this.txt_iCount_2);
+            this.layoutControl2.Controls.Add(this.txt_yuliang_2);
+            this.layoutControl2.Location = new System.Drawing.Point(580, 42);
+            this.layoutControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.layoutControl2.Name = "layoutControl2";
+            this.layoutControl2.Root = this.layoutControlGroup4;
+            this.layoutControl2.Size = new System.Drawing.Size(280, 26);
+            this.layoutControl2.TabIndex = 478;
+            this.layoutControl2.Text = "layoutControl2";
+            // 
+            // txt_iCount_2
+            // 
+            this.txt_iCount_2.Location = new System.Drawing.Point(86, 2);
+            this.txt_iCount_2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_iCount_2.Name = "txt_iCount_2";
+            this.txt_iCount_2.Properties.Appearance.Options.UseFont = true;
+            this.txt_iCount_2.Properties.ReadOnly = true;
+            this.txt_iCount_2.Properties.UseMaskAsDisplayFormat = true;
+            this.txt_iCount_2.Size = new System.Drawing.Size(52, 20);
+            this.txt_iCount_2.StyleController = this.layoutControl2;
+            this.txt_iCount_2.TabIndex = 264;
+            this.txt_iCount_2.Tag = "ReadOnly";
+            this.txt_iCount_2.ToolTip = "璇疯緭鍏ユ潯鐮佸紶鏁�";
+            // 
+            // txt_yuliang_2
+            // 
+            this.txt_yuliang_2.Location = new System.Drawing.Point(226, 2);
+            this.txt_yuliang_2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_yuliang_2.Name = "txt_yuliang_2";
+            this.txt_yuliang_2.Properties.ReadOnly = true;
+            this.txt_yuliang_2.Size = new System.Drawing.Size(52, 20);
+            this.txt_yuliang_2.StyleController = this.layoutControl2;
+            this.txt_yuliang_2.TabIndex = 265;
+            // 
+            // layoutControlGroup4
+            // 
+            this.layoutControlGroup4.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup4.GroupBordersVisible = false;
+            this.layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem31,
+            this.layoutControlItem32});
+            this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.layoutControlGroup4.Name = "Root";
+            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition11.Width = 100D;
+            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition12.Width = 100D;
+            this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition11,
+            columnDefinition12});
+            rowDefinition9.Height = 100D;
+            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition9});
+            this.layoutControlGroup4.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            this.layoutControlGroup4.Size = new System.Drawing.Size(280, 26);
+            this.layoutControlGroup4.TextVisible = false;
+            // 
+            // layoutControlItem31
+            // 
+            this.layoutControlItem31.Control = this.txt_iCount_2;
+            this.layoutControlItem31.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem31.Name = "layoutControlItem26";
+            this.layoutControlItem31.Size = new System.Drawing.Size(140, 26);
+            this.layoutControlItem31.Text = "鎵撳嵃鏁村紶鏁板��";
+            this.layoutControlItem31.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem32
+            // 
+            this.layoutControlItem32.Control = this.txt_yuliang_2;
+            this.layoutControlItem32.Location = new System.Drawing.Point(140, 0);
+            this.layoutControlItem32.Name = "layoutControlItem27";
+            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem32.Size = new System.Drawing.Size(140, 26);
+            this.layoutControlItem32.Text = "鎵撳嵃浣欐暟";
+            this.layoutControlItem32.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // radOut2
+            // 
+            this.radOut2.Location = new System.Drawing.Point(864, 42);
+            this.radOut2.Margin = new System.Windows.Forms.Padding(0);
+            this.radOut2.Name = "radOut2";
+            this.radOut2.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
+            this.radOut2.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
+            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
+            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
+            this.radOut2.Properties.Padding = new System.Windows.Forms.Padding(0);
+            this.radOut2.Size = new System.Drawing.Size(281, 26);
+            this.radOut2.StyleController = this.lay99;
+            this.radOut2.TabIndex = 477;
+            // 
+            // ucBtnPrint2
+            // 
+            this.ucBtnPrint2.allClickKey = null;
+            this.ucBtnPrint2.guidKey = null;
+            this.ucBtnPrint2.Location = new System.Drawing.Point(864, 72);
+            this.ucBtnPrint2.Margin = new System.Windows.Forms.Padding(0);
+            this.ucBtnPrint2.Name = "ucBtnPrint2";
+            this.ucBtnPrint2.rptParameter = null;
+            this.ucBtnPrint2.Size = new System.Drawing.Size(281, 26);
+            this.ucBtnPrint2.TabIndex = 6;
+            // 
+            // txtItemNo
+            // 
+            this.txtItemNo.Location = new System.Drawing.Point(96, 12);
+            this.txtItemNo.Name = "txtItemNo";
+            this.txtItemNo.Properties.ReadOnly = true;
+            this.txtItemNo.Properties.Tag = "ReadOnly";
+            this.txtItemNo.Size = new System.Drawing.Size(196, 20);
+            this.txtItemNo.StyleController = this.lay99;
+            this.txtItemNo.TabIndex = 4;
+            // 
+            // txtItemName
+            // 
+            this.txtItemName.Location = new System.Drawing.Point(96, 42);
+            this.txtItemName.Name = "txtItemName";
+            this.txtItemName.Properties.ReadOnly = true;
+            this.txtItemName.Size = new System.Drawing.Size(196, 20);
+            this.txtItemName.StyleController = this.lay99;
+            this.txtItemName.TabIndex = 5;
+            this.txtItemName.Tag = "ReadOnly";
+            // 
+            // txt_kQtyHb
+            // 
+            this.txt_kQtyHb.Location = new System.Drawing.Point(664, 12);
+            this.txt_kQtyHb.Name = "txt_kQtyHb";
+            this.txt_kQtyHb.Properties.ReadOnly = true;
+            this.txt_kQtyHb.Size = new System.Drawing.Size(196, 20);
+            this.txt_kQtyHb.StyleController = this.lay99;
+            this.txt_kQtyHb.TabIndex = 479;
+            this.txt_kQtyHb.Tag = "ReadOnly";
+            // 
+            // txt_psnQty_2
+            // 
+            this.txt_psnQty_2.Location = new System.Drawing.Point(664, 72);
+            this.txt_psnQty_2.Name = "txt_psnQty_2";
+            this.txt_psnQty_2.Size = new System.Drawing.Size(196, 20);
+            this.txt_psnQty_2.StyleController = this.lay99;
+            this.txt_psnQty_2.TabIndex = 480;
+            // 
+            // txtItemModel
+            // 
+            this.txtItemModel.Location = new System.Drawing.Point(96, 72);
+            this.txtItemModel.Name = "txtItemModel";
+            this.txtItemModel.Properties.ReadOnly = true;
+            this.txtItemModel.Size = new System.Drawing.Size(196, 20);
+            this.txtItemModel.StyleController = this.lay99;
+            this.txtItemModel.TabIndex = 481;
+            // 
+            // txtQuantityHb
+            // 
+            this.txtQuantityHb.Location = new System.Drawing.Point(380, 12);
+            this.txtQuantityHb.Name = "txtQuantityHb";
+            this.txtQuantityHb.Properties.ReadOnly = true;
+            this.txtQuantityHb.Size = new System.Drawing.Size(196, 20);
+            this.txtQuantityHb.StyleController = this.lay99;
+            this.txtQuantityHb.TabIndex = 482;
+            // 
+            // txt_yQtyHb
+            // 
+            this.txt_yQtyHb.Location = new System.Drawing.Point(380, 42);
+            this.txt_yQtyHb.Name = "txt_yQtyHb";
+            this.txt_yQtyHb.Properties.ReadOnly = true;
+            this.txt_yQtyHb.Size = new System.Drawing.Size(196, 20);
+            this.txt_yQtyHb.StyleController = this.lay99;
+            this.txt_yQtyHb.TabIndex = 483;
+            // 
+            // txt_releaseNo
+            // 
+            this.txt_releaseNo.Location = new System.Drawing.Point(380, 72);
+            this.txt_releaseNo.Name = "txt_releaseNo";
+            this.txt_releaseNo.Properties.ReadOnly = true;
+            this.txt_releaseNo.Size = new System.Drawing.Size(196, 20);
+            this.txt_releaseNo.StyleController = this.lay99;
+            this.txt_releaseNo.TabIndex = 484;
+            // 
+            // layoutControlGroup3
+            // 
+            this.layoutControlGroup3.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup3.GroupBordersVisible = false;
+            this.layoutControlGroup3.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem33,
+            this.layoutControlItem30,
+            this.layoutControlItem29,
+            this.layoutControlItem28,
+            this.layoutControlItem9,
+            this.layoutControlItem34,
+            this.layoutControlItem36,
+            this.layoutControlItem37,
+            this.layoutControlItem38,
+            this.layoutControlItem39,
+            this.layoutControlItem35});
+            this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.layoutControlGroup3.Name = "Root";
+            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;
+            this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition13,
+            columnDefinition14,
+            columnDefinition15,
+            columnDefinition16});
+            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;
+            this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition10,
+            rowDefinition11,
+            rowDefinition12});
+            this.layoutControlGroup3.Size = new System.Drawing.Size(1157, 110);
+            this.layoutControlGroup3.TextVisible = false;
+            // 
+            // layoutControlItem33
+            // 
+            this.layoutControlItem33.Control = this.layoutControl2;
+            this.layoutControlItem33.Location = new System.Drawing.Point(568, 30);
+            this.layoutControlItem33.Name = "layoutControlItem33";
+            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem33.Size = new System.Drawing.Size(284, 30);
+            this.layoutControlItem33.Text = "鎵撳嵃寮犳暟";
+            this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem33.TextVisible = false;
+            // 
+            // layoutControlItem30
+            // 
+            this.layoutControlItem30.Control = this.radOut2;
+            this.layoutControlItem30.CustomizationFormText = "鎵撳嵃妯″紡";
+            this.layoutControlItem30.Location = new System.Drawing.Point(852, 30);
+            this.layoutControlItem30.Name = "layoutControlItem30";
+            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem30.Size = new System.Drawing.Size(285, 30);
+            this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem30.TextVisible = false;
+            // 
+            // layoutControlItem29
+            // 
+            this.layoutControlItem29.Control = this.ucBtnPrint2;
+            this.layoutControlItem29.Location = new System.Drawing.Point(852, 60);
+            this.layoutControlItem29.Name = "layoutControlItem29";
+            this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem29.Size = new System.Drawing.Size(285, 30);
+            this.layoutControlItem29.Text = "鎵撳嵃鎸夐挳";
+            this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem29.TextVisible = false;
+            // 
+            // layoutControlItem28
+            // 
+            this.layoutControlItem28.Control = this.txtItemName;
+            this.layoutControlItem28.Location = new System.Drawing.Point(0, 30);
+            this.layoutControlItem28.Name = "layoutControlItem28";
+            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem28.Size = new System.Drawing.Size(284, 30);
+            this.layoutControlItem28.Text = "鐗╂枡鍚嶇О";
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem9
+            // 
+            this.layoutControlItem9.Control = this.txtItemNo;
+            this.layoutControlItem9.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem9.Name = "layoutControlItem9";
+            this.layoutControlItem9.Size = new System.Drawing.Size(284, 30);
+            this.layoutControlItem9.Text = "鐗╂枡缂栧彿";
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem34
+            // 
+            this.layoutControlItem34.Control = this.txt_kQtyHb;
+            this.layoutControlItem34.Location = new System.Drawing.Point(568, 0);
+            this.layoutControlItem34.Name = "layoutControlItem34";
+            this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem34.Size = new System.Drawing.Size(284, 30);
+            this.layoutControlItem34.Text = "鍙墦鍗版暟";
+            this.layoutControlItem34.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem36
+            // 
+            this.layoutControlItem36.Control = this.txtItemModel;
+            this.layoutControlItem36.Location = new System.Drawing.Point(0, 60);
+            this.layoutControlItem36.Name = "layoutControlItem36";
+            this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem36.Size = new System.Drawing.Size(284, 30);
+            this.layoutControlItem36.Text = "鐗╂枡瑙勬牸";
+            this.layoutControlItem36.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem37
+            // 
+            this.layoutControlItem37.Control = this.txtQuantityHb;
+            this.layoutControlItem37.Location = new System.Drawing.Point(284, 0);
+            this.layoutControlItem37.Name = "layoutControlItem37";
+            this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem37.Size = new System.Drawing.Size(284, 30);
+            this.layoutControlItem37.Text = "鏀惰揣鎬绘暟";
+            this.layoutControlItem37.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem38
+            // 
+            this.layoutControlItem38.Control = this.txt_yQtyHb;
+            this.layoutControlItem38.Location = new System.Drawing.Point(284, 30);
+            this.layoutControlItem38.Name = "layoutControlItem38";
+            this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem38.Size = new System.Drawing.Size(284, 30);
+            this.layoutControlItem38.Text = "宸叉墦鍗版�婚噺";
+            this.layoutControlItem38.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem39
+            // 
+            this.layoutControlItem39.Control = this.txt_releaseNo;
+            this.layoutControlItem39.Location = new System.Drawing.Point(284, 60);
+            this.layoutControlItem39.Name = "layoutControlItem39";
+            this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem39.Size = new System.Drawing.Size(284, 30);
+            this.layoutControlItem39.Text = "妫�楠屽崟鍙�";
+            this.layoutControlItem39.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem35
+            // 
+            this.layoutControlItem35.Control = this.txt_psnQty_2;
+            this.layoutControlItem35.Location = new System.Drawing.Point(568, 60);
+            this.layoutControlItem35.Name = "layoutControlItem35";
+            this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem35.Size = new System.Drawing.Size(284, 30);
+            this.layoutControlItem35.Text = "姣忓紶鏉$爜鏁伴噺";
+            this.layoutControlItem35.TextSize = new System.Drawing.Size(72, 14);
             // 
             // gcMx3
             // 
@@ -1962,7 +2393,7 @@
             this.repositoryItemButtonEdit3,
             this.repositoryItemButtonEdit4,
             this.repositoryItemComboBox2});
-            this.gcMx3.Size = new System.Drawing.Size(1174, 187);
+            this.gcMx3.Size = new System.Drawing.Size(1174, 178);
             this.gcMx3.TabIndex = 2;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
@@ -1972,9 +2403,6 @@
             this.gvMx3.Appearance.Row.Options.UseFont = true;
             this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn33,
-            this.gridColumn34,
-            this.gridColumn35,
-            this.gridColumn36,
             this.gridColumn37,
             this.gridColumn38,
             this.gridColumn39,
@@ -1989,7 +2417,6 @@
             this.gridColumn48,
             this.gridColumn49,
             this.gridColumn50,
-            this.gridColumn51,
             this.gridColumn52,
             this.gridColumn53,
             this.gridColumn54});
@@ -2011,42 +2438,6 @@
             this.gridColumn33.OptionsColumn.ReadOnly = true;
             this.gridColumn33.Width = 82;
             // 
-            // gridColumn34
-            // 
-            this.gridColumn34.AppearanceCell.Options.UseFont = true;
-            this.gridColumn34.Caption = "guid涓嶈兘鍒犻櫎";
-            this.gridColumn34.FieldName = "guid";
-            this.gridColumn34.MinWidth = 61;
-            this.gridColumn34.Name = "gridColumn34";
-            this.gridColumn34.OptionsColumn.ReadOnly = true;
-            this.gridColumn34.Tag = "query_a.guid";
-            this.gridColumn34.Width = 87;
-            // 
-            // gridColumn35
-            // 
-            this.gridColumn35.AppearanceCell.Options.UseFont = true;
-            this.gridColumn35.Caption = "鎬ユ枡鏍囪瘑";
-            this.gridColumn35.FieldName = "urgentFlag";
-            this.gridColumn35.MinWidth = 10;
-            this.gridColumn35.Name = "gridColumn35";
-            this.gridColumn35.Tag = "query_a.urgent_flag";
-            this.gridColumn35.Visible = true;
-            this.gridColumn35.VisibleIndex = 0;
-            this.gridColumn35.Width = 10;
-            // 
-            // gridColumn36
-            // 
-            this.gridColumn36.AppearanceCell.Options.UseFont = true;
-            this.gridColumn36.Caption = "ERP閲囪喘鍗曞彿";
-            this.gridColumn36.FieldName = "ebeln";
-            this.gridColumn36.MinWidth = 44;
-            this.gridColumn36.Name = "gridColumn36";
-            this.gridColumn36.OptionsColumn.ReadOnly = true;
-            this.gridColumn36.Tag = "query_a.ebeln";
-            this.gridColumn36.Visible = true;
-            this.gridColumn36.VisibleIndex = 1;
-            this.gridColumn36.Width = 92;
-            // 
             // gridColumn37
             // 
             this.gridColumn37.Caption = "鐗╂枡缂栧彿";
@@ -2055,7 +2446,7 @@
             this.gridColumn37.Name = "gridColumn37";
             this.gridColumn37.OptionsColumn.ReadOnly = true;
             this.gridColumn37.Visible = true;
-            this.gridColumn37.VisibleIndex = 2;
+            this.gridColumn37.VisibleIndex = 0;
             this.gridColumn37.Width = 77;
             // 
             // gridColumn38
@@ -2068,7 +2459,7 @@
             this.gridColumn38.OptionsColumn.ReadOnly = true;
             this.gridColumn38.Tag = "query_a.board_style";
             this.gridColumn38.Visible = true;
-            this.gridColumn38.VisibleIndex = 3;
+            this.gridColumn38.VisibleIndex = 1;
             this.gridColumn38.Width = 139;
             // 
             // gridColumn39
@@ -2078,7 +2469,7 @@
             this.gridColumn39.MinWidth = 44;
             this.gridColumn39.Name = "gridColumn39";
             this.gridColumn39.Visible = true;
-            this.gridColumn39.VisibleIndex = 4;
+            this.gridColumn39.VisibleIndex = 2;
             this.gridColumn39.Width = 95;
             // 
             // gridColumn40
@@ -2088,7 +2479,7 @@
             this.gridColumn40.MinWidth = 44;
             this.gridColumn40.Name = "gridColumn40";
             this.gridColumn40.Visible = true;
-            this.gridColumn40.VisibleIndex = 5;
+            this.gridColumn40.VisibleIndex = 3;
             this.gridColumn40.Width = 73;
             // 
             // gridColumn41
@@ -2101,7 +2492,7 @@
             this.gridColumn41.OptionsColumn.ReadOnly = true;
             this.gridColumn41.Tag = "query_a.ok_rkqty";
             this.gridColumn41.Visible = true;
-            this.gridColumn41.VisibleIndex = 6;
+            this.gridColumn41.VisibleIndex = 4;
             this.gridColumn41.Width = 77;
             // 
             // gridColumn42
@@ -2114,7 +2505,7 @@
             this.gridColumn42.OptionsColumn.ReadOnly = true;
             this.gridColumn42.Tag = "query_a.ebeln_qty";
             this.gridColumn42.Visible = true;
-            this.gridColumn42.VisibleIndex = 7;
+            this.gridColumn42.VisibleIndex = 5;
             this.gridColumn42.Width = 77;
             // 
             // gridColumn43
@@ -2128,7 +2519,7 @@
             this.gridColumn43.MinWidth = 44;
             this.gridColumn43.Name = "gridColumn43";
             this.gridColumn43.Visible = true;
-            this.gridColumn43.VisibleIndex = 8;
+            this.gridColumn43.VisibleIndex = 6;
             this.gridColumn43.Width = 73;
             // 
             // gridColumn44
@@ -2148,7 +2539,7 @@
             this.gridColumn45.Name = "gridColumn45";
             this.gridColumn45.OptionsColumn.ReadOnly = true;
             this.gridColumn45.Visible = true;
-            this.gridColumn45.VisibleIndex = 9;
+            this.gridColumn45.VisibleIndex = 7;
             this.gridColumn45.Width = 73;
             // 
             // gridColumn46
@@ -2167,7 +2558,7 @@
             this.gridColumn47.MinWidth = 44;
             this.gridColumn47.Name = "gridColumn47";
             this.gridColumn47.Visible = true;
-            this.gridColumn47.VisibleIndex = 10;
+            this.gridColumn47.VisibleIndex = 8;
             this.gridColumn47.Width = 73;
             // 
             // gridColumn48
@@ -2177,7 +2568,7 @@
             this.gridColumn48.MinWidth = 44;
             this.gridColumn48.Name = "gridColumn48";
             this.gridColumn48.Visible = true;
-            this.gridColumn48.VisibleIndex = 11;
+            this.gridColumn48.VisibleIndex = 9;
             this.gridColumn48.Width = 80;
             // 
             // gridColumn49
@@ -2187,7 +2578,7 @@
             this.gridColumn49.MinWidth = 22;
             this.gridColumn49.Name = "gridColumn49";
             this.gridColumn49.Visible = true;
-            this.gridColumn49.VisibleIndex = 12;
+            this.gridColumn49.VisibleIndex = 10;
             this.gridColumn49.Width = 82;
             // 
             // gridColumn50
@@ -2198,32 +2589,13 @@
             this.gridColumn50.Name = "gridColumn50";
             this.gridColumn50.Width = 82;
             // 
-            // gridColumn51
-            // 
-            this.gridColumn51.Caption = "鍏ュ簱绫诲瀷";
-            this.gridColumn51.ColumnEdit = this.repositoryItemComboBox2;
-            this.gridColumn51.FieldName = "rkType";
-            this.gridColumn51.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
-            this.gridColumn51.Name = "gridColumn51";
-            this.gridColumn51.OptionsColumn.ReadOnly = true;
-            this.gridColumn51.Visible = true;
-            this.gridColumn51.VisibleIndex = 16;
-            this.gridColumn51.Width = 66;
-            // 
-            // repositoryItemComboBox2
-            // 
-            this.repositoryItemComboBox2.AutoHeight = false;
-            this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
-            // 
             // gridColumn52
             // 
             this.gridColumn52.Caption = "浠撳簱缂栫爜";
             this.gridColumn52.FieldName = "depotCode";
             this.gridColumn52.Name = "gridColumn52";
             this.gridColumn52.Visible = true;
-            this.gridColumn52.VisibleIndex = 13;
+            this.gridColumn52.VisibleIndex = 11;
             // 
             // gridColumn53
             // 
@@ -2231,7 +2603,7 @@
             this.gridColumn53.FieldName = "depotName";
             this.gridColumn53.Name = "gridColumn53";
             this.gridColumn53.Visible = true;
-            this.gridColumn53.VisibleIndex = 14;
+            this.gridColumn53.VisibleIndex = 12;
             // 
             // gridColumn54
             // 
@@ -2239,7 +2611,7 @@
             this.gridColumn54.FieldName = "staffName";
             this.gridColumn54.Name = "gridColumn54";
             this.gridColumn54.Visible = true;
-            this.gridColumn54.VisibleIndex = 15;
+            this.gridColumn54.VisibleIndex = 13;
             // 
             // repositoryItemButtonEdit3
             // 
@@ -2254,6 +2626,13 @@
             this.repositoryItemButtonEdit4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton()});
             this.repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4";
+            // 
+            // repositoryItemComboBox2
+            // 
+            this.repositoryItemComboBox2.AutoHeight = false;
+            this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
             // 
             // Frm_ArrivalBarcode
             // 
@@ -2348,25 +2727,56 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             this.xtraTabPage3.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
+            this.splitContainerControl1.Panel1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
             this.splitContainerControl1.Panel2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
             this.splitContainerControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.lay99)).EndInit();
+            this.lay99.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl2)).EndInit();
+            this.layoutControl2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.radOut2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtItemNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtItemName.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_kQtyHb.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_2.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtItemModel.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txtQuantityHb.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_yQtyHb.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_releaseNo.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2506,9 +2916,6 @@
         private DevExpress.XtraGrid.GridControl gcMx3;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
@@ -2523,12 +2930,40 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn48;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn49;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn50;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn51;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn52;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn53;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4;
+        private DevExpress.XtraLayout.LayoutControl lay99;
+        private UserControl.UcBtnPrint ucBtnPrint2;
+        private DevExpress.XtraEditors.TextEdit txtItemNo;
+        private DevExpress.XtraEditors.TextEdit txtItemName;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3;
+        private DevExpress.XtraEditors.RadioGroup radOut2;
+        private DevExpress.XtraLayout.LayoutControl layoutControl2;
+        private DevExpress.XtraEditors.TextEdit txt_iCount_2;
+        private DevExpress.XtraEditors.TextEdit txt_yuliang_2;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+        private DevExpress.XtraEditors.TextEdit txt_kQtyHb;
+        private DevExpress.XtraEditors.TextEdit txt_psnQty_2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+        private DevExpress.XtraEditors.TextEdit txtItemModel;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
+        private DevExpress.XtraEditors.TextEdit txtQuantityHb;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
+        private DevExpress.XtraEditors.TextEdit txt_yQtyHb;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem38;
+        private DevExpress.XtraEditors.TextEdit txt_releaseNo;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem39;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3