From fdc017bffe579b0855743b68c58e3ba7571b8ad1 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期一, 01 九月 2025 18:12:23 +0800
Subject: [PATCH] 1、优化条码删除报错 2、采购入库三联打印

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 1605 ++++++++++++++++++++++++++++++----------------------------
 1 files changed, 826 insertions(+), 779 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 0fe3eb1..1bd0594 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -38,16 +38,6 @@
             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();
@@ -58,6 +48,16 @@
             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 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();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -80,8 +80,33 @@
             this.gv_fstatus = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn106 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
+            this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMxL2 = new DevExpress.XtraGrid.GridControl();
+            this.gvMxL2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn88 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn89 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn90 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn91 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn92 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn93 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn94 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn95 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn96 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn97 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn98 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn100 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn101 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn103 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn104 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit7 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.repositoryItemButtonEdit8 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.repositoryItemComboBox4 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMxL1 = new DevExpress.XtraGrid.GridControl();
             this.gvMxL1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -110,30 +135,6 @@
             this.gridColumn72 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit5 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.repositoryItemButtonEdit6 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMxL2 = new DevExpress.XtraGrid.GridControl();
-            this.gvMxL2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn88 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn89 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn90 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn91 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn92 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn93 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn94 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn95 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn96 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn97 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn98 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn100 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn101 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn103 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn104 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit7 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.repositoryItemButtonEdit8 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.repositoryItemComboBox4 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.xtraTabPage6 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMxL3 = new DevExpress.XtraGrid.GridControl();
             this.gvMxL3 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -241,27 +242,10 @@
             this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
             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.gv_hbdy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
             this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.lay99 = new DevExpress.XtraLayout.LayoutControl();
+            this.ucBtnPrintOne1 = new Gs.DevApp.UserControl.UcBtnPrintOne();
             this.layoutControl2 = new DevExpress.XtraLayout.LayoutControl();
             this.txt_iCount_2 = new DevExpress.XtraEditors.TextEdit();
             this.txt_yuliang_2 = new DevExpress.XtraEditors.TextEdit();
@@ -290,6 +274,7 @@
             this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem40 = 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();
@@ -313,7 +298,26 @@
             this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            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.gv_hbdy = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -327,18 +331,18 @@
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
             this.xtraTabControl2.SuspendLayout();
-            this.xtraTabPage4.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMxL1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit6)).BeginInit();
             this.xtraTabPage5.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMxL2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMxL2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).BeginInit();
+            this.xtraTabPage4.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMxL1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit6)).BeginInit();
             this.xtraTabPage6.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMxL3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMxL3)).BeginInit();
@@ -420,9 +424,6 @@
             ((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.splitContainerControl1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -460,11 +461,16 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
+            this.tabMxPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -526,7 +532,7 @@
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split1.Size = new System.Drawing.Size(1176, 669);
-            this.split1.SplitterPosition = 377;
+            this.split1.SplitterPosition = 416;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
@@ -537,7 +543,7 @@
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1176, 252);
+            this.gcMain1.Size = new System.Drawing.Size(1176, 213);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -566,7 +572,8 @@
             this.gv_remark,
             this.gv_fstatus,
             this.gridColumn11,
-            this.gv_checkDate});
+            this.gv_checkDate,
+            this.gridColumn106});
             this.gridView1.DetailHeight = 272;
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 44;
@@ -659,7 +666,7 @@
             this.gv_createBy.OptionsColumn.AllowEdit = false;
             this.gv_createBy.Tag = "query_a.create_by";
             this.gv_createBy.Visible = true;
-            this.gv_createBy.VisibleIndex = 6;
+            this.gv_createBy.VisibleIndex = 7;
             this.gv_createBy.Width = 82;
             // 
             // gridColumn26
@@ -669,7 +676,7 @@
             this.gridColumn26.MinWidth = 22;
             this.gridColumn26.Name = "gridColumn26";
             this.gridColumn26.Visible = true;
-            this.gridColumn26.VisibleIndex = 7;
+            this.gridColumn26.VisibleIndex = 8;
             this.gridColumn26.Width = 82;
             // 
             // gv_suppNo
@@ -682,7 +689,7 @@
             this.gv_suppNo.OptionsColumn.AllowEdit = false;
             this.gv_suppNo.Tag = "query_a.supp_no";
             this.gv_suppNo.Visible = true;
-            this.gv_suppNo.VisibleIndex = 8;
+            this.gv_suppNo.VisibleIndex = 9;
             this.gv_suppNo.Width = 82;
             // 
             // gridColumn2
@@ -693,7 +700,7 @@
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.OptionsColumn.AllowEdit = false;
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 9;
+            this.gridColumn2.VisibleIndex = 10;
             this.gridColumn2.Width = 175;
             // 
             // gv_depotsCode
@@ -706,7 +713,7 @@
             this.gv_depotsCode.OptionsColumn.AllowEdit = false;
             this.gv_depotsCode.Tag = "query_a.depots_code";
             this.gv_depotsCode.Visible = true;
-            this.gv_depotsCode.VisibleIndex = 10;
+            this.gv_depotsCode.VisibleIndex = 11;
             this.gv_depotsCode.Width = 82;
             // 
             // gridColumn3
@@ -717,7 +724,7 @@
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.OptionsColumn.AllowEdit = false;
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 11;
+            this.gridColumn3.VisibleIndex = 12;
             this.gridColumn3.Width = 82;
             // 
             // gv_remark
@@ -730,7 +737,7 @@
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.remark";
             this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 12;
+            this.gv_remark.VisibleIndex = 13;
             this.gv_remark.Width = 82;
             // 
             // gv_fstatus
@@ -752,7 +759,7 @@
             this.gridColumn11.MinWidth = 22;
             this.gridColumn11.Name = "gridColumn11";
             this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 13;
+            this.gridColumn11.VisibleIndex = 14;
             this.gridColumn11.Width = 82;
             // 
             // gv_checkDate
@@ -765,14 +772,22 @@
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.check_date";
             this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 14;
+            this.gv_checkDate.VisibleIndex = 15;
             this.gv_checkDate.Width = 157;
+            // 
+            // gridColumn106
+            // 
+            this.gridColumn106.Caption = "鍏ュ簱姣斾緥";
+            this.gridColumn106.FieldName = "rkbl";
+            this.gridColumn106.Name = "gridColumn106";
+            this.gridColumn106.Visible = true;
+            this.gridColumn106.VisibleIndex = 6;
             // 
             // pageBar1
             // 
             this.pageBar1.CurrentPage = 1;
             this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 252);
+            this.pageBar1.Location = new System.Drawing.Point(0, 213);
             this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
@@ -786,331 +801,19 @@
             this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
             this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabControl2.Name = "xtraTabControl2";
-            this.xtraTabControl2.SelectedTabPage = this.xtraTabPage4;
-            this.xtraTabControl2.Size = new System.Drawing.Size(1176, 377);
+            this.xtraTabControl2.SelectedTabPage = this.xtraTabPage5;
+            this.xtraTabControl2.Size = new System.Drawing.Size(1176, 416);
             this.xtraTabControl2.TabIndex = 4;
             this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.xtraTabPage4,
             this.xtraTabPage5,
+            this.xtraTabPage4,
             this.xtraTabPage6});
