From b084bd77d01a94c8f0a2d20c86a1f45ba7c8a23c Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 19 四月 2025 14:08:05 +0800
Subject: [PATCH] 页面跳转

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs |  523 ++++++++++++++++++++++++++++++---------------------------
 1 files changed, 274 insertions(+), 249 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..e92b17e 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();
@@ -89,7 +90,6 @@
             this.gv_cust = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_daa015 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_daa009 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_prepareTime = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_daa028 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -219,13 +219,13 @@
             this.txt_zQty = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem36 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
             this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx3 = new DevExpress.XtraGrid.GridControl();
             this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -244,12 +244,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();
@@ -350,13 +352,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_zQty.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
             this.xtraTabPage3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
@@ -367,12 +369,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();
@@ -417,6 +421,7 @@
             // split1
             // 
             this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
             this.split1.Name = "split1";
@@ -430,8 +435,9 @@
             // split1.Panel2
             // 
             this.split1.Panel2.Text = "Panel2";
+            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split1.Size = new System.Drawing.Size(1267, 708);
-            this.split1.SplitterPosition = 696;
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
@@ -477,7 +483,6 @@
             this.gv_cust,
             this.gridColumn1,
             this.gv_daa015,
-            this.gridColumn2,
             this.gv_daa009,
             this.gv_prepareTime,
             this.gv_daa028,
@@ -807,16 +812,6 @@
             this.gv_daa015.VisibleIndex = 24;
             this.gv_daa015.Width = 94;
             // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "瀹為檯绾垮埆";
-            this.gridColumn2.FieldName = "sjlineName";
-            this.gridColumn2.MinWidth = 50;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 25;
-            this.gridColumn2.Width = 94;
-            // 
             // gv_daa009
             // 
             this.gv_daa009.AppearanceCell.Options.UseFont = true;
@@ -840,7 +835,7 @@
             this.gv_prepareTime.OptionsColumn.AllowEdit = false;
             this.gv_prepareTime.Tag = "query_a.prepare_time";
             this.gv_prepareTime.Visible = true;
-            this.gv_prepareTime.VisibleIndex = 26;
+            this.gv_prepareTime.VisibleIndex = 25;
             this.gv_prepareTime.Width = 180;
             // 
             // gv_daa028
@@ -853,7 +848,7 @@
             this.gv_daa028.OptionsColumn.AllowEdit = false;
             this.gv_daa028.Tag = "query_a.daa028";
             this.gv_daa028.Visible = true;
-            this.gv_daa028.VisibleIndex = 27;
+            this.gv_daa028.VisibleIndex = 26;
             this.gv_daa028.Width = 180;
             // 
             // gv_daa016
@@ -866,7 +861,7 @@
             this.gv_daa016.OptionsColumn.AllowEdit = false;
             this.gv_daa016.Tag = "query_a.daa016";
             this.gv_daa016.Visible = true;
-            this.gv_daa016.VisibleIndex = 28;
+            this.gv_daa016.VisibleIndex = 27;
             this.gv_daa016.Width = 180;
             // 
             // gv_daa017
@@ -879,7 +874,7 @@
             this.gv_daa017.OptionsColumn.AllowEdit = false;
             this.gv_daa017.Tag = "query_a.daa017";
             this.gv_daa017.Visible = true;
-            this.gv_daa017.VisibleIndex = 29;
+            this.gv_daa017.VisibleIndex = 28;
             this.gv_daa017.Width = 180;
             // 
             // gv_mesStartProd
@@ -892,7 +887,7 @@
             this.gv_mesStartProd.OptionsColumn.AllowEdit = false;
             this.gv_mesStartProd.Tag = "query_a.mes_start_prod";
             this.gv_mesStartProd.Visible = true;
-            this.gv_mesStartProd.VisibleIndex = 30;
+            this.gv_mesStartProd.VisibleIndex = 29;
             this.gv_mesStartProd.Width = 180;
             // 
             // gv_mesEndProd
@@ -905,7 +900,7 @@
             this.gv_mesEndProd.OptionsColumn.AllowEdit = false;
             this.gv_mesEndProd.Tag = "query_a.mes_end_prod";
             this.gv_mesEndProd.Visible = true;
