From 93ec2955713f40a50348b1990bbaeeee837f5378 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 12 四月 2025 09:09:40 +0800
Subject: [PATCH] 工单

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs |  259 +++++++++++++++++++++++++++++----------------------
 1 files changed, 146 insertions(+), 113 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index cb0399c..acccbab 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -57,6 +57,7 @@
             DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -244,12 +245,14 @@
             this.txt_kQty98 = new DevExpress.XtraEditors.TextEdit();
             this.txt_printRemark98 = new DevExpress.XtraEditors.TextEdit();
             this.txt_iCount_98 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_zQty98 = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
             this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx4 = new DevExpress.XtraGrid.GridControl();
             this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -367,12 +370,14 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
             this.xtraTabPage4.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
@@ -2212,7 +2217,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(174, 443, 812, 500);
+            this.layoutMx99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(256, 530, 812, 500);
             this.layoutMx99.Root = this.layoutControlGroup1;
             this.layoutMx99.Size = new System.Drawing.Size(1265, 82);
             this.layoutMx99.TabIndex = 0;
@@ -2220,7 +2225,7 @@
             // 
             // radOut
             // 
-            this.radOut.Location = new System.Drawing.Point(813, 10);
+            this.radOut.Location = new System.Drawing.Point(853, 10);
             this.radOut.Margin = new System.Windows.Forms.Padding(0);
             this.radOut.Name = "radOut";
             this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2228,46 +2233,46 @@
             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(348, 28);
+            this.radOut.Size = new System.Drawing.Size(248, 31);
             this.radOut.StyleController = this.layoutMx99;
             this.radOut.TabIndex = 473;
             // 
             // ucBtnPrint1
             // 
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(812, 41);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(851, 41);
             this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint1.Name = "ucBtnPrint1";
             this.ucBtnPrint1.rptParameter = null;
-            this.ucBtnPrint1.Size = new System.Drawing.Size(267, 31);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(278, 31);
             this.ucBtnPrint1.TabIndex = 464;
             // 
             // txt_iCount_1
             // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(633, 43);
+            this.txt_iCount_1.Location = new System.Drawing.Point(659, 43);
             this.txt_iCount_1.Name = "txt_iCount_1";
             this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(176, 24);
+            this.txt_iCount_1.Size = new System.Drawing.Size(189, 24);
             this.txt_iCount_1.StyleController = this.layoutMx99;
             this.txt_iCount_1.TabIndex = 332;
             this.txt_iCount_1.Tag = "readOnly-1";
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(366, 43);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(379, 43);
             this.txt_psnQty_1.Name = "txt_psnQty_1";
             this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
-            this.txt_psnQty_1.Size = new System.Drawing.Size(176, 24);
+            this.txt_psnQty_1.Size = new System.Drawing.Size(189, 24);
             this.txt_psnQty_1.StyleController = this.layoutMx99;
             this.txt_psnQty_1.TabIndex = 330;
             this.txt_psnQty_1.Tag = "readOnly-1";
             // 
             // txt_printRemark
             // 
-            this.txt_printRemark.Location = new System.Drawing.Point(633, 12);
+            this.txt_printRemark.Location = new System.Drawing.Point(659, 12);
             this.txt_printRemark.Name = "txt_printRemark";
             this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_printRemark.Size = new System.Drawing.Size(176, 24);
+            this.txt_printRemark.Size = new System.Drawing.Size(189, 24);
             this.txt_printRemark.StyleController = this.layoutMx99;
             this.txt_printRemark.TabIndex = 334;
             this.txt_printRemark.Tag = "readOnly-1";
@@ -2275,11 +2280,11 @@
             // txt_kQty
             // 
             this.txt_kQty.EditValue = "";
-            this.txt_kQty.Location = new System.Drawing.Point(366, 12);
+            this.txt_kQty.Location = new System.Drawing.Point(379, 12);
             this.txt_kQty.Name = "txt_kQty";
             this.txt_kQty.Properties.Appearance.Options.UseFont = true;
             this.txt_kQty.Properties.ReadOnly = true;
-            this.txt_kQty.Size = new System.Drawing.Size(176, 24);
+            this.txt_kQty.Size = new System.Drawing.Size(189, 24);
             this.txt_kQty.StyleController = this.layoutMx99;
             this.txt_kQty.TabIndex = 472;
             this.txt_kQty.Tag = "readonly";
