From daebf2c2a4f1cbbf310e9d739c2ed198cfc5865e Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期二, 22 七月 2025 08:26:53 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 1237 ++++++++++++++++++++++++++++++++++++----------------------
 1 files changed, 764 insertions(+), 473 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index b5561e3..60d9e10 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -30,44 +30,40 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition70 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition71 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition72 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition73 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition74 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition75 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition76 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition34 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition35 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition36 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition37 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition38 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition39 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition74 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition75 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition40 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition76 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition77 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition78 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition40 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition79 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition80 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition41 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition42 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition81 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition82 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition83 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition41 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition42 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition84 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition85 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition86 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition43 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition87 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition88 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition89 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition43 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition90 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition91 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition92 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition93 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition94 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition95 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition96 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition44 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -136,6 +132,7 @@
             this.txt_lineNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_dptNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_isQiTao = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_daa018 = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -161,6 +158,7 @@
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem46 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem48 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -233,20 +231,8 @@
             this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptChongDa = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
-            this.gcMx3 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.panMx98 = new System.Windows.Forms.Panel();
+            this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx98 = new DevExpress.XtraLayout.LayoutControl();
             this.ucBtnPrint98 = new Gs.DevApp.UserControl.UcBtnPrint();
             this.txt_yQty98 = new DevExpress.XtraEditors.TextEdit();
@@ -261,7 +247,34 @@
             this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.gcMx3 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
+            this.splitMx100 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.layMx100 = new DevExpress.XtraDataLayout.DataLayoutControl();
+            this.ucBtnPrint100 = new Gs.DevApp.UserControl.UcBtnPrint();
+            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
+            this.txt_zQty100 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_yQty100 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_kQty100 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_iCount_100 = new DevExpress.XtraEditors.TextEdit();
+            this.btnDesign = new DevExpress.XtraEditors.SimpleButton();
+            this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem43 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem44 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem45 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem47 = new DevExpress.XtraLayout.LayoutControlItem();
             this.gcMx4 = new DevExpress.XtraGrid.GridControl();
             this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -272,23 +285,22 @@
             this.gridColumn46 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.panMx100 = new System.Windows.Forms.Panel();
-            this.layMx100 = new DevExpress.XtraDataLayout.DataLayoutControl();
-            this.ucBtnPrint100 = new Gs.DevApp.UserControl.UcBtnPrint();
-            this.btnIn = new DevExpress.XtraEditors.SimpleButton();
-            this.txt_zQty100 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_yQty100 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_kQty100 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_iCount_100 = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem43 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem44 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem45 = new DevExpress.XtraLayout.LayoutControlItem();
             this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
             this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
+            this.xtraTabPage6 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx6 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx6 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn50 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
@@ -332,6 +344,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_dptNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
@@ -357,6 +370,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -395,11 +409,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).BeginInit();
             this.xtraTabPage3.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
-            this.panMx98.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).BeginInit();
+            this.splitMx98.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).BeginInit();
+            this.splitMx98.Panel2.SuspendLayout();
+            this.splitMx98.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).BeginInit();
             this.layoutMx98.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).BeginInit();
@@ -414,10 +430,15 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
             this.xtraTabPage4.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
-            this.panMx100.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx100)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel1)).BeginInit();
+            this.splitMx100.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel2)).BeginInit();
+            this.splitMx100.Panel2.SuspendLayout();
+            this.splitMx100.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.layMx100)).BeginInit();
             this.layMx100.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.txt_zQty100.Properties)).BeginInit();
@@ -431,7 +452,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
             this.xtraTabPage5.SuspendLayout();
+            this.xtraTabPage6.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx6)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -616,7 +643,7 @@
             this.gridColumn27.MinWidth = 25;
             this.gridColumn27.Name = "gridColumn27";
             this.gridColumn27.Visible = true;
-            this.gridColumn27.VisibleIndex = 6;
+            this.gridColumn27.VisibleIndex = 18;
             this.gridColumn27.Width = 94;
             // 
             // gv_daa018
@@ -653,7 +680,7 @@
             this.gv_daa001.OptionsColumn.AllowEdit = false;
             this.gv_daa001.Tag = "query_a.daa001";
             this.gv_daa001.Visible = true;
-            this.gv_daa001.VisibleIndex = 7;
+            this.gv_daa001.VisibleIndex = 6;
             this.gv_daa001.Width = 120;
             // 
             // gv_daa021
@@ -666,7 +693,7 @@
             this.gv_daa021.OptionsColumn.AllowEdit = false;
             this.gv_daa021.Tag = "query_a.daa021";
             this.gv_daa021.Visible = true;
-            this.gv_daa021.VisibleIndex = 8;
+            this.gv_daa021.VisibleIndex = 7;
             this.gv_daa021.Width = 100;
             // 
             // gridColumn3
@@ -794,7 +821,7 @@
             this.gridColumn1.MinWidth = 50;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 18;
+            this.gridColumn1.VisibleIndex = 19;
             this.gridColumn1.Width = 94;
             // 
             // gv_daa015
@@ -807,7 +834,7 @@
             this.gv_daa015.OptionsColumn.AllowEdit = false;
             this.gv_daa015.Tag = "query_a.daa015";
             this.gv_daa015.Visible = true;
-            this.gv_daa015.VisibleIndex = 19;
+            this.gv_daa015.VisibleIndex = 8;
             this.gv_daa015.Width = 94;
             // 
             // gv_daa009
@@ -1011,6 +1038,7 @@
             this.layoutMx1.Controls.Add(this.txt_lineNo);
             this.layoutMx1.Controls.Add(this.txt_dptNo);
             this.layoutMx1.Controls.Add(this.txt_isQiTao);
+            this.layoutMx1.Controls.Add(this.txt_daa018);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem29,
@@ -1256,6 +1284,15 @@
             this.txt_isQiTao.StyleController = this.layoutMx1;
             this.txt_isQiTao.TabIndex = 476;
             // 
+            // txt_daa018
+            // 
+            this.txt_daa018.Location = new System.Drawing.Point(918, 152);
+            this.txt_daa018.Name = "txt_daa018";
+            this.txt_daa018.Size = new System.Drawing.Size(296, 24);
+            this.txt_daa018.StyleController = this.layoutMx1;
+            this.txt_daa018.TabIndex = 477;
+            this.txt_daa018.Tag = "readonly";
+            // 
             // layoutControlItem29
             // 
             this.layoutControlItem29.Control = this.lbGuid;
@@ -1316,22 +1353,23 @@
             this.layoutControlItem19,
             this.layoutControlItem17,
             this.layoutControlItem28,
-            this.layoutControlItem46});
+            this.layoutControlItem46,
+            this.layoutControlItem48});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition70.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition70.Width = 100D;
-            columnDefinition71.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition71.Width = 100D;
-            columnDefinition72.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition72.Width = 100D;
             columnDefinition73.SizeType = System.Windows.Forms.SizeType.Percent;
             columnDefinition73.Width = 100D;
+            columnDefinition74.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition74.Width = 100D;
+            columnDefinition75.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition75.Width = 100D;
+            columnDefinition76.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition76.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition70,
-            columnDefinition71,
-            columnDefinition72,
-            columnDefinition73});
+            columnDefinition73,
+            columnDefinition74,
+            columnDefinition75,
+            columnDefinition76});
             rowDefinition34.Height = 100D;
             rowDefinition34.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition35.Height = 100D;
@@ -1577,6 +1615,17 @@
             this.layoutControlItem46.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem46.TextVisible = false;
             // 