-            this.gv_mesEndProd.VisibleIndex = 31;
+            this.gv_mesEndProd.VisibleIndex = 30;
             this.gv_mesEndProd.Width = 180;
             // 
             // gridColumn21
@@ -915,7 +910,7 @@
             this.gridColumn21.MinWidth = 25;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 32;
+            this.gridColumn21.VisibleIndex = 31;
             this.gridColumn21.Width = 94;
             // 
             // gridColumn22
@@ -925,7 +920,7 @@
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 33;
+            this.gridColumn22.VisibleIndex = 32;
             this.gridColumn22.Width = 94;
             // 
             // gridColumn23
@@ -943,7 +938,7 @@
             this.gridColumn24.MinWidth = 25;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 34;
+            this.gridColumn24.VisibleIndex = 33;
             this.gridColumn24.Width = 94;
             // 
             // gridColumn25
@@ -953,7 +948,7 @@
             this.gridColumn25.MinWidth = 25;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 35;
+            this.gridColumn25.VisibleIndex = 34;
             this.gridColumn25.Width = 94;
             // 
             // gridColumn26
@@ -963,7 +958,7 @@
             this.gridColumn26.MinWidth = 25;
             this.gridColumn26.Name = "gridColumn26";
             this.gridColumn26.Visible = true;
-            this.gridColumn26.VisibleIndex = 36;
+            this.gridColumn26.VisibleIndex = 35;
             this.gridColumn26.Width = 94;
             // 
             // pageBar1
@@ -1001,6 +996,7 @@
             // 
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
+            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1267, 708);
             this.splitMx1.SplitterPosition = 183;
             this.splitMx1.TabIndex = 0;
@@ -1052,20 +1048,20 @@
             // 
             // txt_daa009
             // 
-            this.txt_daa009.Location = new System.Drawing.Point(420, 152);
+            this.txt_daa009.Location = new System.Drawing.Point(425, 152);
             this.txt_daa009.Name = "txt_daa009";
             this.txt_daa009.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa009.Size = new System.Drawing.Size(506, 24);
+            this.txt_daa009.Size = new System.Drawing.Size(518, 24);
             this.txt_daa009.StyleController = this.layoutMx1;
             this.txt_daa009.TabIndex = 240;
             this.txt_daa009.Tag = "";
             // 
             // txt_daa013
             // 
-            this.txt_daa013.Location = new System.Drawing.Point(726, 124);
+            this.txt_daa013.Location = new System.Drawing.Point(737, 124);
             this.txt_daa013.Name = "txt_daa013";
             this.txt_daa013.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa013.Size = new System.Drawing.Size(200, 24);
+            this.txt_daa013.Size = new System.Drawing.Size(206, 24);
             this.txt_daa013.StyleController = this.layoutMx1;
             this.txt_daa013.TabIndex = 472;
             this.txt_daa013.Tag = "readonly";
@@ -1075,27 +1071,27 @@
             this.txt_daa001.Location = new System.Drawing.Point(114, 12);
             this.txt_daa001.Name = "txt_daa001";
             this.txt_daa001.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa001.Size = new System.Drawing.Size(200, 24);
+            this.txt_daa001.Size = new System.Drawing.Size(205, 24);
             this.txt_daa001.StyleController = this.layoutMx1;
             this.txt_daa001.TabIndex = 216;
             this.txt_daa001.Tag = "readonly";
             // 
             // textEdit1
             // 
-            this.textEdit1.Location = new System.Drawing.Point(420, 40);
+            this.textEdit1.Location = new System.Drawing.Point(425, 40);
             this.textEdit1.Name = "textEdit1";
             this.textEdit1.Properties.Appearance.Options.UseFont = true;
-            this.textEdit1.Size = new System.Drawing.Size(200, 24);
+            this.textEdit1.Size = new System.Drawing.Size(206, 24);
             this.textEdit1.StyleController = this.layoutMx1;
             this.textEdit1.TabIndex = 467;
             this.textEdit1.Tag = "readonly";
             // 
             // txt_daa008
             // 
