From 2caa1d97437e4089a7d6547c2efb87c7990b3b16 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 03 八月 2025 08:51:24 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 1098 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 845 insertions(+), 253 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 3b0582d..16653d5 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
@@ -40,6 +40,7 @@
             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.XtraGrid.GridLevelNode gridLevelNode1 = new DevExpress.XtraGrid.GridLevelNode();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
@@ -104,10 +105,12 @@
             this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+            this.txt_daa015 = new Gs.DevApp.UserControl.UcLookWorkline();
             this.lbGuid = new System.Windows.Forms.Label();
             this.txt_daa009 = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa013 = new DevExpress.XtraEditors.TextEdit();
@@ -128,13 +131,14 @@
             this.txt_daa003 = new DevExpress.XtraEditors.TextEdit();
             this.txt_dwName = new DevExpress.XtraEditors.TextEdit();
             this.txt_daa004 = new DevExpress.XtraEditors.TextEdit();
-            this.txt_daa015 = new DevExpress.XtraEditors.TextEdit();
             this.txt_lineNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_dptNo = new DevExpress.XtraEditors.TextEdit();
             this.txt_isQiTao = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_daa018 = new DevExpress.XtraEditors.TextEdit();
+            this.txt_daa025 = new DevExpress.XtraEditors.ComboBoxEdit();
             this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -142,21 +146,23 @@
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.txt_daa015label = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem46 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem48 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -189,6 +195,41 @@
             this.gvMx1dab020 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1dab022 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1dab023 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabPage6 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx6 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx6 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn50 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabPage7 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx7 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx7 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gvMx1daa002 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1daa010 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1daa004 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn63 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn64 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn65 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.xtraTabPage8 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx8 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx8 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2status = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2pbillNo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn56 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn57 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn59 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn60 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn61 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn62 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx99 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx99 = new DevExpress.XtraLayout.LayoutControl();
@@ -324,13 +365,14 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa004.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_dptNo.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa025.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
@@ -338,26 +380,37 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa015label)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            this.xtraTabPage6.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx6)).BeginInit();
+            this.xtraTabPage7.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx7)).BeginInit();
+            this.xtraTabPage8.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx8)).BeginInit();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitMx99)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel1)).BeginInit();
@@ -547,7 +600,8 @@
             this.gridColumn22,
             this.gridColumn23,
             this.gridColumn24,
-            this.gridColumn25});
+            this.gridColumn25,
+            this.gridColumn52});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -622,7 +676,7 @@
             this.gridColumn27.MinWidth = 25;
             this.gridColumn27.Name = "gridColumn27";
             this.gridColumn27.Visible = true;
-            this.gridColumn27.VisibleIndex = 6;
+            this.gridColumn27.VisibleIndex = 19;
             this.gridColumn27.Width = 94;
             // 
             // gv_daa018
@@ -646,7 +700,7 @@
             this.gridColoun100.Name = "gridColoun100";
             this.gridColoun100.Tag = "org.fnamber";
             this.gridColoun100.Visible = true;
-            this.gridColoun100.VisibleIndex = 28;
+            this.gridColoun100.VisibleIndex = 29;
             this.gridColoun100.Width = 250;
             // 
             // gv_daa001
@@ -659,7 +713,7 @@
             this.gv_daa001.OptionsColumn.AllowEdit = false;
             this.gv_daa001.Tag = "query_a.daa001";
             this.gv_daa001.Visible = true;
-            this.gv_daa001.VisibleIndex = 7;
+            this.gv_daa001.VisibleIndex = 6;
             this.gv_daa001.Width = 120;
             // 
             // gv_daa021
@@ -672,7 +726,7 @@
             this.gv_daa021.OptionsColumn.AllowEdit = false;
             this.gv_daa021.Tag = "query_a.daa021";
             this.gv_daa021.Visible = true;
-            this.gv_daa021.VisibleIndex = 8;
+            this.gv_daa021.VisibleIndex = 7;
             this.gv_daa021.Width = 100;
             // 
             // gridColumn3
@@ -682,7 +736,7 @@
             this.gridColumn3.MinWidth = 50;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 9;
+            this.gridColumn3.VisibleIndex = 10;
             this.gridColumn3.Width = 94;
             // 
             // gv_daa003
@@ -695,7 +749,7 @@
             this.gv_daa003.OptionsColumn.AllowEdit = false;
             this.gv_daa003.Tag = "query_a.daa003";
             this.gv_daa003.Visible = true;
-            this.gv_daa003.VisibleIndex = 10;
+            this.gv_daa003.VisibleIndex = 11;
             this.gv_daa003.Width = 150;
             // 
             // gv_daa004
@@ -708,7 +762,7 @@
             this.gv_daa004.OptionsColumn.AllowEdit = false;
             this.gv_daa004.Tag = "query_a.daa004";
             this.gv_daa004.Visible = true;
-            this.gv_daa004.VisibleIndex = 11;
+            this.gv_daa004.VisibleIndex = 12;
             this.gv_daa004.Width = 150;
             // 
             // gv_daa008
@@ -722,7 +776,7 @@
             this.gv_daa008.OptionsColumn.AllowEdit = false;
             this.gv_daa008.Tag = "query_a.daa008";
             this.gv_daa008.Visible = true;
-            this.gv_daa008.VisibleIndex = 12;
+            this.gv_daa008.VisibleIndex = 13;
             this.gv_daa008.Width = 50;
             // 
             // gv_daa011
@@ -736,7 +790,7 @@
             this.gv_daa011.OptionsColumn.AllowEdit = false;
             this.gv_daa011.Tag = "query_a.daa011";
             this.gv_daa011.Visible = true;
-            this.gv_daa011.VisibleIndex = 13;
+            this.gv_daa011.VisibleIndex = 14;
             this.gv_daa011.Width = 50;
             // 
             // gridColumn4
@@ -751,7 +805,7 @@
             this.gridColumn4.MinWidth = 50;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 14;
+            this.gridColumn4.VisibleIndex = 15;
             this.gridColumn4.Width = 50;
             // 
             // gv_daa010
@@ -765,7 +819,7 @@
             this.gv_daa010.OptionsColumn.AllowEdit = false;
             this.gv_daa010.Tag = "query_a.daa010";
             this.gv_daa010.Visible = true;
-            this.gv_daa010.VisibleIndex = 16;
+            this.gv_daa010.VisibleIndex = 17;
             this.gv_daa010.Width = 50;
             // 
             // gv_daa005
@@ -779,7 +833,7 @@
             this.gv_daa005.OptionsColumn.AllowEdit = false;
             this.gv_daa005.Tag = "query_a.daa005";
             this.gv_daa005.Visible = true;
-            this.gv_daa005.VisibleIndex = 17;
+            this.gv_daa005.VisibleIndex = 18;
             this.gv_daa005.Width = 50;
             // 
             // gv_cust
@@ -800,7 +854,7 @@
             this.gridColumn1.MinWidth = 50;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 18;
+            this.gridColumn1.VisibleIndex = 20;
             this.gridColumn1.Width = 94;
             // 
             // gv_daa015
@@ -813,7 +867,7 @@
             this.gv_daa015.OptionsColumn.AllowEdit = false;
             this.gv_daa015.Tag = "query_a.daa015";
             this.gv_daa015.Visible = true;
-            this.gv_daa015.VisibleIndex = 19;
+            this.gv_daa015.VisibleIndex = 8;
             this.gv_daa015.Width = 94;
             // 
             // gv_daa009
@@ -826,7 +880,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 = 94;
             // 
             // gv_prepareTime
@@ -861,7 +915,7 @@
             this.gv_daa016.OptionsColumn.AllowEdit = false;
             this.gv_daa016.Tag = "query_a.daa016";
             this.gv_daa016.Visible = true;
-            this.gv_daa016.VisibleIndex = 20;
+            this.gv_daa016.VisibleIndex = 21;
             this.gv_daa016.Width = 180;
             // 
             // gv_daa017
@@ -874,7 +928,7 @@
             this.gv_daa017.OptionsColumn.AllowEdit = false;
             this.gv_daa017.Tag = "query_a.daa017";
             this.gv_daa017.Visible = true;
-            this.gv_daa017.VisibleIndex = 21;
+            this.gv_daa017.VisibleIndex = 22;
             this.gv_daa017.Width = 180;
             // 
             // gv_mesStartProd
@@ -887,7 +941,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 = 22;
+            this.gv_mesStartProd.VisibleIndex = 23;
             this.gv_mesStartProd.Width = 180;
             // 
             // gv_mesEndProd
@@ -900,7 +954,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 = 23;
+            this.gv_mesEndProd.VisibleIndex = 24;
             this.gv_mesEndProd.Width = 180;
             // 
             // gridColumn21
@@ -910,7 +964,7 @@
             this.gridColumn21.MinWidth = 25;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 24;
+            this.gridColumn21.VisibleIndex = 25;
             this.gridColumn21.Width = 94;
             // 
             // gridColumn22
@@ -920,7 +974,7 @@
             this.gridColumn22.MinWidth = 25;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 25;