+            // layoutControlItem48
+            // 
+            this.layoutControlItem48.Control = this.txt_daa018;
+            this.layoutControlItem48.Location = new System.Drawing.Point(804, 140);
+            this.layoutControlItem48.Name = "layoutControlItem48";
+            this.layoutControlItem48.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem48.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem48.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem48.Text = "宸ュ崟鐘舵��";
+            this.layoutControlItem48.TextSize = new System.Drawing.Size(90, 18);
+            // 
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
@@ -1587,6 +1636,7 @@
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
+            this.xtraTabPage6,
             this.tabMxPage2,
             this.xtraTabPage3,
             this.xtraTabPage4,
@@ -1594,6 +1644,8 @@
             // 
             // tabMxPage1
             // 
+            this.tabMxPage1.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
+            this.tabMxPage1.Appearance.Header.Options.UseForeColor = true;
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
             this.tabMxPage1.Size = new System.Drawing.Size(1648, 481);
@@ -1829,21 +1881,25 @@
             // gvMx1zyBl
             // 
             this.gvMx1zyBl.AppearanceCell.Options.UseFont = true;
-            this.gvMx1zyBl.Caption = "浣滀笟涓嶈壇";
+            this.gvMx1zyBl.Caption = "浣滀笟涓嶈壇閫�鏂�";
             this.gvMx1zyBl.FieldName = "zyBl";
             this.gvMx1zyBl.MinWidth = 50;
             this.gvMx1zyBl.Name = "gvMx1zyBl";
             this.gvMx1zyBl.Tag = "query_a.zy_bl";
+            this.gvMx1zyBl.Visible = true;
+            this.gvMx1zyBl.VisibleIndex = 17;
             this.gvMx1zyBl.Width = 94;
             // 
             // gvMx1llBl
             // 
             this.gvMx1llBl.AppearanceCell.Options.UseFont = true;
-            this.gvMx1llBl.Caption = "鏉ユ枡涓嶈壇";
+            this.gvMx1llBl.Caption = "鏉ユ枡涓嶈壇閫�鏂�";
             this.gvMx1llBl.FieldName = "llBl";
             this.gvMx1llBl.MinWidth = 50;
             this.gvMx1llBl.Name = "gvMx1llBl";
             this.gvMx1llBl.Tag = "query_a.ll_bl";
+            this.gvMx1llBl.Visible = true;
+            this.gvMx1llBl.VisibleIndex = 15;
             this.gvMx1llBl.Width = 94;
             // 
             // gvMx1lpTl
@@ -1854,6 +1910,8 @@
             this.gvMx1lpTl.MinWidth = 50;
             this.gvMx1lpTl.Name = "gvMx1lpTl";
             this.gvMx1lpTl.Tag = "query_a.lp_tl";
+            this.gvMx1lpTl.Visible = true;
+            this.gvMx1lpTl.VisibleIndex = 16;
             this.gvMx1lpTl.Width = 94;
             // 
             // gvMx1dab021
@@ -1931,8 +1989,8 @@
             // gvMx1dab022
             // 
             this.gvMx1dab022.AppearanceCell.Options.UseFont = true;
-            this.gvMx1dab022.Caption = "閫�鏂欐暟閲�";
-            this.gvMx1dab022.FieldName = "dab022";
+            this.gvMx1dab022.Caption = "閫�鏂欐�绘暟";
+            this.gvMx1dab022.FieldName = "ztsl";
             this.gvMx1dab022.MinWidth = 50;
             this.gvMx1dab022.Name = "gvMx1dab022";
             this.gvMx1dab022.Tag = "query_a.dab022";
@@ -1991,7 +2049,7 @@
             this.layoutMx99.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx99.Location = new System.Drawing.Point(0, 0);
             this.layoutMx99.Name = "layoutMx99";
-            this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(221, 389, 812, 500);
+            this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(475, 530, 812, 500);
             this.layoutMx99.Root = this.layoutControlGroup1;
             this.layoutMx99.Size = new System.Drawing.Size(1648, 83);
             this.layoutMx99.TabIndex = 0;
@@ -2036,13 +2094,13 @@
             this.layoutControlItem39});
             this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup3.Name = "Root";
-            columnDefinition74.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition74.Width = 100D;
-            columnDefinition75.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition75.Width = 100D;
+            columnDefinition77.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition77.Width = 100D;
+            columnDefinition78.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition78.Width = 100D;
             this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition74,
-            columnDefinition75});
+            columnDefinition77,
+            columnDefinition78});
             rowDefinition40.Height = 100D;
             rowDefinition40.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
@@ -2073,7 +2131,7 @@
             // 
             // radOut
             // 
-            this.radOut.Location = new System.Drawing.Point(988, 10);
+            this.radOut.Location = new System.Drawing.Point(985, 10);
             this.radOut.Margin = new System.Windows.Forms.Padding(0);
             this.radOut.Name = "radOut";
             this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2081,18 +2139,20 @@
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
-            this.radOut.Size = new System.Drawing.Size(237, 28);
+            this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
+            this.radOut.Size = new System.Drawing.Size(325, 32);
             this.radOut.StyleController = this.layoutMx99;
             this.radOut.TabIndex = 473;
             // 
             // ucBtnPrint1
             // 
+            this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(986, 42);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(985, 42);
             this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint1.Name = "ucBtnPrint1";
             this.ucBtnPrint1.rptParameter = null;
-            this.ucBtnPrint1.Size = new System.Drawing.Size(323, 32);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(325, 32);
             this.ucBtnPrint1.TabIndex = 464;
             // 
             // txt_psnQty_1
@@ -2162,22 +2222,22 @@
             this.layoutControlItem36});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
-            columnDefinition76.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition76.Width = 100D;
-            columnDefinition77.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition77.Width = 100D;
-            columnDefinition78.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition78.Width = 100D;
             columnDefinition79.SizeType = System.Windows.Forms.SizeType.Percent;
             columnDefinition79.Width = 100D;
-            columnDefinition80.SizeType = System.Windows.Forms.SizeType.AutoSize;
-            columnDefinition80.Width = 328D;
+            columnDefinition80.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition80.Width = 100D;
+            columnDefinition81.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition81.Width = 100D;
+            columnDefinition82.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition82.Width = 100D;
+            columnDefinition83.SizeType = System.Windows.Forms.SizeType.AutoSize;
+            columnDefinition83.Width = 328D;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition76,
-            columnDefinition77,
-            columnDefinition78,
             columnDefinition79,
-            columnDefinition80});
+            columnDefinition80,
+            columnDefinition81,
+            columnDefinition82,
+            columnDefinition83});
             rowDefinition41.Height = 100D;
             rowDefinition41.SizeType = System.Windows.Forms.SizeType.Percent;
             rowDefinition42.Height = 100D;
@@ -2204,13 +2264,10 @@
             // 
             this.layoutControlItem35.Control = this.radOut;
             this.layoutControlItem35.Location = new System.Drawing.Point(975, 0);
-            this.layoutControlItem35.MaxSize = new System.Drawing.Size(240, 28);
-            this.layoutControlItem35.MinSize = new System.Drawing.Size(240, 28);
             this.layoutControlItem35.Name = "layoutControlItem35";
             this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
+            this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
             this.layoutControlItem35.Size = new System.Drawing.Size(325, 32);
-            this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem35.Text = "鑷姩璁$畻";
             this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem35.TextVisible = false;
@@ -2224,9 +2281,9 @@
             this.layoutControlItem26.Name = "layoutControlItem26";
             this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
+            this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
             this.layoutControlItem26.Size = new System.Drawing.Size(325, 32);
-            this.layoutControlItem26.Text = "鎶ュ伐鎵撳嵃";
+            this.layoutControlItem26.Text = "鎵樻澘鎵撳嵃";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem26.TextVisible = false;
             // 
@@ -2293,8 +2350,6 @@
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.rptChongDa});
             this.gcMx2.Size = new System.Drawing.Size(1648, 386);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
@@ -2319,8 +2374,7 @@
             this.gvMx2createDate,
             this.gridColumn30,
             this.gridColumn31,
