From 855d6d0e62af450f66e8a4ebcd06415f5a6814f1 Mon Sep 17 00:00:00 2001
From: wbc <2597324127@qq.com>
Date: 星期三, 10 十二月 2025 23:18:04 +0800
Subject: [PATCH] Merge branch 'master' of http://43.142.96.171:8080/r/~kyy/LB_MesClient

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs |  788 +++++++++++++++++++++++++++++++-------------------------
 1 files changed, 434 insertions(+), 354 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 1261de9..da1c089 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -30,40 +30,40 @@
         private void InitializeComponent()
         {
             this.components = new System.ComponentModel.Container();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
-            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.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition17 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition18 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition31 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition32 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition33 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition34 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition19 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition20 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition35 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition36 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition37 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition38 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition39 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition40 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition41 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition42 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition43 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition44 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition45 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition46 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -347,6 +347,12 @@
             this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
             this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
+            this.gridColumn88 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn89 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn90 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn91 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn92 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn93 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -648,7 +654,7 @@
             this.gv_fxk.MinWidth = 23;
             this.gv_fxk.Name = "gv_fxk";
             this.gv_fxk.Visible = true;
-            this.gv_fxk.VisibleIndex = 0;
+            this.gv_fxk.VisibleIndex = 1;
             this.gv_fxk.Width = 86;
             // 
             // gridColumn5
@@ -669,6 +675,8 @@
             this.gridColumn7.MinWidth = 50;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.Tag = "query_a.jabs";
+            this.gridColumn7.Visible = true;
+            this.gridColumn7.VisibleIndex = 0;
             this.gridColumn7.Width = 50;
             // 
             // gridColumn10
@@ -680,7 +688,7 @@
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Tag = "query_a.jabs";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 17;
+            this.gridColumn10.VisibleIndex = 18;
             this.gridColumn10.Width = 50;
             // 
             // gridColumn8
@@ -690,7 +698,7 @@
             this.gridColumn8.MinWidth = 23;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 16;
+            this.gridColumn8.VisibleIndex = 17;
             this.gridColumn8.Width = 86;
             // 
             // gridColumn12
@@ -712,7 +720,7 @@
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Tag = "query_a.jabs";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 1;
+            this.gridColumn6.VisibleIndex = 2;
             this.gridColumn6.Width = 50;
             // 
             // gridColumn27
@@ -733,7 +741,7 @@
             this.gv_daa018.OptionsColumn.AllowEdit = false;
             this.gv_daa018.Tag = "query_a.daa018";
             this.gv_daa018.Visible = true;
-            this.gv_daa018.VisibleIndex = 2;
+            this.gv_daa018.VisibleIndex = 3;
             this.gv_daa018.Width = 93;
             // 
             // gridColoun100
@@ -755,7 +763,7 @@
             this.gv_daa001.OptionsColumn.AllowEdit = false;
             this.gv_daa001.Tag = "query_a.daa001";
             this.gv_daa001.Visible = true;
-            this.gv_daa001.VisibleIndex = 4;
+            this.gv_daa001.VisibleIndex = 5;
             this.gv_daa001.Width = 71;
             // 
             // gv_daa021
@@ -776,7 +784,7 @@
             this.gridColumn3.MinWidth = 50;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 5;
+            this.gridColumn3.VisibleIndex = 6;
             this.gridColumn3.Width = 80;
             // 
             // gv_daa003
@@ -789,7 +797,7 @@
             this.gv_daa003.OptionsColumn.AllowEdit = false;
             this.gv_daa003.Tag = "query_a.daa003";
             this.gv_daa003.Visible = true;
-            this.gv_daa003.VisibleIndex = 6;
+            this.gv_daa003.VisibleIndex = 7;
             this.gv_daa003.Width = 86;
             // 
             // gv_daa004
@@ -802,7 +810,7 @@
             this.gv_daa004.OptionsColumn.AllowEdit = false;
             this.gv_daa004.Tag = "query_a.daa004";
             this.gv_daa004.Visible = true;
-            this.gv_daa004.VisibleIndex = 7;
+            this.gv_daa004.VisibleIndex = 8;
             this.gv_daa004.Width = 86;
             // 
             // gv_daa008
@@ -816,7 +824,7 @@
             this.gv_daa008.OptionsColumn.AllowEdit = false;
             this.gv_daa008.Tag = "query_a.daa008";
             this.gv_daa008.Visible = true;
-            this.gv_daa008.VisibleIndex = 10;
+            this.gv_daa008.VisibleIndex = 11;
             this.gv_daa008.Width = 50;
             // 
             // gv_daa011
@@ -830,7 +838,7 @@
             this.gv_daa011.OptionsColumn.AllowEdit = false;
             this.gv_daa011.Tag = "query_a.daa011";
             this.gv_daa011.Visible = true;
-            this.gv_daa011.VisibleIndex = 11;
+            this.gv_daa011.VisibleIndex = 12;
             this.gv_daa011.Width = 50;
             // 
             // gridColumn4
@@ -845,7 +853,7 @@
             this.gridColumn4.MinWidth = 50;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 12;
+            this.gridColumn4.VisibleIndex = 13;
             this.gridColumn4.Width = 50;
             // 
             // gv_daa010
@@ -859,7 +867,7 @@
             this.gv_daa010.OptionsColumn.AllowEdit = false;
             this.gv_daa010.Tag = "query_a.daa010";
             this.gv_daa010.Visible = true;
-            this.gv_daa010.VisibleIndex = 13;
+            this.gv_daa010.VisibleIndex = 14;
             this.gv_daa010.Width = 50;
             // 
             // gv_daa005
@@ -873,7 +881,7 @@
             this.gv_daa005.OptionsColumn.AllowEdit = false;
             this.gv_daa005.Tag = "query_a.daa005";
             this.gv_daa005.Visible = true;
-            this.gv_daa005.VisibleIndex = 14;
+            this.gv_daa005.VisibleIndex = 15;
             this.gv_daa005.Width = 50;
             // 
             // gv_cust
@@ -894,7 +902,7 @@
             this.gridColumn1.MinWidth = 50;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 8;
+            this.gridColumn1.VisibleIndex = 9;
             this.gridColumn1.Width = 51;
             // 
             // gv_daa015
@@ -907,7 +915,7 @@
             this.gv_daa015.OptionsColumn.AllowEdit = false;
             this.gv_daa015.Tag = "query_a.daa015";
             this.gv_daa015.Visible = true;
-            this.gv_daa015.VisibleIndex = 9;
+            this.gv_daa015.VisibleIndex = 10;
             this.gv_daa015.Width = 51;
             // 
             // gv_daa009
@@ -920,7 +928,7 @@
             this.gv_daa009.OptionsColumn.AllowEdit = false;
             this.gv_daa009.Tag = "query_a.daa009";
             this.gv_daa009.Visible = true;
-            this.gv_daa009.VisibleIndex = 15;
+            this.gv_daa009.VisibleIndex = 16;
             this.gv_daa009.Width = 51;
             // 
             // gv_prepareTime
@@ -955,7 +963,7 @@
             this.gv_daa016.OptionsColumn.AllowEdit = false;
             this.gv_daa016.Tag = "query_a.daa016";
             this.gv_daa016.Visible = true;
-            this.gv_daa016.VisibleIndex = 18;
+            this.gv_daa016.VisibleIndex = 19;
             this.gv_daa016.Width = 103;
             // 
             // gv_daa017
@@ -968,7 +976,7 @@
             this.gv_daa017.OptionsColumn.AllowEdit = false;
             this.gv_daa017.Tag = "query_a.daa017";
             this.gv_daa017.Visible = true;
-            this.gv_daa017.VisibleIndex = 19;
+            this.gv_daa017.VisibleIndex = 20;
             this.gv_daa017.Width = 103;
             // 
             // gv_mesStartProd
@@ -981,7 +989,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 = 20;
+            this.gv_mesStartProd.VisibleIndex = 21;
             this.gv_mesStartProd.Width = 103;
             // 
             // gv_mesEndProd
@@ -994,7 +1002,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 = 21;
+            this.gv_mesEndProd.VisibleIndex = 22;
             this.gv_mesEndProd.Width = 103;
             // 
             // gridColumn21
@@ -1012,7 +1020,7 @@
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 22;
+            this.gridColumn22.VisibleIndex = 23;
             this.gridColumn22.Width = 45;
             // 
             // gridColumn23
@@ -1030,7 +1038,7 @@
             this.gridColumn24.MinWidth = 25;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 23;
+            this.gridColumn24.VisibleIndex = 24;
             this.gridColumn24.Width = 25;
             // 
             // gridColumn25
@@ -1040,7 +1048,7 @@
             this.gridColumn25.MinWidth = 25;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 3;
+            this.gridColumn25.VisibleIndex = 4;
             this.gridColumn25.Width = 114;
             // 
             // pageBar1
@@ -1103,6 +1111,9 @@
             this.gridColumn53,
             this.gridColumn54,
             this.gridColumn55,
+            this.gridColumn92,
+            this.gridColumn91,
+            this.gridColumn93,
             this.gridColumn56,
             this.gridColumn57,
             this.gridColumn58,
@@ -1435,7 +1446,7 @@
             // 
             this.xtraTabPage7.Controls.Add(this.splitContainerControl1);
             this.xtraTabPage7.Name = "xtraTabPage7";
-            this.xtraTabPage7.Size = new System.Drawing.Size(1648, 250);
+            this.xtraTabPage7.Size = new System.Drawing.Size(1649, 250);
             this.xtraTabPage7.Text = "鎵樻澘鐮佹槑缁�";
             // 
             // splitContainerControl1
@@ -1454,7 +1465,7 @@
             this.splitContainerControl1.Panel2.Controls.Add(this.gcMxL2);
             this.splitContainerControl1.Panel2.Text = "Panel2";
             this.splitContainerControl1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitContainerControl1.Size = new System.Drawing.Size(1648, 250);
+            this.splitContainerControl1.Size = new System.Drawing.Size(1649, 250);
             this.splitContainerControl1.SplitterPosition = 0;
             this.splitContainerControl1.TabIndex = 2;
             // 
@@ -1466,7 +1477,7 @@
             this.gcMxL2.Name = "gcMxL2";
             this.gcMxL2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit2});
