From 3d46409edbd033d22cd0e781c36add3ef7f7f3a1 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 12 六月 2025 17:04:48 +0800
Subject: [PATCH] bug

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs |  684 ++++++++++++++++++++++++++++----------------------------
 1 files changed, 344 insertions(+), 340 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 435ff98..a360c01 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -236,16 +236,7 @@
             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.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();
@@ -260,17 +251,18 @@
             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.gcMx4 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn44 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn45 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn46 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.splitMx100 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layMx100 = new DevExpress.XtraDataLayout.DataLayoutControl();
             this.ucBtnPrint100 = new Gs.DevApp.UserControl.UcBtnPrint();
             this.btnIn = new DevExpress.XtraEditors.SimpleButton();
@@ -285,11 +277,19 @@
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem45 = 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();
+            this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn44 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn45 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn46 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
             this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl();
-            this.splitMx100 = new DevExpress.XtraEditors.SplitContainerControl();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -397,8 +397,12 @@
             ((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();
+            ((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();
@@ -413,9 +417,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();
+            ((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();
@@ -429,19 +439,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
             this.xtraTabPage5.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.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();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -1989,6 +1989,7 @@
             // 
             this.splitMx99.Panel2.Controls.Add(this.gcMx2);
             this.splitMx99.Panel2.Text = "Panel2";
+            this.splitMx99.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.Panel2;
             this.splitMx99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx99.Size = new System.Drawing.Size(1648, 481);
             this.splitMx99.SplitterPosition = 83;
@@ -2007,9 +2008,9 @@
             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(312, 530, 812, 500);
             this.layoutMx99.Root = this.layoutControlGroup1;
-            this.layoutMx99.Size = new System.Drawing.Size(1648, 83);
+            this.layoutMx99.Size = new System.Drawing.Size(0, 0);
             this.layoutMx99.TabIndex = 0;
             this.layoutMx99.Text = "layoutControl1";
             // 
@@ -2242,7 +2243,7 @@
             this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
             this.layoutControlItem26.Size = new System.Drawing.Size(321, 32);
-            this.layoutControlItem26.Text = "鎶ュ伐鎵撳嵃";
+            this.layoutControlItem26.Text = "鎵樻澘鎵撳嵃";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem26.TextVisible = false;
             // 
@@ -2311,7 +2312,7 @@
             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.Size = new System.Drawing.Size(1648, 481);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -2517,130 +2518,27 @@
             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, 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});
+            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;
+            this.splitMx98.Panel2.Controls.Add(this.gcMx3);
+            this.splitMx98.Panel2.Text = "Panel2";
+            this.splitMx98.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.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
             // 
@@ -2655,7 +2553,7 @@
             this.layoutMx98.Name = "layoutMx98";
             this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(96, 558, 812, 500);
             this.layoutMx98.Root = this.layoutControlGroup2;
-            this.layoutMx98.Size = new System.Drawing.Size(1648, 52);
+            this.layoutMx98.Size = new System.Drawing.Size(0, 0);
             this.layoutMx98.TabIndex = 0;
             this.layoutMx98.Text = "layoutControl1";
             // 
@@ -2812,6 +2710,131 @@
             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, 481);
+            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.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;
+            // 
             // xtraTabPage4
             // 
             this.xtraTabPage4.Controls.Add(this.splitMx100);
@@ -2819,130 +2842,27 @@
             this.xtraTabPage4.Size = new System.Drawing.Size(1648, 481);
             this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�";
             // 
-            // gcMx4
+            // splitMx100
             // 
-            this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
-            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, 417);
-            this.gcMx4.TabIndex = 2;
-            this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx4});
+            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";
             // 
-            // gvMx4
+            // splitMx100.Panel1
             // 