-            this.gridColumn32,
-            this.gvBtnAlawys});
+            this.gridColumn32});
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -2473,168 +2527,33 @@
             this.gridColumn32.VisibleIndex = 11;
             this.gridColumn32.Width = 94;
             // 
-            // gvBtnAlawys
-            // 
-            this.gvBtnAlawys.Caption = "閲嶆墦";
-            this.gvBtnAlawys.ColumnEdit = this.rptChongDa;
-            this.gvBtnAlawys.MinWidth = 25;
-            this.gvBtnAlawys.Name = "gvBtnAlawys";
-            this.gvBtnAlawys.Visible = true;
-            this.gvBtnAlawys.VisibleIndex = 12;
-            this.gvBtnAlawys.Width = 94;
-            // 
-            // rptChongDa
-            // 
-            this.rptChongDa.AutoHeight = false;
-            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.printernetwork_16x16;
-            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.rptChongDa.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閲嶆墦", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.rptChongDa.Name = "rptChongDa";
-            this.rptChongDa.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.rptChongDa.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
-            // 
             // xtraTabPage3
             // 
-            this.xtraTabPage3.Controls.Add(this.gcMx3);
-            this.xtraTabPage3.Controls.Add(this.panMx98);
+            this.xtraTabPage3.Controls.Add(this.splitMx98);
             this.xtraTabPage3.Name = "xtraTabPage3";
             this.xtraTabPage3.Size = new System.Drawing.Size(1648, 481);
             this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
             // 
-            // gcMx3
+            // splitMx98
             // 
-            this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx3.Location = new System.Drawing.Point(0, 54);
-            this.gcMx3.MainView = this.gvMx3;
-            this.gcMx3.Name = "gcMx3";
-            this.gcMx3.Size = new System.Drawing.Size(1648, 427);
-            this.gcMx3.TabIndex = 1;
-            this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx3});
+            this.splitMx98.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitMx98.Horizontal = false;
+            this.splitMx98.Location = new System.Drawing.Point(0, 0);
+            this.splitMx98.Name = "splitMx98";
             // 
-            // gvMx3
+            // splitMx98.Panel1
             // 
-            this.gvMx3.Appearance.HeaderPanel.Options.UseTextOptions = true;
-            this.gvMx3.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gvMx3.Appearance.Row.Options.UseFont = true;
-            this.gvMx3.ColumnPanelRowHeight = 50;
-            this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn33,
-            this.gridColumn38,
-            this.gridColumn36,
-            this.gridColumn37,
-            this.gridColumn42,
-            this.gridColumn43,
-            this.gridColumn34,
-            this.gridColumn35});
-            this.gvMx3.GridControl = this.gcMx3;
-            this.gvMx3.Name = "gvMx3";
-            this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
-            this.gvMx3.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx3.OptionsView.ShowFooter = true;
-            this.gvMx3.OptionsView.ShowGroupPanel = false;
+            this.splitMx98.Panel1.Controls.Add(this.layoutMx98);
+            this.splitMx98.Panel1.Text = "Panel1";
             // 
-            // gridColumn33
+            // splitMx98.Panel2
             // 
-            this.gridColumn33.AppearanceCell.Options.UseFont = true;
-            this.gridColumn33.Caption = "guid ";
-            this.gridColumn33.FieldName = "guid";
-            this.gridColumn33.MinWidth = 50;
-            this.gridColumn33.Name = "gridColumn33";
-            this.gridColumn33.Tag = "query_a.guid";
-            this.gridColumn33.Width = 94;
-            // 
-            // gridColumn38
-            // 
-            this.gridColumn38.AppearanceCell.Options.UseFont = true;
-            this.gridColumn38.Caption = "宸ュ崟鍙�";
-            this.gridColumn38.FieldName = "daa001";
-            this.gridColumn38.MinWidth = 50;
-            this.gridColumn38.Name = "gridColumn38";
-            this.gridColumn38.Tag = "query_a.UNIT";
-            this.gridColumn38.Visible = true;
-            this.gridColumn38.VisibleIndex = 0;
-            this.gridColumn38.Width = 94;
-            // 
-            // gridColumn36
-            // 
-            this.gridColumn36.AppearanceCell.Options.UseFont = true;
-            this.gridColumn36.Caption = "杩芥函鐮�";
-            this.gridColumn36.FieldName = "barCode";
-            this.gridColumn36.MinWidth = 50;
-            this.gridColumn36.Name = "gridColumn36";
-            this.gridColumn36.Tag = "query_a.ITEM_BARCODE";
-            this.gridColumn36.Visible = true;
-            this.gridColumn36.VisibleIndex = 1;
-            this.gridColumn36.Width = 94;
-            // 
-            // gridColumn37
-            // 
-            this.gridColumn37.AppearanceCell.Options.UseFont = true;
-            this.gridColumn37.Caption = "鏁伴噺 ";
-            this.gridColumn37.FieldName = "quantity";
-            this.gridColumn37.MinWidth = 50;
-            this.gridColumn37.Name = "gridColumn37";
-            this.gridColumn37.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
-            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣锛歿0:0.##}")});
-            this.gridColumn37.Tag = "query_a.QUANTITY";
-            this.gridColumn37.Visible = true;
-            this.gridColumn37.VisibleIndex = 2;
-            this.gridColumn37.Width = 94;
-            // 
-            // gridColumn42
-            // 
-            this.gridColumn42.AppearanceCell.Options.UseFont = true;
-            this.gridColumn42.Caption = "鍒涘缓浜� ";
-            this.gridColumn42.FieldName = "createBy";
-            this.gridColumn42.MinWidth = 50;
-            this.gridColumn42.Name = "gridColumn42";
-            this.gridColumn42.Tag = "query_a.CREATE_BY";
-            this.gridColumn42.Visible = true;
-            this.gridColumn42.VisibleIndex = 3;
-            this.gridColumn42.Width = 94;
-            // 
-            // gridColumn43
-            // 
-            this.gridColumn43.AppearanceCell.Options.UseFont = true;
-            this.gridColumn43.Caption = "鍒涘缓鏃堕棿 ";
-            this.gridColumn43.FieldName = "createDate";
-            this.gridColumn43.MinWidth = 50;
-            this.gridColumn43.Name = "gridColumn43";
-            this.gridColumn43.Tag = "query_a.CREATE_DATE";
-            this.gridColumn43.Visible = true;
-            this.gridColumn43.VisibleIndex = 4;
-            this.gridColumn43.Width = 94;
-            // 
-            // gridColumn34
-            // 
-            this.gridColumn34.Caption = "绾垮埆ID";
-            this.gridColumn34.FieldName = "lineId";
-            this.gridColumn34.MinWidth = 25;
-            this.gridColumn34.Name = "gridColumn34";
-            this.gridColumn34.Visible = true;
-            this.gridColumn34.VisibleIndex = 5;
-            this.gridColumn34.Width = 94;
-            // 
-            // gridColumn35
-            // 
-            this.gridColumn35.Caption = "绾垮埆鍚嶇О";
-            this.gridColumn35.FieldName = "xtName";
-            this.gridColumn35.MinWidth = 25;
-            this.gridColumn35.Name = "gridColumn35";
-            this.gridColumn35.Visible = true;
-            this.gridColumn35.VisibleIndex = 6;
-            this.gridColumn35.Width = 94;
-            // 
-            // panMx98
-            // 
-            this.panMx98.Controls.Add(this.layoutMx98);
-            this.panMx98.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panMx98.Location = new System.Drawing.Point(0, 0);
-            this.panMx98.Name = "panMx98";
-            this.panMx98.Size = new System.Drawing.Size(1648, 54);
-            this.panMx98.TabIndex = 0;
+            this.splitMx98.Panel2.Controls.Add(this.gcMx3);
+            this.splitMx98.Panel2.Text = "Panel2";
+            this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx98.Size = new System.Drawing.Size(1648, 481);
+            this.splitMx98.SplitterPosition = 52;
+            this.splitMx98.TabIndex = 2;
             // 
             // layoutMx98
             // 