-            this.gcMxL2.Size = new System.Drawing.Size(1648, 238);
+            this.gcMxL2.Size = new System.Drawing.Size(1649, 238);
             this.gcMxL2.TabIndex = 0;
             this.gcMxL2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMxL2});
@@ -1725,7 +1736,7 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1651, 708);
-            this.splitMx1.SplitterPosition = 330;
+            this.splitMx1.SplitterPosition = 329;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -1766,7 +1777,7 @@
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(657, 373, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1651, 330);
+            this.layoutMx1.Size = new System.Drawing.Size(1651, 329);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
@@ -1781,10 +1792,10 @@
             // 
             // txt_daa009
             // 
-            this.txt_daa009.Location = new System.Drawing.Point(144, 269);
+            this.txt_daa009.Location = new System.Drawing.Point(141, 267);
             this.txt_daa009.Name = "txt_daa009";
             this.txt_daa009.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa009.Size = new System.Drawing.Size(679, 24);
+            this.txt_daa009.Size = new System.Drawing.Size(682, 24);
             this.txt_daa009.StyleController = this.layoutMx1;
             this.txt_daa009.TabIndex = 240;
             this.txt_daa009.Tag = "";
@@ -1801,170 +1812,170 @@
             // 
             // txt_daa001
             // 
-            this.txt_daa001.Location = new System.Drawing.Point(144, 16);
+            this.txt_daa001.Location = new System.Drawing.Point(141, 12);
             this.txt_daa001.Name = "txt_daa001";
             this.txt_daa001.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa001.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa001.Size = new System.Drawing.Size(274, 24);
             this.txt_daa001.StyleController = this.layoutMx1;
             this.txt_daa001.TabIndex = 216;
             this.txt_daa001.Tag = "readonly";
             // 
             // txt_daa008
             // 
-            this.txt_daa008.Location = new System.Drawing.Point(958, 16);
+            this.txt_daa008.Location = new System.Drawing.Point(956, 12);
             this.txt_daa008.Name = "txt_daa008";
             this.txt_daa008.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa008.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa008.Size = new System.Drawing.Size(275, 24);
             this.txt_daa008.StyleController = this.layoutMx1;
             this.txt_daa008.TabIndex = 235;
             this.txt_daa008.Tag = "readonly";
             // 
             // txt_saleOrderNo
             // 
-            this.txt_saleOrderNo.Location = new System.Drawing.Point(958, 218);
+            this.txt_saleOrderNo.Location = new System.Drawing.Point(956, 216);
             this.txt_saleOrderNo.Name = "txt_saleOrderNo";
             this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_saleOrderNo.Size = new System.Drawing.Size(272, 24);
+            this.txt_saleOrderNo.Size = new System.Drawing.Size(275, 24);
             this.txt_saleOrderNo.StyleController = this.layoutMx1;
             this.txt_saleOrderNo.TabIndex = 465;
             this.txt_saleOrderNo.Tag = "readonly";
             // 
             // txt_mesStartProdn
             // 
-            this.txt_mesStartProdn.Location = new System.Drawing.Point(1365, 16);
+            this.txt_mesStartProdn.Location = new System.Drawing.Point(1364, 12);
             this.txt_mesStartProdn.Name = "txt_mesStartProdn";
             this.txt_mesStartProdn.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesStartProdn.Size = new System.Drawing.Size(273, 24);
+            this.txt_mesStartProdn.Size = new System.Drawing.Size(275, 24);
             this.txt_mesStartProdn.StyleController = this.layoutMx1;
             this.txt_mesStartProdn.TabIndex = 336;
             this.txt_mesStartProdn.Tag = "readonly";
             // 
             // txt_daa014
             // 
