From 58279ea8063d330fee4abd5d4d44d3a6db740d29 Mon Sep 17 00:00:00 2001
From: cnf <3200815559@qq.com>
Date: 星期五, 08 八月 2025 15:24:13 +0800
Subject: [PATCH] iqc检验项目赋值物料,增加物料属性字段,调拨模块修改

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 1211 ++++++++++++++++++++++++++++++++++++++-------------------
 1 files changed, 811 insertions(+), 400 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 285eb82..6333fff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -30,24 +30,24 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -133,7 +133,28 @@
             this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvAbtGuid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -154,30 +175,38 @@
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.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.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+            this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMx3 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn44 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn45 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn46 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn50 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -261,14 +290,25 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            this.xtraTabPage3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
+            this.splitContainerControl1.Panel2.SuspendLayout();
+            this.splitContainerControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -799,32 +839,32 @@
             this.layoutControlItem13});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition1.Width = 100D;
-            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition2.Width = 100D;
-            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition3.Width = 100D;
-            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition4.Width = 100D;
+            columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition11.Width = 100D;
+            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition12.Width = 100D;
+            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition13.Width = 100D;
+            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition14.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition1,
-            columnDefinition2,
-            columnDefinition3,
-            columnDefinition4});
-            rowDefinition1.Height = 100D;
-            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition2.Height = 100D;
-            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition3.Height = 100D;
-            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition4.Height = 100D;
-            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition11,
+            columnDefinition12,
+            columnDefinition13,
+            columnDefinition14});
+            rowDefinition9.Height = 100D;
+            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition10.Height = 100D;
+            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition11.Height = 100D;
+            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition12.Height = 100D;
+            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3,
-            rowDefinition4});
+            rowDefinition9,
+            rowDefinition10,
+            rowDefinition11,
+            rowDefinition12});
             this.Root.Size = new System.Drawing.Size(1159, 116);
             this.Root.TextVisible = false;
             // 
@@ -967,7 +1007,8 @@
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
-            this.tabMxPage2});
+            this.tabMxPage2,
+            this.xtraTabPage3});
             // 
             // tabMxPage1
             // 
@@ -996,7 +1037,7 @@
             this.split99.Panel2.Text = "Panel2";
             this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split99.Size = new System.Drawing.Size(1174, 297);
-            this.split99.SplitterPosition = 90;
+            this.split99.SplitterPosition = 115;
             this.split99.TabIndex = 2;
             // 
             // layout99
@@ -1020,7 +1061,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, 90);
+            this.layout99.Size = new System.Drawing.Size(1174, 115);
             this.layout99.TabIndex = 0;
             this.layout99.Text = "layoutControl1";
             // 
@@ -1028,11 +1069,11 @@
             // 
             this.layoutControl1.Controls.Add(this.txt_iCount_1);
             this.layoutControl1.Controls.Add(this.txt_yuliang_1);
-            this.layoutControl1.Location = new System.Drawing.Point(580, 68);
+            this.layoutControl1.Location = new System.Drawing.Point(588, 75);
             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(280, 24);
+            this.layoutControl1.Size = new System.Drawing.Size(284, 28);
             this.layoutControl1.TabIndex = 477;
             this.layoutControl1.Text = "layoutControl1";
             // 
@@ -1044,7 +1085,7 @@
             this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
             this.txt_iCount_1.Properties.ReadOnly = true;
             this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(52, 20);
+            this.txt_iCount_1.Size = new System.Drawing.Size(54, 20);
             this.txt_iCount_1.StyleController = this.layoutControl1;
             this.txt_iCount_1.TabIndex = 264;
             this.txt_iCount_1.Tag = "ReadOnly";
@@ -1052,11 +1093,11 @@
             // 
             // txt_yuliang_1
             // 
-            this.txt_yuliang_1.Location = new System.Drawing.Point(226, 2);
+            this.txt_yuliang_1.Location = new System.Drawing.Point(228, 2);
             this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_yuliang_1.Name = "txt_yuliang_1";
             this.txt_yuliang_1.Properties.ReadOnly = true;
-            this.txt_yuliang_1.Size = new System.Drawing.Size(52, 20);
+            this.txt_yuliang_1.Size = new System.Drawing.Size(54, 20);
             this.txt_yuliang_1.StyleController = this.layoutControl1;
             this.txt_yuliang_1.TabIndex = 265;
             // 
@@ -1068,20 +1109,20 @@
             this.layoutControlItem26,
             this.layoutControlItem27});
             this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
-            this.layoutControlGroup2.Name = "layoutControlGroup2";
-            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition5.Width = 100D;
-            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition6.Width = 100D;
+            this.layoutControlGroup2.Name = "Root";
+            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition15.Width = 100D;
+            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition16.Width = 100D;
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6});
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition15,
+            columnDefinition16});
+            rowDefinition13.Height = 100D;
+            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition5});
+            rowDefinition13});
             this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup2.Size = new System.Drawing.Size(280, 24);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(284, 28);
             this.layoutControlGroup2.TextVisible = false;
             // 
             // layoutControlItem26
@@ -1089,17 +1130,17 @@
             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(140, 24);
+            this.layoutControlItem26.Size = new System.Drawing.Size(142, 28);
             this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem27
             // 
             this.layoutControlItem27.Control = this.txt_yuliang_1;