@@ -2647,20 +2566,21 @@
             this.layoutMx98.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx98.Location = new System.Drawing.Point(0, 0);
             this.layoutMx98.Name = "layoutMx98";
-            this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(96, 558, 812, 500);
+            this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(96, 530, 812, 500);
             this.layoutMx98.Root = this.layoutControlGroup2;
-            this.layoutMx98.Size = new System.Drawing.Size(1648, 54);
+            this.layoutMx98.Size = new System.Drawing.Size(1648, 52);
             this.layoutMx98.TabIndex = 0;
             this.layoutMx98.Text = "layoutControl1";
             // 
             // ucBtnPrint98
             // 
+            this.ucBtnPrint98.allClickKey = null;
             this.ucBtnPrint98.guidKey = null;
-            this.ucBtnPrint98.Location = new System.Drawing.Point(1366, 10);
+            this.ucBtnPrint98.Location = new System.Drawing.Point(1365, 10);
             this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint98.Name = "ucBtnPrint98";
             this.ucBtnPrint98.rptParameter = null;
-            this.ucBtnPrint98.Size = new System.Drawing.Size(271, 34);
+            this.ucBtnPrint98.Size = new System.Drawing.Size(273, 32);
             this.ucBtnPrint98.TabIndex = 8;
             // 
             // txt_yQty98
@@ -2719,30 +2639,30 @@
             this.layoutControlItem37});
             this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup2.Name = "Root";
-            columnDefinition81.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition81.Width = 100D;
-            columnDefinition82.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition82.Width = 100D;
-            columnDefinition83.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition83.Width = 100D;
             columnDefinition84.SizeType = System.Windows.Forms.SizeType.Percent;
             columnDefinition84.Width = 100D;
             columnDefinition85.SizeType = System.Windows.Forms.SizeType.Percent;
             columnDefinition85.Width = 100D;
             columnDefinition86.SizeType = System.Windows.Forms.SizeType.Percent;
             columnDefinition86.Width = 100D;
+            columnDefinition87.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition87.Width = 100D;
+            columnDefinition88.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition88.Width = 100D;
+            columnDefinition89.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition89.Width = 100D;
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition81,
-            columnDefinition82,
-            columnDefinition83,
             columnDefinition84,
             columnDefinition85,
-            columnDefinition86});
+            columnDefinition86,
+            columnDefinition87,
+            columnDefinition88,
+            columnDefinition89});
             rowDefinition43.Height = 100D;
             rowDefinition43.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition43});
-            this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 54);
+            this.layoutControlGroup2.Size = new System.Drawing.Size(1648, 52);
             this.layoutControlGroup2.TextVisible = false;
             // 
             // layoutControlItem34
@@ -2751,8 +2671,8 @@
             this.layoutControlItem34.Location = new System.Drawing.Point(1355, 0);
             this.layoutControlItem34.Name = "layoutControlItem34";
             this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 5;
-            this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
-            this.layoutControlItem34.Size = new System.Drawing.Size(273, 34);
+            this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            this.layoutControlItem34.Size = new System.Drawing.Size(273, 32);
             this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem34.TextVisible = false;
@@ -2763,7 +2683,7 @@
             this.layoutControlItem33.Location = new System.Drawing.Point(1084, 0);
             this.layoutControlItem33.Name = "layoutControlItem33";
             this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 4;
-            this.layoutControlItem33.Size = new System.Drawing.Size(271, 34);
+            this.layoutControlItem33.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟";
             this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -2773,7 +2693,7 @@
             this.layoutControlItem32.Location = new System.Drawing.Point(813, 0);
             this.layoutControlItem32.Name = "layoutControlItem32";
             this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem32.Size = new System.Drawing.Size(271, 34);
+            this.layoutControlItem32.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
             this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -2783,7 +2703,7 @@
             this.layoutControlItem31.Location = new System.Drawing.Point(542, 0);
             this.layoutControlItem31.Name = "layoutControlItem31";
             this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem31.Size = new System.Drawing.Size(271, 34);
+            this.layoutControlItem31.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
             this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -2793,7 +2713,7 @@
             this.layoutControlItem30.Location = new System.Drawing.Point(271, 0);
             this.layoutControlItem30.Name = "layoutControlItem30";
             this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem30.Size = new System.Drawing.Size(271, 34);
+            this.layoutControlItem30.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
             this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -2802,25 +2722,378 @@
             this.layoutControlItem37.Control = this.txt_zQty98;
             this.layoutControlItem37.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem37.Name = "layoutControlItem37";
-            this.layoutControlItem37.Size = new System.Drawing.Size(271, 34);
+            this.layoutControlItem37.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem37.Text = "宸ュ崟鎬婚噺";
             this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
             // 
+            // gcMx3
+            // 
+            this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx3.Location = new System.Drawing.Point(0, 0);
+            this.gcMx3.MainView = this.gvMx3;
+            this.gcMx3.Name = "gcMx3";
+            this.gcMx3.Size = new System.Drawing.Size(1648, 417);
+            this.gcMx3.TabIndex = 1;
+            this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx3});
+            // 
+            // gvMx3
+            // 
+            this.gvMx3.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx3.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx3.Appearance.Row.Options.UseFont = true;
+            this.gvMx3.ColumnPanelRowHeight = 50;
+            this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn33,
+            this.gridColumn38,
+            this.gridColumn36,
+            this.gridColumn37,
+            this.gridColumn42,
+            this.gridColumn43,
+            this.gridColumn34,
+            this.gridColumn35});
+            this.gvMx3.GridControl = this.gcMx3;
+            this.gvMx3.Name = "gvMx3";
+            this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx3.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx3.OptionsView.ShowFooter = true;
+            this.gvMx3.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn33
+            // 
+            this.gridColumn33.AppearanceCell.Options.UseFont = true;
+            this.gridColumn33.Caption = "guid ";
+            this.gridColumn33.FieldName = "guid";
+            this.gridColumn33.MinWidth = 50;
+            this.gridColumn33.Name = "gridColumn33";
+            this.gridColumn33.OptionsColumn.ReadOnly = true;
+            this.gridColumn33.Tag = "query_a.guid";
+            this.gridColumn33.Width = 94;
+            // 
+            // gridColumn38
+            // 
+            this.gridColumn38.AppearanceCell.Options.UseFont = true;
+            this.gridColumn38.Caption = "宸ュ崟鍙�";
+            this.gridColumn38.FieldName = "daa001";
+            this.gridColumn38.MinWidth = 50;
+            this.gridColumn38.Name = "gridColumn38";
+            this.gridColumn38.OptionsColumn.ReadOnly = true;
+            this.gridColumn38.Tag = "query_a.UNIT";
+            this.gridColumn38.Visible = true;
+            this.gridColumn38.VisibleIndex = 0;
+            this.gridColumn38.Width = 94;
+            // 
+            // gridColumn36
+            // 
+            this.gridColumn36.AppearanceCell.Options.UseFont = true;
+            this.gridColumn36.Caption = "杩芥函鐮�";
+            this.gridColumn36.FieldName = "barCode";
+            this.gridColumn36.MinWidth = 50;
+            this.gridColumn36.Name = "gridColumn36";
+            this.gridColumn36.OptionsColumn.ReadOnly = true;
+            this.gridColumn36.Tag = "query_a.ITEM_BARCODE";
+            this.gridColumn36.Visible = true;
+            this.gridColumn36.VisibleIndex = 1;
+            this.gridColumn36.Width = 94;
+            // 
+            // gridColumn37
+            // 
+            this.gridColumn37.AppearanceCell.Options.UseFont = true;
+            this.gridColumn37.Caption = "鏁伴噺 ";
+            this.gridColumn37.FieldName = "quantity";
+            this.gridColumn37.MinWidth = 50;
+            this.gridColumn37.Name = "gridColumn37";
+            this.gridColumn37.OptionsColumn.ReadOnly = true;
+            this.gridColumn37.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
+            new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣锛歿0:0.##}")});
+            this.gridColumn37.Tag = "query_a.QUANTITY";
+            this.gridColumn37.Visible = true;
+            this.gridColumn37.VisibleIndex = 2;
+            this.gridColumn37.Width = 94;
+            // 
+            // gridColumn42
+            // 
+            this.gridColumn42.AppearanceCell.Options.UseFont = true;
+            this.gridColumn42.Caption = "鍒涘缓浜� ";
+            this.gridColumn42.FieldName = "createBy";
+            this.gridColumn42.MinWidth = 50;
+            this.gridColumn42.Name = "gridColumn42";
+            this.gridColumn42.OptionsColumn.ReadOnly = true;
+            this.gridColumn42.Tag = "query_a.CREATE_BY";
+            this.gridColumn42.Visible = true;
+            this.gridColumn42.VisibleIndex = 3;
+            this.gridColumn42.Width = 94;
+            // 
+            // gridColumn43
+            // 
+            this.gridColumn43.AppearanceCell.Options.UseFont = true;
+            this.gridColumn43.Caption = "鍒涘缓鏃堕棿 ";
+            this.gridColumn43.FieldName = "createDate";
+            this.gridColumn43.MinWidth = 50;
+            this.gridColumn43.Name = "gridColumn43";
+            this.gridColumn43.OptionsColumn.ReadOnly = true;
+            this.gridColumn43.Tag = "query_a.CREATE_DATE";
+            this.gridColumn43.Visible = true;
+            this.gridColumn43.VisibleIndex = 4;
+            this.gridColumn43.Width = 94;
+            // 
+            // gridColumn34
+            // 
+            this.gridColumn34.Caption = "绾垮埆ID";
+            this.gridColumn34.FieldName = "lineId";
+            this.gridColumn34.MinWidth = 25;
+            this.gridColumn34.Name = "gridColumn34";
+            this.gridColumn34.OptionsColumn.ReadOnly = true;
+            this.gridColumn34.Visible = true;
+            this.gridColumn34.VisibleIndex = 5;
+            this.gridColumn34.Width = 94;
+            // 
+            // gridColumn35
+            // 
+            this.gridColumn35.Caption = "绾垮埆鍚嶇О";
+            this.gridColumn35.FieldName = "xtName";
+            this.gridColumn35.MinWidth = 25;
+            this.gridColumn35.Name = "gridColumn35";
+            this.gridColumn35.OptionsColumn.ReadOnly = true;
+            this.gridColumn35.Visible = true;
+            this.gridColumn35.VisibleIndex = 6;
+            this.gridColumn35.Width = 94;
+            // 
             // xtraTabPage4
             // 