-            // 
-            // xtraTabPage4
-            // 
-            this.xtraTabPage4.Controls.Add(this.gcMxL1);
-            this.xtraTabPage4.Name = "xtraTabPage4";
-            this.xtraTabPage4.Size = new System.Drawing.Size(1174, 351);
-            this.xtraTabPage4.Text = "鏉ユ枡鏄庣粏";
-            // 
-            // gcMxL1
-            // 
-            this.gcMxL1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMxL1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.gcMxL1.Location = new System.Drawing.Point(0, 0);
-            this.gcMxL1.MainView = this.gvMxL1;
-            this.gcMxL1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.gcMxL1.Name = "gcMxL1";
-            this.gcMxL1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit5,
-            this.repositoryItemButtonEdit6,
-            this.repositoryItemComboBox3});
-            this.gcMxL1.Size = new System.Drawing.Size(1174, 351);
-            this.gcMxL1.TabIndex = 2;
-            this.gcMxL1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMxL1});
-            // 
-            // gvMxL1
-            // 
-            this.gvMxL1.Appearance.Row.Options.UseFont = true;
-            this.gvMxL1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn34,
-            this.gridColumn35,
-            this.gridColumn36,
-            this.gridColumn51,
-            this.gridColumn55,
-            this.gridColumn56,
-            this.gridColumn57,
-            this.gridColumn58,
-            this.gridColumn59,
-            this.gridColumn60,
-            this.gridColumn61,
-            this.gridColumn62,
-            this.gridColumn63,
-            this.gridColumn64,
-            this.gridColumn65,
-            this.gridColumn66,
-            this.gridColumn67,
-            this.gridColumn68,
-            this.gridColumn69,
-            this.gridColumn70,
-            this.gridColumn71,
-            this.gridColumn72});
-            this.gvMxL1.DetailHeight = 272;
-            this.gvMxL1.GridControl = this.gcMxL1;
-            this.gvMxL1.Name = "gvMxL1";
-            this.gvMxL1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
-            this.gvMxL1.OptionsFilter.AllowFilterEditor = false;
-            this.gvMxL1.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMxL1.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
-            this.gvMxL1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gridColumn34
-            // 
-            this.gridColumn34.Caption = "abtGuid涓嶈兘鍒犻櫎";
-            this.gridColumn34.FieldName = "aboutGuid";
-            this.gridColumn34.MinWidth = 44;
-            this.gridColumn34.Name = "gridColumn34";
-            this.gridColumn34.OptionsColumn.ReadOnly = true;
-            this.gridColumn34.Width = 82;
-            // 
-            // gridColumn35
-            // 
-            this.gridColumn35.AppearanceCell.Options.UseFont = true;
-            this.gridColumn35.Caption = "guid涓嶈兘鍒犻櫎";
-            this.gridColumn35.FieldName = "guid";
-            this.gridColumn35.MinWidth = 61;
-            this.gridColumn35.Name = "gridColumn35";
-            this.gridColumn35.OptionsColumn.ReadOnly = true;
-            this.gridColumn35.Tag = "query_a.guid";
-            this.gridColumn35.Width = 87;
-            // 
-            // gridColumn36
-            // 
-            this.gridColumn36.AppearanceCell.Options.UseFont = true;
-            this.gridColumn36.Caption = "鎬ユ枡鏍囪瘑";
-            this.gridColumn36.FieldName = "urgentFlag";
-            this.gridColumn36.MinWidth = 10;
-            this.gridColumn36.Name = "gridColumn36";
-            this.gridColumn36.Tag = "query_a.urgent_flag";
-            this.gridColumn36.Visible = true;
-            this.gridColumn36.VisibleIndex = 0;
-            this.gridColumn36.Width = 10;
-            // 
-            // gridColumn51
-            // 
-            this.gridColumn51.AppearanceCell.Options.UseFont = true;
-            this.gridColumn51.Caption = "ERP閲囪喘鍗曞彿";
-            this.gridColumn51.FieldName = "ebeln";
-            this.gridColumn51.MinWidth = 44;
-            this.gridColumn51.Name = "gridColumn51";
-            this.gridColumn51.OptionsColumn.ReadOnly = true;
-            this.gridColumn51.Tag = "query_a.ebeln";
-            this.gridColumn51.Visible = true;
-            this.gridColumn51.VisibleIndex = 1;
-            this.gridColumn51.Width = 92;
-            // 
-            // gridColumn55
-            // 
-            this.gridColumn55.Caption = "鐗╂枡缂栧彿";
-            this.gridColumn55.FieldName = "itemNo";
-            this.gridColumn55.MinWidth = 44;
-            this.gridColumn55.Name = "gridColumn55";
-            this.gridColumn55.OptionsColumn.ReadOnly = true;
-            this.gridColumn55.Visible = true;
-            this.gridColumn55.VisibleIndex = 2;
-            this.gridColumn55.Width = 77;
-            // 
-            // gridColumn56
-            // 
-            this.gridColumn56.AppearanceCell.Options.UseFont = true;
-            this.gridColumn56.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn56.FieldName = "itemName";
-            this.gridColumn56.MinWidth = 44;
-            this.gridColumn56.Name = "gridColumn56";
-            this.gridColumn56.OptionsColumn.ReadOnly = true;
-            this.gridColumn56.Tag = "query_a.board_style";
-            this.gridColumn56.Visible = true;
-            this.gridColumn56.VisibleIndex = 3;
-            this.gridColumn56.Width = 139;
-            // 
-            // gridColumn57
-            // 
-            this.gridColumn57.Caption = "鐗╂枡瑙勬牸";
-            this.gridColumn57.FieldName = "itemModel";
-            this.gridColumn57.MinWidth = 44;
-            this.gridColumn57.Name = "gridColumn57";
-            this.gridColumn57.Visible = true;
-            this.gridColumn57.VisibleIndex = 4;
-            this.gridColumn57.Width = 95;
-            // 
-            // gridColumn58
-            // 
-            this.gridColumn58.Caption = "鏈鏀惰揣鏁伴噺";
-            this.gridColumn58.FieldName = "quantity";
-            this.gridColumn58.MinWidth = 44;
-            this.gridColumn58.Name = "gridColumn58";
-            this.gridColumn58.Visible = true;
-            this.gridColumn58.VisibleIndex = 5;
-            this.gridColumn58.Width = 73;
-            // 
-            // gridColumn59
-            // 
-            this.gridColumn59.AppearanceCell.Options.UseFont = true;
-            this.gridColumn59.Caption = "宸插叆搴撴暟閲�";
-            this.gridColumn59.FieldName = "okRkqty";
-            this.gridColumn59.MinWidth = 44;
-            this.gridColumn59.Name = "gridColumn59";
-            this.gridColumn59.OptionsColumn.ReadOnly = true;
-            this.gridColumn59.Tag = "query_a.ok_rkqty";
-            this.gridColumn59.Visible = true;
-            this.gridColumn59.VisibleIndex = 6;
-            this.gridColumn59.Width = 77;
-            // 
-            // gridColumn60
-            // 
-            this.gridColumn60.AppearanceCell.Options.UseFont = true;
-            this.gridColumn60.Caption = "宸叉墦鍗版暟閲�";
-            this.gridColumn60.FieldName = "yQty";
-            this.gridColumn60.MinWidth = 44;
-            this.gridColumn60.Name = "gridColumn60";
-            this.gridColumn60.OptionsColumn.ReadOnly = true;
-            this.gridColumn60.Tag = "query_a.ebeln_qty";
-            this.gridColumn60.Visible = true;
-            this.gridColumn60.VisibleIndex = 7;
-            this.gridColumn60.Width = 77;
-            // 
-            // gridColumn61
-            // 
-            this.gridColumn61.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gridColumn61.AppearanceCell.Options.UseForeColor = true;
-            this.gridColumn61.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gridColumn61.AppearanceHeader.Options.UseForeColor = true;
-            this.gridColumn61.Caption = "鍙墦鍗版�婚噺";
-            this.gridColumn61.FieldName = "kQty";
-            this.gridColumn61.MinWidth = 44;
-            this.gridColumn61.Name = "gridColumn61";
-            this.gridColumn61.Visible = true;
-            this.gridColumn61.VisibleIndex = 8;
-            this.gridColumn61.Width = 73;
-            // 
-            // gridColumn62
-            // 
-            this.gridColumn62.Caption = "鐗╂枡鍗曚綅";
-            this.gridColumn62.FieldName = "wnDw";
-            this.gridColumn62.MinWidth = 44;
-            this.gridColumn62.Name = "gridColumn62";
-            this.gridColumn62.OptionsColumn.ReadOnly = true;
-            this.gridColumn62.Width = 139;
-            // 
-            // gridColumn63
-            // 
-            this.gridColumn63.Caption = "閲囪喘鍗曚綅";
-            this.gridColumn63.FieldName = "cgUnit";
-            this.gridColumn63.MinWidth = 44;
-            this.gridColumn63.Name = "gridColumn63";
-            this.gridColumn63.OptionsColumn.ReadOnly = true;
-            this.gridColumn63.Visible = true;
-            this.gridColumn63.VisibleIndex = 9;
-            this.gridColumn63.Width = 73;
-            // 
-            // gridColumn64
-            // 
-            this.gridColumn64.Caption = "搴撳瓨鍗曚綅";
-            this.gridColumn64.FieldName = "kcUnit";
-            this.gridColumn64.MinWidth = 44;
-            this.gridColumn64.Name = "gridColumn64";
-            this.gridColumn64.OptionsColumn.ReadOnly = true;
-            this.gridColumn64.Width = 73;
-            // 
-            // gridColumn65
-            // 
-            this.gridColumn65.Caption = "妫�楠岀姸鎬�";
-            this.gridColumn65.FieldName = "jyzt";
-            this.gridColumn65.MinWidth = 44;
-            this.gridColumn65.Name = "gridColumn65";
-            this.gridColumn65.Visible = true;
-            this.gridColumn65.VisibleIndex = 10;
-            this.gridColumn65.Width = 73;
-            // 
-            // gridColumn66
-            // 
-            this.gridColumn66.Caption = "妫�楠岀粨鏋�";
-            this.gridColumn66.FieldName = "jyjg";
-            this.gridColumn66.MinWidth = 44;
-            this.gridColumn66.Name = "gridColumn66";
-            this.gridColumn66.Visible = true;
-            this.gridColumn66.VisibleIndex = 11;
-            this.gridColumn66.Width = 80;
-            // 
-            // gridColumn67
-            // 
-            this.gridColumn67.Caption = "澶勭悊鎰忚";
-            this.gridColumn67.FieldName = "clyj";
-            this.gridColumn67.MinWidth = 22;
-            this.gridColumn67.Name = "gridColumn67";
-            this.gridColumn67.Visible = true;
-            this.gridColumn67.VisibleIndex = 12;
-            this.gridColumn67.Width = 82;
-            // 
-            // gridColumn68
-            // 
-            this.gridColumn68.Caption = "榛樿姣忓紶鏉$爜鏁伴噺";
-            this.gridColumn68.FieldName = "mrtmsl";
-            this.gridColumn68.MinWidth = 22;
-            this.gridColumn68.Name = "gridColumn68";
-            this.gridColumn68.Width = 82;
-            // 
-            // gridColumn69
-            // 
-            this.gridColumn69.Caption = "鍏ュ簱绫诲瀷";
-            this.gridColumn69.ColumnEdit = this.repositoryItemComboBox3;
-            this.gridColumn69.FieldName = "rkType";
-            this.gridColumn69.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
-            this.gridColumn69.Name = "gridColumn69";
-            this.gridColumn69.OptionsColumn.ReadOnly = true;
-            this.gridColumn69.Visible = true;
-            this.gridColumn69.VisibleIndex = 16;
-            this.gridColumn69.Width = 66;
-            // 
-            // repositoryItemComboBox3
-            // 
-            this.repositoryItemComboBox3.AutoHeight = false;
-            this.repositoryItemComboBox3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBox3.Name = "repositoryItemComboBox3";
-            // 
-            // gridColumn70
-            // 
-            this.gridColumn70.Caption = "浠撳簱缂栫爜";
-            this.gridColumn70.FieldName = "depotCode";
-            this.gridColumn70.Name = "gridColumn70";
-            this.gridColumn70.Visible = true;
-            this.gridColumn70.VisibleIndex = 13;
-            // 
-            // gridColumn71
-            // 
-            this.gridColumn71.Caption = "浠撳簱鍚嶇О";
-            this.gridColumn71.FieldName = "depotName";
-            this.gridColumn71.Name = "gridColumn71";
-            this.gridColumn71.Visible = true;
-            this.gridColumn71.VisibleIndex = 14;
-            // 
-            // gridColumn72
-            // 
-            this.gridColumn72.Caption = "浠撶鍛�";
-            this.gridColumn72.FieldName = "staffName";
-            this.gridColumn72.Name = "gridColumn72";
-            this.gridColumn72.Visible = true;
-            this.gridColumn72.VisibleIndex = 15;
-            // 
-            // repositoryItemButtonEdit5
-            // 
-            this.repositoryItemButtonEdit5.AutoHeight = false;
-            this.repositoryItemButtonEdit5.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.repositoryItemButtonEdit5.Name = "repositoryItemButtonEdit5";
-            // 
-            // repositoryItemButtonEdit6
-            // 
-            this.repositoryItemButtonEdit6.AutoHeight = false;
-            this.repositoryItemButtonEdit6.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.repositoryItemButtonEdit6.Name = "repositoryItemButtonEdit6";
             // 
             // xtraTabPage5
             // 
             this.xtraTabPage5.Controls.Add(this.gcMxL2);
             this.xtraTabPage5.Name = "xtraTabPage5";