@@ -2290,7 +2295,7 @@
             this.txt_yQty.Name = "txt_yQty";
             this.txt_yQty.Properties.Appearance.Options.UseFont = true;
             this.txt_yQty.Properties.ReadOnly = true;
-            this.txt_yQty.Size = new System.Drawing.Size(176, 24);
+            this.txt_yQty.Size = new System.Drawing.Size(189, 24);
             this.txt_yQty.StyleController = this.layoutMx99;
             this.txt_yQty.TabIndex = 470;
             this.txt_yQty.Tag = "readonly";
@@ -2300,7 +2305,7 @@
             this.txt_zQty.Location = new System.Drawing.Point(99, 12);
             this.txt_zQty.Name = "txt_zQty";
             this.txt_zQty.Properties.ReadOnly = true;
-            this.txt_zQty.Size = new System.Drawing.Size(176, 24);
+            this.txt_zQty.Size = new System.Drawing.Size(189, 24);
             this.txt_zQty.StyleController = this.layoutMx99;
             this.txt_zQty.TabIndex = 474;
             // 
@@ -2328,7 +2333,7 @@
             columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
             columnDefinition8.Width = 100D;
             columnDefinition9.SizeType = System.Windows.Forms.SizeType.AutoSize;
-            columnDefinition9.Width = 175D;
+            columnDefinition9.Width = 125D;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
             columnDefinition5,
             columnDefinition6,
@@ -2350,10 +2355,10 @@
             this.layoutControlItem23.AppearanceItemCaption.Options.UseTextOptions = true;
             this.layoutControlItem23.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem23.Control = this.txt_kQty;
-            this.layoutControlItem23.Location = new System.Drawing.Point(267, 0);
+            this.layoutControlItem23.Location = new System.Drawing.Point(280, 0);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem23.Size = new System.Drawing.Size(267, 31);
+            this.layoutControlItem23.Size = new System.Drawing.Size(280, 31);
             this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
             this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -2362,10 +2367,10 @@
             this.layoutControlItem21.AppearanceItemCaption.Options.UseTextOptions = true;
             this.layoutControlItem21.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem21.Control = this.txt_printRemark;
-            this.layoutControlItem21.Location = new System.Drawing.Point(534, 0);
+            this.layoutControlItem21.Location = new System.Drawing.Point(560, 0);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem21.Size = new System.Drawing.Size(267, 31);
+            this.layoutControlItem21.Size = new System.Drawing.Size(280, 31);
             this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
             this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -2375,11 +2380,11 @@
             this.layoutControlItem24.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem24.Control = this.txt_psnQty_1;
             this.layoutControlItem24.CustomizationFormText = "鍐呭寘瑁呮暟閲�";
-            this.layoutControlItem24.Location = new System.Drawing.Point(267, 31);
+            this.layoutControlItem24.Location = new System.Drawing.Point(280, 31);
             this.layoutControlItem24.Name = "layoutControlItem24";
             this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem24.Size = new System.Drawing.Size(267, 31);
+            this.layoutControlItem24.Size = new System.Drawing.Size(280, 31);
             this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
             this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -2388,25 +2393,25 @@
             this.layoutControlItem25.AppearanceItemCaption.Options.UseTextOptions = true;
             this.layoutControlItem25.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem25.Control = this.txt_iCount_1;
-            this.layoutControlItem25.Location = new System.Drawing.Point(534, 31);
+            this.layoutControlItem25.Location = new System.Drawing.Point(560, 31);
             this.layoutControlItem25.Name = "layoutControlItem25";
             this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem25.Size = new System.Drawing.Size(267, 31);
+            this.layoutControlItem25.Size = new System.Drawing.Size(280, 31);
             this.layoutControlItem25.Text = "鎵撳嵃寮犳暟";
             this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem35
             // 
             this.layoutControlItem35.Control = this.radOut;
-            this.layoutControlItem35.Location = new System.Drawing.Point(801, 0);
-            this.layoutControlItem35.MaxSize = new System.Drawing.Size(350, 28);
-            this.layoutControlItem35.MinSize = new System.Drawing.Size(300, 20);
+            this.layoutControlItem35.Location = new System.Drawing.Point(840, 0);
+            this.layoutControlItem35.MaxSize = new System.Drawing.Size(251, 0);
+            this.layoutControlItem35.MinSize = new System.Drawing.Size(221, 20);
             this.layoutControlItem35.Name = "layoutControlItem35";
             this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem35.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 0, 0, 0);