-            this.xtraTabPage4.Controls.Add(this.gcMx4);
-            this.xtraTabPage4.Controls.Add(this.panMx100);
+            this.xtraTabPage4.Controls.Add(this.splitMx100);
             this.xtraTabPage4.Name = "xtraTabPage4";
             this.xtraTabPage4.Size = new System.Drawing.Size(1648, 481);
             this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�";
             // 
+            // splitMx100
+            // 
+            this.splitMx100.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitMx100.Horizontal = false;
+            this.splitMx100.Location = new System.Drawing.Point(0, 0);
+            this.splitMx100.Name = "splitMx100";
+            // 
+            // splitMx100.Panel1
+            // 
+            this.splitMx100.Panel1.Controls.Add(this.layMx100);
+            this.splitMx100.Panel1.Text = "Panel1";
+            // 
+            // splitMx100.Panel2
+            // 
+            this.splitMx100.Panel2.Controls.Add(this.gcMx4);
+            this.splitMx100.Panel2.Text = "Panel2";
+            this.splitMx100.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+            this.splitMx100.Size = new System.Drawing.Size(1648, 481);
+            this.splitMx100.SplitterPosition = 52;
+            this.splitMx100.TabIndex = 3;
+            // 
+            // layMx100
+            // 
+            this.layMx100.Controls.Add(this.ucBtnPrint100);
+            this.layMx100.Controls.Add(this.btnIn);
+            this.layMx100.Controls.Add(this.txt_zQty100);
+            this.layMx100.Controls.Add(this.txt_yQty100);
+            this.layMx100.Controls.Add(this.txt_kQty100);
+            this.layMx100.Controls.Add(this.txt_iCount_100);
+            this.layMx100.Controls.Add(this.btnDesign);
+            this.layMx100.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layMx100.Location = new System.Drawing.Point(0, 0);
+            this.layMx100.Name = "layMx100";
+            this.layMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(274, 530, 812, 500);
+            this.layMx100.Root = this.layoutControlGroup4;
+            this.layMx100.Size = new System.Drawing.Size(1648, 52);
+            this.layMx100.TabIndex = 2;
+            this.layMx100.Text = "dataLayoutControl1";
+            // 
+            // ucBtnPrint100
+            // 
+            this.ucBtnPrint100.allClickKey = null;
+            this.ucBtnPrint100.guidKey = null;
+            this.ucBtnPrint100.Location = new System.Drawing.Point(1096, 10);
+            this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0);
+            this.ucBtnPrint100.Name = "ucBtnPrint100";
+            this.ucBtnPrint100.rptParameter = null;
+            this.ucBtnPrint100.Size = new System.Drawing.Size(272, 32);
+            this.ucBtnPrint100.TabIndex = 0;
+            // 
+            // btnIn
+            // 
+            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16;
+            this.btnIn.Location = new System.Drawing.Point(1370, 12);
+            this.btnIn.Name = "btnIn";
+            this.btnIn.Size = new System.Drawing.Size(116, 27);
+            this.btnIn.StyleController = this.layMx100;
+            this.btnIn.TabIndex = 1;
+            this.btnIn.Text = "瀵煎叆鍚庣洊鐮�";
+            // 
+            // txt_zQty100
+            // 
+            this.txt_zQty100.Location = new System.Drawing.Point(114, 12);
+            this.txt_zQty100.Name = "txt_zQty100";
+            this.txt_zQty100.Properties.ReadOnly = true;
+            this.txt_zQty100.Size = new System.Drawing.Size(164, 24);
+            this.txt_zQty100.StyleController = this.layMx100;
+            this.txt_zQty100.TabIndex = 4;
+            // 
+            // txt_yQty100
+            // 
+            this.txt_yQty100.Location = new System.Drawing.Point(384, 12);
+            this.txt_yQty100.Name = "txt_yQty100";
+            this.txt_yQty100.Properties.ReadOnly = true;
+            this.txt_yQty100.Size = new System.Drawing.Size(166, 24);
+            this.txt_yQty100.StyleController = this.layMx100;
+            this.txt_yQty100.TabIndex = 5;
+            // 
+            // txt_kQty100
+            // 
+            this.txt_kQty100.Location = new System.Drawing.Point(656, 12);
+            this.txt_kQty100.Name = "txt_kQty100";
+            this.txt_kQty100.Properties.ReadOnly = true;
+            this.txt_kQty100.Size = new System.Drawing.Size(166, 24);
+            this.txt_kQty100.StyleController = this.layMx100;
+            this.txt_kQty100.TabIndex = 6;
+            // 
+            // txt_iCount_100
+            // 
+            this.txt_iCount_100.Location = new System.Drawing.Point(928, 12);
+            this.txt_iCount_100.Name = "txt_iCount_100";
+            this.txt_iCount_100.Size = new System.Drawing.Size(166, 24);
+            this.txt_iCount_100.StyleController = this.layMx100;
+            this.txt_iCount_100.TabIndex = 7;
+            // 
+            // btnDesign
+            // 
+            this.btnDesign.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.print_16x16;
+            this.btnDesign.Location = new System.Drawing.Point(1490, 12);
+            this.btnDesign.Name = "btnDesign";
+            this.btnDesign.Size = new System.Drawing.Size(146, 27);
+            this.btnDesign.StyleController = this.layMx100;
+            this.btnDesign.TabIndex = 8;
+            this.btnDesign.Text = "缁存姢瀹㈡埛妯℃澘";
+            // 
+            // layoutControlGroup4
+            // 
+            this.layoutControlGroup4.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup4.GroupBordersVisible = false;
+            this.layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem42,
+            this.layoutControlItem43,
+            this.layoutControlItem44,
+            this.layoutControlItem2,
+            this.layoutControlItem10,
+            this.layoutControlItem45,
+            this.layoutControlItem47});
+            this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.layoutControlGroup4.Name = "Root";
+            columnDefinition90.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition90.Width = 100D;
+            columnDefinition91.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition91.Width = 100D;
+            columnDefinition92.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition92.Width = 100D;
+            columnDefinition93.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition93.Width = 100D;
+            columnDefinition94.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition94.Width = 100D;
+            columnDefinition95.SizeType = System.Windows.Forms.SizeType.Absolute;
+            columnDefinition95.Width = 120D;
+            columnDefinition96.SizeType = System.Windows.Forms.SizeType.Absolute;
+            columnDefinition96.Width = 150D;
+            this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition90,
+            columnDefinition91,
+            columnDefinition92,
+            columnDefinition93,
+            columnDefinition94,
+            columnDefinition95,
+            columnDefinition96});
+            rowDefinition44.Height = 100D;
+            rowDefinition44.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition44});
+            this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 52);
+            this.layoutControlGroup4.TextVisible = false;
+            // 
+            // layoutControlItem42
+            // 
+            this.layoutControlItem42.Control = this.txt_zQty100;
+            this.layoutControlItem42.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem42.Name = "layoutControlItem42";
+            this.layoutControlItem42.Size = new System.Drawing.Size(270, 32);
+            this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
+            this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem43
+            // 
+            this.layoutControlItem43.Control = this.txt_yQty100;
+            this.layoutControlItem43.Location = new System.Drawing.Point(270, 0);
+            this.layoutControlItem43.Name = "layoutControlItem43";
+            this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem43.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem43.Text = "宸叉墦鍗版暟";
+            this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem44
+            // 
+            this.layoutControlItem44.Control = this.txt_kQty100;
+            this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟";
+            this.layoutControlItem44.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem44.Name = "layoutControlItem44";
+            this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem44.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem44.Text = "鍙墦鍗版暟瀛�";
+            this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.btnIn;
+            this.layoutControlItem2.Location = new System.Drawing.Point(1358, 0);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5;
+            this.layoutControlItem2.Size = new System.Drawing.Size(120, 32);
+            this.layoutControlItem2.Text = "瀵煎叆鎸夐挳";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem2.TextVisible = false;
+            // 
+            // layoutControlItem10
+            // 
+            this.layoutControlItem10.Control = this.ucBtnPrint100;
+            this.layoutControlItem10.Location = new System.Drawing.Point(1086, 0);
+            this.layoutControlItem10.Name = "layoutControlItem10";
+            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 4;
+            this.layoutControlItem10.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            this.layoutControlItem10.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem10.Text = "鎵撳嵃鎸夐挳";
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem10.TextVisible = false;
+            // 
+            // layoutControlItem45
+            // 
+            this.layoutControlItem45.Control = this.txt_iCount_100;
+            this.layoutControlItem45.Location = new System.Drawing.Point(814, 0);
+            this.layoutControlItem45.Name = "layoutControlItem45";
+            this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem45.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
+            this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem47
+            // 
+            this.layoutControlItem47.Control = this.btnDesign;
+            this.layoutControlItem47.Location = new System.Drawing.Point(1478, 0);
+            this.layoutControlItem47.Name = "layoutControlItem47";
+            this.layoutControlItem47.OptionsTableLayoutItem.ColumnIndex = 6;
+            this.layoutControlItem47.Size = new System.Drawing.Size(150, 32);
+            this.layoutControlItem47.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem47.TextVisible = false;
+            // 
             // gcMx4
             // 
             this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx4.Location = new System.Drawing.Point(0, 56);