-            this.xtraTabPage5.Size = new System.Drawing.Size(1174, 351);
+            this.xtraTabPage5.Size = new System.Drawing.Size(1174, 390);
             this.xtraTabPage5.Text = "鍚堝苟鏄庣粏";
             // 
             // gcMxL2
@@ -1125,7 +828,7 @@
             this.repositoryItemButtonEdit7,
             this.repositoryItemButtonEdit8,
             this.repositoryItemComboBox4});
-            this.gcMxL2.Size = new System.Drawing.Size(1174, 351);
+            this.gcMxL2.Size = new System.Drawing.Size(1174, 390);
             this.gcMxL2.TabIndex = 3;
             this.gcMxL2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMxL2});
@@ -1366,11 +1069,326 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.repositoryItemComboBox4.Name = "repositoryItemComboBox4";
             // 
+            // xtraTabPage4
+            // 
+            this.xtraTabPage4.Controls.Add(this.gcMxL1);
+            this.xtraTabPage4.Name = "xtraTabPage4";
+            this.xtraTabPage4.Size = new System.Drawing.Size(1174, 390);
+            this.xtraTabPage4.Text = "鏉ユ枡鏄庣粏";
+            // 
+            // gcMxL1
+            // 
+            this.gcMxL1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMxL1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMxL1.Location = new System.Drawing.Point(0, 0);
+            this.gcMxL1.MainView = this.gvMxL1;
+            this.gcMxL1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMxL1.Name = "gcMxL1";
+            this.gcMxL1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit5,
+            this.repositoryItemButtonEdit6,
+            this.repositoryItemComboBox3});
+            this.gcMxL1.Size = new System.Drawing.Size(1174, 390);
+            this.gcMxL1.TabIndex = 2;
+            this.gcMxL1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMxL1});
+            // 
+            // gvMxL1
+            // 
+            this.gvMxL1.Appearance.Row.Options.UseFont = true;
+            this.gvMxL1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn34,
+            this.gridColumn35,
+            this.gridColumn36,
+            this.gridColumn51,
+            this.gridColumn55,
+            this.gridColumn56,
+            this.gridColumn57,
+            this.gridColumn58,
+            this.gridColumn59,
+            this.gridColumn60,
+            this.gridColumn61,
+            this.gridColumn62,
+            this.gridColumn63,
+            this.gridColumn64,
+            this.gridColumn65,
+            this.gridColumn66,
+            this.gridColumn67,
+            this.gridColumn68,
+            this.gridColumn69,
+            this.gridColumn70,
+            this.gridColumn71,
+            this.gridColumn72});
+            this.gvMxL1.DetailHeight = 272;
+            this.gvMxL1.GridControl = this.gcMxL1;
+            this.gvMxL1.Name = "gvMxL1";
+            this.gvMxL1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+            this.gvMxL1.OptionsFilter.AllowFilterEditor = false;
+            this.gvMxL1.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMxL1.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMxL1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn34
+            // 
+            this.gridColumn34.Caption = "abtGuid涓嶈兘鍒犻櫎";
+            this.gridColumn34.FieldName = "aboutGuid";
+            this.gridColumn34.MinWidth = 44;
+            this.gridColumn34.Name = "gridColumn34";
+            this.gridColumn34.OptionsColumn.ReadOnly = true;
+            this.gridColumn34.Width = 82;
+            // 
+            // gridColumn35
+            // 
+            this.gridColumn35.AppearanceCell.Options.UseFont = true;
+            this.gridColumn35.Caption = "guid涓嶈兘鍒犻櫎";
+            this.gridColumn35.FieldName = "guid";
+            this.gridColumn35.MinWidth = 61;
+            this.gridColumn35.Name = "gridColumn35";
+            this.gridColumn35.OptionsColumn.ReadOnly = true;
+            this.gridColumn35.Tag = "query_a.guid";
+            this.gridColumn35.Width = 87;
+            // 
+            // gridColumn36
+            // 
+            this.gridColumn36.AppearanceCell.Options.UseFont = true;
+            this.gridColumn36.Caption = "鎬ユ枡鏍囪瘑";
+            this.gridColumn36.FieldName = "urgentFlag";
+            this.gridColumn36.MinWidth = 10;
+            this.gridColumn36.Name = "gridColumn36";
+            this.gridColumn36.Tag = "query_a.urgent_flag";
+            this.gridColumn36.Visible = true;
+            this.gridColumn36.VisibleIndex = 0;
+            this.gridColumn36.Width = 10;
+            // 
+            // gridColumn51
+            // 
+            this.gridColumn51.AppearanceCell.Options.UseFont = true;
+            this.gridColumn51.Caption = "ERP閲囪喘鍗曞彿";
+            this.gridColumn51.FieldName = "ebeln";
+            this.gridColumn51.MinWidth = 44;
+            this.gridColumn51.Name = "gridColumn51";
+            this.gridColumn51.OptionsColumn.ReadOnly = true;
+            this.gridColumn51.Tag = "query_a.ebeln";
+            this.gridColumn51.Visible = true;
+            this.gridColumn51.VisibleIndex = 1;
+            this.gridColumn51.Width = 79;
+            // 
+            // gridColumn55
+            // 
+            this.gridColumn55.Caption = "鐗╂枡缂栧彿";
+            this.gridColumn55.FieldName = "itemNo";
+            this.gridColumn55.MinWidth = 44;
+            this.gridColumn55.Name = "gridColumn55";
+            this.gridColumn55.OptionsColumn.ReadOnly = true;
+            this.gridColumn55.Visible = true;
+            this.gridColumn55.VisibleIndex = 2;
+            this.gridColumn55.Width = 66;
+            // 
+            // gridColumn56
+            // 
+            this.gridColumn56.AppearanceCell.Options.UseFont = true;
+            this.gridColumn56.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn56.FieldName = "itemName";
+            this.gridColumn56.MinWidth = 44;
+            this.gridColumn56.Name = "gridColumn56";
+            this.gridColumn56.OptionsColumn.ReadOnly = true;
+            this.gridColumn56.Tag = "query_a.board_style";
+            this.gridColumn56.Visible = true;
+            this.gridColumn56.VisibleIndex = 3;
+            this.gridColumn56.Width = 120;
+            // 
+            // gridColumn57
+            // 
+            this.gridColumn57.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn57.FieldName = "itemModel";
+            this.gridColumn57.MinWidth = 44;
+            this.gridColumn57.Name = "gridColumn57";
+            this.gridColumn57.Visible = true;
+            this.gridColumn57.VisibleIndex = 4;
+            this.gridColumn57.Width = 82;
+            // 
+            // gridColumn58
+            // 
+            this.gridColumn58.Caption = "鏈鏀惰揣鏁伴噺";
+            this.gridColumn58.FieldName = "quantity";
+            this.gridColumn58.MinWidth = 44;
+            this.gridColumn58.Name = "gridColumn58";
+            this.gridColumn58.Visible = true;
+            this.gridColumn58.VisibleIndex = 5;
+            this.gridColumn58.Width = 178;
+            // 
+            // gridColumn59
+            // 
+            this.gridColumn59.AppearanceCell.Options.UseFont = true;
+            this.gridColumn59.Caption = "宸插叆搴撴暟閲�";
+            this.gridColumn59.FieldName = "okRkqty";
+            this.gridColumn59.MinWidth = 44;
+            this.gridColumn59.Name = "gridColumn59";
+            this.gridColumn59.OptionsColumn.ReadOnly = true;
+            this.gridColumn59.Tag = "query_a.ok_rkqty";
+            this.gridColumn59.Visible = true;
+            this.gridColumn59.VisibleIndex = 6;
+            this.gridColumn59.Width = 139;
+            // 
+            // gridColumn60
+            // 
+            this.gridColumn60.AppearanceCell.Options.UseFont = true;
+            this.gridColumn60.Caption = "宸叉墦鍗版暟閲�";
+            this.gridColumn60.FieldName = "yQty";
+            this.gridColumn60.MinWidth = 44;
+            this.gridColumn60.Name = "gridColumn60";
+            this.gridColumn60.OptionsColumn.ReadOnly = true;
+            this.gridColumn60.Tag = "query_a.ebeln_qty";
+            this.gridColumn60.Visible = true;
+            this.gridColumn60.VisibleIndex = 7;
+            this.gridColumn60.Width = 109;
+            // 
+            // gridColumn61
+            // 
+            this.gridColumn61.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn61.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn61.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn61.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn61.Caption = "鍙墦鍗版�婚噺";
+            this.gridColumn61.FieldName = "kQty";
+            this.gridColumn61.MinWidth = 44;
+            this.gridColumn61.Name = "gridColumn61";
+            this.gridColumn61.Visible = true;
+            this.gridColumn61.VisibleIndex = 8;
+            this.gridColumn61.Width = 84;
+            // 
+            // gridColumn62
+            // 
+            this.gridColumn62.Caption = "鐗╂枡鍗曚綅";
+            this.gridColumn62.FieldName = "wnDw";
+            this.gridColumn62.MinWidth = 44;
+            this.gridColumn62.Name = "gridColumn62";
+            this.gridColumn62.OptionsColumn.ReadOnly = true;
+            this.gridColumn62.Width = 139;
+            // 
+            // gridColumn63
+            // 
+            this.gridColumn63.Caption = "閲囪喘鍗曚綅";
+            this.gridColumn63.FieldName = "cgUnit";
+            this.gridColumn63.MinWidth = 44;
+            this.gridColumn63.Name = "gridColumn63";
+            this.gridColumn63.OptionsColumn.ReadOnly = true;
+            this.gridColumn63.Visible = true;
+            this.gridColumn63.VisibleIndex = 9;
+            this.gridColumn63.Width = 44;
+            // 
+            // gridColumn64
+            // 
+            this.gridColumn64.Caption = "搴撳瓨鍗曚綅";
+            this.gridColumn64.FieldName = "kcUnit";
+            this.gridColumn64.MinWidth = 44;
+            this.gridColumn64.Name = "gridColumn64";
+            this.gridColumn64.OptionsColumn.ReadOnly = true;
+            this.gridColumn64.Width = 73;
+            // 
+            // gridColumn65
+            // 
+            this.gridColumn65.Caption = "妫�楠岀姸鎬�";
+            this.gridColumn65.FieldName = "jyzt";
+            this.gridColumn65.MinWidth = 44;
+            this.gridColumn65.Name = "gridColumn65";
+            this.gridColumn65.Visible = true;
+            this.gridColumn65.VisibleIndex = 10;
+            this.gridColumn65.Width = 44;
+            // 
+            // gridColumn66
+            // 
+            this.gridColumn66.Caption = "妫�楠岀粨鏋�";
+            this.gridColumn66.FieldName = "jyjg";
+            this.gridColumn66.MinWidth = 44;
+            this.gridColumn66.Name = "gridColumn66";
+            this.gridColumn66.Visible = true;
+            this.gridColumn66.VisibleIndex = 11;
+            this.gridColumn66.Width = 44;
+            // 
+            // gridColumn67
+            // 
+            this.gridColumn67.Caption = "澶勭悊鎰忚";
+            this.gridColumn67.FieldName = "clyj";
+            this.gridColumn67.MinWidth = 22;
+            this.gridColumn67.Name = "gridColumn67";
+            this.gridColumn67.Visible = true;
+            this.gridColumn67.VisibleIndex = 12;
+            this.gridColumn67.Width = 22;
+            // 
+            // gridColumn68
+            // 
+            this.gridColumn68.Caption = "榛樿姣忓紶鏉$爜鏁伴噺";
+            this.gridColumn68.FieldName = "mrtmsl";
+            this.gridColumn68.MinWidth = 22;
+            this.gridColumn68.Name = "gridColumn68";
+            this.gridColumn68.Width = 82;
+            // 
+            // gridColumn69
+            // 
+            this.gridColumn69.Caption = "鍏ュ簱绫诲瀷";
+            this.gridColumn69.ColumnEdit = this.repositoryItemComboBox3;
+            this.gridColumn69.FieldName = "rkType";
+            this.gridColumn69.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+            this.gridColumn69.Name = "gridColumn69";
+            this.gridColumn69.OptionsColumn.ReadOnly = true;
+            this.gridColumn69.Visible = true;
+            this.gridColumn69.VisibleIndex = 16;
+            this.gridColumn69.Width = 66;
+            // 
+            // repositoryItemComboBox3
+            // 
+            this.repositoryItemComboBox3.AutoHeight = false;
+            this.repositoryItemComboBox3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox3.Name = "repositoryItemComboBox3";
+            // 
+            // gridColumn70
+            // 
+            this.gridColumn70.Caption = "浠撳簱缂栫爜";
+            this.gridColumn70.FieldName = "depotCode";
+            this.gridColumn70.Name = "gridColumn70";
+            this.gridColumn70.Visible = true;
+            this.gridColumn70.VisibleIndex = 13;
+            this.gridColumn70.Width = 20;
+            // 
+            // gridColumn71
+            // 
+            this.gridColumn71.Caption = "浠撳簱鍚嶇О";
+            this.gridColumn71.FieldName = "depotName";
+            this.gridColumn71.Name = "gridColumn71";
+            this.gridColumn71.Visible = true;
+            this.gridColumn71.VisibleIndex = 14;
+            this.gridColumn71.Width = 20;
+            // 
+            // gridColumn72
+            // 
+            this.gridColumn72.Caption = "浠撶鍛�";
+            this.gridColumn72.FieldName = "staffName";
+            this.gridColumn72.Name = "gridColumn72";
+            this.gridColumn72.Visible = true;
+            this.gridColumn72.VisibleIndex = 15;
+            this.gridColumn72.Width = 20;
+            // 
+            // repositoryItemButtonEdit5
+            // 
+            this.repositoryItemButtonEdit5.AutoHeight = false;
+            this.repositoryItemButtonEdit5.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.repositoryItemButtonEdit5.Name = "repositoryItemButtonEdit5";
+            // 
+            // repositoryItemButtonEdit6
+            // 
+            this.repositoryItemButtonEdit6.AutoHeight = false;
+            this.repositoryItemButtonEdit6.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.repositoryItemButtonEdit6.Name = "repositoryItemButtonEdit6";
+            // 
             // xtraTabPage6
             // 
             this.xtraTabPage6.Controls.Add(this.gcMxL3);
             this.xtraTabPage6.Name = "xtraTabPage6";
