From 9c38dbf93ea5b7dea6b34b03cb3143812b20147d Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期三, 02 七月 2025 23:05:41 +0800
Subject: [PATCH] BUG

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs |  475 ++++++++++++++++++++---------------------------------------
 1 files changed, 161 insertions(+), 314 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
index 2fcf88b..ff324f8 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_WomFanGong.Designer.cs
@@ -36,12 +36,6 @@
             DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -62,6 +56,7 @@
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.ucBtnPrint98 = new Gs.DevApp.UserControl.UcBtnPrint();
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_releaseNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_guid = new DevExpress.XtraEditors.TextEdit();
@@ -74,6 +69,7 @@
             this.txt_itemModel = new DevExpress.XtraEditors.TextEdit();
             this.txt_erpCheckBy = new DevExpress.XtraEditors.TextEdit();
             this.btnZsm = new DevExpress.XtraEditors.SimpleButton();
+            this.txt_aboutGuid = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -87,6 +83,7 @@
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_daa00111111 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -99,32 +96,23 @@
             this.gvMx1pricingUnit = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1purchaseQty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl();
-            this.layoutMx100 = new DevExpress.XtraLayout.LayoutControl();
-            this.ucBtnPrint98 = new Gs.DevApp.UserControl.UcBtnPrint();
-            this.txt_zQty98 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_yQty98 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_kQty98 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_iCount_98 = new DevExpress.XtraEditors.TextEdit();
-            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem43 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem44 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem45 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
             this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -154,6 +142,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -167,32 +156,16 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa00111111)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
             this.tabMxPage2.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.layoutMx100)).BeginInit();
-            this.layoutMx100.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -449,11 +422,12 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1363, 570);
-            this.splitMx1.SplitterPosition = 123;
+            this.splitMx1.SplitterPosition = 122;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
+            this.layoutMx1.Controls.Add(this.ucBtnPrint98);
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_releaseNo);
             this.layoutMx1.Controls.Add(this.txt_guid);
@@ -466,17 +440,30 @@
             this.layoutMx1.Controls.Add(this.txt_itemModel);
             this.layoutMx1.Controls.Add(this.txt_erpCheckBy);
             this.layoutMx1.Controls.Add(this.btnZsm);
+            this.layoutMx1.Controls.Add(this.txt_aboutGuid);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem3,
-            this.layoutControlItem4});
+            this.layoutControlItem4,
+            this.txt_daa00111111});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(656, 429, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1363, 123);
+            this.layoutMx1.Size = new System.Drawing.Size(1363, 122);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
+            // 
+            // ucBtnPrint98
+            // 
+            this.ucBtnPrint98.allClickKey = null;
+            this.ucBtnPrint98.guidKey = null;
+            this.ucBtnPrint98.Location = new System.Drawing.Point(683, 80);
+            this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
+            this.ucBtnPrint98.Name = "ucBtnPrint98";
+            this.ucBtnPrint98.rptParameter = null;
+            this.ucBtnPrint98.Size = new System.Drawing.Size(332, 30);
+            this.ucBtnPrint98.TabIndex = 9;
             // 
             // lbGuid
             // 
@@ -577,6 +564,14 @@
             this.btnZsm.TabIndex = 242;
             this.btnZsm.Text = "鐢熸垚杩芥函鐮�";
             // 
+            // txt_aboutGuid
+            // 
+            this.txt_aboutGuid.Location = new System.Drawing.Point(770, 80);
+            this.txt_aboutGuid.Name = "txt_aboutGuid";
+            this.txt_aboutGuid.Size = new System.Drawing.Size(245, 24);
+            this.txt_aboutGuid.StyleController = this.layoutMx1;
+            this.txt_aboutGuid.TabIndex = 243;
+            // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.lbGuid;
@@ -612,7 +607,8 @@
             this.layoutControlItem7,
             this.layoutControlItem11,
             this.layoutControlItem14,
-            this.layoutControlItem8});
+            this.layoutControlItem8,
+            this.layoutControlItem13});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -638,7 +634,7 @@
             rowDefinition1,
             rowDefinition2,
             rowDefinition3});