-            this.txt_daa014.Location = new System.Drawing.Point(144, 65);
+            this.txt_daa014.Location = new System.Drawing.Point(141, 63);
             this.txt_daa014.Name = "txt_daa014";
             this.txt_daa014.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa014.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa014.Size = new System.Drawing.Size(274, 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(551, 16);
+            this.txt_daa022Remark.Location = new System.Drawing.Point(548, 12);
             this.txt_daa022Remark.Name = "txt_daa022Remark";
             this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa022Remark.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa022Remark.Size = new System.Drawing.Size(275, 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(958, 65);
+            this.txt_daa010.Location = new System.Drawing.Point(956, 63);
             this.txt_daa010.Name = "txt_daa010";
             this.txt_daa010.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa010.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa010.Size = new System.Drawing.Size(275, 24);
             this.txt_daa010.StyleController = this.layoutMx1;
             this.txt_daa010.TabIndex = 243;
             this.txt_daa010.Tag = "readonly";
             // 
             // txt_mesEndProdn
             // 
-            this.txt_mesEndProdn.Location = new System.Drawing.Point(1365, 65);
+            this.txt_mesEndProdn.Location = new System.Drawing.Point(1364, 63);
             this.txt_mesEndProdn.Name = "txt_mesEndProdn";
             this.txt_mesEndProdn.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesEndProdn.Size = new System.Drawing.Size(273, 24);
+            this.txt_mesEndProdn.Size = new System.Drawing.Size(275, 24);
             this.txt_mesEndProdn.StyleController = this.layoutMx1;
             this.txt_mesEndProdn.TabIndex = 338;
             this.txt_mesEndProdn.Tag = "readonly";
             // 
             // txt_daa011
             // 
-            this.txt_daa011.Location = new System.Drawing.Point(958, 116);
+            this.txt_daa011.Location = new System.Drawing.Point(956, 114);
             this.txt_daa011.Name = "txt_daa011";
             this.txt_daa011.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa011.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa011.Size = new System.Drawing.Size(275, 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(551, 116);
+            this.txt_dptName.Location = new System.Drawing.Point(548, 114);
             this.txt_dptName.Name = "txt_dptName";
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(272, 24);
+            this.txt_dptName.Size = new System.Drawing.Size(275, 24);
             this.txt_dptName.StyleController = this.layoutMx1;
             this.txt_dptName.TabIndex = 258;
             this.txt_dptName.Tag = "readonly";
             // 
             // txt_daa016n
             // 
-            this.txt_daa016n.Location = new System.Drawing.Point(1365, 116);
+            this.txt_daa016n.Location = new System.Drawing.Point(1364, 114);
             this.txt_daa016n.Name = "txt_daa016n";
             this.txt_daa016n.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa016n.Size = new System.Drawing.Size(273, 24);
+            this.txt_daa016n.Size = new System.Drawing.Size(275, 24);
             this.txt_daa016n.StyleController = this.layoutMx1;
             this.txt_daa016n.TabIndex = 273;
             this.txt_daa016n.Tag = "readonly";
             // 
             // txt_daa029
             // 
-            this.txt_daa029.Location = new System.Drawing.Point(144, 116);
+            this.txt_daa029.Location = new System.Drawing.Point(141, 114);
             this.txt_daa029.Name = "txt_daa029";
             this.txt_daa029.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa029.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa029.Size = new System.Drawing.Size(274, 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(551, 167);
+            this.txt_lineName.Location = new System.Drawing.Point(548, 165);
             this.txt_lineName.Name = "txt_lineName";
             this.txt_lineName.Properties.Appearance.Options.UseFont = true;
-            this.txt_lineName.Size = new System.Drawing.Size(272, 24);
+            this.txt_lineName.Size = new System.Drawing.Size(275, 24);
             this.txt_lineName.StyleController = this.layoutMx1;
             this.txt_lineName.TabIndex = 267;
             this.txt_lineName.Tag = "readonly";
             // 
             // txt_daa017n
             // 
-            this.txt_daa017n.Location = new System.Drawing.Point(1365, 167);
+            this.txt_daa017n.Location = new System.Drawing.Point(1364, 165);
             this.txt_daa017n.Name = "txt_daa017n";
             this.txt_daa017n.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa017n.Size = new System.Drawing.Size(273, 24);
+            this.txt_daa017n.Size = new System.Drawing.Size(275, 24);
             this.txt_daa017n.StyleController = this.layoutMx1;
             this.txt_daa017n.TabIndex = 280;
             this.txt_daa017n.Tag = "readonly";
             // 
             // txt_daa003
             // 
-            this.txt_daa003.Location = new System.Drawing.Point(144, 167);
+            this.txt_daa003.Location = new System.Drawing.Point(141, 165);
             this.txt_daa003.Name = "txt_daa003";
             this.txt_daa003.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa003.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa003.Size = new System.Drawing.Size(274, 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(958, 167);
+            this.txt_dwName.Location = new System.Drawing.Point(956, 165);
             this.txt_dwName.Name = "txt_dwName";
             this.txt_dwName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dwName.Size = new System.Drawing.Size(272, 24);
+            this.txt_dwName.Size = new System.Drawing.Size(275, 24);
             this.txt_dwName.StyleController = this.layoutMx1;
             this.txt_dwName.TabIndex = 226;
             this.txt_dwName.Tag = "readonly";
             // 
             // txt_daa004
             // 
-            this.txt_daa004.Location = new System.Drawing.Point(144, 218);
+            this.txt_daa004.Location = new System.Drawing.Point(141, 216);
             this.txt_daa004.Name = "txt_daa004";
             this.txt_daa004.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa004.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa004.Size = new System.Drawing.Size(274, 24);
             this.txt_daa004.StyleController = this.layoutMx1;
             this.txt_daa004.TabIndex = 222;
             this.txt_daa004.Tag = "readonly";
@@ -1972,24 +1983,24 @@
             // txt_daa015
             // 
             this.txt_daa015.IsReadly = false;
-            this.txt_daa015.Location = new System.Drawing.Point(1365, 218);
+            this.txt_daa015.Location = new System.Drawing.Point(1364, 216);
             this.txt_daa015.Name = "txt_daa015";
-            this.txt_daa015.Size = new System.Drawing.Size(273, 24);
+            this.txt_daa015.Size = new System.Drawing.Size(275, 24);
             this.txt_daa015.TabIndex = 473;
             // 
             // txt_lineNo
             // 
-            this.txt_lineNo.Location = new System.Drawing.Point(551, 218);
+            this.txt_lineNo.Location = new System.Drawing.Point(548, 216);
             this.txt_lineNo.Name = "txt_lineNo";
-            this.txt_lineNo.Size = new System.Drawing.Size(272, 24);
+            this.txt_lineNo.Size = new System.Drawing.Size(275, 24);
             this.txt_lineNo.StyleController = this.layoutMx1;
             this.txt_lineNo.TabIndex = 474;
             // 
             // txt_dptNo
             // 
-            this.txt_dptNo.Location = new System.Drawing.Point(551, 65);
+            this.txt_dptNo.Location = new System.Drawing.Point(548, 63);
             this.txt_dptNo.Name = "txt_dptNo";
-            this.txt_dptNo.Size = new System.Drawing.Size(272, 24);
+            this.txt_dptNo.Size = new System.Drawing.Size(275, 24);
             this.txt_dptNo.StyleController = this.layoutMx1;
             this.txt_dptNo.TabIndex = 475;
             // 
@@ -2004,10 +2015,10 @@
             // 
             // txt_daa018Txt
             // 
-            this.txt_daa018Txt.Location = new System.Drawing.Point(958, 269);
+            this.txt_daa018Txt.Location = new System.Drawing.Point(956, 267);
             this.txt_daa018Txt.Name = "txt_daa018Txt";
             this.txt_daa018Txt.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa018Txt.Size = new System.Drawing.Size(272, 24);
+            this.txt_daa018Txt.Size = new System.Drawing.Size(275, 24);
             this.txt_daa018Txt.StyleController = this.layoutMx1;
             this.txt_daa018Txt.TabIndex = 465;
             this.txt_daa018Txt.Tag = "readonly";
@@ -2015,14 +2026,14 @@
             // txt_xgdate
             // 
             this.txt_xgdate.EditValue = null;
-            this.txt_xgdate.Location = new System.Drawing.Point(1365, 269);
+            this.txt_xgdate.Location = new System.Drawing.Point(1364, 267);
             this.txt_xgdate.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
             this.txt_xgdate.Name = "txt_xgdate";
             this.txt_xgdate.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.txt_xgdate.Properties.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.txt_xgdate.Size = new System.Drawing.Size(273, 24);
+            this.txt_xgdate.Size = new System.Drawing.Size(275, 24);
             this.txt_xgdate.StyleController = this.layoutMx1;
             this.txt_xgdate.TabIndex = 477;
             // 
@@ -2098,55 +2109,55 @@
             this.txt_xg});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition1.Width = 100D;
-            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition2.Width = 100D;
-            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition3.Width = 100D;
-            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition4.Width = 100D;
+            columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition24.Width = 100D;
+            columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition25.Width = 100D;
+            columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition26.Width = 100D;
+            columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition27.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition1,
-            columnDefinition2,
-            columnDefinition3,
-            columnDefinition4});
-            rowDefinition1.Height = 100D;
-            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition2.Height = 100D;
-            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition3.Height = 100D;
-            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition4.Height = 100D;
-            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition6.Height = 100D;
-            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition24,
+            columnDefinition25,
+            columnDefinition26,
+            columnDefinition27});
+            rowDefinition12.Height = 100D;
+            rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition13.Height = 100D;
+            rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition14.Height = 100D;
+            rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition15.Height = 100D;
+            rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition16.Height = 100D;
+            rowDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition17.Height = 100D;
+            rowDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3,
-            rowDefinition4,
-            rowDefinition5,
-            rowDefinition6});
-            this.Root.Size = new System.Drawing.Size(1651, 330);
+            rowDefinition12,
+            rowDefinition13,
+            rowDefinition14,
+            rowDefinition15,
+            rowDefinition16,
+            rowDefinition17});
+            this.Root.Size = new System.Drawing.Size(1651, 329);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_daa008;
-            this.layoutControlItem3.Location = new System.Drawing.Point(814, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(815, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(407, 49);
+            this.layoutControlItem3.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_daa014;
-            this.layoutControlItem5.Location = new System.Drawing.Point(0, 49);
+            this.layoutControlItem5.Location = new System.Drawing.Point(0, 51);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem5.Size = new System.Drawing.Size(407, 51);
@@ -2156,22 +2167,22 @@
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_daa010;
-            this.layoutControlItem7.Location = new System.Drawing.Point(814, 49);
+            this.layoutControlItem7.Location = new System.Drawing.Point(815, 51);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem7.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_daa011;
-            this.layoutControlItem11.Location = new System.Drawing.Point(814, 100);
+            this.layoutControlItem11.Location = new System.Drawing.Point(815, 102);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem11.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem11.Text = "宸茬敓浜ч噺";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(117, 18);
             // 
@@ -2181,29 +2192,29 @@
             this.layoutControlItem6.Location = new System.Drawing.Point(407, 0);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(407, 49);
+            this.layoutControlItem6.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem6.Text = "閫氱煡澶囨枡";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_lineName;
-            this.layoutControlItem14.Location = new System.Drawing.Point(407, 151);
+            this.layoutControlItem14.Location = new System.Drawing.Point(407, 153);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem14.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem14.Text = "鐢熶骇绾垮埆";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_dwName;
-            this.layoutControlItem15.Location = new System.Drawing.Point(814, 151);
+            this.layoutControlItem15.Location = new System.Drawing.Point(815, 153);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem15.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem15.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem15.Text = "鍗曚綅";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(117, 18);
             // 
@@ -2211,17 +2222,17 @@
             // 
             this.layoutControlItem4.Control = this.txt_mesStartProdn;
             this.layoutControlItem4.CustomizationFormText = "Mes棰勮寮�宸�";
-            this.layoutControlItem4.Location = new System.Drawing.Point(1221, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(1223, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem4.Size = new System.Drawing.Size(408, 49);
+            this.layoutControlItem4.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem4.Text = "Mes棰勮寮�宸�";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_mesEndProdn;
-            this.layoutControlItem8.Location = new System.Drawing.Point(1221, 49);
+            this.layoutControlItem8.Location = new System.Drawing.Point(1223, 51);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
@@ -2232,7 +2243,7 @@
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_daa016n;
-            this.layoutControlItem12.Location = new System.Drawing.Point(1221, 100);
+            this.layoutControlItem12.Location = new System.Drawing.Point(1223, 102);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
@@ -2243,7 +2254,7 @@
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_daa017n;
-            this.layoutControlItem16.Location = new System.Drawing.Point(1221, 151);
+            this.layoutControlItem16.Location = new System.Drawing.Point(1223, 153);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
@@ -2254,29 +2265,29 @@
             // layoutControlItem40
             // 
             this.layoutControlItem40.Control = this.txt_lineNo;
-            this.layoutControlItem40.Location = new System.Drawing.Point(407, 202);
+            this.layoutControlItem40.Location = new System.Drawing.Point(407, 204);
             this.layoutControlItem40.Name = "layoutControlItem40";
             this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem40.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem40.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem40.Text = "绾垮埆缂栫爜";
             this.layoutControlItem40.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_saleOrderNo;
-            this.layoutControlItem9.Location = new System.Drawing.Point(814, 202);
+            this.layoutControlItem9.Location = new System.Drawing.Point(815, 204);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem9.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem9.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_daa029;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 100);
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 102);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
             this.layoutControlItem13.Size = new System.Drawing.Size(407, 51);
@@ -2286,7 +2297,7 @@
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_daa003;
-            this.layoutControlItem19.Location = new System.Drawing.Point(0, 151);
+            this.layoutControlItem19.Location = new System.Drawing.Point(0, 153);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
             this.layoutControlItem19.Size = new System.Drawing.Size(407, 51);
@@ -2296,7 +2307,7 @@
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txt_daa004;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 202);
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 204);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
             this.layoutControlItem17.Size = new System.Drawing.Size(407, 51);