-            this.layoutControlItem27.Location = new System.Drawing.Point(140, 0);
+            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(140, 24);
+            this.layoutControlItem27.Size = new System.Drawing.Size(142, 28);
             this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
             this.layoutControlItem27.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -1118,16 +1159,16 @@
             // 
             this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(863, 38);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(875, 41);
             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(283, 28);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(288, 32);
             this.ucBtnPrint1.TabIndex = 232;
             // 
             // radOut
             // 
-            this.radOut.Location = new System.Drawing.Point(865, 10);
+            this.radOut.Location = new System.Drawing.Point(877, 10);
             this.radOut.Margin = new System.Windows.Forms.Padding(0);
             this.radOut.Name = "radOut";
             this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1136,18 +1177,18 @@
             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(282, 28);
+            this.radOut.Size = new System.Drawing.Size(287, 31);
             this.radOut.StyleController = this.layout99;
             this.radOut.TabIndex = 476;
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(664, 40);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(672, 43);
             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;
             this.txt_psnQty_1.Properties.UseMaskAsDisplayFormat = true;
-            this.txt_psnQty_1.Size = new System.Drawing.Size(196, 20);
+            this.txt_psnQty_1.Size = new System.Drawing.Size(200, 20);
             this.txt_psnQty_1.StyleController = this.layout99;
             this.txt_psnQty_1.TabIndex = 263;
             this.txt_psnQty_1.Tag = "ReadOnly";
@@ -1160,64 +1201,64 @@
             this.txtWlid.Name = "txtWlid";
             this.txtWlid.Properties.Appearance.Options.UseFont = true;
             this.txtWlid.Properties.ReadOnly = true;
-            this.txtWlid.Size = new System.Drawing.Size(196, 20);
+            this.txtWlid.Size = new System.Drawing.Size(200, 20);
             this.txtWlid.StyleController = this.layout99;
             this.txtWlid.TabIndex = 214;
             // 
             // txtWlmc
             // 
-            this.txtWlmc.Location = new System.Drawing.Point(96, 40);
+            this.txtWlmc.Location = new System.Drawing.Point(96, 43);
             this.txtWlmc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txtWlmc.Name = "txtWlmc";
             this.txtWlmc.Properties.Appearance.Options.UseFont = true;
             this.txtWlmc.Properties.ReadOnly = true;
-            this.txtWlmc.Size = new System.Drawing.Size(196, 20);
+            this.txtWlmc.Size = new System.Drawing.Size(200, 20);
             this.txtWlmc.StyleController = this.layout99;
             this.txtWlmc.TabIndex = 216;
             // 
             // txtWlgg
             // 
-            this.txtWlgg.Location = new System.Drawing.Point(96, 68);
+            this.txtWlgg.Location = new System.Drawing.Point(96, 75);
             this.txtWlgg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txtWlgg.Name = "txtWlgg";
             this.txtWlgg.Properties.Appearance.Options.UseFont = true;
             this.txtWlgg.Properties.ReadOnly = true;
-            this.txtWlgg.Size = new System.Drawing.Size(480, 20);
+            this.txtWlgg.Size = new System.Drawing.Size(488, 20);
             this.txtWlgg.StyleController = this.layout99;
             this.txtWlgg.TabIndex = 218;
             // 
             // txt_kQty
             // 
-            this.txt_kQty.Location = new System.Drawing.Point(664, 12);
+            this.txt_kQty.Location = new System.Drawing.Point(672, 12);
             this.txt_kQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_kQty.Name = "txt_kQty";
             this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
             this.txt_kQty.Properties.Appearance.Options.UseFont = true;
             this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;
             this.txt_kQty.Properties.ReadOnly = true;
-            this.txt_kQty.Size = new System.Drawing.Size(196, 20);
+            this.txt_kQty.Size = new System.Drawing.Size(200, 20);
             this.txt_kQty.StyleController = this.layout99;
             this.txt_kQty.TabIndex = 224;
             // 
             // txtQuantity
             // 
-            this.txtQuantity.Location = new System.Drawing.Point(380, 12);
+            this.txtQuantity.Location = new System.Drawing.Point(384, 12);
             this.txtQuantity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txtQuantity.Name = "txtQuantity";
             this.txtQuantity.Properties.Appearance.Options.UseFont = true;
             this.txtQuantity.Properties.ReadOnly = true;
-            this.txtQuantity.Size = new System.Drawing.Size(196, 20);
+            this.txtQuantity.Size = new System.Drawing.Size(200, 20);
             this.txtQuantity.StyleController = this.layout99;
             this.txtQuantity.TabIndex = 220;
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(380, 40);
+            this.txt_yQty.Location = new System.Drawing.Point(384, 43);
             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;
             this.txt_yQty.Properties.ReadOnly = true;
-            this.txt_yQty.Size = new System.Drawing.Size(196, 20);
+            this.txt_yQty.Size = new System.Drawing.Size(200, 20);
             this.txt_yQty.StyleController = this.layout99;
             this.txt_yQty.TabIndex = 222;
             // 
@@ -1250,30 +1291,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;
+            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition17.Width = 100D;
+            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition18.Width = 100D;
+            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition19.Width = 100D;
+            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition20.Width = 100D;
             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;
+            columnDefinition17,
+            columnDefinition18,
+            columnDefinition19,
+            columnDefinition20});
+            rowDefinition14.Height = 100D;
+            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition15.Height = 100D;
+            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition16.Height = 100D;
+            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition6,
-            rowDefinition7,
-            rowDefinition8});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1157, 104);
+            rowDefinition14,
+            rowDefinition15,
+            rowDefinition16});
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1174, 115);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem15
@@ -1281,81 +1322,81 @@
             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(284, 28);