+            this.gridColumn22.VisibleIndex = 26;
             this.gridColumn22.Width = 94;
             // 
             // gridColumn23
@@ -938,7 +992,7 @@
             this.gridColumn24.MinWidth = 25;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 26;
+            this.gridColumn24.VisibleIndex = 27;
             this.gridColumn24.Width = 94;
             // 
             // gridColumn25
@@ -948,8 +1002,18 @@
             this.gridColumn25.MinWidth = 25;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 27;
+            this.gridColumn25.VisibleIndex = 28;
             this.gridColumn25.Width = 94;
+            // 
+            // gridColumn52
+            // 
+            this.gridColumn52.Caption = "鐢熶骇绫诲瀷";
+            this.gridColumn52.FieldName = "daa025";
+            this.gridColumn52.MinWidth = 25;
+            this.gridColumn52.Name = "gridColumn52";
+            this.gridColumn52.Visible = true;
+            this.gridColumn52.VisibleIndex = 9;
+            this.gridColumn52.Width = 94;
             // 
             // pageBar1
             // 
@@ -988,11 +1052,12 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1650, 708);
-            this.splitMx1.SplitterPosition = 183;
+            this.splitMx1.SplitterPosition = 192;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
+            this.layoutMx1.Controls.Add(this.txt_daa015);
             this.layoutMx1.Controls.Add(this.lbGuid);
             this.layoutMx1.Controls.Add(this.txt_daa009);
             this.layoutMx1.Controls.Add(this.txt_daa013);
@@ -1013,22 +1078,31 @@
             this.layoutMx1.Controls.Add(this.txt_daa003);
             this.layoutMx1.Controls.Add(this.txt_dwName);
             this.layoutMx1.Controls.Add(this.txt_daa004);
-            this.layoutMx1.Controls.Add(this.txt_daa015);
             this.layoutMx1.Controls.Add(this.txt_lineNo);
             this.layoutMx1.Controls.Add(this.txt_dptNo);
             this.layoutMx1.Controls.Add(this.txt_isQiTao);
+            this.layoutMx1.Controls.Add(this.txt_daa018);
+            this.layoutMx1.Controls.Add(this.txt_daa025);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem29,
-            this.layoutControlItem27,
-            this.layoutControlItem18});
+            this.layoutControlItem18,
+            this.layoutControlItem41});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(910, 530, 812, 500);
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1059, 277, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1650, 183);
+            this.layoutMx1.Size = new System.Drawing.Size(1650, 192);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
+            // 
+            // txt_daa015
+            // 
+            this.txt_daa015.IsReadly = false;
+            this.txt_daa015.Location = new System.Drawing.Point(928, 155);
+            this.txt_daa015.Name = "txt_daa015";
+            this.txt_daa015.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa015.TabIndex = 478;
             // 
             // lbGuid
             // 
@@ -1041,10 +1115,10 @@
             // 
             // txt_daa009
             // 
-            this.txt_daa009.Location = new System.Drawing.Point(114, 152);
+            this.txt_daa009.Location = new System.Drawing.Point(114, 155);
             this.txt_daa009.Name = "txt_daa009";
             this.txt_daa009.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa009.Size = new System.Drawing.Size(698, 24);
+            this.txt_daa009.Size = new System.Drawing.Size(708, 24);
             this.txt_daa009.StyleController = this.layoutMx1;
             this.txt_daa009.TabIndex = 240;
             this.txt_daa009.Tag = "";
@@ -1064,37 +1138,37 @@
             this.txt_daa001.Location = new System.Drawing.Point(114, 12);
             this.txt_daa001.Name = "txt_daa001";
             this.txt_daa001.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa001.Size = new System.Drawing.Size(296, 24);