-            this.txt_daa008.Location = new System.Drawing.Point(726, 12);
+            this.txt_daa008.Location = new System.Drawing.Point(737, 12);
             this.txt_daa008.Name = "txt_daa008";
             this.txt_daa008.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa008.Size = new System.Drawing.Size(200, 24);
+            this.txt_daa008.Size = new System.Drawing.Size(206, 24);
             this.txt_daa008.StyleController = this.layoutMx1;
             this.txt_daa008.TabIndex = 235;
             this.txt_daa008.Tag = "readonly";
@@ -1105,27 +1101,27 @@
             this.txt_saleOrderNo.Location = new System.Drawing.Point(114, 68);
             this.txt_saleOrderNo.Name = "txt_saleOrderNo";
             this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_saleOrderNo.Size = new System.Drawing.Size(200, 24);
+            this.txt_saleOrderNo.Size = new System.Drawing.Size(205, 24);
             this.txt_saleOrderNo.StyleController = this.layoutMx1;
             this.txt_saleOrderNo.TabIndex = 465;
             this.txt_saleOrderNo.Tag = "readonly";
             // 
             // txt_daa028
             // 
-            this.txt_daa028.Location = new System.Drawing.Point(420, 68);
+            this.txt_daa028.Location = new System.Drawing.Point(425, 68);
             this.txt_daa028.Name = "txt_daa028";
             this.txt_daa028.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa028.Size = new System.Drawing.Size(200, 24);
+            this.txt_daa028.Size = new System.Drawing.Size(206, 24);
             this.txt_daa028.StyleController = this.layoutMx1;
             this.txt_daa028.TabIndex = 341;
             this.txt_daa028.Tag = "readonly";
             // 
             // txt_mesStartProd
             // 
-            this.txt_mesStartProd.Location = new System.Drawing.Point(1032, 40);
+            this.txt_mesStartProd.Location = new System.Drawing.Point(1049, 40);
             this.txt_mesStartProd.Name = "txt_mesStartProd";
             this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesStartProd.Size = new System.Drawing.Size(202, 24);
+            this.txt_mesStartProd.Size = new System.Drawing.Size(206, 24);
             this.txt_mesStartProd.StyleController = this.layoutMx1;
             this.txt_mesStartProd.TabIndex = 336;
             this.txt_mesStartProd.Tag = "readonly";
@@ -1135,67 +1131,67 @@
             this.txt_daa014.Location = new System.Drawing.Point(114, 40);
             this.txt_daa014.Name = "txt_daa014";
             this.txt_daa014.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa014.Size = new System.Drawing.Size(200, 24);
+            this.txt_daa014.Size = new System.Drawing.Size(205, 24);
             this.txt_daa014.StyleController = this.layoutMx1;
             this.txt_daa014.TabIndex = 327;
             this.txt_daa014.Tag = "readonly";
             // 
             // txt_daa022Remark
             // 
-            this.txt_daa022Remark.Location = new System.Drawing.Point(420, 12);
+            this.txt_daa022Remark.Location = new System.Drawing.Point(425, 12);
             this.txt_daa022Remark.Name = "txt_daa022Remark";
             this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa022Remark.Size = new System.Drawing.Size(200, 24);
+            this.txt_daa022Remark.Size = new System.Drawing.Size(206, 24);
             this.txt_daa022Remark.StyleController = this.layoutMx1;
             this.txt_daa022Remark.TabIndex = 462;
             this.txt_daa022Remark.Tag = "readonly";
             // 
             // txt_daa010
             // 
-            this.txt_daa010.Location = new System.Drawing.Point(726, 40);
+            this.txt_daa010.Location = new System.Drawing.Point(737, 40);
             this.txt_daa010.Name = "txt_daa010";
             this.txt_daa010.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa010.Size = new System.Drawing.Size(200, 24);
+            this.txt_daa010.Size = new System.Drawing.Size(206, 24);
             this.txt_daa010.StyleController = this.layoutMx1;
             this.txt_daa010.TabIndex = 243;
             this.txt_daa010.Tag = "readonly";
             // 
             // txt_mesEndProd
             // 