-            this.xtraTabPage6.Size = new System.Drawing.Size(1174, 351);
+            this.xtraTabPage6.Size = new System.Drawing.Size(1174, 390);
             this.xtraTabPage6.Text = "宸叉墦鏉$爜鏄庣粏";
             // 
             // gcMxL3
@@ -1381,7 +1399,7 @@
             this.gcMxL3.MainView = this.gvMxL3;
             this.gcMxL3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMxL3.Name = "gcMxL3";
-            this.gcMxL3.Size = new System.Drawing.Size(1174, 351);
+            this.gcMxL3.Size = new System.Drawing.Size(1174, 390);
             this.gcMxL3.TabIndex = 1;
             this.gcMxL3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMxL3});
@@ -1635,11 +1653,11 @@
             // 
             // txt_dptName
             // 
-            this.txt_dptName.Location = new System.Drawing.Point(385, 36);
+            this.txt_dptName.Location = new System.Drawing.Point(380, 36);
             this.txt_dptName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_dptName.Name = "txt_dptName";
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(201, 20);
+            this.txt_dptName.Size = new System.Drawing.Size(197, 20);
             this.txt_dptName.StyleController = this.layoutMx1;
             this.txt_dptName.TabIndex = 468;
             // 
@@ -1649,37 +1667,37 @@
             this.txt_gysNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_gysNo.Name = "txt_gysNo";
             this.txt_gysNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_gysNo.Size = new System.Drawing.Size(201, 20);