-            this.layoutControlItem35.Size = new System.Drawing.Size(444, 31);
+            this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
+            this.layoutControlItem35.Size = new System.Drawing.Size(405, 31);
             this.layoutControlItem35.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem35.Text = "鑷姩璁$畻";
             this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
@@ -2417,12 +2422,12 @@
             this.layoutControlItem26.AppearanceItemCaption.Options.UseTextOptions = true;
             this.layoutControlItem26.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem26.Control = this.ucBtnPrint1;
-            this.layoutControlItem26.Location = new System.Drawing.Point(801, 31);
+            this.layoutControlItem26.Location = new System.Drawing.Point(840, 31);
             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.Size = new System.Drawing.Size(269, 31);
+            this.layoutControlItem26.Size = new System.Drawing.Size(280, 31);
             this.layoutControlItem26.Text = "鎶ュ伐鎵撳嵃";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem26.TextVisible = false;
@@ -2435,7 +2440,7 @@
             this.layoutControlItem22.Location = new System.Drawing.Point(0, 31);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem22.Size = new System.Drawing.Size(267, 31);
+            this.layoutControlItem22.Size = new System.Drawing.Size(280, 31);
             this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
             this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -2444,7 +2449,7 @@
             this.layoutControlItem36.Control = this.txt_zQty;
             this.layoutControlItem36.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem36.Name = "layoutControlItem36";
-            this.layoutControlItem36.Size = new System.Drawing.Size(267, 31);
+            this.layoutControlItem36.Size = new System.Drawing.Size(280, 31);
             this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
             this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -2594,10 +2599,11 @@
             this.layoutMx98.Controls.Add(this.txt_kQty98);
             this.layoutMx98.Controls.Add(this.txt_printRemark98);
             this.layoutMx98.Controls.Add(this.txt_iCount_98);
+            this.layoutMx98.Controls.Add(this.txt_zQty98);
             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(199, 178, 812, 500);
+            this.layoutMx98.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(96, 558, 812, 500);
             this.layoutMx98.Root = this.layoutControlGroup2;
             this.layoutMx98.Size = new System.Drawing.Size(1265, 54);
             this.layoutMx98.TabIndex = 0;
@@ -2606,57 +2612,67 @@
             // ucBtnPrint98
             // 
             this.ucBtnPrint98.guidKey = null;