-            this.txt_mesEndProd.Location = new System.Drawing.Point(1032, 68);
+            this.txt_mesEndProd.Location = new System.Drawing.Point(1049, 68);
             this.txt_mesEndProd.Name = "txt_mesEndProd";
             this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesEndProd.Size = new System.Drawing.Size(202, 24);
+            this.txt_mesEndProd.Size = new System.Drawing.Size(206, 24);
             this.txt_mesEndProd.StyleController = this.layoutMx1;
             this.txt_mesEndProd.TabIndex = 338;
             this.txt_mesEndProd.Tag = "readonly";
             // 
             // txt_daa011
             // 
-            this.txt_daa011.Location = new System.Drawing.Point(726, 68);
+            this.txt_daa011.Location = new System.Drawing.Point(737, 68);
             this.txt_daa011.Name = "txt_daa011";
             this.txt_daa011.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa011.Size = new System.Drawing.Size(200, 24);
+            this.txt_daa011.Size = new System.Drawing.Size(206, 24);
             this.txt_daa011.StyleController = this.layoutMx1;
             this.txt_daa011.TabIndex = 247;
             this.txt_daa011.Tag = "readonly";
             // 
             // txt_dptName
             // 
-            this.txt_dptName.Location = new System.Drawing.Point(726, 96);
+            this.txt_dptName.Location = new System.Drawing.Point(737, 96);
             this.txt_dptName.Name = "txt_dptName";
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(200, 24);
+            this.txt_dptName.Size = new System.Drawing.Size(206, 24);
             this.txt_dptName.StyleController = this.layoutMx1;
             this.txt_dptName.TabIndex = 258;
             this.txt_dptName.Tag = "readonly";
             // 
             // txt_daa016
             // 
-            this.txt_daa016.Location = new System.Drawing.Point(1032, 96);
+            this.txt_daa016.Location = new System.Drawing.Point(1049, 96);
             this.txt_daa016.Name = "txt_daa016";
             this.txt_daa016.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa016.Size = new System.Drawing.Size(202, 24);
+            this.txt_daa016.Size = new System.Drawing.Size(206, 24);
             this.txt_daa016.StyleController = this.layoutMx1;
             this.txt_daa016.TabIndex = 273;
             this.txt_daa016.Tag = "readonly";
@@ -1205,27 +1201,27 @@
             this.txt_daa029.Location = new System.Drawing.Point(114, 96);
             this.txt_daa029.Name = "txt_daa029";
             this.txt_daa029.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa029.Size = new System.Drawing.Size(200, 24);
+            this.txt_daa029.Size = new System.Drawing.Size(205, 24);
             this.txt_daa029.StyleController = this.layoutMx1;
             this.txt_daa029.TabIndex = 217;
             this.txt_daa029.Tag = "readonly";
             // 
             // txt_lineName
             // 
-            this.txt_lineName.Location = new System.Drawing.Point(420, 96);
+            this.txt_lineName.Location = new System.Drawing.Point(425, 96);
             this.txt_lineName.Name = "txt_lineName";
             this.txt_lineName.Properties.Appearance.Options.UseFont = true;
-            this.txt_lineName.Size = new System.Drawing.Size(200, 24);
+            this.txt_lineName.Size = new System.Drawing.Size(206, 24);
             this.txt_lineName.StyleController = this.layoutMx1;
             this.txt_lineName.TabIndex = 267;
             this.txt_lineName.Tag = "readonly";
             // 
             // txt_daa017
             // 
-            this.txt_daa017.Location = new System.Drawing.Point(1032, 124);
+            this.txt_daa017.Location = new System.Drawing.Point(1049, 124);
             this.txt_daa017.Name = "txt_daa017";
             this.txt_daa017.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa017.Size = new System.Drawing.Size(202, 24);
+            this.txt_daa017.Size = new System.Drawing.Size(206, 24);
             this.txt_daa017.StyleController = this.layoutMx1;
             this.txt_daa017.TabIndex = 280;
             this.txt_daa017.Tag = "readonly";
@@ -1235,17 +1231,17 @@
             this.txt_daa003.Location = new System.Drawing.Point(114, 152);
             this.txt_daa003.Name = "txt_daa003";
             this.txt_daa003.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa003.Size = new System.Drawing.Size(200, 24);