+            this.layoutControlItem15.Size = new System.Drawing.Size(288, 31);
             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, 28);
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 31);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem16.Size = new System.Drawing.Size(284, 28);
+            this.layoutControlItem16.Size = new System.Drawing.Size(288, 32);
             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, 56);
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 63);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem17.Size = new System.Drawing.Size(568, 28);
+            this.layoutControlItem17.Size = new System.Drawing.Size(576, 32);
             this.layoutControlItem17.Text = "鐗╂枡瑙勬牸";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txtQuantity;
-            this.layoutControlItem18.Location = new System.Drawing.Point(284, 0);
+            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(284, 28);
+            this.layoutControlItem18.Size = new System.Drawing.Size(288, 31);
             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(284, 28);
+            this.layoutControlItem19.Location = new System.Drawing.Point(288, 31);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem19.Size = new System.Drawing.Size(284, 28);
+            this.layoutControlItem19.Size = new System.Drawing.Size(288, 32);
             this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
             this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_kQty;
-            this.layoutControlItem20.Location = new System.Drawing.Point(568, 0);
+            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(284, 28);
+            this.layoutControlItem20.Size = new System.Drawing.Size(288, 31);
             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(568, 28);
+            this.layoutControlItem21.Location = new System.Drawing.Point(576, 31);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem21.Size = new System.Drawing.Size(284, 28);
+            this.layoutControlItem21.Size = new System.Drawing.Size(288, 32);
             this.layoutControlItem21.Text = "姣忓紶鏉$爜鏁伴噺";
             this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem22
             // 
             this.layoutControlItem22.Control = this.radOut;
-            this.layoutControlItem22.Location = new System.Drawing.Point(852, 0);
+            this.layoutControlItem22.Location = new System.Drawing.Point(864, 0);
             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(285, 28);
+            this.layoutControlItem22.Size = new System.Drawing.Size(290, 31);
             this.layoutControlItem22.Text = "鑷姩璁$畻";
             this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem22.TextVisible = false;
@@ -1363,12 +1404,12 @@
             // layoutControlItem23
             // 
             this.layoutControlItem23.Control = this.ucBtnPrint1;
-            this.layoutControlItem23.Location = new System.Drawing.Point(852, 28);
+            this.layoutControlItem23.Location = new System.Drawing.Point(864, 31);
             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(285, 28);
+            this.layoutControlItem23.Size = new System.Drawing.Size(290, 32);
             this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem23.TextVisible = false;
@@ -1376,31 +1417,236 @@
             // layoutControlItem25
             // 
             this.layoutControlItem25.Control = this.layoutControl1;
-            this.layoutControlItem25.Location = new System.Drawing.Point(568, 56);
+            this.layoutControlItem25.Location = new System.Drawing.Point(576, 63);
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem25.Size = new System.Drawing.Size(284, 28);
+            this.layoutControlItem25.Size = new System.Drawing.Size(288, 32);
             this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
             this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem25.TextVisible = false;
             // 
-            // gcMx1
+            // tabMxPage2
             // 