@@ -2306,22 +2317,22 @@
             // layoutControlItem28
             // 
             this.layoutControlItem28.Control = this.txt_daa009;
-            this.layoutControlItem28.Location = new System.Drawing.Point(0, 253);
+            this.layoutControlItem28.Location = new System.Drawing.Point(0, 255);
             this.layoutControlItem28.Name = "layoutControlItem28";
             this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem28.Size = new System.Drawing.Size(814, 51);
+            this.layoutControlItem28.Size = new System.Drawing.Size(815, 54);
             this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
             this.layoutControlItem28.TextSize = new System.Drawing.Size(117, 18);
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_dptName;
-            this.layoutControlItem20.Location = new System.Drawing.Point(407, 100);
+            this.layoutControlItem20.Location = new System.Drawing.Point(407, 102);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem20.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem20.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
             this.layoutControlItem20.TextSize = new System.Drawing.Size(117, 18);
             // 
@@ -2329,11 +2340,11 @@
             // 
             this.layoutControlItem41.Control = this.txt_dptNo;
             this.layoutControlItem41.CustomizationFormText = "浠诲姟鍗曞崟鍙�";
-            this.layoutControlItem41.Location = new System.Drawing.Point(407, 49);
+            this.layoutControlItem41.Location = new System.Drawing.Point(407, 51);
             this.layoutControlItem41.Name = "layoutControlItem41";
             this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem41.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem41.Size = new System.Drawing.Size(408, 51);
             this.layoutControlItem41.Text = "浠诲姟鍗曞崟鍙�";
             this.layoutControlItem41.TextSize = new System.Drawing.Size(117, 18);
             // 
@@ -2342,18 +2353,18 @@
             this.layoutControlItem47.Control = this.txt_daa018Txt;
             this.layoutControlItem47.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
             this.layoutControlItem47.CustomizationFormText = "宸ュ崟鐘舵��";
-            this.layoutControlItem47.Location = new System.Drawing.Point(814, 253);
+            this.layoutControlItem47.Location = new System.Drawing.Point(815, 255);
             this.layoutControlItem47.Name = "layoutControlItem47";
             this.layoutControlItem47.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem47.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem47.Size = new System.Drawing.Size(407, 51);
+            this.layoutControlItem47.Size = new System.Drawing.Size(408, 54);
             this.layoutControlItem47.Text = "宸ュ崟鐘舵��";
             this.layoutControlItem47.TextSize = new System.Drawing.Size(117, 18);
             // 
             // txt_daa015label
             // 
             this.txt_daa015label.Control = this.txt_daa015;
-            this.txt_daa015label.Location = new System.Drawing.Point(1221, 202);
+            this.txt_daa015label.Location = new System.Drawing.Point(1223, 204);
             this.txt_daa015label.Name = "txt_daa015label";
             this.txt_daa015label.OptionsTableLayoutItem.ColumnIndex = 3;
             this.txt_daa015label.OptionsTableLayoutItem.RowIndex = 4;
@@ -2366,18 +2377,18 @@
             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(407, 49);
+            this.layoutControlItem1.Size = new System.Drawing.Size(407, 51);
             this.layoutControlItem1.Text = "宸ュ崟鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(117, 18);
             // 
             // txt_xg
             // 
             this.txt_xg.Control = this.txt_xgdate;
-            this.txt_xg.Location = new System.Drawing.Point(1221, 253);
+            this.txt_xg.Location = new System.Drawing.Point(1223, 255);
             this.txt_xg.Name = "txt_xg";
             this.txt_xg.OptionsTableLayoutItem.ColumnIndex = 3;
             this.txt_xg.OptionsTableLayoutItem.RowIndex = 5;
-            this.txt_xg.Size = new System.Drawing.Size(408, 51);
+            this.txt_xg.Size = new System.Drawing.Size(408, 54);
             this.txt_xg.Text = "鎺掍骇鏃堕棿(鍙慨鏀�)";
             this.txt_xg.TextSize = new System.Drawing.Size(117, 18);
             // 
@@ -2387,7 +2398,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1651, 366);
+            this.tabMx.Size = new System.Drawing.Size(1651, 367);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -2400,7 +2411,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1649, 334);
+            this.tabMxPage1.Size = new System.Drawing.Size(1649, 335);
             this.tabMxPage1.Text = "澶囨枡鍗曡韩";
             // 
             // gcMx1
@@ -2409,7 +2420,7 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1649, 334);
+            this.gcMx1.Size = new System.Drawing.Size(1649, 335);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -2432,6 +2443,9 @@
             this.gvMx1dab014,
             this.gridColumn15,
             this.gridColumn16,
+            this.gridColumn89,
+            this.gridColumn88,
+            this.gridColumn90,
             this.gvMx1dab012,
             this.gvMx1dab009,
             this.gvMx1scrapqty,
@@ -2607,7 +2621,7 @@
             this.gvMx1dab009.Name = "gvMx1dab009";
             this.gvMx1dab009.Tag = "query_a.dab009";
             this.gvMx1dab009.Visible = true;
-            this.gvMx1dab009.VisibleIndex = 12;
+            this.gvMx1dab009.VisibleIndex = 15;
             this.gvMx1dab009.Width = 94;
             // 
             // gvMx1scrapqty
@@ -2639,7 +2653,7 @@
             this.gvMx1zyBl.Name = "gvMx1zyBl";
             this.gvMx1zyBl.Tag = "query_a.zy_bl";
             this.gvMx1zyBl.Visible = true;
-            this.gvMx1zyBl.VisibleIndex = 17;
+            this.gvMx1zyBl.VisibleIndex = 20;
             this.gvMx1zyBl.Width = 94;
             // 
             // gvMx1llBl
@@ -2651,7 +2665,7 @@
             this.gvMx1llBl.Name = "gvMx1llBl";
             this.gvMx1llBl.Tag = "query_a.ll_bl";
             this.gvMx1llBl.Visible = true;
-            this.gvMx1llBl.VisibleIndex = 15;
+            this.gvMx1llBl.VisibleIndex = 18;
             this.gvMx1llBl.Width = 94;
             // 
             // gvMx1lpTl
@@ -2663,7 +2677,7 @@
             this.gvMx1lpTl.Name = "gvMx1lpTl";
             this.gvMx1lpTl.Tag = "query_a.lp_tl";
             this.gvMx1lpTl.Visible = true;
-            this.gvMx1lpTl.VisibleIndex = 16;
+            this.gvMx1lpTl.VisibleIndex = 19;
             this.gvMx1lpTl.Width = 94;
             // 
             // gvMx1dab021