+            this.txt_daa003.Size = new System.Drawing.Size(205, 24);
             this.txt_daa003.StyleController = this.layoutMx1;
             this.txt_daa003.TabIndex = 219;
             this.txt_daa003.Tag = "readonly";
             // 
             // txt_dwName
             // 
-            this.txt_dwName.Location = new System.Drawing.Point(1032, 12);
+            this.txt_dwName.Location = new System.Drawing.Point(1049, 12);
             this.txt_dwName.Name = "txt_dwName";
             this.txt_dwName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dwName.Size = new System.Drawing.Size(202, 24);
+            this.txt_dwName.Size = new System.Drawing.Size(206, 24);
             this.txt_dwName.StyleController = this.layoutMx1;
             this.txt_dwName.TabIndex = 226;
             this.txt_dwName.Tag = "readonly";
@@ -1255,16 +1251,16 @@
             this.txt_daa004.Location = new System.Drawing.Point(114, 124);
             this.txt_daa004.Name = "txt_daa004";
             this.txt_daa004.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa004.Size = new System.Drawing.Size(200, 24);
+            this.txt_daa004.Size = new System.Drawing.Size(205, 24);
             this.txt_daa004.StyleController = this.layoutMx1;
             this.txt_daa004.TabIndex = 222;
             this.txt_daa004.Tag = "readonly";
             // 
             // txt_daa015
             // 
-            this.txt_daa015.Location = new System.Drawing.Point(420, 124);
+            this.txt_daa015.Location = new System.Drawing.Point(425, 124);
             this.txt_daa015.Name = "txt_daa015";
-            this.txt_daa015.Size = new System.Drawing.Size(200, 24);
+            this.txt_daa015.Size = new System.Drawing.Size(206, 24);
             this.txt_daa015.StyleController = this.layoutMx1;
             this.txt_daa015.TabIndex = 473;
             // 
@@ -1341,7 +1337,7 @@
             rowDefinition4,
             rowDefinition5,
             rowDefinition6});
-            this.Root.Size = new System.Drawing.Size(1246, 188);
+            this.Root.Size = new System.Drawing.Size(1267, 188);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -1349,17 +1345,17 @@
             this.layoutControlItem1.Control = this.txt_daa001;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem1.Size = new System.Drawing.Size(311, 28);
             this.layoutControlItem1.Text = "宸ュ崟鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_daa008;