+            this.txt_gysNo.Size = new System.Drawing.Size(196, 20);
             this.txt_gysNo.StyleController = this.layoutMx1;
             this.txt_gysNo.TabIndex = 467;
             // 
             // txt_depotsCode
             // 
-            this.txt_depotsCode.Location = new System.Drawing.Point(385, 60);
+            this.txt_depotsCode.Location = new System.Drawing.Point(380, 60);
             this.txt_depotsCode.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_depotsCode.Name = "txt_depotsCode";
             this.txt_depotsCode.Properties.Appearance.Options.UseFont = true;
-            this.txt_depotsCode.Size = new System.Drawing.Size(201, 20);
+            this.txt_depotsCode.Size = new System.Drawing.Size(197, 20);
             this.txt_depotsCode.StyleController = this.layoutMx1;
             this.txt_depotsCode.TabIndex = 462;
             // 
             // txt_barcodeProgress
             // 
-            this.txt_barcodeProgress.Location = new System.Drawing.Point(674, 60);
+            this.txt_barcodeProgress.Location = new System.Drawing.Point(665, 60);
             this.txt_barcodeProgress.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_barcodeProgress.Name = "txt_barcodeProgress";
             this.txt_barcodeProgress.Properties.Appearance.Options.UseFont = true;
-            this.txt_barcodeProgress.Size = new System.Drawing.Size(201, 20);
+            this.txt_barcodeProgress.Size = new System.Drawing.Size(197, 20);
             this.txt_barcodeProgress.StyleController = this.layoutMx1;
             this.txt_barcodeProgress.TabIndex = 342;
             // 
             // txt_paperBillNo
             // 
-            this.txt_paperBillNo.Location = new System.Drawing.Point(385, 12);
+            this.txt_paperBillNo.Location = new System.Drawing.Point(380, 12);
             this.txt_paperBillNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_paperBillNo.Name = "txt_paperBillNo";
             this.txt_paperBillNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_paperBillNo.Size = new System.Drawing.Size(201, 20);
+            this.txt_paperBillNo.Size = new System.Drawing.Size(197, 20);
             this.txt_paperBillNo.StyleController = this.layoutMx1;
             this.txt_paperBillNo.TabIndex = 463;
             // 
@@ -1689,7 +1707,7 @@
             this.txt_billNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(201, 20);
+            this.txt_billNo.Size = new System.Drawing.Size(196, 20);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             // 
@@ -1699,17 +1717,17 @@
             this.txt_gysName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_gysName.Name = "txt_gysName";
             this.txt_gysName.Properties.Appearance.Options.UseFont = true;
-            this.txt_gysName.Size = new System.Drawing.Size(201, 20);
+            this.txt_gysName.Size = new System.Drawing.Size(196, 20);
             this.txt_gysName.StyleController = this.layoutMx1;
             this.txt_gysName.TabIndex = 459;
             // 
             // txt_createBy
             // 
-            this.txt_createBy.Location = new System.Drawing.Point(674, 12);
+            this.txt_createBy.Location = new System.Drawing.Point(665, 12);
             this.txt_createBy.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_createBy.Name = "txt_createBy";
             this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(201, 20);
+            this.txt_createBy.Size = new System.Drawing.Size(197, 20);
             this.txt_createBy.StyleController = this.layoutMx1;
             this.txt_createBy.TabIndex = 217;
             // 
@@ -1719,37 +1737,37 @@
             this.txt_remark.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(490, 20);
+            this.txt_remark.Size = new System.Drawing.Size(481, 20);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 235;
             // 
             // txt_createDate
             // 
-            this.txt_createDate.Location = new System.Drawing.Point(674, 36);
+            this.txt_createDate.Location = new System.Drawing.Point(665, 36);
             this.txt_createDate.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_createDate.Name = "txt_createDate";
             this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(201, 20);
+            this.txt_createDate.Size = new System.Drawing.Size(197, 20);
             this.txt_createDate.StyleController = this.layoutMx1;
             this.txt_createDate.TabIndex = 252;
             // 
             // txt_fType
             // 
-            this.txt_fType.Location = new System.Drawing.Point(879, 12);
+            this.txt_fType.Location = new System.Drawing.Point(866, 12);
             this.txt_fType.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_fType.Name = "txt_fType";
             this.txt_fType.Properties.Caption = "濮斿鏍囪瘑";
-            this.txt_fType.Size = new System.Drawing.Size(285, 20);
+            this.txt_fType.Size = new System.Drawing.Size(281, 20);
             this.txt_fType.StyleController = this.layoutMx1;
             this.txt_fType.TabIndex = 469;
             // 
             // txt_urgentFlag
             // 
-            this.txt_urgentFlag.Location = new System.Drawing.Point(879, 36);
+            this.txt_urgentFlag.Location = new System.Drawing.Point(866, 36);
             this.txt_urgentFlag.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_urgentFlag.Name = "txt_urgentFlag";
             this.txt_urgentFlag.Properties.Caption = "鎬ユ枡鏍囪瘑";
-            this.txt_urgentFlag.Size = new System.Drawing.Size(285, 20);
+            this.txt_urgentFlag.Size = new System.Drawing.Size(281, 20);
             this.txt_urgentFlag.StyleController = this.layoutMx1;
             this.txt_urgentFlag.TabIndex = 470;
             // 
@@ -1810,7 +1828,7 @@
             rowDefinition2,
             rowDefinition3,
             rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1176, 116);