-            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.gcMx1.Location = new System.Drawing.Point(0, 0);
-            this.gcMx1.MainView = this.gvMx1;
-            this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.gcMx1.Name = "gcMx1";
-            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit1,
-            this.repositoryItemButtonEdit2,
-            this.repositoryItemComboBox1});
-            this.gcMx1.Size = new System.Drawing.Size(1174, 197);
-            this.gcMx1.TabIndex = 1;
-            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx1});
+            this.tabMxPage2.Controls.Add(this.gcMx2);
+            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.tabMxPage2.Name = "tabMxPage2";
+            this.tabMxPage2.Size = new System.Drawing.Size(1174, 297);
+            this.tabMxPage2.Text = "宸叉墦鏉$爜鏄庣粏";
+            // 
+            // gcMx2
+            // 
+            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx2.Location = new System.Drawing.Point(0, 0);
+            this.gcMx2.MainView = this.gvMx2;
+            this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx2.Name = "gcMx2";
+            this.gcMx2.Size = new System.Drawing.Size(1174, 297);
+            this.gcMx2.TabIndex = 0;
+            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx2});
+            // 
+            // gvMx2
+            // 
+            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx2.Appearance.Row.Options.UseFont = true;
+            this.gvMx2.ColumnPanelRowHeight = 39;
+            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx2guid,
+            this.gridColumn16,
+            this.gvMx2itemBarcode,
+            this.gvMx2itemNo,
+            this.gridColumn18,
+            this.gridColumn14,
+            this.gvMx2oldqty,
+            this.gridColumn21,
+            this.gridColumn20,
+            this.gridColumn17,
+            this.gridColumn22,
+            this.gridColumn23,
+            this.gridColumn24,
+            this.gridColumn32});
+            this.gvMx2.DetailHeight = 272;
+            this.gvMx2.GridControl = this.gcMx2;
+            this.gvMx2.Name = "gvMx2";
+            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx2.OptionsView.ShowGroupPanel = false;
+            // 
+            // gvMx2guid
+            // 
+            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
+            this.gvMx2guid.Caption = "guid ";
+            this.gvMx2guid.FieldName = "guid";
+            this.gvMx2guid.MinWidth = 44;
+            this.gvMx2guid.Name = "gvMx2guid";
+            this.gvMx2guid.Tag = "query_a.guid";
+            this.gvMx2guid.Width = 82;
+            // 
+            // gridColumn16
+            // 
+            this.gridColumn16.Caption = "鏄惁鍏ュ簱";
+            this.gridColumn16.FieldName = "isRk";
+            this.gridColumn16.MaxWidth = 44;
+            this.gridColumn16.MinWidth = 44;
+            this.gridColumn16.Name = "gridColumn16";
+            this.gridColumn16.Visible = true;
+            this.gridColumn16.VisibleIndex = 0;
+            this.gridColumn16.Width = 44;
+            // 
+            // gvMx2itemBarcode
+            // 
+            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
+            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
+            this.gvMx2itemBarcode.FieldName = "itemBarcode";
+            this.gvMx2itemBarcode.MinWidth = 44;
+            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
+            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
+            this.gvMx2itemBarcode.Visible = true;
+            this.gvMx2itemBarcode.VisibleIndex = 1;
+            this.gvMx2itemBarcode.Width = 262;
+            // 
+            // gvMx2itemNo
+            // 
+            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
+            this.gvMx2itemNo.FieldName = "itemNo";
+            this.gvMx2itemNo.MinWidth = 44;
+            this.gvMx2itemNo.Name = "gvMx2itemNo";
+            this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
+            this.gvMx2itemNo.Visible = true;
+            this.gvMx2itemNo.VisibleIndex = 2;
+            this.gvMx2itemNo.Width = 87;
+            // 
+            // gridColumn18
+            // 
+            this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn18.FieldName = "itemName";
+            this.gridColumn18.MinWidth = 44;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 3;
+            this.gridColumn18.Width = 131;
+            // 
+            // gridColumn14
+            // 
+            this.gridColumn14.Caption = "瑙勬牸鍨嬪彿";
+            this.gridColumn14.FieldName = "itemModel";
+            this.gridColumn14.MinWidth = 44;
+            this.gridColumn14.Name = "gridColumn14";
+            this.gridColumn14.Visible = true;
+            this.gridColumn14.VisibleIndex = 4;
+            this.gridColumn14.Width = 131;
+            // 
+            // gvMx2oldqty
+            // 
+            this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
+            this.gvMx2oldqty.Caption = "鏁伴噺";
+            this.gvMx2oldqty.FieldName = "quantity";
+            this.gvMx2oldqty.MinWidth = 44;
+            this.gvMx2oldqty.Name = "gvMx2oldqty";
+            this.gvMx2oldqty.Tag = "query_a.OLDQTY";
+            this.gvMx2oldqty.Visible = true;
+            this.gvMx2oldqty.VisibleIndex = 5;
+            this.gvMx2oldqty.Width = 82;
+            // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "鍗曚綅";
+            this.gridColumn21.FieldName = "dwName";
+            this.gridColumn21.MinWidth = 22;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 6;
+            this.gridColumn21.Width = 82;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.Caption = "鎵撶爜浜�";
+            this.gridColumn20.FieldName = "createBy";
+            this.gridColumn20.MinWidth = 22;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 7;
+            this.gridColumn20.Width = 82;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.Caption = "鎵撶爜鏃ユ湡";
+            this.gridColumn17.FieldName = "createDate";
+            this.gridColumn17.MinWidth = 10;
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 8;
+            this.gridColumn17.Width = 157;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.Caption = "鍏ュ簱浜�";
+            this.gridColumn22.FieldName = "rkUser";
+            this.gridColumn22.MinWidth = 22;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 9;
+            this.gridColumn22.Width = 82;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "鍏ュ簱鏃ユ湡";
+            this.gridColumn23.FieldName = "rkDate";
+            this.gridColumn23.MinWidth = 22;
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.Visible = true;
+            this.gridColumn23.VisibleIndex = 10;
+            this.gridColumn23.Width = 82;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.Caption = "鍏ュ簱浣�";
+            this.gridColumn24.FieldName = "rkPositon";
+            this.gridColumn24.MinWidth = 22;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 11;
+            this.gridColumn24.Width = 82;
+            // 
+            // gridColumn32
+            // 
+            this.gridColumn32.Caption = "鍏ュ簱绫诲瀷";
+            this.gridColumn32.FieldName = "cgrkType";
+            this.gridColumn32.Name = "gridColumn32";
+            this.gridColumn32.Visible = true;
+            this.gridColumn32.VisibleIndex = 12;
+            // 
+            // xtraTabPage3
+            // 
+            this.xtraTabPage3.Controls.Add(this.splitContainerControl1);
+            this.xtraTabPage3.Name = "xtraTabPage3";
+            this.xtraTabPage3.Size = new System.Drawing.Size(1174, 297);
+            this.xtraTabPage3.Text = "鍚堝苟鏄庣粏";
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            // 
+            // repositoryItemButtonEdit2
+            // 
+            this.repositoryItemButtonEdit2.AutoHeight = false;
+            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+            // 
+            // repositoryItemComboBox1
+            // 
+            this.repositoryItemComboBox1.AutoHeight = false;
+            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
             // 
             // gvMx1
             // 
@@ -1645,13 +1891,6 @@
             this.gridColumn28.VisibleIndex = 16;
             this.gridColumn28.Width = 66;
             // 
-            // repositoryItemComboBox1
-            // 
-            this.repositoryItemComboBox1.AutoHeight = false;
-            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
-            // 
             // gridColumn29
             // 
             this.gridColumn29.Caption = "浠撳簱缂栫爜";
@@ -1676,213 +1915,345 @@
             this.gridColumn31.Visible = true;
             this.gridColumn31.VisibleIndex = 15;
             // 
-            // repositoryItemButtonEdit1
+            // gcMx1
             // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx1.Location = new System.Drawing.Point(0, 0);