-            this.layoutControlItem3.Location = new System.Drawing.Point(612, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(623, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem3.Size = new System.Drawing.Size(312, 28);
             this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1369,18 +1365,18 @@
             this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem5.Size = new System.Drawing.Size(311, 28);
             this.layoutControlItem5.Text = "鎶曟枡鍗曞彿";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_daa010;
-            this.layoutControlItem7.Location = new System.Drawing.Point(612, 28);
+            this.layoutControlItem7.Location = new System.Drawing.Point(623, 28);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem7.Size = new System.Drawing.Size(312, 28);
             this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1390,29 +1386,29 @@
             this.layoutControlItem9.Location = new System.Drawing.Point(0, 56);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem9.Size = new System.Drawing.Size(311, 28);
             this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_daa028;
-            this.layoutControlItem10.Location = new System.Drawing.Point(306, 56);
+            this.layoutControlItem10.Location = new System.Drawing.Point(311, 56);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem10.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem10.Size = new System.Drawing.Size(312, 28);
             this.layoutControlItem10.Text = "澶囨枡鏃堕棿";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_daa011;
-            this.layoutControlItem11.Location = new System.Drawing.Point(612, 56);
+            this.layoutControlItem11.Location = new System.Drawing.Point(623, 56);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem11.Size = new System.Drawing.Size(312, 28);
             this.layoutControlItem11.Text = "宸茬敓浜ч噺";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1422,18 +1418,18 @@
             this.layoutControlItem13.Location = new System.Drawing.Point(0, 84);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem13.Size = new System.Drawing.Size(311, 28);
             this.layoutControlItem13.Text = "浜у搧缂栫爜";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_lineName;
-            this.layoutControlItem14.Location = new System.Drawing.Point(306, 84);
+            this.layoutControlItem14.Location = new System.Drawing.Point(311, 84);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem14.Size = new System.Drawing.Size(312, 28);
             this.layoutControlItem14.Text = "鐢熶骇绾垮埆";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1443,7 +1439,7 @@
             this.layoutControlItem17.Location = new System.Drawing.Point(0, 112);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem17.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem17.Size = new System.Drawing.Size(311, 28);
             this.layoutControlItem17.Text = "浜у搧瑙勬牸";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1453,116 +1449,116 @@
             this.layoutControlItem19.Location = new System.Drawing.Point(0, 140);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem19.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem19.Size = new System.Drawing.Size(311, 28);
             this.layoutControlItem19.Text = "浜у搧鍚嶇О";
             this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_daa022Remark;
-            this.layoutControlItem6.Location = new System.Drawing.Point(306, 0);
+            this.layoutControlItem6.Location = new System.Drawing.Point(311, 0);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem6.Size = new System.Drawing.Size(312, 28);
             this.layoutControlItem6.Text = "閫氱煡澶囨枡";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.textEdit1;
-            this.layoutControlItem2.Location = new System.Drawing.Point(306, 28);
+            this.layoutControlItem2.Location = new System.Drawing.Point(311, 28);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem2.Size = new System.Drawing.Size(312, 28);
             this.layoutControlItem2.Text = "澶囨枡鐘舵��";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_dwName;
-            this.layoutControlItem15.Location = new System.Drawing.Point(918, 0);
+            this.layoutControlItem15.Location = new System.Drawing.Point(935, 0);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem15.Size = new System.Drawing.Size(308, 28);
+            this.layoutControlItem15.Size = new System.Drawing.Size(312, 28);
             this.layoutControlItem15.Text = "鍗曚綅";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_mesStartProd;
-            this.layoutControlItem4.Location = new System.Drawing.Point(918, 28);
+            this.layoutControlItem4.Location = new System.Drawing.Point(935, 28);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(308, 28);
+            this.layoutControlItem4.Size = new System.Drawing.Size(312, 28);
             this.layoutControlItem4.Text = "棰勮寮�宸ユ椂闂�";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_mesEndProd;
-            this.layoutControlItem8.Location = new System.Drawing.Point(918, 56);
+            this.layoutControlItem8.Location = new System.Drawing.Point(935, 56);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(308, 28);
+            this.layoutControlItem8.Size = new System.Drawing.Size(312, 28);
             this.layoutControlItem8.Text = "棰勮瀹屽伐鏃堕棿";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_daa016;
-            this.layoutControlItem12.Location = new System.Drawing.Point(918, 84);
+            this.layoutControlItem12.Location = new System.Drawing.Point(935, 84);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(308, 28);
+            this.layoutControlItem12.Size = new System.Drawing.Size(312, 28);
             this.layoutControlItem12.Text = "瀹為檯寮�宸ユ椂闂�";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_daa017;
-            this.layoutControlItem16.Location = new System.Drawing.Point(918, 112);
+            this.layoutControlItem16.Location = new System.Drawing.Point(935, 112);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem16.Size = new System.Drawing.Size(308, 28);
+            this.layoutControlItem16.Size = new System.Drawing.Size(312, 28);
             this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem28
             // 
             this.layoutControlItem28.Control = this.txt_daa009;
-            this.layoutControlItem28.Location = new System.Drawing.Point(306, 140);
+            this.layoutControlItem28.Location = new System.Drawing.Point(311, 140);
             this.layoutControlItem28.Name = "layoutControlItem28";
             this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem28.Size = new System.Drawing.Size(612, 28);
+            this.layoutControlItem28.Size = new System.Drawing.Size(624, 28);
             this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
             this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem27
             // 
             this.layoutControlItem27.Control = this.txt_daa015;
-            this.layoutControlItem27.Location = new System.Drawing.Point(306, 112);
+            this.layoutControlItem27.Location = new System.Drawing.Point(311, 112);
             this.layoutControlItem27.Name = "layoutControlItem27";
             this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem27.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem27.Size = new System.Drawing.Size(312, 28);
             this.layoutControlItem27.Text = "鐢熶骇绾垮埆ID";
             this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_dptName;
-            this.layoutControlItem20.Location = new System.Drawing.Point(612, 84);
+            this.layoutControlItem20.Location = new System.Drawing.Point(623, 84);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem20.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem20.Size = new System.Drawing.Size(312, 28);
             this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
             this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1570,11 +1566,11 @@
             // 
             this.layoutControlItem18.Control = this.txt_daa013;
             this.layoutControlItem18.CustomizationFormText = "鐢熶骇杞﹂棿ID";
-            this.layoutControlItem18.Location = new System.Drawing.Point(612, 112);
+            this.layoutControlItem18.Location = new System.Drawing.Point(623, 112);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem18.Size = new System.Drawing.Size(306, 28);
+            this.layoutControlItem18.Size = new System.Drawing.Size(312, 28);
             this.layoutControlItem18.Text = "杞﹂棿ID";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1732,7 +1728,7 @@
             // 
             this.gvMx1dab007.AppearanceCell.Options.UseFont = true;
             this.gvMx1dab007.Caption = "宸查鐢ㄩ噺";
-            this.gvMx1dab007.FieldName = "dab007";
+            this.gvMx1dab007.FieldName = "ylQty";
             this.gvMx1dab007.MinWidth = 50;
             this.gvMx1dab007.Name = "gvMx1dab007";
             this.gvMx1dab007.Tag = "query_a.dab007";
@@ -1743,6 +1739,7 @@
             // gridColumn14
             // 
             this.gridColumn14.Caption = "鍓╀綑鍙";
+            this.gridColumn14.FieldName = "klQty";
             this.gridColumn14.MinWidth = 25;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
@@ -2212,7 +2209,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 +2217,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 +2225,47 @@
             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.Properties.ReadOnly = true;
+            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(659, 12);
             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(379, 43);
             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 +2273,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 +2288,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 +2298,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;
             // 
@@ -2310,13 +2308,13 @@
             this.layoutControlGroup1.GroupBordersVisible = false;
             this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem23,
-            this.layoutControlItem21,
-            this.layoutControlItem24,
             this.layoutControlItem25,
             this.layoutControlItem35,
             this.layoutControlItem26,
             this.layoutControlItem22,
-            this.layoutControlItem36});
+            this.layoutControlItem36,
+            this.layoutControlItem21,
+            this.layoutControlItem24});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
             columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -2328,7 +2326,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,63 +2348,37 @@
             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);