+            this.txt_daa001.Size = new System.Drawing.Size(301, 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(918, 12);
+            this.txt_daa008.Location = new System.Drawing.Point(928, 12);
             this.txt_daa008.Name = "txt_daa008";
             this.txt_daa008.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa008.Size = new System.Drawing.Size(296, 24);
+            this.txt_daa008.Size = new System.Drawing.Size(301, 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(918, 124);
+            this.txt_saleOrderNo.Location = new System.Drawing.Point(928, 126);
             this.txt_saleOrderNo.Name = "txt_saleOrderNo";
             this.txt_saleOrderNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_saleOrderNo.Size = new System.Drawing.Size(296, 24);
+            this.txt_saleOrderNo.Size = new System.Drawing.Size(301, 24);
             this.txt_saleOrderNo.StyleController = this.layoutMx1;
             this.txt_saleOrderNo.TabIndex = 465;
             this.txt_saleOrderNo.Tag = "readonly";
             // 
             // txt_mesStartProd
             // 
-            this.txt_mesStartProd.Location = new System.Drawing.Point(1320, 12);
+            this.txt_mesStartProd.Location = new System.Drawing.Point(1335, 12);
             this.txt_mesStartProd.Name = "txt_mesStartProd";
             this.txt_mesStartProd.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesStartProd.Size = new System.Drawing.Size(297, 24);
+            this.txt_mesStartProd.Size = new System.Drawing.Size(303, 24);
             this.txt_mesStartProd.StyleController = this.layoutMx1;
             this.txt_mesStartProd.TabIndex = 336;
             this.txt_mesStartProd.Tag = "readonly";
@@ -1104,67 +1178,67 @@
             this.txt_daa014.Location = new System.Drawing.Point(114, 40);
             this.txt_daa014.Name = "txt_daa014";
             this.txt_daa014.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa014.Size = new System.Drawing.Size(296, 24);
+            this.txt_daa014.Size = new System.Drawing.Size(301, 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(516, 12);
+            this.txt_daa022Remark.Location = new System.Drawing.Point(521, 12);
             this.txt_daa022Remark.Name = "txt_daa022Remark";
             this.txt_daa022Remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa022Remark.Size = new System.Drawing.Size(296, 24);
+            this.txt_daa022Remark.Size = new System.Drawing.Size(301, 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(918, 40);
+            this.txt_daa010.Location = new System.Drawing.Point(928, 40);
             this.txt_daa010.Name = "txt_daa010";
             this.txt_daa010.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa010.Size = new System.Drawing.Size(296, 24);
+            this.txt_daa010.Size = new System.Drawing.Size(301, 24);
             this.txt_daa010.StyleController = this.layoutMx1;
             this.txt_daa010.TabIndex = 243;
             this.txt_daa010.Tag = "readonly";
             // 
             // txt_mesEndProd
             // 
-            this.txt_mesEndProd.Location = new System.Drawing.Point(1320, 40);
+            this.txt_mesEndProd.Location = new System.Drawing.Point(1335, 40);
             this.txt_mesEndProd.Name = "txt_mesEndProd";
             this.txt_mesEndProd.Properties.Appearance.Options.UseFont = true;
-            this.txt_mesEndProd.Size = new System.Drawing.Size(297, 24);
+            this.txt_mesEndProd.Size = new System.Drawing.Size(303, 24);
             this.txt_mesEndProd.StyleController = this.layoutMx1;
             this.txt_mesEndProd.TabIndex = 338;
             this.txt_mesEndProd.Tag = "readonly";
             // 
             // txt_daa011
             // 
-            this.txt_daa011.Location = new System.Drawing.Point(918, 68);
+            this.txt_daa011.Location = new System.Drawing.Point(928, 68);
             this.txt_daa011.Name = "txt_daa011";
             this.txt_daa011.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa011.Size = new System.Drawing.Size(296, 24);
+            this.txt_daa011.Size = new System.Drawing.Size(301, 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(516, 40);
+            this.txt_dptName.Location = new System.Drawing.Point(521, 40);
             this.txt_dptName.Name = "txt_dptName";
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dptName.Size = new System.Drawing.Size(296, 24);
+            this.txt_dptName.Size = new System.Drawing.Size(301, 24);
             this.txt_dptName.StyleController = this.layoutMx1;
             this.txt_dptName.TabIndex = 258;
             this.txt_dptName.Tag = "readonly";
             // 
             // txt_daa016
             // 
-            this.txt_daa016.Location = new System.Drawing.Point(1320, 68);
+            this.txt_daa016.Location = new System.Drawing.Point(1335, 68);
             this.txt_daa016.Name = "txt_daa016";
             this.txt_daa016.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa016.Size = new System.Drawing.Size(297, 24);
+            this.txt_daa016.Size = new System.Drawing.Size(303, 24);
             this.txt_daa016.StyleController = this.layoutMx1;
             this.txt_daa016.TabIndex = 273;
             this.txt_daa016.Tag = "readonly";
@@ -1174,93 +1248,115 @@
             this.txt_daa029.Location = new System.Drawing.Point(114, 68);
             this.txt_daa029.Name = "txt_daa029";
             this.txt_daa029.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa029.Size = new System.Drawing.Size(296, 24);
+            this.txt_daa029.Size = new System.Drawing.Size(301, 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(516, 96);
+            this.txt_lineName.Location = new System.Drawing.Point(521, 68);
             this.txt_lineName.Name = "txt_lineName";
             this.txt_lineName.Properties.Appearance.Options.UseFont = true;
-            this.txt_lineName.Size = new System.Drawing.Size(296, 24);
+            this.txt_lineName.Size = new System.Drawing.Size(301, 24);
             this.txt_lineName.StyleController = this.layoutMx1;
             this.txt_lineName.TabIndex = 267;
             this.txt_lineName.Tag = "readonly";
             // 
             // txt_daa017
             // 
-            this.txt_daa017.Location = new System.Drawing.Point(1320, 96);
+            this.txt_daa017.Location = new System.Drawing.Point(1335, 97);
             this.txt_daa017.Name = "txt_daa017";
             this.txt_daa017.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa017.Size = new System.Drawing.Size(297, 24);
+            this.txt_daa017.Size = new System.Drawing.Size(303, 24);
             this.txt_daa017.StyleController = this.layoutMx1;
             this.txt_daa017.TabIndex = 280;
             this.txt_daa017.Tag = "readonly";
             // 
             // txt_daa003
             // 
-            this.txt_daa003.Location = new System.Drawing.Point(114, 96);
+            this.txt_daa003.Location = new System.Drawing.Point(114, 97);
             this.txt_daa003.Name = "txt_daa003";
             this.txt_daa003.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa003.Size = new System.Drawing.Size(296, 24);
+            this.txt_daa003.Size = new System.Drawing.Size(301, 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(918, 96);
+            this.txt_dwName.Location = new System.Drawing.Point(928, 97);
             this.txt_dwName.Name = "txt_dwName";
             this.txt_dwName.Properties.Appearance.Options.UseFont = true;
-            this.txt_dwName.Size = new System.Drawing.Size(296, 24);
+            this.txt_dwName.Size = new System.Drawing.Size(301, 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(114, 124);
+            this.txt_daa004.Location = new System.Drawing.Point(114, 126);
             this.txt_daa004.Name = "txt_daa004";
             this.txt_daa004.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa004.Size = new System.Drawing.Size(296, 24);
+            this.txt_daa004.Size = new System.Drawing.Size(301, 24);
             this.txt_daa004.StyleController = this.layoutMx1;
             this.txt_daa004.TabIndex = 222;
             this.txt_daa004.Tag = "readonly";
             // 
-            // txt_daa015
-            // 
-            this.txt_daa015.Location = new System.Drawing.Point(420, 124);
-            this.txt_daa015.Name = "txt_daa015";
-            this.txt_daa015.Size = new System.Drawing.Size(200, 24);
-            this.txt_daa015.StyleController = this.layoutMx1;
-            this.txt_daa015.TabIndex = 473;
-            // 
             // txt_lineNo
             // 
-            this.txt_lineNo.Location = new System.Drawing.Point(516, 124);
+            this.txt_lineNo.Location = new System.Drawing.Point(521, 97);
             this.txt_lineNo.Name = "txt_lineNo";
-            this.txt_lineNo.Size = new System.Drawing.Size(296, 24);
+            this.txt_lineNo.Size = new System.Drawing.Size(301, 24);
             this.txt_lineNo.StyleController = this.layoutMx1;
             this.txt_lineNo.TabIndex = 474;
+            this.txt_lineNo.Tag = "readonly";
             // 
             // txt_dptNo
             // 
-            this.txt_dptNo.Location = new System.Drawing.Point(516, 68);
+            this.txt_dptNo.Location = new System.Drawing.Point(521, 68);
             this.txt_dptNo.Name = "txt_dptNo";
-            this.txt_dptNo.Size = new System.Drawing.Size(296, 24);
+            this.txt_dptNo.Size = new System.Drawing.Size(301, 24);
             this.txt_dptNo.StyleController = this.layoutMx1;
             this.txt_dptNo.TabIndex = 475;
+            this.txt_dptNo.Tag = "readonly";
             // 
             // txt_isQiTao
             // 
-            this.txt_isQiTao.Location = new System.Drawing.Point(1218, 124);
+            this.txt_isQiTao.Location = new System.Drawing.Point(1233, 126);
             this.txt_isQiTao.Name = "txt_isQiTao";
             this.txt_isQiTao.Properties.Caption = "澶囨枡榻愬";
-            this.txt_isQiTao.Size = new System.Drawing.Size(399, 24);
+            this.txt_isQiTao.Size = new System.Drawing.Size(405, 24);
             this.txt_isQiTao.StyleController = this.layoutMx1;
             this.txt_isQiTao.TabIndex = 476;
+            this.txt_isQiTao.Tag = "readonly";
+            // 
+            // txt_daa018
+            // 
+            this.txt_daa018.Location = new System.Drawing.Point(521, 126);
+            this.txt_daa018.Name = "txt_daa018";
+            this.txt_daa018.Size = new System.Drawing.Size(301, 24);
+            this.txt_daa018.StyleController = this.layoutMx1;
+            this.txt_daa018.TabIndex = 477;
+            this.txt_daa018.Tag = "readonly";
+            // 
+            // txt_daa025
+            // 
+            this.txt_daa025.Location = new System.Drawing.Point(1335, 155);
+            this.txt_daa025.Name = "txt_daa025";
+            this.txt_daa025.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.txt_daa025.Properties.Items.AddRange(new object[] {
+            "F-閲忎骇",
+            "S-璇曚骇",
+            "C-鎷嗘満杩斿伐",
+            "W-缁翠慨杩斿伐",
+            "G-杩斿伐",
+            "O-澶栧彂"});
+            this.txt_daa025.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            this.txt_daa025.Size = new System.Drawing.Size(303, 24);
+            this.txt_daa025.StyleController = this.layoutMx1;
+            this.txt_daa025.TabIndex = 479;
             // 
             // layoutControlItem29
             // 
@@ -1274,17 +1370,6 @@
             this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem29.TextVisible = false;
             // 
-            // layoutControlItem27
-            // 
-            this.layoutControlItem27.Control = this.txt_daa015;
-            this.layoutControlItem27.Location = new System.Drawing.Point(306, 112);
-            this.layoutControlItem27.Name = "layoutControlItem27";
-            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem27.Size = new System.Drawing.Size(306, 28);
-            this.layoutControlItem27.Text = "鐢熶骇绾垮埆ID";
-            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
-            // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_daa013;
@@ -1297,6 +1382,17 @@
             this.layoutControlItem18.Text = "杞﹂棿ID";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
             // 
+            // layoutControlItem41
+            // 
+            this.layoutControlItem41.Control = this.txt_dptNo;
+            this.layoutControlItem41.Location = new System.Drawing.Point(407, 56);
+            this.layoutControlItem41.Name = "layoutControlItem41";
+            this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem41.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem41.Text = "杞﹂棿缂栫爜";
+            this.layoutControlItem41.TextSize = new System.Drawing.Size(90, 18);
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -1308,21 +1404,23 @@
             this.layoutControlItem7,
             this.layoutControlItem11,
             this.layoutControlItem6,
-            this.layoutControlItem14,
             this.layoutControlItem20,
-            this.layoutControlItem41,
             this.layoutControlItem15,
             this.layoutControlItem4,
             this.layoutControlItem8,
             this.layoutControlItem12,
             this.layoutControlItem16,
-            this.layoutControlItem40,
             this.layoutControlItem9,
             this.layoutControlItem13,
             this.layoutControlItem19,
             this.layoutControlItem17,
             this.layoutControlItem28,
-            this.layoutControlItem46});
+            this.txt_daa015label,
+            this.layoutControlItem14,
+            this.layoutControlItem46,
+            this.layoutControlItem48,
+            this.layoutControlItem40,
+            this.layoutControlItem27});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1357,7 +1455,7 @@
             rowDefinition4,
             rowDefinition5,
             rowDefinition6});
-            this.Root.Size = new System.Drawing.Size(1629, 188);
+            this.Root.Size = new System.Drawing.Size(1650, 192);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -1365,17 +1463,17 @@
             this.layoutControlItem1.Control = this.txt_daa001;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem1.Size = new System.Drawing.Size(407, 28);
             this.layoutControlItem1.Text = "宸ュ崟鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_daa008;
-            this.layoutControlItem3.Location = new System.Drawing.Point(804, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(814, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem3.Size = new System.Drawing.Size(407, 28);
             this.layoutControlItem3.Text = "宸ュ崟鏁伴噺";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1385,83 +1483,61 @@
             this.layoutControlItem5.Location = new System.Drawing.Point(0, 28);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem5.Size = new System.Drawing.Size(407, 28);
             this.layoutControlItem5.Text = "鎶曟枡鍗曞彿";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_daa010;
-            this.layoutControlItem7.Location = new System.Drawing.Point(804, 28);
+            this.layoutControlItem7.Location = new System.Drawing.Point(814, 28);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem7.Size = new System.Drawing.Size(407, 28);
             this.layoutControlItem7.Text = "鍏ュ簱鏁伴噺";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_daa011;
-            this.layoutControlItem11.Location = new System.Drawing.Point(804, 56);
+            this.layoutControlItem11.Location = new System.Drawing.Point(814, 56);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem11.Size = new System.Drawing.Size(407, 29);
             this.layoutControlItem11.Text = "宸茬敓浜ч噺";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_daa022Remark;
-            this.layoutControlItem6.Location = new System.Drawing.Point(402, 0);
+            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(402, 28);
+            this.layoutControlItem6.Size = new System.Drawing.Size(407, 28);
             this.layoutControlItem6.Text = "閫氱煡澶囨枡";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem14
-            // 
-            this.layoutControlItem14.Control = this.txt_lineName;
-            this.layoutControlItem14.Location = new System.Drawing.Point(402, 84);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(402, 28);
-            this.layoutControlItem14.Text = "鐢熶骇绾垮埆";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem20
             // 
             this.layoutControlItem20.Control = this.txt_dptName;
-            this.layoutControlItem20.Location = new System.Drawing.Point(402, 28);
+            this.layoutControlItem20.Location = new System.Drawing.Point(407, 28);
             this.layoutControlItem20.Name = "layoutControlItem20";
             this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem20.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem20.Size = new System.Drawing.Size(407, 28);
             this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
             this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem41
-            // 
-            this.layoutControlItem41.Control = this.txt_dptNo;
-            this.layoutControlItem41.Location = new System.Drawing.Point(402, 56);
-            this.layoutControlItem41.Name = "layoutControlItem41";
-            this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem41.Size = new System.Drawing.Size(402, 28);
-            this.layoutControlItem41.Text = "杞﹂棿缂栫爜";
-            this.layoutControlItem41.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_dwName;
-            this.layoutControlItem15.Location = new System.Drawing.Point(804, 84);
+            this.layoutControlItem15.Location = new System.Drawing.Point(814, 85);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem15.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem15.Size = new System.Drawing.Size(407, 29);
             this.layoutControlItem15.Text = "鍗曚綅";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1469,65 +1545,54 @@
             // 
             this.layoutControlItem4.Control = this.txt_mesStartProd;
             this.layoutControlItem4.CustomizationFormText = "Mes棰勮寮�宸�";
-            this.layoutControlItem4.Location = new System.Drawing.Point(1206, 0);
+            this.layoutControlItem4.Location = new System.Drawing.Point(1221, 0);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem4.Size = new System.Drawing.Size(403, 28);
+            this.layoutControlItem4.Size = new System.Drawing.Size(409, 28);
             this.layoutControlItem4.Text = "Mes棰勮寮�宸�";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_mesEndProd;
-            this.layoutControlItem8.Location = new System.Drawing.Point(1206, 28);
+            this.layoutControlItem8.Location = new System.Drawing.Point(1221, 28);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(403, 28);
+            this.layoutControlItem8.Size = new System.Drawing.Size(409, 28);
             this.layoutControlItem8.Text = "Mes棰勮瀹屽伐";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_daa016;
-            this.layoutControlItem12.Location = new System.Drawing.Point(1206, 56);
+            this.layoutControlItem12.Location = new System.Drawing.Point(1221, 56);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(403, 28);
+            this.layoutControlItem12.Size = new System.Drawing.Size(409, 29);
             this.layoutControlItem12.Text = "瀹為檯寮�宸ユ椂闂�";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_daa017;
-            this.layoutControlItem16.Location = new System.Drawing.Point(1206, 84);
+            this.layoutControlItem16.Location = new System.Drawing.Point(1221, 85);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(403, 28);
+            this.layoutControlItem16.Size = new System.Drawing.Size(409, 29);
             this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem40
-            // 
-            this.layoutControlItem40.Control = this.txt_lineNo;
-            this.layoutControlItem40.Location = new System.Drawing.Point(402, 112);
-            this.layoutControlItem40.Name = "layoutControlItem40";
-            this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem40.Size = new System.Drawing.Size(402, 28);
-            this.layoutControlItem40.Text = "绾垮埆缂栫爜";
-            this.layoutControlItem40.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_saleOrderNo;
-            this.layoutControlItem9.Location = new System.Drawing.Point(804, 112);
+            this.layoutControlItem9.Location = new System.Drawing.Point(814, 114);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem9.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem9.Size = new System.Drawing.Size(407, 29);
             this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -1537,51 +1602,107 @@
             this.layoutControlItem13.Location = new System.Drawing.Point(0, 56);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem13.Size = new System.Drawing.Size(407, 29);
             this.layoutControlItem13.Text = "浜у搧缂栫爜";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem19
             // 
             this.layoutControlItem19.Control = this.txt_daa003;
-            this.layoutControlItem19.Location = new System.Drawing.Point(0, 84);
+            this.layoutControlItem19.Location = new System.Drawing.Point(0, 85);
             this.layoutControlItem19.Name = "layoutControlItem19";
             this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem19.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem19.Size = new System.Drawing.Size(407, 29);
             this.layoutControlItem19.Text = "浜у搧鍚嶇О";
             this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem17
             // 
             this.layoutControlItem17.Control = this.txt_daa004;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 112);
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 114);
             this.layoutControlItem17.Name = "layoutControlItem17";
             this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem17.Size = new System.Drawing.Size(402, 28);
+            this.layoutControlItem17.Size = new System.Drawing.Size(407, 29);
             this.layoutControlItem17.Text = "浜у搧瑙勬牸";
             this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem28
             // 
             this.layoutControlItem28.Control = this.txt_daa009;
-            this.layoutControlItem28.Location = new System.Drawing.Point(0, 140);
+            this.layoutControlItem28.Location = new System.Drawing.Point(0, 143);
             this.layoutControlItem28.Name = "layoutControlItem28";
             this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem28.Size = new System.Drawing.Size(804, 28);
+            this.layoutControlItem28.Size = new System.Drawing.Size(814, 29);
             this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
             this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // txt_daa015label
+            // 
+            this.txt_daa015label.Control = this.txt_daa015;
+            this.txt_daa015label.Location = new System.Drawing.Point(814, 143);
+            this.txt_daa015label.Name = "txt_daa015label";
+            this.txt_daa015label.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.txt_daa015label.OptionsTableLayoutItem.RowIndex = 5;
+            this.txt_daa015label.Size = new System.Drawing.Size(407, 29);
+            this.txt_daa015label.Text = "绾夸綋鍙樻洿";
+            this.txt_daa015label.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem14
+            // 
+            this.layoutControlItem14.Control = this.txt_lineName;
+            this.layoutControlItem14.Location = new System.Drawing.Point(407, 56);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem14.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem14.Text = "绾垮埆鍚嶇О";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem46
             // 
             this.layoutControlItem46.Control = this.txt_isQiTao;
-            this.layoutControlItem46.Location = new System.Drawing.Point(1206, 112);
+            this.layoutControlItem46.Location = new System.Drawing.Point(1221, 114);
             this.layoutControlItem46.Name = "layoutControlItem46";
             this.layoutControlItem46.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem46.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem46.Size = new System.Drawing.Size(403, 28);
+            this.layoutControlItem46.Size = new System.Drawing.Size(409, 29);
+            this.layoutControlItem46.Text = "澶囨枡榻愭稕";
             this.layoutControlItem46.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem46.TextVisible = false;
+            // 
+            // layoutControlItem48
+            // 
+            this.layoutControlItem48.Control = this.txt_daa018;
+            this.layoutControlItem48.Location = new System.Drawing.Point(407, 114);
+            this.layoutControlItem48.Name = "layoutControlItem48";
+            this.layoutControlItem48.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem48.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem48.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem48.Text = "宸ュ崟鐘舵��";
+            this.layoutControlItem48.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem40
+            // 
+            this.layoutControlItem40.Control = this.txt_lineNo;
+            this.layoutControlItem40.Location = new System.Drawing.Point(407, 85);
+            this.layoutControlItem40.Name = "layoutControlItem40";
+            this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem40.Size = new System.Drawing.Size(407, 29);
+            this.layoutControlItem40.Text = "绾垮埆缂栫爜";
+            this.layoutControlItem40.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem27
+            // 
+            this.layoutControlItem27.Control = this.txt_daa025;
+            this.layoutControlItem27.Location = new System.Drawing.Point(1221, 143);
+            this.layoutControlItem27.Name = "layoutControlItem27";
+            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem27.Size = new System.Drawing.Size(409, 29);
+            this.layoutControlItem27.Text = "鐢熶骇绫诲瀷";
+            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
             // 
             // tabMx
             // 
@@ -1589,10 +1710,13 @@
             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(1650, 513);
+            this.tabMx.Size = new System.Drawing.Size(1650, 504);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
+            this.xtraTabPage6,
+            this.xtraTabPage7,
+            this.xtraTabPage8,
             this.tabMxPage2,
             this.xtraTabPage3,
             this.xtraTabPage4,
@@ -1600,9 +1724,11 @@
             // 
             // tabMxPage1
             // 
+            this.tabMxPage1.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
+            this.tabMxPage1.Appearance.Header.Options.UseForeColor = true;
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1648, 481);
+            this.tabMxPage1.Size = new System.Drawing.Size(1648, 472);
             this.tabMxPage1.Text = "澶囨枡鍗曡韩";
             // 
             // gcMx1
@@ -1611,7 +1737,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(1648, 481);
+            this.gcMx1.Size = new System.Drawing.Size(1648, 472);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1962,11 +2088,425 @@
             this.gvMx1dab023.VisibleIndex = 14;
             this.gvMx1dab023.Width = 94;
             // 
+            // xtraTabPage6
+            // 
+            this.xtraTabPage6.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
+            this.xtraTabPage6.Appearance.Header.Options.UseForeColor = true;
+            this.xtraTabPage6.Controls.Add(this.gcMx6);
+            this.xtraTabPage6.Name = "xtraTabPage6";
+            this.xtraTabPage6.Size = new System.Drawing.Size(1648, 472);
+            this.xtraTabPage6.Text = "澶囨枡鏄庣粏";
+            // 
+            // gcMx6
+            // 
+            this.gcMx6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx6.Location = new System.Drawing.Point(0, 0);
+            this.gcMx6.MainView = this.gvMx6;
+            this.gcMx6.Name = "gcMx6";
+            this.gcMx6.Size = new System.Drawing.Size(1648, 472);
+            this.gcMx6.TabIndex = 1;
+            this.gcMx6.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx6});
+            // 
+            // gvMx6
+            // 
+            this.gvMx6.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx6.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx6.ColumnPanelRowHeight = 50;
+            this.gvMx6.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn2,
+            this.gridColumn9,
+            this.gridColumn11,
+            this.gridColumn20,
+            this.gridColumn26,
+            this.gridColumn28,
+            this.gridColumn29,
+            this.gridColumn49,
+            this.gridColumn8,
+            this.gridColumn50,
+            this.gridColumn51});
+            this.gvMx6.GridControl = this.gcMx6;
+            this.gvMx6.Name = "gvMx6";
+            this.gvMx6.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.gvMx6.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx6.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "gvMx1Guid";
+            this.gridColumn2.FieldName = "guid";
+            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Width = 94;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.AppearanceCell.Options.UseFont = true;
+            this.gridColumn9.Caption = "宸ュ崟鍗曞彿";
+            this.gridColumn9.FieldName = "daa001";
+            this.gridColumn9.MinWidth = 50;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Tag = "query_a.dab001";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 0;
+            this.gridColumn9.Width = 94;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.AppearanceCell.Options.UseFont = true;
+            this.gridColumn11.Caption = "鏉愭枡缂栫爜";
+            this.gridColumn11.FieldName = "itemNo";
+            this.gridColumn11.MinWidth = 50;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Tag = "query_a.dab003";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 1;
+            this.gridColumn11.Width = 94;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.AppearanceCell.Options.UseFont = true;
+            this.gridColumn20.Caption = "鏉愭枡鍚嶇О";
+            this.gridColumn20.FieldName = "itemName";
+            this.gridColumn20.MinWidth = 50;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Tag = "query_a.dab004";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 2;
+            this.gridColumn20.Width = 94;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.AppearanceCell.Options.UseFont = true;
+            this.gridColumn26.Caption = "鏉愭枡瑙勬牸";
+            this.gridColumn26.FieldName = "itemModel";
+            this.gridColumn26.MinWidth = 50;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Tag = "query_a.dab005";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 3;
+            this.gridColumn26.Width = 94;
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.Caption = "鐗╂枡鏉$爜";
+            this.gridColumn28.FieldName = "itemBarcode";
+            this.gridColumn28.MinWidth = 25;
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 4;
+            this.gridColumn28.Width = 94;
+            // 
+            // gridColumn29
+            // 
+            this.gridColumn29.Caption = "鏉$爜鏁伴噺";
+            this.gridColumn29.FieldName = "quantity";
+            this.gridColumn29.MinWidth = 25;
+            this.gridColumn29.Name = "gridColumn29";
+            this.gridColumn29.Visible = true;
+            this.gridColumn29.VisibleIndex = 5;
+            this.gridColumn29.Width = 94;
+            // 
+            // gridColumn49
+            // 
+            this.gridColumn49.Caption = "澶囨枡璇︽儏";
+            this.gridColumn49.FieldName = "blDetail";
+            this.gridColumn49.MinWidth = 25;
+            this.gridColumn49.Name = "gridColumn49";
+            this.gridColumn49.Visible = true;
+            this.gridColumn49.VisibleIndex = 6;
+            this.gridColumn49.Width = 94;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "鏀舵枡璇︽儏";
+            this.gridColumn8.FieldName = "slDetail";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 7;
+            this.gridColumn8.Width = 94;
+            // 
+            // gridColumn50
+            // 
+            this.gridColumn50.Caption = "鎶曟枡璇︽儏";
+            this.gridColumn50.FieldName = "tlDetail";
+            this.gridColumn50.MinWidth = 25;
+            this.gridColumn50.Name = "gridColumn50";
+            this.gridColumn50.Visible = true;
+            this.gridColumn50.VisibleIndex = 8;
+            this.gridColumn50.Width = 94;
+            // 
+            // gridColumn51
+            // 
+            this.gridColumn51.Caption = "閫�鏂欒鎯�";
+            this.gridColumn51.FieldName = "tuiDetail";
+            this.gridColumn51.MinWidth = 25;
+            this.gridColumn51.Name = "gridColumn51";
+            this.gridColumn51.Visible = true;
+            this.gridColumn51.VisibleIndex = 9;
+            this.gridColumn51.Width = 94;
+            // 
+            // xtraTabPage7
+            // 
+            this.xtraTabPage7.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
+            this.xtraTabPage7.Appearance.Header.Options.UseForeColor = true;
+            this.xtraTabPage7.Controls.Add(this.gcMx7);
+            this.xtraTabPage7.Name = "xtraTabPage7";
+            this.xtraTabPage7.Size = new System.Drawing.Size(1648, 472);
+            this.xtraTabPage7.Text = "宸ュ簭鏄庣粏";
+            // 
+            // gcMx7
+            // 
+            this.gcMx7.Dock = System.Windows.Forms.DockStyle.Fill;
+            gridLevelNode1.RelationName = "Level1";
+            this.gcMx7.LevelTree.Nodes.AddRange(new DevExpress.XtraGrid.GridLevelNode[] {
+            gridLevelNode1});
+            this.gcMx7.Location = new System.Drawing.Point(0, 0);
+            this.gcMx7.MainView = this.gvMx7;
+            this.gcMx7.Name = "gcMx7";
+            this.gcMx7.Size = new System.Drawing.Size(1648, 472);
+            this.gcMx7.TabIndex = 1;
+            this.gcMx7.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx7});
+            // 
+            // gvMx7
+            // 
+            this.gvMx7.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx7.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx7.ColumnPanelRowHeight = 50;
+            this.gvMx7.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx1daa002,
+            this.gvMx1daa010,
+            this.gvMx1daa004,
+            this.gridColumn63,
+            this.gridColumn64,
+            this.gridColumn65});
+            this.gvMx7.GridControl = this.gcMx7;
+            this.gvMx7.Name = "gvMx7";
+            this.gvMx7.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+            this.gvMx7.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx7.OptionsView.ShowGroupPanel = false;
+            // 
+            // gvMx1daa002
+            // 
+            this.gvMx1daa002.AppearanceCell.Options.UseFont = true;
+            this.gvMx1daa002.Caption = "搴忓彿";
+            this.gvMx1daa002.FieldName = "fSeq";
+            this.gvMx1daa002.MinWidth = 50;
+            this.gvMx1daa002.Name = "gvMx1daa002";
+            this.gvMx1daa002.OptionsColumn.ReadOnly = true;
+            this.gvMx1daa002.Tag = "query_a.daa010";
+            this.gvMx1daa002.Visible = true;
+            this.gvMx1daa002.VisibleIndex = 0;
+            this.gvMx1daa002.Width = 54;
+            // 
+            // gvMx1daa010
+            // 
+            this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
+            this.gvMx1daa010.Caption = "宸ュ簭";
+            this.gvMx1daa010.FieldName = "processNo";
+            this.gvMx1daa010.MinWidth = 50;
+            this.gvMx1daa010.Name = "gvMx1daa010";
+            this.gvMx1daa010.OptionsColumn.ReadOnly = true;
+            this.gvMx1daa010.Tag = "query_a.daa010";
+            this.gvMx1daa010.Visible = true;
+            this.gvMx1daa010.VisibleIndex = 1;
+            this.gvMx1daa010.Width = 129;
+            // 
+            // gvMx1daa004
+            // 
+            this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
+            this.gvMx1daa004.Caption = "涓婂伐搴�";
+            this.gvMx1daa004.FieldName = "frontProcessNo";
+            this.gvMx1daa004.MinWidth = 150;
+            this.gvMx1daa004.Name = "gvMx1daa004";
+            this.gvMx1daa004.OptionsColumn.ReadOnly = true;
+            this.gvMx1daa004.Tag = "query_a.daa010";
+            this.gvMx1daa004.Visible = true;
+            this.gvMx1daa004.VisibleIndex = 2;
+            this.gvMx1daa004.Width = 150;
+            // 
+            // gridColumn63
+            // 
+            this.gridColumn63.Caption = "鏄惁鍙繑宸�";
+            this.gridColumn63.FieldName = "isBack";
+            this.gridColumn63.MinWidth = 25;
+            this.gridColumn63.Name = "gridColumn63";
+            this.gridColumn63.OptionsColumn.ReadOnly = true;
+            this.gridColumn63.Tag = "query_a.daa010";
+            this.gridColumn63.Visible = true;
+            this.gridColumn63.VisibleIndex = 3;
+            this.gridColumn63.Width = 94;
+            // 
+            // gridColumn64
+            // 
+            this.gridColumn64.Caption = "鏄惁杩旇拷婧爜";
+            this.gridColumn64.FieldName = "isZsm";
+            this.gridColumn64.MinWidth = 25;
+            this.gridColumn64.Name = "gridColumn64";
+            this.gridColumn64.OptionsColumn.ReadOnly = true;
+            this.gridColumn64.Tag = "query_a.daa010";
+            this.gridColumn64.Visible = true;
+            this.gridColumn64.VisibleIndex = 4;
+            this.gridColumn64.Width = 94;
+            // 
+            // gridColumn65
+            // 
+            this.gridColumn65.Caption = "鏄惁杩旀墭鏉跨爜";
+            this.gridColumn65.FieldName = "isTbm";
+            this.gridColumn65.MinWidth = 25;
+            this.gridColumn65.Name = "gridColumn65";
+            this.gridColumn65.OptionsColumn.ReadOnly = true;
+            this.gridColumn65.Tag = "query_a.daa010";
+            this.gridColumn65.Visible = true;
+            this.gridColumn65.VisibleIndex = 5;
+            this.gridColumn65.Width = 94;
+            // 
+            // xtraTabPage8
+            // 
+            this.xtraTabPage8.Appearance.Header.ForeColor = System.Drawing.Color.Blue;
+            this.xtraTabPage8.Appearance.Header.Options.UseForeColor = true;
+            this.xtraTabPage8.Controls.Add(this.gcMx8);
+            this.xtraTabPage8.Name = "xtraTabPage8";
+            this.xtraTabPage8.Size = new System.Drawing.Size(1648, 472);
+            this.xtraTabPage8.Text = "鏁版嵁閲囬泦鏄庣粏";
+            // 
+            // gcMx8
+            // 
+            this.gcMx8.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx8.Location = new System.Drawing.Point(0, 0);
+            this.gcMx8.MainView = this.gvMx8;
+            this.gcMx8.Name = "gcMx8";
+            this.gcMx8.Size = new System.Drawing.Size(1648, 472);
+            this.gcMx8.TabIndex = 1;
+            this.gcMx8.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx8});
+            // 
+            // gvMx8
+            // 
+            this.gvMx8.Appearance.Row.Options.UseFont = true;
+            this.gvMx8.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn53,
+            this.gvMx2status,
+            this.gvMx2pbillNo,
+            this.gridColumn56,
+            this.gridColumn57,
+            this.gridColumn59,
+            this.gridColumn60,
+            this.gridColumn61,
+            this.gridColumn62});
+            this.gvMx8.GridControl = this.gcMx8;
+            this.gvMx8.Name = "gvMx8";
+            this.gvMx8.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+            this.gvMx8.OptionsFind.ShowSearchNavButtons = false;
+            this.gvMx8.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridColumn53
+            // 
+            this.gridColumn53.Caption = "guid";
+            this.gridColumn53.FieldName = "guid";
+            this.gridColumn53.MinWidth = 25;
+            this.gridColumn53.Name = "gridColumn53";
+            this.gridColumn53.OptionsColumn.ReadOnly = true;
+            this.gridColumn53.Width = 94;
+            // 
+            // gvMx2status
+            // 
+            this.gvMx2status.AppearanceCell.Options.UseFont = true;
+            this.gvMx2status.Caption = "宸ュ崟缂栧彿";
+            this.gvMx2status.FieldName = "gdbh";
+            this.gvMx2status.MinWidth = 10;
+            this.gvMx2status.Name = "gvMx2status";
+            this.gvMx2status.OptionsColumn.ReadOnly = true;
+            this.gvMx2status.Tag = "query_a.status";
+            this.gvMx2status.Visible = true;
+            this.gvMx2status.VisibleIndex = 0;
+            this.gvMx2status.Width = 50;
+            // 
+            // gvMx2pbillNo
+            // 
+            this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx2pbillNo.Caption = "杩芥函鐮�";
+            this.gvMx2pbillNo.FieldName = "barCode";
+            this.gvMx2pbillNo.Name = "gvMx2pbillNo";
+            this.gvMx2pbillNo.OptionsColumn.ReadOnly = true;
+            this.gvMx2pbillNo.Tag = "query_a.pbill_no";
+            this.gvMx2pbillNo.Visible = true;
+            this.gvMx2pbillNo.VisibleIndex = 1;
+            this.gvMx2pbillNo.Width = 94;
+            // 
+            // gridColumn56
+            // 
+            this.gridColumn56.Caption = "鏁伴噺";
+            this.gridColumn56.FieldName = "quantity";
+            this.gridColumn56.MinWidth = 25;
+            this.gridColumn56.Name = "gridColumn56";
+            this.gridColumn56.OptionsColumn.ReadOnly = true;
+            this.gridColumn56.Visible = true;
+            this.gridColumn56.VisibleIndex = 2;
+            this.gridColumn56.Width = 94;
+            // 
+            // gridColumn57
+            // 
+            this.gridColumn57.Caption = "宸ュ簭";
+            this.gridColumn57.FieldName = "processNo";
+            this.gridColumn57.MinWidth = 25;
+            this.gridColumn57.Name = "gridColumn57";
+            this.gridColumn57.OptionsColumn.ReadOnly = true;
+            this.gridColumn57.Visible = true;
+            this.gridColumn57.VisibleIndex = 3;
+            this.gridColumn57.Width = 94;
+            // 
+            // gridColumn59
+            // 
+            this.gridColumn59.Caption = "缁撴灉";
+            this.gridColumn59.FieldName = "checkResult";
+            this.gridColumn59.MinWidth = 25;
+            this.gridColumn59.Name = "gridColumn59";
+            this.gridColumn59.OptionsColumn.ReadOnly = true;
+            this.gridColumn59.Visible = true;
+            this.gridColumn59.VisibleIndex = 4;
+            this.gridColumn59.Width = 94;
+            // 
+            // gridColumn60
+            // 
+            this.gridColumn60.Caption = "涓婃姤浜�";
+            this.gridColumn60.FieldName = "createBy";
+            this.gridColumn60.MinWidth = 25;
+            this.gridColumn60.Name = "gridColumn60";
+            this.gridColumn60.OptionsColumn.ReadOnly = true;
+            this.gridColumn60.Visible = true;
+            this.gridColumn60.VisibleIndex = 5;
+            this.gridColumn60.Width = 94;
+            // 
+            // gridColumn61
+            // 
+            this.gridColumn61.Caption = "鏈�鍚庝笂鎶ユ椂闂�";
+            this.gridColumn61.FieldName = "createDate";
+            this.gridColumn61.MinWidth = 25;
+            this.gridColumn61.Name = "gridColumn61";
+            this.gridColumn61.OptionsColumn.ReadOnly = true;
+            this.gridColumn61.Visible = true;
+            this.gridColumn61.VisibleIndex = 6;
+            this.gridColumn61.Width = 94;
+            // 
+            // gridColumn62
+            // 
+            this.gridColumn62.Caption = "鏁版嵁鐘舵��";
+            this.gridColumn62.FieldName = "barCodeRemark";
+            this.gridColumn62.MinWidth = 25;
+            this.gridColumn62.Name = "gridColumn62";
+            this.gridColumn62.OptionsColumn.ReadOnly = true;
+            this.gridColumn62.Visible = true;
+            this.gridColumn62.VisibleIndex = 7;
+            this.gridColumn62.Width = 94;
+            // 
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.splitMx99);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1648, 481);
+            this.tabMxPage2.Size = new System.Drawing.Size(1648, 472);
             this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�";
             // 
             // splitMx99