+            this.Root.Size = new System.Drawing.Size(1159, 116);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -1818,7 +1836,7 @@
             this.layoutControlItem1.Control = this.txt_billNo;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem1.Size = new System.Drawing.Size(284, 24);
             this.layoutControlItem1.Text = "鍒拌揣鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -1828,7 +1846,7 @@
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 24);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem2.Size = new System.Drawing.Size(284, 24);
             this.layoutControlItem2.Text = "渚涘簲鍟嗗悕绉�";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -1838,49 +1856,49 @@
             this.layoutControlItem3.Location = new System.Drawing.Point(0, 48);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem3.Size = new System.Drawing.Size(284, 24);
             this.layoutControlItem3.Text = "渚涘簲鍟嗙紪鍙�";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_paperBillNo;
-            this.layoutControlItem4.Location = new System.Drawing.Point(289, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(284, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem4.Size = new System.Drawing.Size(285, 24);
             this.layoutControlItem4.Text = "閫佽揣鍗曞彿";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_dptName;
-            this.layoutControlItem5.Location = new System.Drawing.Point(289, 24);
+            this.layoutControlItem5.Location = new System.Drawing.Point(284, 24);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem5.Size = new System.Drawing.Size(285, 24);
             this.layoutControlItem5.Text = "浠撳簱鍚嶇О";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_depotsCode;
-            this.layoutControlItem6.Location = new System.Drawing.Point(289, 48);
+            this.layoutControlItem6.Location = new System.Drawing.Point(284, 48);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem6.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem6.Size = new System.Drawing.Size(285, 24);
             this.layoutControlItem6.Text = "浠撳簱缂栧彿";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_createBy;
-            this.layoutControlItem7.Location = new System.Drawing.Point(578, 0);
+            this.layoutControlItem7.Location = new System.Drawing.Point(569, 0);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem7.Size = new System.Drawing.Size(285, 24);
             this.layoutControlItem7.Text = "鍒涘缓浜哄憳";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -1888,11 +1906,11 @@
             // 
             this.layoutControlItem8.Control = this.txt_createDate;
             this.layoutControlItem8.CustomizationFormText = "鍒涘缓鏃ユ湡";
-            this.layoutControlItem8.Location = new System.Drawing.Point(578, 24);
+            this.layoutControlItem8.Location = new System.Drawing.Point(569, 24);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem8.Size = new System.Drawing.Size(285, 24);
             this.layoutControlItem8.Text = "鍒涘缓鏃ユ湡";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -1903,17 +1921,17 @@
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(578, 24);
+            this.layoutControlItem12.Size = new System.Drawing.Size(569, 24);
             this.layoutControlItem12.Text = "鏀舵枡澶囨敞";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_fType;
-            this.layoutControlItem10.Location = new System.Drawing.Point(867, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(854, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem10.Size = new System.Drawing.Size(285, 24);
             this.layoutControlItem10.Text = "鎻愪氦鐘舵��";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -1921,11 +1939,11 @@
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_urgentFlag;
-            this.layoutControlItem11.Location = new System.Drawing.Point(867, 24);
+            this.layoutControlItem11.Location = new System.Drawing.Point(854, 24);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem11.Size = new System.Drawing.Size(285, 24);
             this.layoutControlItem11.Text = "鎬ユ枡鏍囪瘑";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
@@ -1933,11 +1951,11 @@
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_barcodeProgress;
-            this.layoutControlItem13.Location = new System.Drawing.Point(578, 48);
+            this.layoutControlItem13.Location = new System.Drawing.Point(569, 48);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(289, 24);
+            this.layoutControlItem13.Size = new System.Drawing.Size(285, 24);
             this.layoutControlItem13.Text = "鏉$爜鎵撳嵃姣旂巼";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -1947,13 +1965,13 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabMx.Name = "tabMx";
-            this.tabMx.SelectedTabPage = this.tabMxPage1;
+            this.tabMx.SelectedTabPage = this.xtraTabPage3;
             this.tabMx.Size = new System.Drawing.Size(1176, 550);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+            this.xtraTabPage3,
             this.tabMxPage1,
-            this.tabMxPage2,
-            this.xtraTabPage3});
+            this.tabMxPage2});
             // 
             // tabMxPage1
             // 
@@ -1982,7 +2000,7 @@
             this.split99.Panel2.Text = "Panel2";
             this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split99.Size = new System.Drawing.Size(1174, 524);
-            this.split99.SplitterPosition = 144;
+            this.split99.SplitterPosition = 222;
             this.split99.TabIndex = 2;
             // 
             // layout99
@@ -2006,7 +2024,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, 144);
+            this.layout99.Size = new System.Drawing.Size(1174, 222);
             this.layout99.TabIndex = 0;
             this.layout99.Text = "layoutControl1";
             // 
@@ -2014,11 +2032,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, 94);
+            this.layoutControl1.Location = new System.Drawing.Point(588, 146);
             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, 38);
+            this.layoutControl1.Size = new System.Drawing.Size(284, 64);
             this.layoutControl1.TabIndex = 477;
             this.layoutControl1.Text = "layoutControl1";
             // 
@@ -2055,19 +2073,19 @@
             this.layoutControlItem27});
             this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup2.Name = "Root";
-            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition5.Width = 100D;
-            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition6.Width = 100D;
+            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition11.Width = 100D;
+            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition12.Width = 100D;
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6});
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition11,
+            columnDefinition12});
+            rowDefinition9.Height = 100D;
+            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition5});
+            rowDefinition9});
             this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup2.Size = new System.Drawing.Size(284, 38);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(284, 64);
             this.layoutControlGroup2.TextVisible = false;
             // 
             // layoutControlItem26
@@ -2075,7 +2093,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, 38);
+            this.layoutControlItem26.Size = new System.Drawing.Size(142, 64);
             this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -2085,7 +2103,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, 38);
+            this.layoutControlItem27.Size = new System.Drawing.Size(142, 64);
             this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
             this.layoutControlItem27.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -2104,11 +2122,11 @@
             // 
             this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(875, 51);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(875, 77);
             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, 41);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(288, 67);
             this.ucBtnPrint1.TabIndex = 232;
             // 
             // radOut
@@ -2122,13 +2140,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, 41);
+            this.radOut.Size = new System.Drawing.Size(287, 67);
             this.radOut.StyleController = this.layout99;
             this.radOut.TabIndex = 476;
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(672, 53);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(672, 79);
             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;
@@ -2152,7 +2170,7 @@
             // 
             // txtWlmc
             // 
-            this.txtWlmc.Location = new System.Drawing.Point(96, 53);
+            this.txtWlmc.Location = new System.Drawing.Point(96, 79);
             this.txtWlmc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txtWlmc.Name = "txtWlmc";
             this.txtWlmc.Properties.Appearance.Options.UseFont = true;
@@ -2163,7 +2181,7 @@
             // 
             // txtWlgg
             // 
-            this.txtWlgg.Location = new System.Drawing.Point(96, 94);
+            this.txtWlgg.Location = new System.Drawing.Point(96, 146);
             this.txtWlgg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txtWlgg.Name = "txtWlgg";
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
@@ -2198,7 +2216,7 @@
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(384, 53);
+            this.txt_yQty.Location = new System.Drawing.Point(384, 79);
             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;
@@ -2236,30 +2254,30 @@
             this.layoutControlItem25});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
-            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;
+            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.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            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;
+            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.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition6,
-            rowDefinition7,
-            rowDefinition8});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1174, 144);
+            rowDefinition10,
+            rowDefinition11,
+            rowDefinition12});
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1174, 222);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem15
@@ -2267,28 +2285,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, 41);
+            this.layoutControlItem15.Size = new System.Drawing.Size(288, 67);
             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, 41);
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 67);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem16.Size = new System.Drawing.Size(288, 41);
+            this.layoutControlItem16.Size = new System.Drawing.Size(288, 67);
             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, 82);
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 134);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem17.Size = new System.Drawing.Size(576, 42);
+            this.layoutControlItem17.Size = new System.Drawing.Size(576, 68);
             this.layoutControlItem17.Text = "鐗╂枡瑙勬牸123";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -2298,18 +2316,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, 41);
+            this.layoutControlItem18.Size = new System.Drawing.Size(288, 67);
             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, 41);
+            this.layoutControlItem19.Location = new System.Drawing.Point(288, 67);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem19.Size = new System.Drawing.Size(288, 41);
+            this.layoutControlItem19.Size = new System.Drawing.Size(288, 67);
             this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
             this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -2319,18 +2337,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, 41);
+            this.layoutControlItem20.Size = new System.Drawing.Size(288, 67);
             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, 41);