+            this.gcMx4.Location = new System.Drawing.Point(0, 0);
             this.gcMx4.MainView = this.gvMx4;
             this.gcMx4.Name = "gcMx4";
-            this.gcMx4.Size = new System.Drawing.Size(1648, 425);
+            this.gcMx4.Size = new System.Drawing.Size(1648, 417);
             this.gcMx4.TabIndex = 2;
             this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx4});
@@ -2854,6 +3127,7 @@
             this.gridColumn39.FieldName = "guid";
             this.gridColumn39.MinWidth = 50;
             this.gridColumn39.Name = "gridColumn39";
+            this.gridColumn39.OptionsColumn.ReadOnly = true;
             this.gridColumn39.Tag = "query_a.guid";
             this.gridColumn39.Width = 94;
             // 
@@ -2864,6 +3138,7 @@
             this.gridColumn40.FieldName = "daa001";
             this.gridColumn40.MinWidth = 50;
             this.gridColumn40.Name = "gridColumn40";
+            this.gridColumn40.OptionsColumn.ReadOnly = true;
             this.gridColumn40.Tag = "query_a.UNIT";
             this.gridColumn40.Visible = true;
             this.gridColumn40.VisibleIndex = 0;
@@ -2876,6 +3151,7 @@
             this.gridColumn41.FieldName = "itemBarcode";
             this.gridColumn41.MinWidth = 50;
             this.gridColumn41.Name = "gridColumn41";
+            this.gridColumn41.OptionsColumn.ReadOnly = true;
             this.gridColumn41.Tag = "query_a.ITEM_BARCODE";
             this.gridColumn41.Visible = true;
             this.gridColumn41.VisibleIndex = 1;
@@ -2888,6 +3164,7 @@
             this.gridColumn44.FieldName = "quantity";
             this.gridColumn44.MinWidth = 50;
             this.gridColumn44.Name = "gridColumn44";