@@ -1986,7 +2526,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(1648, 481);
+            this.splitMx99.Size = new System.Drawing.Size(1648, 472);
             this.splitMx99.SplitterPosition = 83;
             this.splitMx99.TabIndex = 2;
             // 
@@ -2013,11 +2553,11 @@
             // 
             this.layShuLiang.Controls.Add(this.txt_iCount_1);
             this.layShuLiang.Controls.Add(this.txt_yuliang_1);
-            this.layShuLiang.Location = new System.Drawing.Point(654, 44);
+            this.layShuLiang.Location = new System.Drawing.Point(662, 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(317, 28);
+            this.layShuLiang.Size = new System.Drawing.Size(321, 28);
             this.layShuLiang.TabIndex = 475;
             this.layShuLiang.Text = "dataLayoutControl1";
             // 
@@ -2026,16 +2566,16 @@
             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(67, 24);
+            this.txt_iCount_1.Size = new System.Drawing.Size(69, 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(247, 2);
+            this.txt_yuliang_1.Location = new System.Drawing.Point(249, 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(68, 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;
             // 
@@ -2060,7 +2600,7 @@
             this.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition7});
             this.layoutControlGroup3.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
-            this.layoutControlGroup3.Size = new System.Drawing.Size(317, 28);
+            this.layoutControlGroup3.Size = new System.Drawing.Size(321, 28);
             this.layoutControlGroup3.TextVisible = false;
             // 
             // layoutControlItem25
@@ -2068,7 +2608,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(158, 28);
+            this.layoutControlItem25.Size = new System.Drawing.Size(160, 28);
             this.layoutControlItem25.Text = "鎵撳嵃鏁村紶鏁�";
             this.layoutControlItem25.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -2076,16 +2616,16 @@
             // 
             this.layoutControlItem39.Control = this.txt_yuliang_1;
             this.layoutControlItem39.CustomizationFormText = "鎵撳嵃浣欐暟";
-            this.layoutControlItem39.Location = new System.Drawing.Point(158, 0);
+            this.layoutControlItem39.Location = new System.Drawing.Point(160, 0);
             this.layoutControlItem39.Name = "layoutControlItem39";
             this.layoutControlItem39.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem39.Size = new System.Drawing.Size(159, 28);
+            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(973, 10);
+            this.radOut.Location = new System.Drawing.Point(985, 10);
             this.radOut.Margin = new System.Windows.Forms.Padding(0);
             this.radOut.Name = "radOut";
             this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -2094,7 +2634,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(321, 32);
+            this.radOut.Size = new System.Drawing.Size(325, 32);
             this.radOut.StyleController = this.layoutMx99;
             this.radOut.TabIndex = 473;
             // 
@@ -2102,29 +2642,29 @@
             // 
             this.ucBtnPrint1.allClickKey = null;
             this.ucBtnPrint1.guidKey = null;
-            this.ucBtnPrint1.Location = new System.Drawing.Point(973, 42);
+            this.ucBtnPrint1.Location = new System.Drawing.Point(985, 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(321, 32);
+            this.ucBtnPrint1.Size = new System.Drawing.Size(325, 32);
             this.ucBtnPrint1.TabIndex = 464;
             // 
             // txt_psnQty_1
             // 
-            this.txt_psnQty_1.Location = new System.Drawing.Point(741, 12);
+            this.txt_psnQty_1.Location = new System.Drawing.Point(749, 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(230, 24);
+            this.txt_psnQty_1.Size = new System.Drawing.Size(234, 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(420, 44);
+            this.txt_printRemark.Location = new System.Drawing.Point(424, 44);
             this.txt_printRemark.Name = "txt_printRemark";
             this.txt_printRemark.Properties.Appearance.Options.UseFont = true;
-            this.txt_printRemark.Size = new System.Drawing.Size(230, 24);
+            this.txt_printRemark.Size = new System.Drawing.Size(234, 24);
             this.txt_printRemark.StyleController = this.layoutMx99;
             this.txt_printRemark.TabIndex = 334;
             this.txt_printRemark.Tag = "readOnly-1";
@@ -2132,11 +2672,11 @@
             // txt_kQty
             // 
             this.txt_kQty.EditValue = "";
-            this.txt_kQty.Location = new System.Drawing.Point(420, 12);
+            this.txt_kQty.Location = new System.Drawing.Point(424, 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(230, 24);
+            this.txt_kQty.Size = new System.Drawing.Size(234, 24);
             this.txt_kQty.StyleController = this.layoutMx99;
             this.txt_kQty.TabIndex = 472;
             this.txt_kQty.Tag = "readonly";
@@ -2147,7 +2687,7 @@
             this.txt_yQty.Name = "txt_yQty";
             this.txt_yQty.Properties.Appearance.Options.UseFont = true;
             this.txt_yQty.Properties.ReadOnly = true;
-            this.txt_yQty.Size = new System.Drawing.Size(230, 24);
+            this.txt_yQty.Size = new System.Drawing.Size(234, 24);
             this.txt_yQty.StyleController = this.layoutMx99;
             this.txt_yQty.TabIndex = 470;
             this.txt_yQty.Tag = "readonly";
@@ -2157,7 +2697,7 @@
             this.txt_zQty.Location = new System.Drawing.Point(99, 12);
             this.txt_zQty.Name = "txt_zQty";
             this.txt_zQty.Properties.ReadOnly = true;
-            this.txt_zQty.Size = new System.Drawing.Size(230, 24);
+            this.txt_zQty.Size = new System.Drawing.Size(234, 24);
             this.txt_zQty.StyleController = this.layoutMx99;
             this.txt_zQty.TabIndex = 474;
             // 
@@ -2185,7 +2725,7 @@
             columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
             columnDefinition10.Width = 100D;
             columnDefinition11.SizeType = System.Windows.Forms.SizeType.AutoSize;
-            columnDefinition11.Width = 323D;
+            columnDefinition11.Width = 328D;
             this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
             columnDefinition7,
             columnDefinition8,
@@ -2199,7 +2739,7 @@
             this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
             rowDefinition8,
             rowDefinition9});
-            this.layoutControlGroup1.Size = new System.Drawing.Size(1627, 84);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1648, 84);
             this.layoutControlGroup1.TextVisible = false;
             // 
             // layoutControlItem23
@@ -2207,21 +2747,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(321, 0);
+            this.layoutControlItem23.Location = new System.Drawing.Point(325, 0);
             this.layoutControlItem23.Name = "layoutControlItem23";
             this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem23.Size = new System.Drawing.Size(321, 32);
+            this.layoutControlItem23.Size = new System.Drawing.Size(325, 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(963, 0);
+            this.layoutControlItem35.Location = new System.Drawing.Point(975, 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(321, 32);
+            this.layoutControlItem35.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem35.Text = "鑷姩璁$畻";
             this.layoutControlItem35.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem35.TextVisible = false;
@@ -2231,12 +2771,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(963, 32);
+            this.layoutControlItem26.Location = new System.Drawing.Point(975, 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(321, 32);
+            this.layoutControlItem26.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem26.Text = "鎵樻澘鎵撳嵃";
             this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem26.TextVisible = false;
@@ -2249,18 +2789,18 @@
             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(321, 32);
+            this.layoutControlItem22.Size = new System.Drawing.Size(325, 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(321, 32);
+            this.layoutControlItem21.Location = new System.Drawing.Point(325, 32);
             this.layoutControlItem21.Name = "layoutControlItem21";
             this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem21.Size = new System.Drawing.Size(321, 32);
+            this.layoutControlItem21.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem21.Text = "鎵撳嵃澶囨敞";
             this.layoutControlItem21.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -2270,21 +2810,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(642, 0);
+            this.layoutControlItem24.Location = new System.Drawing.Point(650, 0);
             this.layoutControlItem24.Name = "layoutControlItem24";
             this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem24.Size = new System.Drawing.Size(321, 32);
+            this.layoutControlItem24.Size = new System.Drawing.Size(325, 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(642, 32);
+            this.layoutControlItem38.Location = new System.Drawing.Point(650, 32);
             this.layoutControlItem38.Name = "layoutControlItem38";
             this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem38.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem38.Size = new System.Drawing.Size(321, 32);
+            this.layoutControlItem38.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem38.Text = "鎵撳嵃鏁伴噺";
             this.layoutControlItem38.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem38.TextVisible = false;
@@ -2294,7 +2834,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(321, 32);
+            this.layoutControlItem36.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem36.Text = "宸ュ崟鎬婚噺";
             this.layoutControlItem36.TextSize = new System.Drawing.Size(75, 18);
             // 
@@ -2304,7 +2844,7 @@
             this.gcMx2.Location = new System.Drawing.Point(0, 0);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1648, 386);
+            this.gcMx2.Size = new System.Drawing.Size(1648, 377);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -2485,7 +3025,7 @@
             // 
             this.xtraTabPage3.Controls.Add(this.splitMx98);
             this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1648, 481);
+            this.xtraTabPage3.Size = new System.Drawing.Size(1648, 472);
             this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
             // 
             // splitMx98
@@ -2505,7 +3045,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(1648, 481);
+            this.splitMx98.Size = new System.Drawing.Size(1648, 472);
             this.splitMx98.SplitterPosition = 52;
             this.splitMx98.TabIndex = 2;
             // 
@@ -2686,7 +3226,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(1648, 417);
+            this.gcMx3.Size = new System.Drawing.Size(1648, 408);
             this.gcMx3.TabIndex = 1;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
@@ -2817,7 +3357,7 @@
             // 
             this.xtraTabPage4.Controls.Add(this.splitMx100);
             this.xtraTabPage4.Name = "xtraTabPage4";
-            this.xtraTabPage4.Size = new System.Drawing.Size(1648, 481);
+            this.xtraTabPage4.Size = new System.Drawing.Size(1648, 472);
             this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�";
             // 
             // splitMx100
@@ -2837,7 +3377,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, 481);
+            this.splitMx100.Size = new System.Drawing.Size(1648, 472);
             this.splitMx100.SplitterPosition = 52;
             this.splitMx100.TabIndex = 3;
             // 
@@ -2863,55 +3403,55 @@
             // 
             this.ucBtnPrint100.allClickKey = null;
             this.ucBtnPrint100.guidKey = null;
-            this.ucBtnPrint100.Location = new System.Drawing.Point(1112, 10);
+            this.ucBtnPrint100.Location = new System.Drawing.Point(1096, 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(276, 32);
+            this.ucBtnPrint100.Size = new System.Drawing.Size(272, 32);
             this.ucBtnPrint100.TabIndex = 0;
             // 
             // btnIn
             // 
             this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16;
-            this.btnIn.Location = new System.Drawing.Point(1390, 12);
+            this.btnIn.Location = new System.Drawing.Point(1370, 12);
             this.btnIn.Name = "btnIn";
-            this.btnIn.Size = new System.Drawing.Size(96, 27);
+            this.btnIn.Size = new System.Drawing.Size(116, 27);
             this.btnIn.StyleController = this.layMx100;
             this.btnIn.TabIndex = 1;
-            this.btnIn.Text = "瀵煎叆鏉$爜";
+            this.btnIn.Text = "瀵煎叆鍚庣洊鐮�";
             // 
             // txt_zQty100
             // 
             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(168, 24);
+            this.txt_zQty100.Size = new System.Drawing.Size(164, 24);
             this.txt_zQty100.StyleController = this.layMx100;
             this.txt_zQty100.TabIndex = 4;
             // 
             // txt_yQty100
             // 
-            this.txt_yQty100.Location = new System.Drawing.Point(388, 12);
+            this.txt_yQty100.Location = new System.Drawing.Point(384, 12);
             this.txt_yQty100.Name = "txt_yQty100";
             this.txt_yQty100.Properties.ReadOnly = true;
-            this.txt_yQty100.Size = new System.Drawing.Size(170, 24);
+            this.txt_yQty100.Size = new System.Drawing.Size(166, 24);
             this.txt_yQty100.StyleController = this.layMx100;
             this.txt_yQty100.TabIndex = 5;
             // 
             // txt_kQty100
             // 
-            this.txt_kQty100.Location = new System.Drawing.Point(664, 12);
+            this.txt_kQty100.Location = new System.Drawing.Point(656, 12);
             this.txt_kQty100.Name = "txt_kQty100";
             this.txt_kQty100.Properties.ReadOnly = true;
-            this.txt_kQty100.Size = new System.Drawing.Size(170, 24);
+            this.txt_kQty100.Size = new System.Drawing.Size(166, 24);
             this.txt_kQty100.StyleController = this.layMx100;
             this.txt_kQty100.TabIndex = 6;
             // 
             // txt_iCount_100
             // 
-            this.txt_iCount_100.Location = new System.Drawing.Point(940, 12);
+            this.txt_iCount_100.Location = new System.Drawing.Point(928, 12);
             this.txt_iCount_100.Name = "txt_iCount_100";
-            this.txt_iCount_100.Size = new System.Drawing.Size(170, 24);
+            this.txt_iCount_100.Size = new System.Drawing.Size(166, 24);
             this.txt_iCount_100.StyleController = this.layMx100;
             this.txt_iCount_100.TabIndex = 7;
             // 
@@ -2950,7 +3490,7 @@
             columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
             columnDefinition22.Width = 100D;
             columnDefinition23.SizeType = System.Windows.Forms.SizeType.Absolute;
-            columnDefinition23.Width = 100D;
+            columnDefinition23.Width = 120D;
             columnDefinition24.SizeType = System.Windows.Forms.SizeType.Absolute;
             columnDefinition24.Width = 150D;
             this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
@@ -2973,17 +3513,17 @@
             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(274, 32);
+            this.layoutControlItem42.Size = new System.Drawing.Size(270, 32);
             this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
             this.layoutControlItem42.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem43
             // 
             this.layoutControlItem43.Control = this.txt_yQty100;
-            this.layoutControlItem43.Location = new System.Drawing.Point(274, 0);
+            this.layoutControlItem43.Location = new System.Drawing.Point(270, 0);
             this.layoutControlItem43.Name = "layoutControlItem43";
             this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem43.Size = new System.Drawing.Size(276, 32);
+            this.layoutControlItem43.Size = new System.Drawing.Size(272, 32);
             this.layoutControlItem43.Text = "宸叉墦鍗版暟";
             this.layoutControlItem43.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -2991,20 +3531,20 @@
             // 
             this.layoutControlItem44.Control = this.txt_kQty100;
             this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟";
-            this.layoutControlItem44.Location = new System.Drawing.Point(550, 0);
+            this.layoutControlItem44.Location = new System.Drawing.Point(542, 0);
             this.layoutControlItem44.Name = "layoutControlItem44";
             this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem44.Size = new System.Drawing.Size(276, 32);
+            this.layoutControlItem44.Size = new System.Drawing.Size(272, 32);
             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(1378, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(1358, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5;
-            this.layoutControlItem2.Size = new System.Drawing.Size(100, 32);
+            this.layoutControlItem2.Size = new System.Drawing.Size(120, 32);
             this.layoutControlItem2.Text = "瀵煎叆鎸夐挳";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem2.TextVisible = false;
@@ -3012,11 +3552,11 @@
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.ucBtnPrint100;
-            this.layoutControlItem10.Location = new System.Drawing.Point(1102, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(1086, 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(276, 32);
+            this.layoutControlItem10.Size = new System.Drawing.Size(272, 32);
             this.layoutControlItem10.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -3024,10 +3564,10 @@
             // layoutControlItem45
             // 
             this.layoutControlItem45.Control = this.txt_iCount_100;
-            this.layoutControlItem45.Location = new System.Drawing.Point(826, 0);
+            this.layoutControlItem45.Location = new System.Drawing.Point(814, 0);
             this.layoutControlItem45.Name = "layoutControlItem45";
             this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem45.Size = new System.Drawing.Size(276, 32);
+            this.layoutControlItem45.Size = new System.Drawing.Size(272, 32);
             this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
             this.layoutControlItem45.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -3047,7 +3587,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, 417);
+            this.gcMx4.Size = new System.Drawing.Size(1648, 408);
             this.gcMx4.TabIndex = 2;
             this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx4});
@@ -3179,7 +3719,7 @@
             this.xtraTabPage5.Controls.Add(this.ucBtnPrint101);
             this.xtraTabPage5.Name = "xtraTabPage5";
             this.xtraTabPage5.PageVisible = false;
-            this.xtraTabPage5.Size = new System.Drawing.Size(1648, 481);
+            this.xtraTabPage5.Size = new System.Drawing.Size(1648, 472);
             this.xtraTabPage5.Text = "鐗╂枡榻愬鏍囪瘑鍗�";
             // 
             // ucBtnPrint101
@@ -3240,13 +3780,14 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa003.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_dwName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_daa004.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_daa015.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lineNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_dptNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isQiTao.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa018.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa025.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
@@ -3254,26 +3795,37 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_daa015label)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem46)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem48)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            this.xtraTabPage6.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx6)).EndInit();
+            this.xtraTabPage7.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx7)).EndInit();
+            this.xtraTabPage8.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx8)).EndInit();
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitMx99.Panel1)).EndInit();
             this.splitMx99.Panel1.ResumeLayout(false);