-            this.Root.Size = new System.Drawing.Size(1363, 123);
+            this.Root.Size = new System.Drawing.Size(1363, 122);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -729,7 +725,7 @@
             this.layoutControlItem14.Location = new System.Drawing.Point(0, 68);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(335, 35);
+            this.layoutControlItem14.Size = new System.Drawing.Size(335, 34);
             this.layoutControlItem14.Text = "宸茶繑宸ユ暟閲�";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -742,11 +738,22 @@
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(336, 35);
+            this.layoutControlItem8.Size = new System.Drawing.Size(336, 34);
             this.layoutControlItem8.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem8.Text = "鐢熸垚杩芥函鐮�";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem8.TextVisible = false;
+            // 
+            // txt_daa00111111
+            // 
+            this.txt_daa00111111.Control = this.txt_aboutGuid;
+            this.txt_daa00111111.Location = new System.Drawing.Point(671, 68);
+            this.txt_daa00111111.Name = "txt_daa00111111";
+            this.txt_daa00111111.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.txt_daa00111111.OptionsTableLayoutItem.RowIndex = 2;
+            this.txt_daa00111111.Size = new System.Drawing.Size(336, 34);
+            this.txt_daa00111111.Text = "宸ュ崟Guid";
+            this.txt_daa00111111.TextSize = new System.Drawing.Size(75, 18);
             // 
             // tabMx
             // 
@@ -754,7 +761,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1363, 435);
+            this.tabMx.Size = new System.Drawing.Size(1363, 436);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -764,7 +771,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1361, 403);
+            this.tabMxPage1.Size = new System.Drawing.Size(1361, 404);
             this.tabMxPage1.Text = "鍗℃澘鏄庣粏";
             // 
             // gcMx1
@@ -773,7 +780,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1361, 403);
+            this.gcMx1.Size = new System.Drawing.Size(1361, 404);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -871,185 +878,10 @@
             // 
             // tabMxPage2
             // 
-            this.tabMxPage2.Controls.Add(this.splitMx98);
+            this.tabMxPage2.Controls.Add(this.gcMx2);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1361, 403);
+            this.tabMxPage2.Size = new System.Drawing.Size(1361, 415);
             this.tabMxPage2.Text = "杩芥函鐮佹槑缁�";