+            this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx1.Name = "gcMx1";
+            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit1,
+            this.repositoryItemButtonEdit2,
+            this.repositoryItemComboBox1});
+            this.gcMx1.Size = new System.Drawing.Size(1174, 172);
+            this.gcMx1.TabIndex = 1;
+            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx1});
+            // 
+            // splitContainerControl1
+            // 
+            this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitContainerControl1.Horizontal = false;
+            this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
+            this.splitContainerControl1.Name = "splitContainerControl1";
+            // 
+            // splitContainerControl1.Panel1
+            // 
+            this.splitContainerControl1.Panel1.Text = "Panel1";
+            // 
+            // splitContainerControl1.Panel2
+            // 
+            this.splitContainerControl1.Panel2.Controls.Add(this.gcMx3);
+            this.splitContainerControl1.Panel2.Text = "Panel2";
+            this.splitContainerControl1.Size = new System.Drawing.Size(1174, 297);
+            this.splitContainerControl1.TabIndex = 0;
+            // 
+            // gcMx3
+            // 
+            this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx3.Location = new System.Drawing.Point(0, 0);
+            this.gcMx3.MainView = this.gvMx3;
+            this.gcMx3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx3.Name = "gcMx3";
+            this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit3,
+            this.repositoryItemButtonEdit4,
+            this.repositoryItemComboBox2});
+            this.gcMx3.Size = new System.Drawing.Size(1174, 187);
+            this.gcMx3.TabIndex = 2;
+            this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx3});
+            // 
+            // gvMx3
+            // 
+            this.gvMx3.Appearance.Row.Options.UseFont = true;
+            this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn33,
+            this.gridColumn34,
+            this.gridColumn35,
+            this.gridColumn36,
+            this.gridColumn37,
+            this.gridColumn38,
+            this.gridColumn39,
+            this.gridColumn40,
+            this.gridColumn41,
+            this.gridColumn42,
+            this.gridColumn43,
+            this.gridColumn44,
+            this.gridColumn45,
+            this.gridColumn46,
+            this.gridColumn47,
+            this.gridColumn48,
+            this.gridColumn49,
+            this.gridColumn50,
+            this.gridColumn51,
+            this.gridColumn52,
+            this.gridColumn53,
+            this.gridColumn54});
+            this.gvMx3.DetailHeight = 272;
+            this.gvMx3.GridControl = this.gcMx3;
+            this.gvMx3.Name = "gvMx3";
+            this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+            this.gvMx3.OptionsFilter.AllowFilterEditor = false;
+            this.gvMx3.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx3.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx3.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn33
+            // 
+            this.gridColumn33.Caption = "abtGuid涓嶈兘鍒犻櫎";
+            this.gridColumn33.FieldName = "aboutGuid";
+            this.gridColumn33.MinWidth = 44;
+            this.gridColumn33.Name = "gridColumn33";
+            this.gridColumn33.OptionsColumn.ReadOnly = true;
+            this.gridColumn33.Width = 82;
+            // 
+            // gridColumn34
+            // 
+            this.gridColumn34.AppearanceCell.Options.UseFont = true;
+            this.gridColumn34.Caption = "guid涓嶈兘鍒犻櫎";
+            this.gridColumn34.FieldName = "guid";
+            this.gridColumn34.MinWidth = 61;
+            this.gridColumn34.Name = "gridColumn34";
+            this.gridColumn34.OptionsColumn.ReadOnly = true;
+            this.gridColumn34.Tag = "query_a.guid";
+            this.gridColumn34.Width = 87;
+            // 
+            // gridColumn35
+            // 
+            this.gridColumn35.AppearanceCell.Options.UseFont = true;
+            this.gridColumn35.Caption = "鎬ユ枡鏍囪瘑";
+            this.gridColumn35.FieldName = "urgentFlag";
+            this.gridColumn35.MinWidth = 10;
+            this.gridColumn35.Name = "gridColumn35";
+            this.gridColumn35.Tag = "query_a.urgent_flag";
+            this.gridColumn35.Visible = true;
+            this.gridColumn35.VisibleIndex = 0;
+            this.gridColumn35.Width = 10;
+            // 
+            // gridColumn36
+            // 
+            this.gridColumn36.AppearanceCell.Options.UseFont = true;
+            this.gridColumn36.Caption = "ERP閲囪喘鍗曞彿";
+            this.gridColumn36.FieldName = "ebeln";
+            this.gridColumn36.MinWidth = 44;
+            this.gridColumn36.Name = "gridColumn36";
+            this.gridColumn36.OptionsColumn.ReadOnly = true;
+            this.gridColumn36.Tag = "query_a.ebeln";
+            this.gridColumn36.Visible = true;
+            this.gridColumn36.VisibleIndex = 1;
+            this.gridColumn36.Width = 92;
+            // 
+            // gridColumn37
+            // 
+            this.gridColumn37.Caption = "鐗╂枡缂栧彿";
+            this.gridColumn37.FieldName = "itemNo";
+            this.gridColumn37.MinWidth = 44;
+            this.gridColumn37.Name = "gridColumn37";
+            this.gridColumn37.OptionsColumn.ReadOnly = true;
+            this.gridColumn37.Visible = true;
+            this.gridColumn37.VisibleIndex = 2;
+            this.gridColumn37.Width = 77;
+            // 
+            // gridColumn38
+            // 
+            this.gridColumn38.AppearanceCell.Options.UseFont = true;
+            this.gridColumn38.Caption = "鐗╂枡鍚嶇О";
+            this.gridColumn38.FieldName = "itemName";
+            this.gridColumn38.MinWidth = 44;
+            this.gridColumn38.Name = "gridColumn38";
+            this.gridColumn38.OptionsColumn.ReadOnly = true;
+            this.gridColumn38.Tag = "query_a.board_style";
+            this.gridColumn38.Visible = true;
+            this.gridColumn38.VisibleIndex = 3;
+            this.gridColumn38.Width = 139;
+            // 
+            // gridColumn39
+            // 
+            this.gridColumn39.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn39.FieldName = "itemModel";
+            this.gridColumn39.MinWidth = 44;
+            this.gridColumn39.Name = "gridColumn39";
+            this.gridColumn39.Visible = true;
+            this.gridColumn39.VisibleIndex = 4;
+            this.gridColumn39.Width = 95;
+            // 
+            // gridColumn40
+            // 
+            this.gridColumn40.Caption = "鏈鏀惰揣鏁伴噺";
+            this.gridColumn40.FieldName = "quantity";
+            this.gridColumn40.MinWidth = 44;
+            this.gridColumn40.Name = "gridColumn40";
+            this.gridColumn40.Visible = true;
+            this.gridColumn40.VisibleIndex = 5;
+            this.gridColumn40.Width = 73;
+            // 
+            // gridColumn41
+            // 
+            this.gridColumn41.AppearanceCell.Options.UseFont = true;
+            this.gridColumn41.Caption = "宸插叆搴撴暟閲�";
+            this.gridColumn41.FieldName = "okRkqty";
+            this.gridColumn41.MinWidth = 44;
+            this.gridColumn41.Name = "gridColumn41";
+            this.gridColumn41.OptionsColumn.ReadOnly = true;
+            this.gridColumn41.Tag = "query_a.ok_rkqty";
+            this.gridColumn41.Visible = true;
+            this.gridColumn41.VisibleIndex = 6;
+            this.gridColumn41.Width = 77;
+            // 
+            // gridColumn42
+            // 
+            this.gridColumn42.AppearanceCell.Options.UseFont = true;
+            this.gridColumn42.Caption = "宸叉墦鍗版暟閲�";
+            this.gridColumn42.FieldName = "yQty";
+            this.gridColumn42.MinWidth = 44;
+            this.gridColumn42.Name = "gridColumn42";
+            this.gridColumn42.OptionsColumn.ReadOnly = true;
+            this.gridColumn42.Tag = "query_a.ebeln_qty";
+            this.gridColumn42.Visible = true;
+            this.gridColumn42.VisibleIndex = 7;
+            this.gridColumn42.Width = 77;
+            // 
+            // gridColumn43
+            // 
+            this.gridColumn43.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn43.AppearanceCell.Options.UseForeColor = true;
+            this.gridColumn43.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+            this.gridColumn43.AppearanceHeader.Options.UseForeColor = true;
+            this.gridColumn43.Caption = "鍙墦鍗版�婚噺";
+            this.gridColumn43.FieldName = "kQty";
+            this.gridColumn43.MinWidth = 44;
+            this.gridColumn43.Name = "gridColumn43";
+            this.gridColumn43.Visible = true;
+            this.gridColumn43.VisibleIndex = 8;
+            this.gridColumn43.Width = 73;
+            // 
+            // gridColumn44
+            // 
+            this.gridColumn44.Caption = "鐗╂枡鍗曚綅";
+            this.gridColumn44.FieldName = "wnDw";
+            this.gridColumn44.MinWidth = 44;
+            this.gridColumn44.Name = "gridColumn44";
+            this.gridColumn44.OptionsColumn.ReadOnly = true;
+            this.gridColumn44.Width = 139;
+            // 
+            // gridColumn45
+            // 
+            this.gridColumn45.Caption = "閲囪喘鍗曚綅";
+            this.gridColumn45.FieldName = "cgUnit";
+            this.gridColumn45.MinWidth = 44;
+            this.gridColumn45.Name = "gridColumn45";
+            this.gridColumn45.OptionsColumn.ReadOnly = true;
+            this.gridColumn45.Visible = true;
+            this.gridColumn45.VisibleIndex = 9;
+            this.gridColumn45.Width = 73;
+            // 
+            // gridColumn46
+            // 
+            this.gridColumn46.Caption = "搴撳瓨鍗曚綅";
+            this.gridColumn46.FieldName = "kcUnit";
+            this.gridColumn46.MinWidth = 44;
+            this.gridColumn46.Name = "gridColumn46";
+            this.gridColumn46.OptionsColumn.ReadOnly = true;
+            this.gridColumn46.Width = 73;
+            // 
+            // gridColumn47
+            // 
+            this.gridColumn47.Caption = "妫�楠岀姸鎬�";
+            this.gridColumn47.FieldName = "jyzt";
+            this.gridColumn47.MinWidth = 44;
+            this.gridColumn47.Name = "gridColumn47";
+            this.gridColumn47.Visible = true;
+            this.gridColumn47.VisibleIndex = 10;
+            this.gridColumn47.Width = 73;
+            // 
+            // gridColumn48
+            // 
+            this.gridColumn48.Caption = "妫�楠岀粨鏋�";
+            this.gridColumn48.FieldName = "jyjg";
+            this.gridColumn48.MinWidth = 44;
+            this.gridColumn48.Name = "gridColumn48";
+            this.gridColumn48.Visible = true;
+            this.gridColumn48.VisibleIndex = 11;
+            this.gridColumn48.Width = 80;
+            // 
+            // gridColumn49
+            // 
+            this.gridColumn49.Caption = "澶勭悊鎰忚";
+            this.gridColumn49.FieldName = "clyj";
+            this.gridColumn49.MinWidth = 22;
+            this.gridColumn49.Name = "gridColumn49";
+            this.gridColumn49.Visible = true;
+            this.gridColumn49.VisibleIndex = 12;
+            this.gridColumn49.Width = 82;
+            // 
+            // gridColumn50
+            // 
+            this.gridColumn50.Caption = "榛樿姣忓紶鏉$爜鏁伴噺";
+            this.gridColumn50.FieldName = "mrtmsl";
+            this.gridColumn50.MinWidth = 22;
+            this.gridColumn50.Name = "gridColumn50";
+            this.gridColumn50.Width = 82;
+            // 
+            // gridColumn51
+            // 
+            this.gridColumn51.Caption = "鍏ュ簱绫诲瀷";
+            this.gridColumn51.ColumnEdit = this.repositoryItemComboBox2;
+            this.gridColumn51.FieldName = "rkType";
+            this.gridColumn51.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+            this.gridColumn51.Name = "gridColumn51";
+            this.gridColumn51.OptionsColumn.ReadOnly = true;
+            this.gridColumn51.Visible = true;
+            this.gridColumn51.VisibleIndex = 16;
+            this.gridColumn51.Width = 66;
+            // 
+            // repositoryItemComboBox2
+            // 
+            this.repositoryItemComboBox2.AutoHeight = false;
+            this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
+            // 
+            // gridColumn52
+            // 
+            this.gridColumn52.Caption = "浠撳簱缂栫爜";
+            this.gridColumn52.FieldName = "depotCode";
+            this.gridColumn52.Name = "gridColumn52";
+            this.gridColumn52.Visible = true;
+            this.gridColumn52.VisibleIndex = 13;
+            // 
+            // gridColumn53
+            // 
+            this.gridColumn53.Caption = "浠撳簱鍚嶇О";
+            this.gridColumn53.FieldName = "depotName";
+            this.gridColumn53.Name = "gridColumn53";
+            this.gridColumn53.Visible = true;
+            this.gridColumn53.VisibleIndex = 14;
+            // 
+            // gridColumn54
+            // 
+            this.gridColumn54.Caption = "浠撶鍛�";
+            this.gridColumn54.FieldName = "staffName";
+            this.gridColumn54.Name = "gridColumn54";
+            this.gridColumn54.Visible = true;
+            this.gridColumn54.VisibleIndex = 15;
+            // 
+            // repositoryItemButtonEdit3
+            // 
+            this.repositoryItemButtonEdit3.AutoHeight = false;
+            this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
             // 