@@ -2675,7 +2689,7 @@
             this.gvMx1dab021.Name = "gvMx1dab021";
             this.gvMx1dab021.Tag = "query_a.dab021";
             this.gvMx1dab021.Visible = true;
-            this.gvMx1dab021.VisibleIndex = 13;
+            this.gvMx1dab021.VisibleIndex = 16;
             this.gvMx1dab021.Width = 94;
             // 
             // gvMx1dab010
@@ -2757,14 +2771,14 @@
             this.gvMx1dab023.Name = "gvMx1dab023";
             this.gvMx1dab023.Tag = "query_a.dab023";
             this.gvMx1dab023.Visible = true;
-            this.gvMx1dab023.VisibleIndex = 14;
+            this.gvMx1dab023.VisibleIndex = 17;
             this.gvMx1dab023.Width = 94;
             // 
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.splitMx99);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1649, 334);
+            this.tabMxPage2.Size = new System.Drawing.Size(1649, 335);
             this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�";
             // 
             // splitMx99
@@ -2784,7 +2798,7 @@
             this.splitMx99.Panel2.Controls.Add(this.gcMx2);
             this.splitMx99.Panel2.Text = "Panel2";
             this.splitMx99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx99.Size = new System.Drawing.Size(1649, 334);
+            this.splitMx99.Size = new System.Drawing.Size(1649, 335);
             this.splitMx99.SplitterPosition = 84;
             this.splitMx99.TabIndex = 2;
             // 
@@ -2811,29 +2825,29 @@
             // 
             this.layShuLiang.Controls.Add(this.txt_iCount_1);
             this.layShuLiang.Controls.Add(this.txt_yuliang_1);
-            this.layShuLiang.Location = new System.Drawing.Point(721, 52);
+            this.layShuLiang.Location = new System.Drawing.Point(664, 44);
             this.layShuLiang.Name = "layShuLiang";
             this.layShuLiang.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(133, 518, 812, 500);
             this.layShuLiang.Root = this.layoutControlGroup3;
-            this.layShuLiang.Size = new System.Drawing.Size(350, 30);
+            this.layShuLiang.Size = new System.Drawing.Size(322, 28);
             this.layShuLiang.TabIndex = 475;
             this.layShuLiang.Text = "dataLayoutControl1";
             // 
             // txt_iCount_1
             // 
-            this.txt_iCount_1.Location = new System.Drawing.Point(91, 3);
+            this.txt_iCount_1.Location = new System.Drawing.Point(89, 2);
             this.txt_iCount_1.Name = "txt_iCount_1";
             this.txt_iCount_1.Properties.ReadOnly = true;
-            this.txt_iCount_1.Size = new System.Drawing.Size(82, 24);
+            this.txt_iCount_1.Size = new System.Drawing.Size(70, 24);
             this.txt_iCount_1.StyleController = this.layShuLiang;
             this.txt_iCount_1.TabIndex = 5;
             // 
             // txt_yuliang_1
             // 
-            this.txt_yuliang_1.Location = new System.Drawing.Point(266, 3);
+            this.txt_yuliang_1.Location = new System.Drawing.Point(250, 2);
             this.txt_yuliang_1.Name = "txt_yuliang_1";
             this.txt_yuliang_1.Properties.ReadOnly = true;
-            this.txt_yuliang_1.Size = new System.Drawing.Size(82, 24);
+            this.txt_yuliang_1.Size = new System.Drawing.Size(70, 24);
             this.txt_yuliang_1.StyleController = this.layShuLiang;
             this.txt_yuliang_1.TabIndex = 6;
             // 
@@ -2846,19 +2860,19 @@
             this.layoutControlItem39});
             this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup3.Name = "Root";
-            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition5.Width = 100D;
-            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition6.Width = 100D;
+            columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition28.Width = 100D;
+            columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition29.Width = 100D;
             this.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6});
-            rowDefinition7.Height = 100D;
-            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition28,
+            columnDefinition29});
+            rowDefinition18.Height = 100D;
+            rowDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition7});
+            rowDefinition18});
             this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup3.Size = new System.Drawing.Size(350, 30);
+            this.layoutControlGroup3.Size = new System.Drawing.Size(322, 28);
             this.layoutControlGroup3.TextVisible = false;
             // 
             // layoutControlItem25
@@ -2866,7 +2880,7 @@
             this.layoutControlItem25.Control = this.txt_iCount_1;
             this.layoutControlItem25.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem25.Name = "layoutControlItem25";
-            this.layoutControlItem25.Size = new System.Drawing.Size(175, 30);
+            this.layoutControlItem25.Size = new System.Drawing.Size(161, 28);
             this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
             this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -2874,16 +2888,16 @@
             // 
             this.layoutControlItem39.Control = this.txt_yuliang_1;
             this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
-            this.layoutControlItem39.Location = new System.Drawing.Point(175, 0);
+            this.layoutControlItem39.Location = new System.Drawing.Point(161, 0);
             this.layoutControlItem39.Name = "layoutControlItem39";
             this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem39.Size = new System.Drawing.Size(175, 30);
+            this.layoutControlItem39.Size = new System.Drawing.Size(161, 28);
             this.layoutControlItem39.Text = "鎵撳嵃浣欐暟";
             this.layoutControlItem39.TextSize = new System.Drawing.Size(75, 18);
             // 
             // radOut
             // 
-            this.radOut.Location = new System.Drawing.Point(1073, 13);
+            this.radOut.Location = new System.Drawing.Point(988, 10);
             this.radOut.Margin = new System.Windows.Forms.Padding(0);
             this.radOut.Name = "radOut";
             this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2892,7 +2906,7 @@
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
             this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
-            this.radOut.Size = new System.Drawing.Size(354, 36);
+            this.radOut.Size = new System.Drawing.Size(326, 32);
             this.radOut.StyleController = this.layoutMx99;
             this.radOut.TabIndex = 473;
             // 
@@ -2900,29 +2914,29 @@
             // 
             this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(1073, 49);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(988, 42);
             this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint1.Name = "ucBtnPrint1";
             this.ucBtnPrint1.rptParameter = null;
-            this.ucBtnPrint1.Size = new System.Drawing.Size(354, 36);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(326, 32);
             this.ucBtnPrint1.TabIndex = 464;
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(810, 16);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(751, 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(261, 24);
+            this.txt_psnQty_1.Size = new System.Drawing.Size(235, 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(456, 52);
+            this.txt_printRemark.Location = new System.Drawing.Point(425, 44);
             this.txt_printRemark.Name = "txt_printRemark";
             this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_printRemark.Size = new System.Drawing.Size(261, 24);
+            this.txt_printRemark.Size = new System.Drawing.Size(235, 24);
             this.txt_printRemark.StyleController = this.layoutMx99;
             this.txt_printRemark.TabIndex = 334;
             this.txt_printRemark.Tag = "readOnly-1";
@@ -2930,32 +2944,32 @@
             // txt_kQty
             // 
             this.txt_kQty.EditValue = "";
-            this.txt_kQty.Location = new System.Drawing.Point(456, 16);
+            this.txt_kQty.Location = new System.Drawing.Point(425, 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(261, 24);
+            this.txt_kQty.Size = new System.Drawing.Size(235, 24);
             this.txt_kQty.StyleController = this.layoutMx99;
             this.txt_kQty.TabIndex = 472;
             this.txt_kQty.Tag = "readonly";
             // 
             // txt_yQty
             // 
-            this.txt_yQty.Location = new System.Drawing.Point(102, 52);
+            this.txt_yQty.Location = new System.Drawing.Point(99, 44);
             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(261, 24);
+            this.txt_yQty.Size = new System.Drawing.Size(235, 24);
             this.txt_yQty.StyleController = this.layoutMx99;
             this.txt_yQty.TabIndex = 470;
             this.txt_yQty.Tag = "readonly";
             // 
             // txt_zQty
             // 
-            this.txt_zQty.Location = new System.Drawing.Point(102, 16);
+            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(261, 24);
+            this.txt_zQty.Size = new System.Drawing.Size(235, 24);
             this.txt_zQty.StyleController = this.layoutMx99;
             this.txt_zQty.TabIndex = 474;
             // 
@@ -2974,30 +2988,30 @@
             this.layoutControlItem36});
             this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup1.Name = "Root";
-            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition7.Width = 100D;
-            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition8.Width = 100D;
-            columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition9.Width = 100D;
-            columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition10.Width = 100D;
-            columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
-            columnDefinition11.Width = 190D;
+            columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition30.Width = 100D;
+            columnDefinition31.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition31.Width = 100D;
+            columnDefinition32.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition32.Width = 100D;
+            columnDefinition33.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition33.Width = 100D;
+            columnDefinition34.SizeType = System.Windows.Forms.SizeType.AutoSize;
+            columnDefinition34.Width = 325D;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition7,
-            columnDefinition8,
-            columnDefinition9,
-            columnDefinition10,
-            columnDefinition11});
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition9.Height = 100D;
-            rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition30,
+            columnDefinition31,
+            columnDefinition32,
+            columnDefinition33,
+            columnDefinition34});
+            rowDefinition19.Height = 100D;
+            rowDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition20.Height = 100D;
+            rowDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition8,
-            rowDefinition9});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1628, 98);
+            rowDefinition19,
+            rowDefinition20});
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1649, 84);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem23
@@ -3005,21 +3019,21 @@
             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(354, 0);