-            this.ucBtnPrint98.Location = new System.Drawing.Point(1007, 10);
+            this.ucBtnPrint98.Location = new System.Drawing.Point(1046, 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(247, 34);
+            this.ucBtnPrint98.Size = new System.Drawing.Size(208, 34);
             this.ucBtnPrint98.TabIndex = 8;
             // 
             // txt_yQty98
             // 
-            this.txt_yQty98.Location = new System.Drawing.Point(114, 12);
+            this.txt_yQty98.Location = new System.Drawing.Point(321, 12);
             this.txt_yQty98.Name = "txt_yQty98";
             this.txt_yQty98.Properties.ReadOnly = true;
-            this.txt_yQty98.Size = new System.Drawing.Size(143, 24);
+            this.txt_yQty98.Size = new System.Drawing.Size(101, 24);
             this.txt_yQty98.StyleController = this.layoutMx98;
             this.txt_yQty98.TabIndex = 4;
             // 
             // txt_kQty98
             // 
-            this.txt_kQty98.Location = new System.Drawing.Point(363, 12);
+            this.txt_kQty98.Location = new System.Drawing.Point(528, 12);
             this.txt_kQty98.Name = "txt_kQty98";
             this.txt_kQty98.Properties.ReadOnly = true;
-            this.txt_kQty98.Size = new System.Drawing.Size(143, 24);
+            this.txt_kQty98.Size = new System.Drawing.Size(101, 24);
             this.txt_kQty98.StyleController = this.layoutMx98;
             this.txt_kQty98.TabIndex = 5;
             // 
             // txt_printRemark98
             // 
-            this.txt_printRemark98.Location = new System.Drawing.Point(612, 12);
+            this.txt_printRemark98.Location = new System.Drawing.Point(735, 12);
             this.txt_printRemark98.Name = "txt_printRemark98";
-            this.txt_printRemark98.Size = new System.Drawing.Size(143, 24);
+            this.txt_printRemark98.Size = new System.Drawing.Size(101, 24);
             this.txt_printRemark98.StyleController = this.layoutMx98;
             this.txt_printRemark98.TabIndex = 6;
             // 
             // txt_iCount_98
             // 
-            this.txt_iCount_98.Location = new System.Drawing.Point(861, 12);
+            this.txt_iCount_98.Location = new System.Drawing.Point(942, 12);
             this.txt_iCount_98.Name = "txt_iCount_98";
-            this.txt_iCount_98.Size = new System.Drawing.Size(143, 24);
+            this.txt_iCount_98.Size = new System.Drawing.Size(101, 24);
             this.txt_iCount_98.StyleController = this.layoutMx98;
             this.txt_iCount_98.TabIndex = 7;
+            // 
+            // 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(101, 24);
+            this.txt_zQty98.StyleController = this.layoutMx98;
+            this.txt_zQty98.TabIndex = 9;
             // 
             // layoutControlGroup2
             // 
             this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.layoutControlGroup2.GroupBordersVisible = false;
             this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem30,
-            this.layoutControlItem31,
-            this.layoutControlItem32,
+            this.layoutControlItem34,
             this.layoutControlItem33,
-            this.layoutControlItem34});
+            this.layoutControlItem32,
+            this.layoutControlItem31,
+            this.layoutControlItem30,
+            this.layoutControlItem37});
             this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup2.Name = "Root";
             columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -2669,12 +2685,15 @@
             columnDefinition13.Width = 100D;
             columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
             columnDefinition14.Width = 100D;
+            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition15.Width = 100D;
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
             columnDefinition10,
             columnDefinition11,
             columnDefinition12,
             columnDefinition13,
-            columnDefinition14});
+            columnDefinition14,
+            columnDefinition15});
             rowDefinition9.Height = 100D;
             rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
@@ -2682,56 +2701,66 @@
             this.layoutControlGroup2.Size = new System.Drawing.Size(1265, 54);
             this.layoutControlGroup2.TextVisible = false;
             // 
-            // layoutControlItem30
+            // layoutControlItem34
             // 