+            this.gridColumn44.OptionsColumn.ReadOnly = true;
             this.gridColumn44.Summary.AddRange(new DevExpress.XtraGrid.GridSummaryItem[] {
             new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣锛歿0:0.##}")});
             this.gridColumn44.Tag = "query_a.QUANTITY";
@@ -2902,6 +3179,7 @@
             this.gridColumn45.FieldName = "createBy";
             this.gridColumn45.MinWidth = 50;
             this.gridColumn45.Name = "gridColumn45";
+            this.gridColumn45.OptionsColumn.ReadOnly = true;
             this.gridColumn45.Tag = "query_a.CREATE_BY";
             this.gridColumn45.Visible = true;
             this.gridColumn45.VisibleIndex = 3;
@@ -2914,6 +3192,7 @@
             this.gridColumn46.FieldName = "createDate";
             this.gridColumn46.MinWidth = 50;
             this.gridColumn46.Name = "gridColumn46";
+            this.gridColumn46.OptionsColumn.ReadOnly = true;
             this.gridColumn46.Tag = "query_a.CREATE_DATE";
             this.gridColumn46.Visible = true;
             this.gridColumn46.VisibleIndex = 4;
@@ -2925,6 +3204,7 @@
             this.gridColumn47.FieldName = "aboutTbBarcode";
             this.gridColumn47.MinWidth = 25;
             this.gridColumn47.Name = "gridColumn47";
+            this.gridColumn47.OptionsColumn.ReadOnly = true;
             this.gridColumn47.Visible = true;
             this.gridColumn47.VisibleIndex = 5;
             this.gridColumn47.Width = 94;
@@ -2935,201 +3215,22 @@
             this.gridColumn48.FieldName = "aboutTracBarcode";
             this.gridColumn48.MinWidth = 25;
             this.gridColumn48.Name = "gridColumn48";
+            this.gridColumn48.OptionsColumn.ReadOnly = true;
             this.gridColumn48.Visible = true;
             this.gridColumn48.VisibleIndex = 6;
             this.gridColumn48.Width = 94;
-            // 
-            // panMx100
-            // 
-            this.panMx100.Controls.Add(this.layMx100);
-            this.panMx100.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panMx100.Location = new System.Drawing.Point(0, 0);
-            this.panMx100.Name = "panMx100";
-            this.panMx100.Size = new System.Drawing.Size(1648, 56);
-            this.panMx100.TabIndex = 0;
-            // 
-            // layMx100
-            // 
-            this.layMx100.Controls.Add(this.ucBtnPrint100);
-            this.layMx100.Controls.Add(this.btnIn);
-            this.layMx100.Controls.Add(this.txt_zQty100);
-            this.layMx100.Controls.Add(this.txt_yQty100);
-            this.layMx100.Controls.Add(this.txt_kQty100);
-            this.layMx100.Controls.Add(this.txt_iCount_100);
-            this.layMx100.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layMx100.Location = new System.Drawing.Point(0, 0);
-            this.layMx100.Name = "layMx100";
-            this.layMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(359, 336, 812, 500);
-            this.layMx100.Root = this.layoutControlGroup4;
-            this.layMx100.Size = new System.Drawing.Size(1648, 56);
-            this.layMx100.TabIndex = 2;
-            this.layMx100.Text = "dataLayoutControl1";
-            // 
-            // ucBtnPrint100
-            // 
-            this.ucBtnPrint100.guidKey = null;
-            this.ucBtnPrint100.Location = new System.Drawing.Point(1154, 12);
-            this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0);
-            this.ucBtnPrint100.Name = "ucBtnPrint100";
-            this.ucBtnPrint100.rptParameter = null;
-            this.ucBtnPrint100.Size = new System.Drawing.Size(282, 32);
-            this.ucBtnPrint100.TabIndex = 0;
-            // 
-            // btnIn
-            // 
-            this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16;
-            this.btnIn.Location = new System.Drawing.Point(1440, 12);
-            this.btnIn.Name = "btnIn";
-            this.btnIn.Size = new System.Drawing.Size(196, 27);
-            this.btnIn.StyleController = this.layMx100;
-            this.btnIn.TabIndex = 1;
-            this.btnIn.Text = "瀵煎叆鏉$爜";
-            // 
-            // txt_zQty100
-            // 
-            this.txt_zQty100.Location = new System.Drawing.Point(114, 12);
-            this.txt_zQty100.Name = "txt_zQty100";
-            this.txt_zQty100.Properties.ReadOnly = true;
-            this.txt_zQty100.Size = new System.Drawing.Size(178, 24);
-            this.txt_zQty100.StyleController = this.layMx100;
-            this.txt_zQty100.TabIndex = 4;
-            // 
-            // txt_yQty100
-            // 
-            this.txt_yQty100.Location = new System.Drawing.Point(398, 12);
-            this.txt_yQty100.Name = "txt_yQty100";
-            this.txt_yQty100.Properties.ReadOnly = true;
-            this.txt_yQty100.Size = new System.Drawing.Size(180, 24);
-            this.txt_yQty100.StyleController = this.layMx100;
-            this.txt_yQty100.TabIndex = 5;
-            // 
-            // txt_kQty100
-            // 
-            this.txt_kQty100.Location = new System.Drawing.Point(684, 12);
-            this.txt_kQty100.Name = "txt_kQty100";
-            this.txt_kQty100.Properties.ReadOnly = true;
-            this.txt_kQty100.Size = new System.Drawing.Size(180, 24);
-            this.txt_kQty100.StyleController = this.layMx100;
-            this.txt_kQty100.TabIndex = 6;
-            // 
-            // txt_iCount_100
-            // 
-            this.txt_iCount_100.Location = new System.Drawing.Point(970, 12);
-            this.txt_iCount_100.Name = "txt_iCount_100";
-            this.txt_iCount_100.Size = new System.Drawing.Size(180, 24);
-            this.txt_iCount_100.StyleController = this.layMx100;
-            this.txt_iCount_100.TabIndex = 7;
-            // 
-            // layoutControlGroup4
-            // 
-            this.layoutControlGroup4.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.layoutControlGroup4.GroupBordersVisible = false;
-            this.layoutControlGroup4.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem42,
-            this.layoutControlItem43,
-            this.layoutControlItem44,
-            this.layoutControlItem2,
-            this.layoutControlItem10,
-            this.layoutControlItem45});
-            this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
-            this.layoutControlGroup4.Name = "Root";
-            columnDefinition87.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition87.Width = 100D;
-            columnDefinition88.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition88.Width = 100D;
-            columnDefinition89.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition89.Width = 100D;
-            columnDefinition90.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition90.Width = 100D;
-            columnDefinition91.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition91.Width = 100D;
-            columnDefinition92.SizeType = System.Windows.Forms.SizeType.Absolute;
-            columnDefinition92.Width = 200D;
-            this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition87,
-            columnDefinition88,
-            columnDefinition89,
-            columnDefinition90,
-            columnDefinition91,
-            columnDefinition92});
-            rowDefinition44.Height = 100D;
-            rowDefinition44.SizeType = System.Windows.Forms.SizeType.Percent;
-            this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition44});
-            this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 56);
-            this.layoutControlGroup4.TextVisible = false;
-            // 
-            // layoutControlItem42
-            // 
-            this.layoutControlItem42.Control = this.txt_zQty100;
-            this.layoutControlItem42.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem42.Name = "layoutControlItem42";
-            this.layoutControlItem42.Size = new System.Drawing.Size(284, 36);
-            this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
-            this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem43
-            // 
-            this.layoutControlItem43.Control = this.txt_yQty100;
-            this.layoutControlItem43.Location = new System.Drawing.Point(284, 0);
-            this.layoutControlItem43.Name = "layoutControlItem43";
-            this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem43.Size = new System.Drawing.Size(286, 36);
-            this.layoutControlItem43.Text = "宸叉墦鍗版暟";
-            this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem44
-            // 
-            this.layoutControlItem44.Control = this.txt_kQty100;
-            this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟";
-            this.layoutControlItem44.Location = new System.Drawing.Point(570, 0);
-            this.layoutControlItem44.Name = "layoutControlItem44";
-            this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem44.Size = new System.Drawing.Size(286, 36);
-            this.layoutControlItem44.Text = "鍙墦鍗版暟瀛�";
-            this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.btnIn;
-            this.layoutControlItem2.Location = new System.Drawing.Point(1428, 0);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5;
-            this.layoutControlItem2.Size = new System.Drawing.Size(200, 36);
-            this.layoutControlItem2.Text = "瀵煎叆鎸夐挳";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem2.TextVisible = false;
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.ucBtnPrint100;
-            this.layoutControlItem10.Location = new System.Drawing.Point(1142, 0);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 4;
-            this.layoutControlItem10.Size = new System.Drawing.Size(286, 36);
-            this.layoutControlItem10.Text = "鎵撳嵃鎸夐挳";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem10.TextVisible = false;
-            // 
-            // layoutControlItem45
-            // 
-            this.layoutControlItem45.Control = this.txt_iCount_100;
-            this.layoutControlItem45.Location = new System.Drawing.Point(856, 0);
-            this.layoutControlItem45.Name = "layoutControlItem45";
-            this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem45.Size = new System.Drawing.Size(286, 36);
-            this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
-            this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
             // 
             // xtraTabPage5
             // 
             this.xtraTabPage5.Controls.Add(this.ucBtnPrint101);
             this.xtraTabPage5.Name = "xtraTabPage5";