+            this.layoutControlItem23.Location = new System.Drawing.Point(326, 0);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem23.Size = new System.Drawing.Size(354, 36);
+            this.layoutControlItem23.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem23.Text = "鍙墦鍗版暟閲�";
             this.layoutControlItem23.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem35
             // 
             this.layoutControlItem35.Control = this.radOut;
-            this.layoutControlItem35.Location = new System.Drawing.Point(1062, 0);
+            this.layoutControlItem35.Location = new System.Drawing.Point(978, 0);
             this.layoutControlItem35.Name = "layoutControlItem35";
             this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem35.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem35.Size = new System.Drawing.Size(354, 36);
+            this.layoutControlItem35.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem35.Text = "鑷姩璁$畻";
             this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem35.TextVisible = false;
@@ -3029,12 +3043,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(1062, 36);
+            this.layoutControlItem26.Location = new System.Drawing.Point(978, 32);
             this.layoutControlItem26.Name = "layoutControlItem26";
             this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
             this.layoutControlItem26.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem26.Size = new System.Drawing.Size(354, 36);
+            this.layoutControlItem26.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem26.Text = "鎵樻澘鎵撳嵃";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem26.TextVisible = false;
@@ -3044,21 +3058,21 @@
             this.layoutControlItem22.AppearanceItemCaption.Options.UseTextOptions = true;
             this.layoutControlItem22.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
             this.layoutControlItem22.Control = this.txt_yQty;
-            this.layoutControlItem22.Location = new System.Drawing.Point(0, 36);
+            this.layoutControlItem22.Location = new System.Drawing.Point(0, 32);
             this.layoutControlItem22.Name = "layoutControlItem22";
             this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem22.Size = new System.Drawing.Size(354, 36);
+            this.layoutControlItem22.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem22.Text = "宸叉墦鍗版暟閲�";
             this.layoutControlItem22.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem21
             // 
             this.layoutControlItem21.Control = this.txt_printRemark;
-            this.layoutControlItem21.Location = new System.Drawing.Point(354, 36);
+            this.layoutControlItem21.Location = new System.Drawing.Point(326, 32);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem21.Size = new System.Drawing.Size(354, 36);
+            this.layoutControlItem21.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
             this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -3068,21 +3082,21 @@
             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(708, 0);
+            this.layoutControlItem24.Location = new System.Drawing.Point(652, 0);
             this.layoutControlItem24.Name = "layoutControlItem24";
             this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem24.Size = new System.Drawing.Size(354, 36);
+            this.layoutControlItem24.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem24.Text = "鍐呭寘瑁呮暟閲�";
             this.layoutControlItem24.TextSize = new System.Drawing.Size(75, 18);
             // 
             // layoutControlItem38
             // 
             this.layoutControlItem38.Control = this.layShuLiang;
-            this.layoutControlItem38.Location = new System.Drawing.Point(708, 36);
+            this.layoutControlItem38.Location = new System.Drawing.Point(652, 32);
             this.layoutControlItem38.Name = "layoutControlItem38";
             this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem38.Size = new System.Drawing.Size(354, 36);
+            this.layoutControlItem38.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺";
             this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem38.TextVisible = false;
@@ -3092,7 +3106,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(354, 36);
+            this.layoutControlItem36.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
             this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -3104,7 +3118,7 @@
             this.gcMx2.Name = "gcMx2";
             this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemCheckEdit1});
-            this.gcMx2.Size = new System.Drawing.Size(1649, 238);
+            this.gcMx2.Size = new System.Drawing.Size(1649, 239);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -3343,7 +3357,7 @@
             this.xtraTabPage3.Controls.Add(this.splitMx98);
             this.xtraTabPage3.Name = "xtraTabPage3";
             this.xtraTabPage3.PageVisible = false;
-            this.xtraTabPage3.Size = new System.Drawing.Size(1649, 334);
+            this.xtraTabPage3.Size = new System.Drawing.Size(1649, 335);
             this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
             // 
             // splitMx98
@@ -3363,7 +3377,7 @@
             this.splitMx98.Panel2.Controls.Add(this.gcMx3);
             this.splitMx98.Panel2.Text = "Panel2";
             this.splitMx98.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx98.Size = new System.Drawing.Size(1649, 334);
+            this.splitMx98.Size = new System.Drawing.Size(1649, 335);
             this.splitMx98.SplitterPosition = 51;
             this.splitMx98.TabIndex = 2;
             // 
@@ -3388,53 +3402,53 @@
             // 
             this.ucBtnPrint98.allClickKey = null;
             this.ucBtnPrint98.guidKey = null;
-            this.ucBtnPrint98.Location = new System.Drawing.Point(1349, 13);
+            this.ucBtnPrint98.Location = new System.Drawing.Point(1365, 10);
             this.ucBtnPrint98.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint98.Name = "ucBtnPrint98";
             this.ucBtnPrint98.rptParameter = null;
-            this.ucBtnPrint98.Size = new System.Drawing.Size(268, 30);
+            this.ucBtnPrint98.Size = new System.Drawing.Size(274, 31);
             this.ucBtnPrint98.TabIndex = 8;
             // 
             // txt_yQty98
             // 
-            this.txt_yQty98.Location = new System.Drawing.Point(383, 16);
+            this.txt_yQty98.Location = new System.Drawing.Point(385, 12);
             this.txt_yQty98.Name = "txt_yQty98";
             this.txt_yQty98.Properties.ReadOnly = true;
-            this.txt_yQty98.Size = new System.Drawing.Size(160, 24);
+            this.txt_yQty98.Size = new System.Drawing.Size(165, 24);
             this.txt_yQty98.StyleController = this.layoutMx98;
             this.txt_yQty98.TabIndex = 4;
             // 
             // txt_kQty98
             // 
-            this.txt_kQty98.Location = new System.Drawing.Point(651, 16);
+            this.txt_kQty98.Location = new System.Drawing.Point(656, 12);
             this.txt_kQty98.Name = "txt_kQty98";
             this.txt_kQty98.Properties.ReadOnly = true;
-            this.txt_kQty98.Size = new System.Drawing.Size(160, 24);
+            this.txt_kQty98.Size = new System.Drawing.Size(165, 24);
             this.txt_kQty98.StyleController = this.layoutMx98;
             this.txt_kQty98.TabIndex = 5;
             // 
             // txt_printRemark98
             // 
-            this.txt_printRemark98.Location = new System.Drawing.Point(919, 16);
+            this.txt_printRemark98.Location = new System.Drawing.Point(927, 12);
             this.txt_printRemark98.Name = "txt_printRemark98";
-            this.txt_printRemark98.Size = new System.Drawing.Size(160, 24);
+            this.txt_printRemark98.Size = new System.Drawing.Size(165, 24);
             this.txt_printRemark98.StyleController = this.layoutMx98;
             this.txt_printRemark98.TabIndex = 6;
             // 
             // txt_iCount_98
             // 
-            this.txt_iCount_98.Location = new System.Drawing.Point(1187, 16);
+            this.txt_iCount_98.Location = new System.Drawing.Point(1198, 12);
             this.txt_iCount_98.Name = "txt_iCount_98";
-            this.txt_iCount_98.Size = new System.Drawing.Size(160, 24);
+            this.txt_iCount_98.Size = new System.Drawing.Size(165, 24);
             this.txt_iCount_98.StyleController = this.layoutMx98;
             this.txt_iCount_98.TabIndex = 7;
             // 
             // txt_zQty98
             // 
-            this.txt_zQty98.Location = new System.Drawing.Point(117, 16);
+            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(158, 24);
+            this.txt_zQty98.Size = new System.Drawing.Size(165, 24);
             this.txt_zQty98.StyleController = this.layoutMx98;
             this.txt_zQty98.TabIndex = 9;
             // 
@@ -3451,40 +3465,40 @@
             this.layoutControlItem37});
             this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup2.Name = "Root";