-            // 
-            // 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.Panel1
-            // 
-            this.splitMx98.Panel1.Controls.Add(this.layoutMx100);
-            this.splitMx98.Panel1.Text = "Panel1";
-            // 
-            // splitMx98.Panel2
-            // 
-            this.splitMx98.Panel2.Controls.Add(this.gcMx2);
-            this.splitMx98.Panel2.Text = "Panel2";
-            this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx98.Size = new System.Drawing.Size(1361, 403);
-            this.splitMx98.SplitterPosition = 56;
-            this.splitMx98.TabIndex = 2;
-            // 
-            // layoutMx100
-            // 
-            this.layoutMx100.Controls.Add(this.ucBtnPrint98);
-            this.layoutMx100.Controls.Add(this.txt_zQty98);
-            this.layoutMx100.Controls.Add(this.txt_yQty98);
-            this.layoutMx100.Controls.Add(this.txt_kQty98);
-            this.layoutMx100.Controls.Add(this.txt_iCount_98);
-            this.layoutMx100.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutMx100.Location = new System.Drawing.Point(0, 0);
-            this.layoutMx100.Name = "layoutMx100";
-            this.layoutMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(454, 530, 812, 500);
-            this.layoutMx100.Root = this.layoutControlGroup1;
-            this.layoutMx100.Size = new System.Drawing.Size(1361, 56);
-            this.layoutMx100.TabIndex = 0;
-            this.layoutMx100.Text = "layoutControl1";
-            // 
-            // ucBtnPrint98
-            // 
-            this.ucBtnPrint98.allClickKey = null;
-            this.ucBtnPrint98.guidKey = null;
-            this.ucBtnPrint98.Location = new System.Drawing.Point(1084, 12);
-            this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
-            this.ucBtnPrint98.Name = "ucBtnPrint98";
-            this.ucBtnPrint98.rptParameter = null;
-            this.ucBtnPrint98.Size = new System.Drawing.Size(265, 32);
-            this.ucBtnPrint98.TabIndex = 9;
-            // 
-            // txt_zQty98
-            // 
-            this.txt_zQty98.Location = new System.Drawing.Point(114, 12);
-            this.txt_zQty98.Name = "txt_zQty98";
-            this.txt_zQty98.Properties.ReadOnly = true;
-            this.txt_zQty98.Size = new System.Drawing.Size(162, 24);
-            this.txt_zQty98.StyleController = this.layoutMx100;
-            this.txt_zQty98.TabIndex = 4;
-            // 
-            // txt_yQty98
-            // 
-            this.txt_yQty98.Location = new System.Drawing.Point(382, 12);
-            this.txt_yQty98.Name = "txt_yQty98";
-            this.txt_yQty98.Properties.ReadOnly = true;
-            this.txt_yQty98.Size = new System.Drawing.Size(162, 24);
-            this.txt_yQty98.StyleController = this.layoutMx100;
-            this.txt_yQty98.TabIndex = 5;
-            // 
-            // txt_kQty98
-            // 
-            this.txt_kQty98.Location = new System.Drawing.Point(650, 12);
-            this.txt_kQty98.Name = "txt_kQty98";
-            this.txt_kQty98.Properties.ReadOnly = true;
-            this.txt_kQty98.Size = new System.Drawing.Size(162, 24);
-            this.txt_kQty98.StyleController = this.layoutMx100;
-            this.txt_kQty98.TabIndex = 6;
-            // 
-            // txt_iCount_98
-            // 
-            this.txt_iCount_98.Location = new System.Drawing.Point(918, 12);
-            this.txt_iCount_98.Name = "txt_iCount_98";
-            this.txt_iCount_98.Size = new System.Drawing.Size(162, 24);
-            this.txt_iCount_98.StyleController = this.layoutMx100;
-            this.txt_iCount_98.TabIndex = 7;
-            // 
-            // layoutControlGroup1
-            // 
-            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.layoutControlGroup1.GroupBordersVisible = false;
-            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem42,
-            this.layoutControlItem43,
-            this.layoutControlItem44,
-            this.layoutControlItem45,
-            this.layoutControlItem13});
-            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
-            this.layoutControlGroup1.Name = "Root";
-            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition5.Width = 100D;
-            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition6.Width = 100D;
-            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition7.Width = 100D;
-            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition8.Width = 100D;
-            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition9.Width = 100D;
-            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6,
-            columnDefinition7,
-            columnDefinition8,
-            columnDefinition9});
-            rowDefinition4.Height = 100D;
-            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition4});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1361, 56);
-            this.layoutControlGroup1.TextVisible = false;
-            // 
-            // layoutControlItem42
-            // 
-            this.layoutControlItem42.Control = this.txt_zQty98;
-            this.layoutControlItem42.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem42.CustomizationFormText = "宸ュ崟鎬婚噺";
-            this.layoutControlItem42.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem42.Name = "layoutControlItem42";
-            this.layoutControlItem42.Size = new System.Drawing.Size(268, 36);
-            this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
-            this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem43
-            // 
-            this.layoutControlItem43.Control = this.txt_yQty98;
-            this.layoutControlItem43.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem43.CustomizationFormText = "宸叉墦鍗版暟";
-            this.layoutControlItem43.Location = new System.Drawing.Point(268, 0);
-            this.layoutControlItem43.Name = "layoutControlItem43";
-            this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem43.Size = new System.Drawing.Size(268, 36);
-            this.layoutControlItem43.Text = "宸叉墦鍗版暟";
-            this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem44
-            // 
-            this.layoutControlItem44.Control = this.txt_kQty98;
-            this.layoutControlItem44.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟";
-            this.layoutControlItem44.Location = new System.Drawing.Point(536, 0);
-            this.layoutControlItem44.Name = "layoutControlItem44";
-            this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem44.Size = new System.Drawing.Size(268, 36);
-            this.layoutControlItem44.Text = "鍙墦鍗版暟瀛�";
-            this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem45
-            // 
-            this.layoutControlItem45.Control = this.txt_iCount_98;
-            this.layoutControlItem45.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
-            this.layoutControlItem45.CustomizationFormText = "鏈鎵撳嵃寮犳暟";
-            this.layoutControlItem45.Location = new System.Drawing.Point(804, 0);
-            this.layoutControlItem45.Name = "layoutControlItem45";
-            this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem45.Size = new System.Drawing.Size(268, 36);
-            this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
-            this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.ucBtnPrint98;
-            this.layoutControlItem13.Location = new System.Drawing.Point(1072, 0);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 4;
-            this.layoutControlItem13.Size = new System.Drawing.Size(269, 36);
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem13.TextVisible = false;
             // 
             // gcMx2
             // 