+            this.layoutControlItem21.Location = new System.Drawing.Point(576, 67);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem21.Size = new System.Drawing.Size(288, 41);
+            this.layoutControlItem21.Size = new System.Drawing.Size(288, 67);
             this.layoutControlItem21.Text = "姣忓紶鏉$爜鏁伴噺";
             this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -2341,7 +2359,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, 41);
+            this.layoutControlItem22.Size = new System.Drawing.Size(290, 67);
             this.layoutControlItem22.Text = "鑷姩璁$畻";
             this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem22.TextVisible = false;
@@ -2349,12 +2367,12 @@
             // layoutControlItem23
             // 
             this.layoutControlItem23.Control = this.ucBtnPrint1;
-            this.layoutControlItem23.Location = new System.Drawing.Point(864, 41);
+            this.layoutControlItem23.Location = new System.Drawing.Point(864, 67);
             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, 41);
+            this.layoutControlItem23.Size = new System.Drawing.Size(290, 67);
             this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem23.TextVisible = false;
@@ -2362,11 +2380,11 @@
             // layoutControlItem25
             // 
             this.layoutControlItem25.Control = this.layoutControl1;
-            this.layoutControlItem25.Location = new System.Drawing.Point(576, 82);
+            this.layoutControlItem25.Location = new System.Drawing.Point(576, 134);
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem25.Size = new System.Drawing.Size(288, 42);
+            this.layoutControlItem25.Size = new System.Drawing.Size(288, 68);
             this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
             this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem25.TextVisible = false;
@@ -2383,7 +2401,7 @@
             this.repositoryItemButtonEdit1,
             this.repositoryItemButtonEdit2,
             this.repositoryItemComboBox1});
-            this.gcMx1.Size = new System.Drawing.Size(1174, 370);
+            this.gcMx1.Size = new System.Drawing.Size(1174, 292);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -2687,209 +2705,6 @@
             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, 524);
-            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, 524);
-            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.gv_hbdy});
-            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;
-            // 
-            // gv_hbdy
-            // 
-            this.gv_hbdy.Caption = "鏄惁鍚堝苟鎵撳嵃";
-            this.gv_hbdy.FieldName = "hbdy2";
-            this.gv_hbdy.Name = "gv_hbdy";
-            this.gv_hbdy.Visible = true;
-            this.gv_hbdy.VisibleIndex = 13;
-            // 
             // xtraTabPage3
             // 
             this.xtraTabPage3.Controls.Add(this.splitContainerControl1);
@@ -2914,11 +2729,12 @@
             this.splitContainerControl1.Panel2.Controls.Add(this.gcMx3);
             this.splitContainerControl1.Panel2.Text = "Panel2";
             this.splitContainerControl1.Size = new System.Drawing.Size(1174, 524);
-            this.splitContainerControl1.SplitterPosition = 109;
+            this.splitContainerControl1.SplitterPosition = 130;
             this.splitContainerControl1.TabIndex = 0;
             // 
             // lay99
             // 
+            this.lay99.Controls.Add(this.ucBtnPrintOne1);
             this.lay99.Controls.Add(this.layoutControl2);
             this.lay99.Controls.Add(this.radOut2);
             this.lay99.Controls.Add(this.ucBtnPrint2);
@@ -2935,19 +2751,30 @@
             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.Size = new System.Drawing.Size(1174, 130);
             this.lay99.TabIndex = 0;
             this.lay99.Text = "layoutControl2";
+            // 
+            // ucBtnPrintOne1
+            // 
+            this.ucBtnPrintOne1.allClickKey = null;
+            this.ucBtnPrintOne1.guidKey = null;
+            this.ucBtnPrintOne1.Location = new System.Drawing.Point(876, 12);
+            this.ucBtnPrintOne1.Margin = new System.Windows.Forms.Padding(0);
+            this.ucBtnPrintOne1.Name = "ucBtnPrintOne1";
+            this.ucBtnPrintOne1.rptParameter = null;
+            this.ucBtnPrintOne1.Size = new System.Drawing.Size(286, 32);
+            this.ucBtnPrintOne1.TabIndex = 485;
             // 
             // layoutControl2
             // 
             this.layoutControl2.Controls.Add(this.txt_iCount_2);
             this.layoutControl2.Controls.Add(this.txt_yuliang_2);
-            this.layoutControl2.Location = new System.Drawing.Point(588, 42);
+            this.layoutControl2.Location = new System.Drawing.Point(588, 48);
             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(284, 26);
+            this.layoutControl2.Size = new System.Drawing.Size(284, 33);
             this.layoutControl2.TabIndex = 478;
             this.layoutControl2.Text = "layoutControl2";
             // 
@@ -2984,19 +2811,19 @@
             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;
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
             this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition11,
-            columnDefinition12});
-            rowDefinition9.Height = 100D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5,
+            columnDefinition6});
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition9});
+            rowDefinition5});
             this.layoutControlGroup4.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup4.Size = new System.Drawing.Size(284, 26);
+            this.layoutControlGroup4.Size = new System.Drawing.Size(284, 33);
             this.layoutControlGroup4.TextVisible = false;
             // 
             // layoutControlItem31
@@ -3004,7 +2831,7 @@
             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(142, 26);
+            this.layoutControlItem31.Size = new System.Drawing.Size(142, 33);
             this.layoutControlItem31.Text = "鎵撳嵃鏁村紶鏁板��";
             this.layoutControlItem31.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -3014,13 +2841,13 @@
             this.layoutControlItem32.Location = new System.Drawing.Point(142, 0);
             this.layoutControlItem32.Name = "layoutControlItem27";
             this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem32.Size = new System.Drawing.Size(142, 26);
+            this.layoutControlItem32.Size = new System.Drawing.Size(142, 33);
             this.layoutControlItem32.Text = "鎵撳嵃浣欐暟";
             this.layoutControlItem32.TextSize = new System.Drawing.Size(72, 14);
             // 
             // radOut2
             // 
-            this.radOut2.Location = new System.Drawing.Point(876, 42);
+            this.radOut2.Location = new System.Drawing.Point(876, 48);
             this.radOut2.Margin = new System.Windows.Forms.Padding(0);
             this.radOut2.Name = "radOut2";
             this.radOut2.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -3029,7 +2856,7 @@
             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(286, 26);
+            this.radOut2.Size = new System.Drawing.Size(286, 33);
             this.radOut2.StyleController = this.lay99;
             this.radOut2.TabIndex = 477;
             // 
@@ -3037,11 +2864,11 @@
             // 
             this.ucBtnPrint2.allClickKey = null;
             this.ucBtnPrint2.guidKey = null;
-            this.ucBtnPrint2.Location = new System.Drawing.Point(876, 72);
+            this.ucBtnPrint2.Location = new System.Drawing.Point(876, 85);
             this.ucBtnPrint2.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint2.Name = "ucBtnPrint2";
             this.ucBtnPrint2.rptParameter = null;
-            this.ucBtnPrint2.Size = new System.Drawing.Size(286, 26);
+            this.ucBtnPrint2.Size = new System.Drawing.Size(286, 33);
             this.ucBtnPrint2.TabIndex = 6;
             // 
             // txtItemNo
@@ -3056,7 +2883,7 @@
             // 
             // txtItemName
             // 
-            this.txtItemName.Location = new System.Drawing.Point(96, 42);
+            this.txtItemName.Location = new System.Drawing.Point(96, 48);
             this.txtItemName.Name = "txtItemName";
             this.txtItemName.Properties.ReadOnly = true;
             this.txtItemName.Size = new System.Drawing.Size(200, 20);
@@ -3076,7 +2903,7 @@
             // 
             // txt_psnQty_2
             // 
-            this.txt_psnQty_2.Location = new System.Drawing.Point(672, 72);
+            this.txt_psnQty_2.Location = new System.Drawing.Point(672, 85);
             this.txt_psnQty_2.Name = "txt_psnQty_2";
             this.txt_psnQty_2.Size = new System.Drawing.Size(200, 20);
             this.txt_psnQty_2.StyleController = this.lay99;
@@ -3084,7 +2911,7 @@
             // 
             // txtItemModel
             // 
-            this.txtItemModel.Location = new System.Drawing.Point(96, 72);
+            this.txtItemModel.Location = new System.Drawing.Point(96, 85);
             this.txtItemModel.Name = "txtItemModel";
             this.txtItemModel.Properties.ReadOnly = true;
             this.txtItemModel.Size = new System.Drawing.Size(200, 20);