-            this.gvMx4.Appearance.HeaderPanel.Options.UseTextOptions = true;
-            this.gvMx4.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gvMx4.Appearance.Row.Options.UseFont = true;
-            this.gvMx4.ColumnPanelRowHeight = 50;
-            this.gvMx4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn39,
-            this.gridColumn40,
-            this.gridColumn41,
-            this.gridColumn44,
-            this.gridColumn45,
-            this.gridColumn46,
-            this.gridColumn47,
-            this.gridColumn48});
-            this.gvMx4.GridControl = this.gcMx4;
-            this.gvMx4.Name = "gvMx4";
-            this.gvMx4.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
-            this.gvMx4.OptionsFind.ShowSearchNavButtons = false;
-            this.gvMx4.OptionsView.ShowFooter = true;
-            this.gvMx4.OptionsView.ShowGroupPanel = false;
+            this.splitMx100.Panel1.Controls.Add(this.layMx100);
+            this.splitMx100.Panel1.Text = "Panel1";
             // 
-            // gridColumn39
+            // splitMx100.Panel2
             // 
-            this.gridColumn39.AppearanceCell.Options.UseFont = true;
-            this.gridColumn39.Caption = "guid ";
-            this.gridColumn39.FieldName = "guid";
-            this.gridColumn39.MinWidth = 50;
-            this.gridColumn39.Name = "gridColumn39";
-            this.gridColumn39.Tag = "query_a.guid";
-            this.gridColumn39.Width = 94;
-            // 
-            // gridColumn40
-            // 
-            this.gridColumn40.AppearanceCell.Options.UseFont = true;
-            this.gridColumn40.Caption = "宸ュ崟鍙�";
-            this.gridColumn40.FieldName = "daa001";
-            this.gridColumn40.MinWidth = 50;
-            this.gridColumn40.Name = "gridColumn40";
-            this.gridColumn40.Tag = "query_a.UNIT";
-            this.gridColumn40.Visible = true;
-            this.gridColumn40.VisibleIndex = 0;
-            this.gridColumn40.Width = 94;
-            // 
-            // gridColumn41
-            // 
-            this.gridColumn41.AppearanceCell.Options.UseFont = true;
-            this.gridColumn41.Caption = "鍚庣洊鐮�";
-            this.gridColumn41.FieldName = "itemBarcode";
-            this.gridColumn41.MinWidth = 50;
-            this.gridColumn41.Name = "gridColumn41";
-            this.gridColumn41.Tag = "query_a.ITEM_BARCODE";
-            this.gridColumn41.Visible = true;
-            this.gridColumn41.VisibleIndex = 1;
-            this.gridColumn41.Width = 94;
-            // 
-            // gridColumn44
-            // 
-            this.gridColumn44.AppearanceCell.Options.UseFont = true;
-            this.gridColumn44.Caption = "鏁伴噺 ";
-            this.gridColumn44.FieldName = "quantity";
-            this.gridColumn44.MinWidth = 50;
-            this.gridColumn44.Name = "gridColumn44";
-            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";
-            this.gridColumn44.Visible = true;
-            this.gridColumn44.VisibleIndex = 2;
-            this.gridColumn44.Width = 94;
-            // 
-            // gridColumn45
-            // 
-            this.gridColumn45.AppearanceCell.Options.UseFont = true;
-            this.gridColumn45.Caption = "鍒涘缓浜� ";
-            this.gridColumn45.FieldName = "createBy";
-            this.gridColumn45.MinWidth = 50;
-            this.gridColumn45.Name = "gridColumn45";
-            this.gridColumn45.Tag = "query_a.CREATE_BY";
-            this.gridColumn45.Visible = true;
-            this.gridColumn45.VisibleIndex = 3;
-            this.gridColumn45.Width = 94;
-            // 
-            // gridColumn46
-            // 
-            this.gridColumn46.AppearanceCell.Options.UseFont = true;
-            this.gridColumn46.Caption = "鍒涘缓鏃堕棿 ";
-            this.gridColumn46.FieldName = "createDate";
-            this.gridColumn46.MinWidth = 50;
-            this.gridColumn46.Name = "gridColumn46";
-            this.gridColumn46.Tag = "query_a.CREATE_DATE";
-            this.gridColumn46.Visible = true;
-            this.gridColumn46.VisibleIndex = 4;
-            this.gridColumn46.Width = 94;
-            // 
-            // gridColumn47
-            // 
-            this.gridColumn47.Caption = "宸茬粦鎵樻澘鐮�";
-            this.gridColumn47.FieldName = "aboutTbBarcode";
-            this.gridColumn47.MinWidth = 25;
-            this.gridColumn47.Name = "gridColumn47";
-            this.gridColumn47.Visible = true;
-            this.gridColumn47.VisibleIndex = 5;
-            this.gridColumn47.Width = 94;
-            // 
-            // gridColumn48
-            // 
-            this.gridColumn48.Caption = "宸茬粦杩芥函鐮�";
-            this.gridColumn48.FieldName = "aboutTracBarcode";
-            this.gridColumn48.MinWidth = 25;
-            this.gridColumn48.Name = "gridColumn48";
-            this.gridColumn48.Visible = true;
-            this.gridColumn48.VisibleIndex = 6;
-            this.gridColumn48.Width = 94;
+            this.splitMx100.Panel2.Controls.Add(this.gcMx4);
+            this.splitMx100.Panel2.Text = "Panel2";
+            this.splitMx100.PanelVisibility = DevExpress.XtraEditors.SplitPanelVisibility.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
             // 