@@ -1057,8 +889,8 @@
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1361, 335);
-            this.gcMx2.TabIndex = 1;
+            this.gcMx2.Size = new System.Drawing.Size(1361, 415);
+            this.gcMx2.TabIndex = 2;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
             // 
@@ -1068,31 +900,33 @@
             this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gvMx2.ColumnPanelRowHeight = 60;
             this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn13,
+            this.gridColumn4,
             this.gridColumn14,
             this.gridColumn15,
             this.gridColumn16,
             this.gridColumn17,
             this.gridColumn22,
             this.gridColumn47,
-            this.gridColumn48,
             this.gridColumn12,
-            this.gridColumn18});
+            this.gridColumn5,
+            this.gridColumn6,
+            this.gridColumn7,
+            this.gridColumn8,
+            this.gridColumn9});
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
             this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
             this.gvMx2.OptionsView.ShowGroupPanel = false;
             // 
-            // gridColumn13
+            // gridColumn4
             // 
-            this.gridColumn13.Caption = "ERP涓ID";
-            this.gridColumn13.FieldName = "ebelnK3id";
-            this.gridColumn13.MinWidth = 25;
-            this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 0;
-            this.gridColumn13.Width = 46;
+            this.gridColumn4.Caption = "鏂扮殑杩芥函鐮�";
+            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.Name = "gridColumn4";
+            this.gridColumn4.Visible = true;
+            this.gridColumn4.VisibleIndex = 0;
+            this.gridColumn4.Width = 146;
             // 
             // gridColumn14
             // 
@@ -1111,8 +945,8 @@
             this.gridColumn15.MinWidth = 25;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 2;
-            this.gridColumn15.Width = 46;
+            this.gridColumn15.VisibleIndex = 6;
+            this.gridColumn15.Width = 69;
             // 
             // gridColumn16
             // 
@@ -1121,8 +955,8 @@
             this.gridColumn16.MinWidth = 25;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 3;
-            this.gridColumn16.Width = 55;
+            this.gridColumn16.VisibleIndex = 7;
+            this.gridColumn16.Width = 82;
             // 
             // gridColumn17
             // 
@@ -1133,64 +967,98 @@
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Tag = "query_a.PRICING_QTY";
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 4;
-            this.gridColumn17.Width = 25;
+            this.gridColumn17.VisibleIndex = 8;
+            this.gridColumn17.Width = 56;
             // 
             // gridColumn22
             // 
             this.gridColumn22.AppearanceCell.Options.UseFont = true;
-            this.gridColumn22.Caption = "鍒拌揣鏁伴噺";
+            this.gridColumn22.Caption = "鏁伴噺";
             this.gridColumn22.FieldName = "quantity";
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Tag = "query_a.PURCHASE_QTY";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 5;
-            this.gridColumn22.Width = 25;
+            this.gridColumn22.VisibleIndex = 3;
+            this.gridColumn22.Width = 37;
             // 
             // gridColumn47
             // 
-            this.gridColumn47.Caption = "鏀舵枡浜�";
-            this.gridColumn47.FieldName = "createBy";
+            this.gridColumn47.Caption = "鏃х殑杩芥函鐮�";
+            this.gridColumn47.FieldName = "barCode";
             this.gridColumn47.MinWidth = 25;
             this.gridColumn47.Name = "gridColumn47";
             this.gridColumn47.Visible = true;
-            this.gridColumn47.VisibleIndex = 7;
-            this.gridColumn47.Width = 43;
-            // 
-            // gridColumn48
-            // 
-            this.gridColumn48.Caption = "鏀舵枡鏃堕棿";
-            this.gridColumn48.FieldName = "createDate";
-            this.gridColumn48.MinWidth = 25;
-            this.gridColumn48.Name = "gridColumn48";
-            this.gridColumn48.Visible = true;
-            this.gridColumn48.VisibleIndex = 8;
-            this.gridColumn48.Width = 94;
+            this.gridColumn47.VisibleIndex = 1;
+            this.gridColumn47.Width = 67;
             // 
             // gridColumn12
             // 