@@ -3102,7 +2929,7 @@
             // 
             // txt_yQtyHb
             // 
-            this.txt_yQtyHb.Location = new System.Drawing.Point(384, 42);
+            this.txt_yQtyHb.Location = new System.Drawing.Point(384, 48);
             this.txt_yQtyHb.Name = "txt_yQtyHb";
             this.txt_yQtyHb.Properties.ReadOnly = true;
             this.txt_yQtyHb.Size = new System.Drawing.Size(200, 20);
@@ -3111,7 +2938,7 @@
             // 
             // txt_releaseNo
             // 
-            this.txt_releaseNo.Location = new System.Drawing.Point(384, 72);
+            this.txt_releaseNo.Location = new System.Drawing.Point(384, 85);
             this.txt_releaseNo.Name = "txt_releaseNo";
             this.txt_releaseNo.Properties.ReadOnly = true;
             this.txt_releaseNo.Size = new System.Drawing.Size(200, 20);
@@ -3133,43 +2960,44 @@
             this.layoutControlItem37,
             this.layoutControlItem38,
             this.layoutControlItem39,
-            this.layoutControlItem35});
+            this.layoutControlItem35,
+            this.layoutControlItem40});
             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;
+            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.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;
+            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.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition10,
-            rowDefinition11,
-            rowDefinition12});
-            this.layoutControlGroup3.Size = new System.Drawing.Size(1174, 110);
+            rowDefinition6,
+            rowDefinition7,
+            rowDefinition8});
+            this.layoutControlGroup3.Size = new System.Drawing.Size(1174, 130);
             this.layoutControlGroup3.TextVisible = false;
             // 
             // layoutControlItem33
             // 
             this.layoutControlItem33.Control = this.layoutControl2;
-            this.layoutControlItem33.Location = new System.Drawing.Point(576, 30);
+            this.layoutControlItem33.Location = new System.Drawing.Point(576, 36);
             this.layoutControlItem33.Name = "layoutControlItem33";
             this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem33.Size = new System.Drawing.Size(288, 30);
+            this.layoutControlItem33.Size = new System.Drawing.Size(288, 37);
             this.layoutControlItem33.Text = "鎵撳嵃寮犳暟";
             this.layoutControlItem33.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem33.TextVisible = false;
@@ -3178,22 +3006,22 @@
             // 
             this.layoutControlItem30.Control = this.radOut2;
             this.layoutControlItem30.CustomizationFormText = "鎵撳嵃妯″紡";
-            this.layoutControlItem30.Location = new System.Drawing.Point(864, 30);
+            this.layoutControlItem30.Location = new System.Drawing.Point(864, 36);
             this.layoutControlItem30.Name = "layoutControlItem30";
             this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem30.Size = new System.Drawing.Size(290, 30);
+            this.layoutControlItem30.Size = new System.Drawing.Size(290, 37);
             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(864, 60);
+            this.layoutControlItem29.Location = new System.Drawing.Point(864, 73);
             this.layoutControlItem29.Name = "layoutControlItem29";
             this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem29.Size = new System.Drawing.Size(290, 30);
+            this.layoutControlItem29.Size = new System.Drawing.Size(290, 37);
             this.layoutControlItem29.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem29.TextVisible = false;
@@ -3201,10 +3029,10 @@
             // layoutControlItem28
             // 
             this.layoutControlItem28.Control = this.txtItemName;
-            this.layoutControlItem28.Location = new System.Drawing.Point(0, 30);
+            this.layoutControlItem28.Location = new System.Drawing.Point(0, 36);
             this.layoutControlItem28.Name = "layoutControlItem28";
             this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem28.Size = new System.Drawing.Size(288, 30);
+            this.layoutControlItem28.Size = new System.Drawing.Size(288, 37);
             this.layoutControlItem28.Text = "鐗╂枡鍚嶇О";
             this.layoutControlItem28.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -3213,7 +3041,7 @@
             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(288, 30);
+            this.layoutControlItem9.Size = new System.Drawing.Size(288, 36);
             this.layoutControlItem9.Text = "鐗╂枡缂栧彿";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -3223,17 +3051,17 @@
             this.layoutControlItem34.Location = new System.Drawing.Point(576, 0);
             this.layoutControlItem34.Name = "layoutControlItem34";
             this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem34.Size = new System.Drawing.Size(288, 30);
+            this.layoutControlItem34.Size = new System.Drawing.Size(288, 36);
             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.Location = new System.Drawing.Point(0, 73);
             this.layoutControlItem36.Name = "layoutControlItem36";
             this.layoutControlItem36.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem36.Size = new System.Drawing.Size(288, 30);
+            this.layoutControlItem36.Size = new System.Drawing.Size(288, 37);
             this.layoutControlItem36.Text = "鐗╂枡瑙勬牸";
             this.layoutControlItem36.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -3243,42 +3071,52 @@
             this.layoutControlItem37.Location = new System.Drawing.Point(288, 0);
             this.layoutControlItem37.Name = "layoutControlItem37";
             this.layoutControlItem37.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem37.Size = new System.Drawing.Size(288, 30);
+            this.layoutControlItem37.Size = new System.Drawing.Size(288, 36);
             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(288, 30);
+            this.layoutControlItem38.Location = new System.Drawing.Point(288, 36);
             this.layoutControlItem38.Name = "layoutControlItem38";
             this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem38.Size = new System.Drawing.Size(288, 30);
+            this.layoutControlItem38.Size = new System.Drawing.Size(288, 37);
             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(288, 60);
+            this.layoutControlItem39.Location = new System.Drawing.Point(288, 73);
             this.layoutControlItem39.Name = "layoutControlItem39";
             this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem39.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem39.Size = new System.Drawing.Size(288, 30);
+            this.layoutControlItem39.Size = new System.Drawing.Size(288, 37);
             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(576, 60);
+            this.layoutControlItem35.Location = new System.Drawing.Point(576, 73);
             this.layoutControlItem35.Name = "layoutControlItem35";
             this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem35.Size = new System.Drawing.Size(288, 30);
+            this.layoutControlItem35.Size = new System.Drawing.Size(288, 37);
             this.layoutControlItem35.Text = "姣忓紶鏉$爜鏁伴噺";
             this.layoutControlItem35.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem40
+            // 
+            this.layoutControlItem40.Control = this.ucBtnPrintOne1;
+            this.layoutControlItem40.Location = new System.Drawing.Point(864, 0);
+            this.layoutControlItem40.Name = "layoutControlItem40";
+            this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem40.Size = new System.Drawing.Size(290, 36);
+            this.layoutControlItem40.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem40.TextVisible = false;
             // 
             // gcMx3
             // 
@@ -3292,7 +3130,7 @@
             this.repositoryItemButtonEdit3,
             this.repositoryItemButtonEdit4,
             this.repositoryItemComboBox2});
-            this.gcMx3.Size = new System.Drawing.Size(1174, 405);
+            this.gcMx3.Size = new System.Drawing.Size(1174, 384);
             this.gcMx3.TabIndex = 2;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
@@ -3533,6 +3371,209 @@
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
             // 
+            // 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, 524);
+            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, 524);
+            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.gv_hbdy});
+            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;
+            // 
+            // gv_hbdy
+            // 
+            this.gv_hbdy.Caption = "鏄惁鍚堝苟鎵撳嵃";
+            this.gv_hbdy.FieldName = "hbdy2";
+            this.gv_hbdy.Name = "gv_hbdy";
+            this.gv_hbdy.Visible = true;
+            this.gv_hbdy.VisibleIndex = 13;
+            // 
             // Frm_ArrivalBarcode
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
@@ -3556,18 +3597,18 @@
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
             this.xtraTabControl2.ResumeLayout(false);
-            this.xtraTabPage4.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMxL1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit6)).EndInit();
             this.xtraTabPage5.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMxL2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMxL2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).EndInit();
+            this.xtraTabPage4.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMxL1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit6)).EndInit();
             this.xtraTabPage6.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMxL3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMxL3)).EndInit();
@@ -3649,9 +3690,6 @@
             ((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.splitContainerControl1.Panel1)).EndInit();
             this.splitContainerControl1.Panel1.ResumeLayout(false);
@@ -3689,11 +3727,16 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
+            this.tabMxPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -3954,5 +3997,9 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn85;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn86;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn87;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn106;
+        private DevExpress.Utils.Behaviors.BehaviorManager behaviorManager1;
+        private UserControl.UcBtnPrintOne ucBtnPrintOne1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3