@@ -2957,7 +2877,7 @@
             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, 52);
+            this.layMx100.Size = new System.Drawing.Size(0, 0);
             this.layMx100.TabIndex = 2;
             this.layMx100.Text = "dataLayoutControl1";
             // 
@@ -3117,10 +3037,136 @@
             this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
             this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
             // 
+            // gcMx4
+            // 
+            this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
+            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, 481);
+            this.gcMx4.TabIndex = 2;
+            this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx4});
+            // 
+            // gvMx4
+            // 
+            this.gvMx4.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx4.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx4.Appearance.Row.Options.UseFont = true;
+            this.gvMx4.ColumnPanelRowHeight = 50;
+            this.gvMx4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn39,
+            this.gridColumn40,
+            this.gridColumn41,
+            this.gridColumn44,
+            this.gridColumn45,
+            this.gridColumn46,
+            this.gridColumn47,
+            this.gridColumn48});
+            this.gvMx4.GridControl = this.gcMx4;
+            this.gvMx4.Name = "gvMx4";
+            this.gvMx4.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx4.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx4.OptionsView.ShowFooter = true;
+            this.gvMx4.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn39
+            // 
+            this.gridColumn39.AppearanceCell.Options.UseFont = true;
+            this.gridColumn39.Caption = "guid ";
+            this.gridColumn39.FieldName = "guid";
+            this.gridColumn39.MinWidth = 50;
+            this.gridColumn39.Name = "gridColumn39";
+            this.gridColumn39.Tag = "query_a.guid";
+            this.gridColumn39.Width = 94;
+            // 
+            // gridColumn40
+            // 
+            this.gridColumn40.AppearanceCell.Options.UseFont = true;
+            this.gridColumn40.Caption = "宸ュ崟鍙�";
+            this.gridColumn40.FieldName = "daa001";
+            this.gridColumn40.MinWidth = 50;
+            this.gridColumn40.Name = "gridColumn40";
+            this.gridColumn40.Tag = "query_a.UNIT";
+            this.gridColumn40.Visible = true;
+            this.gridColumn40.VisibleIndex = 0;
+            this.gridColumn40.Width = 94;
+            // 
+            // gridColumn41
+            // 
+            this.gridColumn41.AppearanceCell.Options.UseFont = true;
+            this.gridColumn41.Caption = "鍚庣洊鐮�";
+            this.gridColumn41.FieldName = "itemBarcode";
+            this.gridColumn41.MinWidth = 50;
+            this.gridColumn41.Name = "gridColumn41";
+            this.gridColumn41.Tag = "query_a.ITEM_BARCODE";
+            this.gridColumn41.Visible = true;
+            this.gridColumn41.VisibleIndex = 1;
+            this.gridColumn41.Width = 94;
+            // 
+            // gridColumn44
+            // 
+            this.gridColumn44.AppearanceCell.Options.UseFont = true;
+            this.gridColumn44.Caption = "鏁伴噺 ";
+            this.gridColumn44.FieldName = "quantity";
+            this.gridColumn44.MinWidth = 50;
+            this.gridColumn44.Name = "gridColumn44";
+            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";
+            this.gridColumn44.Visible = true;
+            this.gridColumn44.VisibleIndex = 2;
+            this.gridColumn44.Width = 94;
+            // 
+            // gridColumn45
+            // 
+            this.gridColumn45.AppearanceCell.Options.UseFont = true;
+            this.gridColumn45.Caption = "鍒涘缓浜� ";
+            this.gridColumn45.FieldName = "createBy";
+            this.gridColumn45.MinWidth = 50;
+            this.gridColumn45.Name = "gridColumn45";
+            this.gridColumn45.Tag = "query_a.CREATE_BY";
+            this.gridColumn45.Visible = true;
+            this.gridColumn45.VisibleIndex = 3;
+            this.gridColumn45.Width = 94;
+            // 
+            // gridColumn46
+            // 
+            this.gridColumn46.AppearanceCell.Options.UseFont = true;
+            this.gridColumn46.Caption = "鍒涘缓鏃堕棿 ";
+            this.gridColumn46.FieldName = "createDate";
+            this.gridColumn46.MinWidth = 50;
+            this.gridColumn46.Name = "gridColumn46";
+            this.gridColumn46.Tag = "query_a.CREATE_DATE";
+            this.gridColumn46.Visible = true;
+            this.gridColumn46.VisibleIndex = 4;
+            this.gridColumn46.Width = 94;
+            // 
+            // gridColumn47
+            // 
+            this.gridColumn47.Caption = "宸茬粦鎵樻澘鐮�";
+            this.gridColumn47.FieldName = "aboutTbBarcode";
+            this.gridColumn47.MinWidth = 25;
+            this.gridColumn47.Name = "gridColumn47";
+            this.gridColumn47.Visible = true;
+            this.gridColumn47.VisibleIndex = 5;
+            this.gridColumn47.Width = 94;
+            // 
+            // gridColumn48
+            // 
+            this.gridColumn48.Caption = "宸茬粦杩芥函鐮�";
+            this.gridColumn48.FieldName = "aboutTracBarcode";
+            this.gridColumn48.MinWidth = 25;
+            this.gridColumn48.Name = "gridColumn48";
+            this.gridColumn48.Visible = true;
+            this.gridColumn48.VisibleIndex = 6;
+            this.gridColumn48.Width = 94;
+            // 
             // 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 = "鐗╂枡榻愬鏍囪瘑鍗�";
             // 
@@ -3133,48 +3179,6 @@
             this.ucBtnPrint101.rptParameter = null;
             this.ucBtnPrint101.Size = new System.Drawing.Size(232, 32);
             this.ucBtnPrint101.TabIndex = 0;
-            // 
-            // splitMx98
-            // 
-            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";
-            // 
-            // splitMx98.splitMx98_Panel1
-            // 
-            this.splitMx98.Panel1.Controls.Add(this.layoutMx98);
-            this.splitMx98.Panel1.Text = "Panel1";
-            // 
-            // splitMx98.splitMx98_Panel2
-            // 
-            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;
-            // 
-            // 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.splitMx100_Panel1
-            // 
-            this.splitMx100.Panel1.Controls.Add(this.layMx100);
-            this.splitMx100.Panel1.Text = "Panel1";
-            // 
-            // splitMx100.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;
             // 
             // Frm_Womdaa
             // 
@@ -3292,8 +3296,12 @@
             ((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();
+            ((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();
@@ -3308,9 +3316,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();
+            ((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();
@@ -3324,19 +3338,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
             this.xtraTabPage5.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.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);
             this.ResumeLayout(false);
 
         }

--
Gitblit v1.9.3