-            // 
-            // layoutControlItem21
-            // 
-            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.Name = "layoutControlItem21";
-            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem21.Size = new System.Drawing.Size(267, 31);
-            this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
-            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
-            // 
-            // layoutControlItem24
-            // 
-            this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true;
-            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.Name = "layoutControlItem24";
-            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem24.Size = new System.Drawing.Size(267, 31);
-            this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
-            this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem25
             // 
             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 +2389,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 +2407,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,9 +2416,35 @@
             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);
+            // 
+            // layoutControlItem21
+            // 
+            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(280, 31);
+            this.layoutControlItem21.Name = "layoutControlItem21";
+            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem21.Size = new System.Drawing.Size(280, 31);
+            this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
+            // 
+            // layoutControlItem24
+            // 
+            this.layoutControlItem24.AppearanceItemCaption.Options.UseTextOptions = true;
+            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(560, 0);
+            this.layoutControlItem24.Name = "layoutControlItem24";
+            this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem24.Size = new System.Drawing.Size(280, 31);
+            this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
+            this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
             // 
             // xtraTabPage3
             // 
@@ -2594,10 +2592,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 +2605,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 +2678,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 +2694,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 +2820,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 +2867,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 +2877,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 +2897,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;
@@ -2977,13 +2999,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_zQty.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
             this.xtraTabPage3.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
@@ -2994,12 +3016,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();
@@ -3038,7 +3062,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gv_cust;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa015;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa009;
         private DevExpress.XtraGrid.Columns.GridColumn gv_prepareTime;
         private DevExpress.XtraGrid.Columns.GridColumn gv_daa028;
@@ -3179,11 +3202,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;
@@ -3193,8 +3211,6 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
         private DevExpress.XtraEditors.RadioGroup radOut;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
@@ -3214,5 +3230,14 @@
         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;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3