@@ -3504,8 +4056,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
         private DevExpress.Utils.ToolTipController tips;
-        private DevExpress.XtraEditors.TextEdit txt_daa015;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
         private DevExpress.XtraEditors.RadioGroup radOut;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
@@ -3544,7 +4094,6 @@
         private DevExpress.XtraEditors.SplitContainerControl splitMx99;
         private DevExpress.XtraEditors.TextEdit txt_lineNo;
         private DevExpress.XtraEditors.TextEdit txt_dptNo;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
@@ -3552,7 +4101,6 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
@@ -3574,10 +4122,54 @@
         private DevExpress.XtraTab.XtraTabPage xtraTabPage5;
         private UserControl.UcBtnPrint ucBtnPrint101;
         private DevExpress.XtraEditors.CheckEdit txt_isQiTao;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem46;
         private DevExpress.XtraEditors.SplitContainerControl splitMx98;
         private DevExpress.XtraEditors.SplitContainerControl splitMx100;
         private DevExpress.XtraEditors.SimpleButton btnDesign;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem47;
+        private DevExpress.XtraEditors.TextEdit txt_daa018;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage6;
+        private DevExpress.XtraGrid.GridControl gcMx6;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn49;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn50;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn51;
+        private UserControl.UcLookWorkline txt_daa015;
+        private DevExpress.XtraLayout.LayoutControlItem txt_daa015label;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage7;
+        private DevExpress.XtraGrid.GridControl gcMx7;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx7;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa002;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa010;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx1daa004;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage8;
+        private DevExpress.XtraGrid.GridControl gcMx8;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx8;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn53;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2status;
+        private DevExpress.XtraGrid.Columns.GridColumn gvMx2pbillNo;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn56;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn57;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn59;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn60;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn61;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn62;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem46;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem48;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem40;
+        private DevExpress.XtraEditors.ComboBoxEdit txt_daa025;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn52;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn63;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn64;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn65;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3