-            // repositoryItemButtonEdit2
+            // repositoryItemButtonEdit4
             // 
-            this.repositoryItemButtonEdit2.AutoHeight = false;
-            this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            this.repositoryItemButtonEdit4.AutoHeight = false;
+            this.repositoryItemButtonEdit4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton()});
-            this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
-            // 
-            // tabMxPage2
-            // 
-            this.tabMxPage2.Controls.Add(this.gcMx2);
-            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1174, 297);
-            this.tabMxPage2.Text = "宸叉墦鏉$爜鏄庣粏";
-            // 
-            // gcMx2
-            // 
-            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.gcMx2.Location = new System.Drawing.Point(0, 0);
-            this.gcMx2.MainView = this.gvMx2;
-            this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1174, 297);
-            this.gcMx2.TabIndex = 0;
-            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx2});
-            // 
-            // gvMx2
-            // 
-            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
-            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gvMx2.Appearance.Row.Options.UseFont = true;
-            this.gvMx2.ColumnPanelRowHeight = 39;
-            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx2guid,
-            this.gridColumn16,
-            this.gvMx2itemBarcode,
-            this.gvMx2itemNo,
-            this.gridColumn18,
-            this.gridColumn14,
-            this.gvMx2oldqty,
-            this.gridColumn21,
-            this.gridColumn20,
-            this.gridColumn17,
-            this.gridColumn22,
-            this.gridColumn23,
-            this.gridColumn24,
-            this.gridColumn32});
-            this.gvMx2.DetailHeight = 272;
-            this.gvMx2.GridControl = this.gcMx2;
-            this.gvMx2.Name = "gvMx2";
-            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
-            this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx2.OptionsView.ShowGroupPanel = false;
-            // 
-            // gvMx2guid
-            // 
-            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx2guid.Caption = "guid ";
-            this.gvMx2guid.FieldName = "guid";
-            this.gvMx2guid.MinWidth = 44;
-            this.gvMx2guid.Name = "gvMx2guid";
-            this.gvMx2guid.Tag = "query_a.guid";
-            this.gvMx2guid.Width = 82;
-            // 
-            // gridColumn16
-            // 
-            this.gridColumn16.Caption = "鏄惁鍏ュ簱";
-            this.gridColumn16.FieldName = "isRk";
-            this.gridColumn16.MaxWidth = 44;
-            this.gridColumn16.MinWidth = 44;
-            this.gridColumn16.Name = "gridColumn16";
-            this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 0;
-            this.gridColumn16.Width = 44;
-            // 
-            // gvMx2itemBarcode
-            // 
-            this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemBarcode.Caption = "鐗╂枡鏉$爜";
-            this.gvMx2itemBarcode.FieldName = "itemBarcode";
-            this.gvMx2itemBarcode.MinWidth = 44;
-            this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
-            this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
-            this.gvMx2itemBarcode.Visible = true;
-            this.gvMx2itemBarcode.VisibleIndex = 1;
-            this.gvMx2itemBarcode.Width = 262;
-            // 
-            // gvMx2itemNo
-            // 
-            this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
-            this.gvMx2itemNo.FieldName = "itemNo";
-            this.gvMx2itemNo.MinWidth = 44;
-            this.gvMx2itemNo.Name = "gvMx2itemNo";
-            this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
-            this.gvMx2itemNo.Visible = true;
-            this.gvMx2itemNo.VisibleIndex = 2;
-            this.gvMx2itemNo.Width = 87;
-            // 
-            // gridColumn18
-            // 
-            this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn18.FieldName = "itemName";
-            this.gridColumn18.MinWidth = 44;
-            this.gridColumn18.Name = "gridColumn18";
-            this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 3;
-            this.gridColumn18.Width = 131;
-            // 
-            // gridColumn14
-            // 
-            this.gridColumn14.Caption = "瑙勬牸鍨嬪彿";
-            this.gridColumn14.FieldName = "itemModel";
-            this.gridColumn14.MinWidth = 44;
-            this.gridColumn14.Name = "gridColumn14";
-            this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 4;
-            this.gridColumn14.Width = 131;
-            // 
-            // gvMx2oldqty
-            // 
-            this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
-            this.gvMx2oldqty.Caption = "鏁伴噺";
-            this.gvMx2oldqty.FieldName = "quantity";
-            this.gvMx2oldqty.MinWidth = 44;
-            this.gvMx2oldqty.Name = "gvMx2oldqty";
-            this.gvMx2oldqty.Tag = "query_a.OLDQTY";
-            this.gvMx2oldqty.Visible = true;
-            this.gvMx2oldqty.VisibleIndex = 5;
-            this.gvMx2oldqty.Width = 82;
-            // 
-            // gridColumn21
-            // 
-            this.gridColumn21.Caption = "鍗曚綅";
-            this.gridColumn21.FieldName = "dwName";
-            this.gridColumn21.MinWidth = 22;
-            this.gridColumn21.Name = "gridColumn21";
-            this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 6;
-            this.gridColumn21.Width = 82;
-            // 
-            // gridColumn20
-            // 
-            this.gridColumn20.Caption = "鎵撶爜浜�";
-            this.gridColumn20.FieldName = "createBy";
-            this.gridColumn20.MinWidth = 22;
-            this.gridColumn20.Name = "gridColumn20";
-            this.gridColumn20.Visible = true;
-            this.gridColumn20.VisibleIndex = 7;
-            this.gridColumn20.Width = 82;
-            // 
-            // gridColumn17
-            // 
-            this.gridColumn17.Caption = "鎵撶爜鏃ユ湡";
-            this.gridColumn17.FieldName = "createDate";
-            this.gridColumn17.MinWidth = 10;
-            this.gridColumn17.Name = "gridColumn17";
-            this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 8;
-            this.gridColumn17.Width = 157;
-            // 
-            // gridColumn22
-            // 
-            this.gridColumn22.Caption = "鍏ュ簱浜�";
-            this.gridColumn22.FieldName = "rkUser";
-            this.gridColumn22.MinWidth = 22;
-            this.gridColumn22.Name = "gridColumn22";
-            this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 9;
-            this.gridColumn22.Width = 82;
-            // 
-            // gridColumn23
-            // 
-            this.gridColumn23.Caption = "鍏ュ簱鏃ユ湡";
-            this.gridColumn23.FieldName = "rkDate";
-            this.gridColumn23.MinWidth = 22;
-            this.gridColumn23.Name = "gridColumn23";
-            this.gridColumn23.Visible = true;
-            this.gridColumn23.VisibleIndex = 10;
-            this.gridColumn23.Width = 82;
-            // 
-            // gridColumn24
-            // 
-            this.gridColumn24.Caption = "鍏ュ簱浣�";
-            this.gridColumn24.FieldName = "rkPositon";
-            this.gridColumn24.MinWidth = 22;
-            this.gridColumn24.Name = "gridColumn24";
-            this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 11;
-            this.gridColumn24.Width = 82;
-            // 
-            // gridColumn32
-            // 
-            this.gridColumn32.Caption = "鍏ュ簱绫诲瀷";
-            this.gridColumn32.FieldName = "cgrkType";
-            this.gridColumn32.Name = "gridColumn32";
-            this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 12;
+            this.repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4";
             // 
             // Frm_ArrivalBarcode
             // 
@@ -1977,14 +2348,25 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+            this.xtraTabPage3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
+            this.splitContainerControl1.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
+            this.splitContainerControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -2036,24 +2418,6 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.XtraTab.XtraTabControl tabMx;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
-        private DevExpress.XtraGrid.GridControl gcMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
         private DevExpress.XtraEditors.TextEdit txt_iCount_1;
         private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
         private UserControl.UcBtnPrint ucBtnPrint1;
@@ -2088,7 +2452,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
         private DevExpress.Utils.ToolTipController tips;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
         private DevExpress.XtraEditors.RadioGroup radOut;
         private DevExpress.XtraEditors.SplitContainerControl split99;
         private DevExpress.XtraLayout.LayoutControl layout99;
@@ -2110,14 +2473,62 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
+        private DevExpress.XtraGrid.GridControl gcMx1;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+        private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
+        private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
+        private DevExpress.XtraGrid.GridControl gcMx3;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn40;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn41;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn44;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn45;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn46;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn48;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn49;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn50;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn51;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn52;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn53;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3