+            this.xtraTabPage5.PageVisible = false;
             this.xtraTabPage5.Size = new System.Drawing.Size(1648, 481);
             this.xtraTabPage5.Text = "鐗╂枡榻愬鏍囪瘑鍗�";
             // 
             // ucBtnPrint101
             // 
+            this.ucBtnPrint101.allClickKey = null;
             this.ucBtnPrint101.guidKey = null;
             this.ucBtnPrint101.Location = new System.Drawing.Point(7, 19);
             this.ucBtnPrint101.Margin = new System.Windows.Forms.Padding(0);
@@ -3137,6 +3238,165 @@
             this.ucBtnPrint101.rptParameter = null;
             this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32);
             this.ucBtnPrint101.TabIndex = 0;
+            // 
+            // xtraTabPage6
+            // 
+            this.xtraTabPage6.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
+            this.xtraTabPage6.Appearance.Header.Options.UseForeColor = true;
+            this.xtraTabPage6.Controls.Add(this.gcMx6);
+            this.xtraTabPage6.Name = "xtraTabPage6";
+            this.xtraTabPage6.Size = new System.Drawing.Size(1648, 481);
+            this.xtraTabPage6.Text = "澶囨枡鏄庣粏";
+            // 
+            // gcMx6
+            // 
+            this.gcMx6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx6.Location = new System.Drawing.Point(0, 0);
+            this.gcMx6.MainView = this.gvMx6;
+            this.gcMx6.Name = "gcMx6";
+            this.gcMx6.Size = new System.Drawing.Size(1648, 481);
+            this.gcMx6.TabIndex = 1;
+            this.gcMx6.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx6});
+            // 
+            // gvMx6
+            // 
+            this.gvMx6.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx6.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx6.ColumnPanelRowHeight = 50;
+            this.gvMx6.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn2,
+            this.gridColumn9,
+            this.gridColumn11,
+            this.gridColumn20,
+            this.gridColumn26,
+            this.gridColumn28,
+            this.gridColumn29,
+            this.gridColumn49,
+            this.gridColumn8,
+            this.gridColumn50,
+            this.gridColumn51});
+            this.gvMx6.GridControl = this.gcMx6;
+            this.gvMx6.Name = "gvMx6";
+            this.gvMx6.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx6.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx6.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "gvMx1Guid";
+            this.gridColumn2.FieldName = "guid";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Width = 94;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.AppearanceCell.Options.UseFont = true;
+            this.gridColumn9.Caption = "宸ュ崟鍗曞彿";
+            this.gridColumn9.FieldName = "daa001";
+            this.gridColumn9.MinWidth = 50;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Tag = "query_a.dab001";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 0;
+            this.gridColumn9.Width = 94;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.AppearanceCell.Options.UseFont = true;
+            this.gridColumn11.Caption = "鏉愭枡缂栫爜";
+            this.gridColumn11.FieldName = "itemNo";
+            this.gridColumn11.MinWidth = 50;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Tag = "query_a.dab003";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 1;
+            this.gridColumn11.Width = 94;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.AppearanceCell.Options.UseFont = true;
+            this.gridColumn20.Caption = "鏉愭枡鍚嶇О";
+            this.gridColumn20.FieldName = "itemName";
+            this.gridColumn20.MinWidth = 50;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Tag = "query_a.dab004";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 2;
+            this.gridColumn20.Width = 94;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.AppearanceCell.Options.UseFont = true;
+            this.gridColumn26.Caption = "鏉愭枡瑙勬牸";
+            this.gridColumn26.FieldName = "itemModel";
+            this.gridColumn26.MinWidth = 50;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Tag = "query_a.dab005";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 3;
+            this.gridColumn26.Width = 94;
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.Caption = "鐗╂枡鏉$爜";
+            this.gridColumn28.FieldName = "itemBarcode";
+            this.gridColumn28.MinWidth = 25;
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 4;
+            this.gridColumn28.Width = 94;
+            // 
+            // gridColumn29
+            // 
+            this.gridColumn29.Caption = "鏉$爜鏁伴噺";
+            this.gridColumn29.FieldName = "quantity";
+            this.gridColumn29.MinWidth = 25;
+            this.gridColumn29.Name = "gridColumn29";
+            this.gridColumn29.Visible = true;
+            this.gridColumn29.VisibleIndex = 5;
+            this.gridColumn29.Width = 94;
+            // 
+            // gridColumn49
+            // 
+            this.gridColumn49.Caption = "澶囨枡璇︽儏";
+            this.gridColumn49.FieldName = "blDetail";
+            this.gridColumn49.MinWidth = 25;
+            this.gridColumn49.Name = "gridColumn49";
+            this.gridColumn49.Visible = true;
+            this.gridColumn49.VisibleIndex = 6;
+            this.gridColumn49.Width = 94;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "鏀舵枡璇︽儏";
+            this.gridColumn8.FieldName = "slDetail";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 7;
+            this.gridColumn8.Width = 94;
+            // 
+            // gridColumn50
+            // 
+            this.gridColumn50.Caption = "鎶曟枡璇︽儏";
+            this.gridColumn50.FieldName = "tlDetail";
+            this.gridColumn50.MinWidth = 25;
+            this.gridColumn50.Name = "gridColumn50";
+            this.gridColumn50.Visible = true;
+            this.gridColumn50.VisibleIndex = 8;
+            this.gridColumn50.Width = 94;
+            // 
+            // gridColumn51
+            // 
+            this.gridColumn51.Caption = "閫�鏂欒鎯�";
+            this.gridColumn51.FieldName = "tuiDetail";
+            this.gridColumn51.MinWidth = 25;
+            this.gridColumn51.Name = "gridColumn51";
+            this.gridColumn51.Visible = true;
+            this.gridColumn51.VisibleIndex = 9;
+            this.gridColumn51.Width = 94;
             // 
             // Frm_Womdaa
             // 
@@ -3189,6 +3449,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_dptNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
@@ -3214,6 +3475,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -3252,11 +3514,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptChongDa)).EndInit();
             this.xtraTabPage3.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
-            this.panMx98.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).EndInit();
+            this.splitMx98.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel2)).EndInit();
+            this.splitMx98.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).EndInit();
+            this.splitMx98.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layoutMx98)).EndInit();
             this.layoutMx98.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).EndInit();
@@ -3271,10 +3535,15 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
             this.xtraTabPage4.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
-            this.panMx100.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel1)).EndInit();
+            this.splitMx100.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx100.Panel2)).EndInit();
+            this.splitMx100.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitMx100)).EndInit();
+            this.splitMx100.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.layMx100)).EndInit();
             this.layMx100.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.txt_zQty100.Properties)).EndInit();
@@ -3288,7 +3557,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
             this.xtraTabPage5.ResumeLayout(false);
+            this.xtraTabPage6.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx6)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -3407,8 +3682,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2createBy;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx2createDate;
-        private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptChongDa;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
@@ -3431,7 +3704,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;
-        private System.Windows.Forms.Panel panMx98;
         private DevExpress.XtraLayout.LayoutControl layoutMx98;
         private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
         private UserControl.UcBtnPrint ucBtnPrint98;
@@ -3449,7 +3721,6 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage4;
-        private System.Windows.Forms.Panel panMx100;
         private DevExpress.XtraGrid.GridControl gcMx4;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx4;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
@@ -3514,5 +3785,25 @@
         private UserControl.UcBtnPrint ucBtnPrint101;
         private DevExpress.XtraEditors.CheckEdit txt_isQiTao;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem46;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx98;
+        private DevExpress.XtraEditors.SplitContainerControl splitMx100;
+        private DevExpress.XtraEditors.SimpleButton btnDesign;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem47;
+        private DevExpress.XtraEditors.TextEdit txt_daa018;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem48;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage6;
+        private DevExpress.XtraGrid.GridControl gcMx6;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn49;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn50;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn51;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3