-            this.gridColumn12.Caption = "鍒拌揣鍗曞彿";
+            this.gridColumn12.Caption = "缁戝畾鏃堕棿";
             this.gridColumn12.FieldName = "dhdh";
             this.gridColumn12.MinWidth = 25;
             this.gridColumn12.Name = "gridColumn12";
             this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 1;
-            this.gridColumn12.Width = 94;
+            this.gridColumn12.VisibleIndex = 5;
+            this.gridColumn12.Width = 146;
             // 
-            // gridColumn18
+            // gridColumn5
             // 
-            this.gridColumn18.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
-            this.gridColumn18.AppearanceCell.Options.UseForeColor = true;
-            this.gridColumn18.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
-            this.gridColumn18.AppearanceHeader.Options.UseForeColor = true;
-            this.gridColumn18.Caption = "瀹炴敹鏁伴噺";
-            this.gridColumn18.FieldName = "sjQuantity";
-            this.gridColumn18.MinWidth = 25;
-            this.gridColumn18.Name = "gridColumn18";
-            this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 6;
-            this.gridColumn18.Width = 94;
+            this.gridColumn5.Caption = "缁戝畾浜�";
+            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.Name = "gridColumn5";
+            this.gridColumn5.Visible = true;
+            this.gridColumn5.VisibleIndex = 4;
+            this.gridColumn5.Width = 146;
+            // 
+            // gridColumn6
+            // 
+            this.gridColumn6.Caption = "鎵樻澘鐮�";
+            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Visible = true;
+            this.gridColumn6.VisibleIndex = 2;
+            this.gridColumn6.Width = 142;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "鐢熶骇宸ュ崟";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 9;
+            this.gridColumn7.Width = 142;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "绾垮埆";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 10;
+            this.gridColumn8.Width = 156;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.Caption = "鐘舵��";
+            this.gridColumn9.FieldName = "barCodeStatus";
+            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 11;
+            this.gridColumn9.Width = 94;
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.ucBtnPrint98;
+            this.layoutControlItem13.Location = new System.Drawing.Point(671, 68);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem13.Size = new System.Drawing.Size(336, 34);
+            this.layoutControlItem13.Text = "纭畾鎵撳嵃";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem13.TextVisible = false;
             // 
             // Frm_WomFanGong
             // 
@@ -1200,7 +1068,7 @@
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_WomFanGong";
-            this.Text = "閲囪喘璁㈠崟";
+            this.Text = "杩斿伐杩芥函鐮�";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
             this.xtraTabControl1.ResumeLayout(false);
             this.xtraTabPage1.ResumeLayout(false);
@@ -1230,6 +1098,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_mrmodeTxt.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_erpCheckBy.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_aboutGuid.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -1243,32 +1112,16 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa00111111)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
             this.tabMxPage2.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.layoutMx100)).EndInit();
-            this.layoutMx100.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_yQty98.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem42)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem43)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem44)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1328,33 +1181,27 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraEditors.TextEdit txt_erpCheckBy;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraEditors.SimpleButton btnZsm;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private UserControl.UcBtnPrint ucBtnPrint98;
+        private DevExpress.XtraEditors.TextEdit txt_aboutGuid;
+        private DevExpress.XtraLayout.LayoutControlItem txt_daa00111111;
         private DevExpress.XtraTab.XtraTabPage tabMxPage2;
         private DevExpress.XtraGrid.GridControl gcMx2;
         private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn48;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
-        private DevExpress.XtraEditors.SimpleButton btnZsm;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraEditors.SplitContainerControl splitMx98;
-        private DevExpress.XtraLayout.LayoutControl layoutMx100;
-        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
-        private DevExpress.XtraEditors.TextEdit txt_zQty98;
-        private DevExpress.XtraEditors.TextEdit txt_yQty98;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem42;
-        private DevExpress.XtraEditors.TextEdit txt_kQty98;
-        private DevExpress.XtraEditors.TextEdit txt_iCount_98;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem43;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem44;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem45;
-        private UserControl.UcBtnPrint ucBtnPrint98;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3