-            columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition12.Width = 100D;
-            columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition13.Width = 100D;
-            columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition14.Width = 100D;
-            columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition15.Width = 100D;
-            columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition16.Width = 100D;
-            columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition17.Width = 100D;
+            columnDefinition35.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition35.Width = 100D;
+            columnDefinition36.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition36.Width = 100D;
+            columnDefinition37.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition37.Width = 100D;
+            columnDefinition38.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition38.Width = 100D;
+            columnDefinition39.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition39.Width = 100D;
+            columnDefinition40.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition40.Width = 100D;
             this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition12,
-            columnDefinition13,
-            columnDefinition14,
-            columnDefinition15,
-            columnDefinition16,
-            columnDefinition17});
-            rowDefinition10.Height = 100D;
-            rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition35,
+            columnDefinition36,
+            columnDefinition37,
+            columnDefinition38,
+            columnDefinition39,
+            columnDefinition40});
+            rowDefinition21.Height = 100D;
+            rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition10});
-            this.layoutControlGroup2.Size = new System.Drawing.Size(1628, 56);
+            rowDefinition21});
+            this.layoutControlGroup2.Size = new System.Drawing.Size(1649, 51);
             this.layoutControlGroup2.TextVisible = false;
             // 
             // layoutControlItem34
             // 
             this.layoutControlItem34.Control = this.ucBtnPrint98;
-            this.layoutControlItem34.Location = new System.Drawing.Point(1338, 0);
+            this.layoutControlItem34.Location = new System.Drawing.Point(1355, 0);
             this.layoutControlItem34.Name = "layoutControlItem34";
             this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 5;
             this.layoutControlItem34.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem34.Size = new System.Drawing.Size(268, 30);
+            this.layoutControlItem34.Size = new System.Drawing.Size(274, 31);
             this.layoutControlItem34.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem34.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem34.TextVisible = false;
@@ -3492,40 +3506,40 @@
             // layoutControlItem33
             // 
             this.layoutControlItem33.Control = this.txt_iCount_98;
-            this.layoutControlItem33.Location = new System.Drawing.Point(1070, 0);
+            this.layoutControlItem33.Location = new System.Drawing.Point(1084, 0);
             this.layoutControlItem33.Name = "layoutControlItem33";
             this.layoutControlItem33.OptionsTableLayoutItem.ColumnIndex = 4;
-            this.layoutControlItem33.Size = new System.Drawing.Size(268, 30);
+            this.layoutControlItem33.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem33.Text = "鏈鎵撳嵃寮犳暟";
             this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem32
             // 
             this.layoutControlItem32.Control = this.txt_printRemark98;
-            this.layoutControlItem32.Location = new System.Drawing.Point(802, 0);
+            this.layoutControlItem32.Location = new System.Drawing.Point(813, 0);
             this.layoutControlItem32.Name = "layoutControlItem32";
             this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem32.Size = new System.Drawing.Size(268, 30);
+            this.layoutControlItem32.Size = new System.Drawing.Size(271, 31);
             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(534, 0);
+            this.layoutControlItem31.Location = new System.Drawing.Point(542, 0);
             this.layoutControlItem31.Name = "layoutControlItem31";
             this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem31.Size = new System.Drawing.Size(268, 30);
+            this.layoutControlItem31.Size = new System.Drawing.Size(271, 31);
             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(266, 0);
+            this.layoutControlItem30.Location = new System.Drawing.Point(271, 0);
             this.layoutControlItem30.Name = "layoutControlItem30";
             this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem30.Size = new System.Drawing.Size(268, 30);
+            this.layoutControlItem30.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem30.Text = "宸叉墦鍗版暟閲�";
             this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3534,7 +3548,7 @@
             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(266, 30);
+            this.layoutControlItem37.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem37.Text = "宸ュ崟鎬婚噺";
             this.layoutControlItem37.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3544,7 +3558,7 @@
             this.gcMx3.Location = new System.Drawing.Point(0, 0);
             this.gcMx3.MainView = this.gvMx3;
             this.gcMx3.Name = "gcMx3";
-            this.gcMx3.Size = new System.Drawing.Size(1649, 271);
+            this.gcMx3.Size = new System.Drawing.Size(1649, 272);
             this.gcMx3.TabIndex = 1;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
@@ -3676,7 +3690,7 @@
             this.xtraTabPage4.Controls.Add(this.splitMx100);
             this.xtraTabPage4.Name = "xtraTabPage4";
             this.xtraTabPage4.PageVisible = false;
-            this.xtraTabPage4.Size = new System.Drawing.Size(1648, 329);
+            this.xtraTabPage4.Size = new System.Drawing.Size(1649, 335);
             this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�";
             // 
             // splitMx100
@@ -3696,7 +3710,7 @@
             this.splitMx100.Panel2.Controls.Add(this.gcMx4);
             this.splitMx100.Panel2.Text = "Panel2";
             this.splitMx100.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx100.Size = new System.Drawing.Size(1648, 329);
+            this.splitMx100.Size = new System.Drawing.Size(1649, 335);
             this.splitMx100.SplitterPosition = 51;
             this.splitMx100.TabIndex = 3;
             // 
@@ -3713,7 +3727,7 @@
             this.layMx100.Name = "layMx100";
             this.layMx100.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(274, 530, 812, 500);
             this.layMx100.Root = this.layoutControlGroup4;
-            this.layMx100.Size = new System.Drawing.Size(1648, 51);
+            this.layMx100.Size = new System.Drawing.Size(1649, 51);
             this.layMx100.TabIndex = 2;
             this.layMx100.Text = "dataLayoutControl1";
             // 
@@ -3721,17 +3735,17 @@
             // 
             this.ucBtnPrint100.allClickKey = null;
             this.ucBtnPrint100.guidKey = null;
-            this.ucBtnPrint100.Location = new System.Drawing.Point(1191, 13);
+            this.ucBtnPrint100.Location = new System.Drawing.Point(1193, 10);
             this.ucBtnPrint100.Margin = new System.Windows.Forms.Padding(0);
             this.ucBtnPrint100.Name = "ucBtnPrint100";
             this.ucBtnPrint100.rptParameter = null;
-            this.ucBtnPrint100.Size = new System.Drawing.Size(296, 33);
+            this.ucBtnPrint100.Size = new System.Drawing.Size(296, 31);
             this.ucBtnPrint100.TabIndex = 0;
             // 
             // btnIn
             // 
             this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16;
-            this.btnIn.Location = new System.Drawing.Point(1489, 16);
+            this.btnIn.Location = new System.Drawing.Point(1491, 12);
             this.btnIn.Name = "btnIn";
             this.btnIn.Size = new System.Drawing.Size(146, 27);
             this.btnIn.StyleController = this.layMx100;
@@ -3740,36 +3754,36 @@
             // 
             // txt_zQty100
             // 
-            this.txt_zQty100.Location = new System.Drawing.Point(117, 16);
+            this.txt_zQty100.Location = new System.Drawing.Point(114, 12);
             this.txt_zQty100.Name = "txt_zQty100";
             this.txt_zQty100.Properties.ReadOnly = true;
-            this.txt_zQty100.Size = new System.Drawing.Size(187, 24);
+            this.txt_zQty100.Size = new System.Drawing.Size(189, 24);
             this.txt_zQty100.StyleController = this.layMx100;
             this.txt_zQty100.TabIndex = 4;
             // 
             // txt_yQty100
             // 
-            this.txt_yQty100.Location = new System.Drawing.Point(412, 16);
+            this.txt_yQty100.Location = new System.Drawing.Point(409, 12);
             this.txt_yQty100.Name = "txt_yQty100";
             this.txt_yQty100.Properties.ReadOnly = true;
-            this.txt_yQty100.Size = new System.Drawing.Size(187, 24);
+            this.txt_yQty100.Size = new System.Drawing.Size(190, 24);
             this.txt_yQty100.StyleController = this.layMx100;
             this.txt_yQty100.TabIndex = 5;
             // 
             // txt_kQty100
             // 
-            this.txt_kQty100.Location = new System.Drawing.Point(707, 16);
+            this.txt_kQty100.Location = new System.Drawing.Point(705, 12);
             this.txt_kQty100.Name = "txt_kQty100";
             this.txt_kQty100.Properties.ReadOnly = true;
-            this.txt_kQty100.Size = new System.Drawing.Size(187, 24);
+            this.txt_kQty100.Size = new System.Drawing.Size(190, 24);
             this.txt_kQty100.StyleController = this.layMx100;
             this.txt_kQty100.TabIndex = 6;
             // 
             // txt_iCount_100
             // 
-            this.txt_iCount_100.Location = new System.Drawing.Point(1002, 16);
+            this.txt_iCount_100.Location = new System.Drawing.Point(1001, 12);
             this.txt_iCount_100.Name = "txt_iCount_100";