-            this.layoutControlItem30.Control = this.txt_yQty98;
-            this.layoutControlItem30.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem30.Name = "layoutControlItem30";
-            this.layoutControlItem30.Size = new System.Drawing.Size(249, 34);
-            this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
-            this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem31
-            // 
-            this.layoutControlItem31.Control = this.txt_kQty98;
-            this.layoutControlItem31.Location = new System.Drawing.Point(249, 0);
-            this.layoutControlItem31.Name = "layoutControlItem31";
-            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem31.Size = new System.Drawing.Size(249, 34);
-            this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
-            this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem32
-            // 
-            this.layoutControlItem32.Control = this.txt_printRemark98;
-            this.layoutControlItem32.Location = new System.Drawing.Point(498, 0);
-            this.layoutControlItem32.Name = "layoutControlItem32";
-            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem32.Size = new System.Drawing.Size(249, 34);
-            this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
-            this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
+            this.layoutControlItem34.Control = this.ucBtnPrint98;
+            this.layoutControlItem34.Location = new System.Drawing.Point(1035, 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(210, 34);
+            this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
+            this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem34.TextVisible = false;
             // 
             // layoutControlItem33
             // 
             this.layoutControlItem33.Control = this.txt_iCount_98;
-            this.layoutControlItem33.Location = new System.Drawing.Point(747, 0);
+            this.layoutControlItem33.Location = new System.Drawing.Point(828, 0);
             this.layoutControlItem33.Name = "layoutControlItem33";
-            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem33.Size = new System.Drawing.Size(249, 34);
+            this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 4;
+            this.layoutControlItem33.Size = new System.Drawing.Size(207, 34);
             this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟";
             this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
             // 
-            // layoutControlItem34
+            // layoutControlItem32
             // 
-            this.layoutControlItem34.Control = this.ucBtnPrint98;
-            this.layoutControlItem34.Location = new System.Drawing.Point(996, 0);
-            this.layoutControlItem34.Name = "layoutControlItem34";
-            this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 4;
-            this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
-            this.layoutControlItem34.Size = new System.Drawing.Size(249, 34);
-            this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
-            this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem34.TextVisible = false;
+            this.layoutControlItem32.Control = this.txt_printRemark98;
+            this.layoutControlItem32.Location = new System.Drawing.Point(621, 0);
+            this.layoutControlItem32.Name = "layoutControlItem32";
+            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem32.Size = new System.Drawing.Size(207, 34);
+            this.layoutControlItem32.Text = "鎵撳嵃澶囨敞";
+            this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem31
+            // 
+            this.layoutControlItem31.Control = this.txt_kQty98;
+            this.layoutControlItem31.Location = new System.Drawing.Point(414, 0);
+            this.layoutControlItem31.Name = "layoutControlItem31";
+            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem31.Size = new System.Drawing.Size(207, 34);
+            this.layoutControlItem31.Text = "鍙墦鍗版暟閲�";
+            this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem30
+            // 
+            this.layoutControlItem30.Control = this.txt_yQty98;
+            this.layoutControlItem30.Location = new System.Drawing.Point(207, 0);
+            this.layoutControlItem30.Name = "layoutControlItem30";
+            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem30.Size = new System.Drawing.Size(207, 34);
+            this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
+            this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem37
+            // 
+            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(207, 34);
+            this.layoutControlItem37.Text = "宸ュ崟鎬婚噺";
+            this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
             // 
             // xtraTabPage4
             // 
@@ -2798,8 +2827,8 @@
             // gridColumn41
             // 
             this.gridColumn41.AppearanceCell.Options.UseFont = true;
-            this.gridColumn41.Caption = "杩芥函鐮�";
-            this.gridColumn41.FieldName = "barCode";
+            this.gridColumn41.Caption = "鍚庣洊鐮�";
+            this.gridColumn41.FieldName = "itemBarcode";
             this.gridColumn41.MinWidth = 50;
             this.gridColumn41.Name = "gridColumn41";
             this.gridColumn41.Tag = "query_a.ITEM_BARCODE";
@@ -2845,8 +2874,8 @@
             // 
             // gridColumn47
             // 
-            this.gridColumn47.Caption = "绾垮埆ID";
-            this.gridColumn47.FieldName = "lineId";
+            this.gridColumn47.Caption = "宸茬粦鎵樻澘鐮�";
+            this.gridColumn47.FieldName = "aboutTbBarcode";
             this.gridColumn47.MinWidth = 25;
             this.gridColumn47.Name = "gridColumn47";
             this.gridColumn47.Visible = true;
@@ -2855,8 +2884,8 @@
             // 
             // gridColumn48
             // 
-            this.gridColumn48.Caption = "绾垮埆鍚嶇О";
-            this.gridColumn48.FieldName = "xtName";
+            this.gridColumn48.Caption = "宸茬粦杩芥函鐮�";
+            this.gridColumn48.FieldName = "aboutTracBarcode";
             this.gridColumn48.MinWidth = 25;
             this.gridColumn48.Name = "gridColumn48";
             this.gridColumn48.Visible = true;
@@ -2875,7 +2904,7 @@
             // ucBtnPrint100
             // 
             this.ucBtnPrint100.guidKey = null;
-            this.ucBtnPrint100.Location = new System.Drawing.Point(20, 9);
+            this.ucBtnPrint100.Location = new System.Drawing.Point(20, 10);
             this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint100.Name = "ucBtnPrint100";
             this.ucBtnPrint100.rptParameter = null;
@@ -2994,12 +3023,14 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_kQty98.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_printRemark98.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_98.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_zQty98.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
             this.xtraTabPage4.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
@@ -3179,11 +3210,6 @@
         private DevExpress.XtraEditors.TextEdit txt_kQty98;
         private DevExpress.XtraEditors.TextEdit txt_printRemark98;
         private DevExpress.XtraEditors.TextEdit txt_iCount_98;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
         private DevExpress.Utils.ToolTipController tips;
@@ -3214,5 +3240,12 @@
         private DevExpress.XtraEditors.TextEdit txt_zQty;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
+        private DevExpress.XtraEditors.TextEdit txt_zQty98;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3