-            this.txt_iCount_100.Size = new System.Drawing.Size(187, 24);
+            this.txt_iCount_100.Size = new System.Drawing.Size(190, 24);
             this.txt_iCount_100.StyleController = this.layMx100;
             this.txt_iCount_100.TabIndex = 7;
             // 
@@ -3786,30 +3800,30 @@
             this.layoutControlItem45});
             this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup4.Name = "Root";
-            columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition18.Width = 100D;
-            columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition19.Width = 100D;
-            columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition20.Width = 100D;
-            columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition21.Width = 100D;
-            columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition22.Width = 100D;
-            columnDefinition23.SizeType = System.Windows.Forms.SizeType.Absolute;
-            columnDefinition23.Width = 150D;
+            columnDefinition41.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition41.Width = 100D;
+            columnDefinition42.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition42.Width = 100D;
+            columnDefinition43.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition43.Width = 100D;
+            columnDefinition44.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition44.Width = 100D;
+            columnDefinition45.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition45.Width = 100D;
+            columnDefinition46.SizeType = System.Windows.Forms.SizeType.Absolute;
+            columnDefinition46.Width = 150D;
             this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition18,
-            columnDefinition19,
-            columnDefinition20,
-            columnDefinition21,
-            columnDefinition22,
-            columnDefinition23});
-            rowDefinition11.Height = 100D;
-            rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition41,
+            columnDefinition42,
+            columnDefinition43,
+            columnDefinition44,
+            columnDefinition45,
+            columnDefinition46});
+            rowDefinition22.Height = 100D;
+            rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition11});
-            this.layoutControlGroup4.Size = new System.Drawing.Size(1648, 59);
+            rowDefinition22});
+            this.layoutControlGroup4.Size = new System.Drawing.Size(1649, 51);
             this.layoutControlGroup4.TextVisible = false;
             // 
             // layoutControlItem42
@@ -3817,7 +3831,7 @@
             this.layoutControlItem42.Control = this.txt_zQty100;
             this.layoutControlItem42.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem42.Name = "layoutControlItem42";
-            this.layoutControlItem42.Size = new System.Drawing.Size(295, 33);
+            this.layoutControlItem42.Size = new System.Drawing.Size(295, 31);
             this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
             this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3827,7 +3841,7 @@
             this.layoutControlItem43.Location = new System.Drawing.Point(295, 0);
             this.layoutControlItem43.Name = "layoutControlItem43";
             this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem43.Size = new System.Drawing.Size(295, 33);
+            this.layoutControlItem43.Size = new System.Drawing.Size(296, 31);
             this.layoutControlItem43.Text = "宸叉墦鍗版暟";
             this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3835,20 +3849,20 @@
             // 
             this.layoutControlItem44.Control = this.txt_kQty100;
             this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟";
-            this.layoutControlItem44.Location = new System.Drawing.Point(590, 0);
+            this.layoutControlItem44.Location = new System.Drawing.Point(591, 0);
             this.layoutControlItem44.Name = "layoutControlItem44";
             this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem44.Size = new System.Drawing.Size(295, 33);
+            this.layoutControlItem44.Size = new System.Drawing.Size(296, 31);
             this.layoutControlItem44.Text = "鍙墦鍗版暟瀛�";
             this.layoutControlItem44.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.btnIn;
-            this.layoutControlItem2.Location = new System.Drawing.Point(1476, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(1479, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5;
-            this.layoutControlItem2.Size = new System.Drawing.Size(150, 33);
+            this.layoutControlItem2.Size = new System.Drawing.Size(150, 31);
             this.layoutControlItem2.Text = "瀵煎叆鎸夐挳";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem2.TextVisible = false;
@@ -3856,11 +3870,11 @@
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.ucBtnPrint100;
-            this.layoutControlItem10.Location = new System.Drawing.Point(1180, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(1183, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 4;
             this.layoutControlItem10.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlItem10.Size = new System.Drawing.Size(296, 33);
+            this.layoutControlItem10.Size = new System.Drawing.Size(296, 31);
             this.layoutControlItem10.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -3868,10 +3882,10 @@
             // layoutControlItem45
             // 
             this.layoutControlItem45.Control = this.txt_iCount_100;
-            this.layoutControlItem45.Location = new System.Drawing.Point(885, 0);
+            this.layoutControlItem45.Location = new System.Drawing.Point(887, 0);
             this.layoutControlItem45.Name = "layoutControlItem45";
             this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem45.Size = new System.Drawing.Size(295, 33);
+            this.layoutControlItem45.Size = new System.Drawing.Size(296, 31);
             this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
             this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3881,7 +3895,7 @@
             this.gcMx4.Location = new System.Drawing.Point(0, 0);
             this.gcMx4.MainView = this.gvMx4;
             this.gcMx4.Name = "gcMx4";
-            this.gcMx4.Size = new System.Drawing.Size(1648, 266);
+            this.gcMx4.Size = new System.Drawing.Size(1649, 272);
             this.gcMx4.TabIndex = 2;
             this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx4});
@@ -4013,7 +4027,7 @@
             this.xtraTabPage5.Controls.Add(this.ucBtnPrint101);
             this.xtraTabPage5.Name = "xtraTabPage5";
             this.xtraTabPage5.PageVisible = false;
-            this.xtraTabPage5.Size = new System.Drawing.Size(1649, 334);
+            this.xtraTabPage5.Size = new System.Drawing.Size(1649, 335);
             this.xtraTabPage5.Text = "鐗╂枡榻愬鏍囪瘑鍗�";
             // 
             // ucBtnPrint101
@@ -4026,6 +4040,66 @@
             this.ucBtnPrint101.rptParameter = null;
             this.ucBtnPrint101.Size = new System.Drawing.Size(415, 59);
             this.ucBtnPrint101.TabIndex = 0;
+            // 
+            // gridColumn88
+            // 
+            this.gridColumn88.Caption = "鍒嗘瘝";
+            this.gridColumn88.FieldName = "denominator";
+            this.gridColumn88.MinWidth = 25;
+            this.gridColumn88.Name = "gridColumn88";
+            this.gridColumn88.Visible = true;
+            this.gridColumn88.VisibleIndex = 13;
+            this.gridColumn88.Width = 94;
+            // 
+            // gridColumn89
+            // 
+            this.gridColumn89.Caption = "鍒嗗瓙";
+            this.gridColumn89.FieldName = "numerator";
+            this.gridColumn89.MinWidth = 25;
+            this.gridColumn89.Name = "gridColumn89";
+            this.gridColumn89.Visible = true;
+            this.gridColumn89.VisibleIndex = 12;
+            this.gridColumn89.Width = 94;
+            // 
+            // gridColumn90
+            // 
+            this.gridColumn90.Caption = "搴撳瓨鏁�";
+            this.gridColumn90.FieldName = "stkQty";
+            this.gridColumn90.MinWidth = 25;
+            this.gridColumn90.Name = "gridColumn90";
+            this.gridColumn90.Visible = true;
+            this.gridColumn90.VisibleIndex = 14;
+            this.gridColumn90.Width = 94;
+            // 
+            // gridColumn91
+            // 
+            this.gridColumn91.Caption = "鍒嗘瘝";
+            this.gridColumn91.FieldName = "denominator";
+            this.gridColumn91.MinWidth = 25;
+            this.gridColumn91.Name = "gridColumn91";
+            this.gridColumn91.Visible = true;
+            this.gridColumn91.VisibleIndex = 13;
+            this.gridColumn91.Width = 94;
+            // 
+            // gridColumn92
+            // 
+            this.gridColumn92.Caption = "鍒嗗瓙";
+            this.gridColumn92.FieldName = "numerator";
+            this.gridColumn92.MinWidth = 25;
+            this.gridColumn92.Name = "gridColumn92";
+            this.gridColumn92.Visible = true;
+            this.gridColumn92.VisibleIndex = 12;
+            this.gridColumn92.Width = 94;
+            // 
+            // gridColumn93
+            // 
+            this.gridColumn93.Caption = "搴撳瓨鏁�";
+            this.gridColumn93.FieldName = "stkQty";
+            this.gridColumn93.MinWidth = 25;
+            this.gridColumn93.Name = "gridColumn93";
+            this.gridColumn93.Visible = true;
+            this.gridColumn93.VisibleIndex = 14;
+            this.gridColumn93.Width = 94;
             // 
             // Frm_Womdaa
             // 
@@ -4495,5 +4569,11 @@
         private DevExpress.XtraEditors.DateEdit txt_xgdate;
         private DevExpress.XtraLayout.LayoutControlItem txt_xg;
         private DevExpress.XtraGrid.Columns.GridColumn gv_fxk;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn89;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn88;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn90;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn92;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn91;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn93;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3