From 0533acdf031795dbe59f255de5f351b584001f34 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 16 十月 2025 14:53:07 +0800
Subject: [PATCH] 工单排产修改开工时间完工时间一起变化

---
 DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs | 1338 ++++++++++++++++++++++++++++++++++++++++++++-------------
 1 files changed, 1,021 insertions(+), 317 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.Designer.cs
index 2132525..db7d6f8 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();
@@ -50,6 +51,12 @@
             DevExpress.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_Womdaa));
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -63,6 +70,7 @@
             DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
             DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
@@ -103,10 +111,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();
@@ -127,13 +137,15 @@
             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.txt_daa021 = new DevExpress.XtraEditors.TextEdit();
             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();
@@ -141,19 +153,24 @@
             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.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.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem49 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -186,6 +203,42 @@
             this.gvMx1dab020 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1dab022 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1dab023 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn58 = 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();
@@ -214,8 +267,6 @@
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
             this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
             this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx2quantity = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -228,6 +279,8 @@
             this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.rptTuoBanNbz = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx98 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layoutMx98 = new DevExpress.XtraLayout.LayoutControl();
@@ -254,6 +307,7 @@
             this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn55 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx100 = new DevExpress.XtraEditors.SplitContainerControl();
             this.layMx100 = new DevExpress.XtraDataLayout.DataLayoutControl();
@@ -263,6 +317,7 @@
             this.txt_yQty100 = new DevExpress.XtraEditors.TextEdit();
             this.txt_kQty100 = new DevExpress.XtraEditors.TextEdit();
             this.txt_iCount_100 = new DevExpress.XtraEditors.TextEdit();
+            this.btnDesign = new DevExpress.XtraEditors.SimpleButton();
             this.layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem42 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem43 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -270,6 +325,7 @@
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem45 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem47 = new DevExpress.XtraLayout.LayoutControlItem();
             this.gcMx4 = new DevExpress.XtraGrid.GridControl();
             this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -283,8 +339,6 @@
             this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
             this.ucBtnPrint101 = new Gs.DevApp.UserControl.UcBtnPrint();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem41 = new DevExpress.XtraLayout.LayoutControlItem();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -323,13 +377,15 @@
             ((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.txt_daa021.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();
@@ -337,24 +393,38 @@
             ((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.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.layoutControlItem28)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem49)).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();
@@ -388,7 +458,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).BeginInit();
             this.xtraTabPage3.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.splitMx98)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).BeginInit();
@@ -432,11 +502,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
             this.xtraTabPage5.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -552,7 +621,8 @@
             this.gridColumn22,
             this.gridColumn23,
             this.gridColumn24,
-            this.gridColumn25});
+            this.gridColumn25,
+            this.gridColumn52});
             this.gridView1.DetailHeight = 272;
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 44;
@@ -628,7 +698,7 @@
             this.gridColumn27.MinWidth = 22;
             this.gridColumn27.Name = "gridColumn27";
             this.gridColumn27.Visible = true;
-            this.gridColumn27.VisibleIndex = 6;
+            this.gridColumn27.VisibleIndex = 20;
             this.gridColumn27.Width = 82;
             // 
             // gv_daa018
@@ -652,7 +722,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 = 219;
             // 
             // gv_daa001
@@ -665,7 +735,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 = 105;
             // 
             // gv_daa021
@@ -678,7 +748,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 = 87;
             // 
             // gridColumn3
@@ -688,33 +758,33 @@
             this.gridColumn3.MinWidth = 44;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 9;
+            this.gridColumn3.VisibleIndex = 11;
             this.gridColumn3.Width = 82;
             // 
             // gv_daa003
             // 
             this.gv_daa003.AppearanceCell.Options.UseFont = true;
             this.gv_daa003.Caption = "浜у搧鍚嶇О";
-            this.gv_daa003.FieldName = "daa003";
+            this.gv_daa003.FieldName = "itemName";
             this.gv_daa003.MinWidth = 44;
             this.gv_daa003.Name = "gv_daa003";
             this.gv_daa003.OptionsColumn.AllowEdit = false;
-            this.gv_daa003.Tag = "query_a.daa003";
+            this.gv_daa003.Tag = "query_s.item_name";
             this.gv_daa003.Visible = true;
-            this.gv_daa003.VisibleIndex = 10;
+            this.gv_daa003.VisibleIndex = 12;
             this.gv_daa003.Width = 131;
             // 
             // gv_daa004
             // 
             this.gv_daa004.AppearanceCell.Options.UseFont = true;
             this.gv_daa004.Caption = "浜у搧瑙勬牸";
-            this.gv_daa004.FieldName = "daa004";
+            this.gv_daa004.FieldName = "itemModel";
             this.gv_daa004.MinWidth = 44;
             this.gv_daa004.Name = "gv_daa004";
             this.gv_daa004.OptionsColumn.AllowEdit = false;
-            this.gv_daa004.Tag = "query_a.daa004";
+            this.gv_daa004.Tag = "query_s.item_model";
             this.gv_daa004.Visible = true;
-            this.gv_daa004.VisibleIndex = 11;
+            this.gv_daa004.VisibleIndex = 13;
             this.gv_daa004.Width = 131;
             // 
             // gv_daa008
@@ -728,7 +798,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 = 14;
             this.gv_daa008.Width = 44;
             // 
             // gv_daa011
@@ -742,7 +812,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 = 15;
             this.gv_daa011.Width = 44;
             // 
             // gridColumn4
@@ -757,7 +827,7 @@
             this.gridColumn4.MinWidth = 44;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 14;
+            this.gridColumn4.VisibleIndex = 16;
             this.gridColumn4.Width = 44;
             // 
             // gv_daa010
@@ -771,7 +841,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 = 18;
             this.gv_daa010.Width = 44;
             // 
             // gv_daa005
@@ -785,7 +855,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 = 19;
             this.gv_daa005.Width = 44;
             // 
             // gv_cust
@@ -806,7 +876,7 @@
             this.gridColumn1.MinWidth = 44;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 18;
+            this.gridColumn1.VisibleIndex = 21;
             this.gridColumn1.Width = 82;
             // 
             // gv_daa015
@@ -819,7 +889,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 = 9;
             this.gv_daa015.Width = 82;
             // 
             // gv_daa009
@@ -832,7 +902,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 = 17;
             this.gv_daa009.Width = 82;
             // 
             // gv_prepareTime
@@ -867,7 +937,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 = 22;
             this.gv_daa016.Width = 157;
             // 
             // gv_daa017
@@ -880,7 +950,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 = 23;
             this.gv_daa017.Width = 157;
             // 
             // gv_mesStartProd
@@ -893,7 +963,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 = 24;
             this.gv_mesStartProd.Width = 157;
             // 
             // gv_mesEndProd
@@ -906,7 +976,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 = 25;
             this.gv_mesEndProd.Width = 157;
             // 
             // gridColumn21
@@ -916,7 +986,7 @@
             this.gridColumn21.MinWidth = 22;
             this.gridColumn21.Name = "gridColumn21";
             this.gridColumn21.Visible = true;
-            this.gridColumn21.VisibleIndex = 24;
+            this.gridColumn21.VisibleIndex = 26;
             this.gridColumn21.Width = 82;
             // 
             // gridColumn22
@@ -926,7 +996,7 @@
             this.gridColumn22.MinWidth = 22;
             this.gridColumn22.Name = "gridColumn22";
             this.gridColumn22.Visible = true;
-            this.gridColumn22.VisibleIndex = 25;
+            this.gridColumn22.VisibleIndex = 27;
             this.gridColumn22.Width = 82;
             // 
             // gridColumn23
@@ -944,7 +1014,7 @@
             this.gridColumn24.MinWidth = 22;
             this.gridColumn24.Name = "gridColumn24";
             this.gridColumn24.Visible = true;
-            this.gridColumn24.VisibleIndex = 26;
+            this.gridColumn24.VisibleIndex = 28;
             this.gridColumn24.Width = 82;
             // 
             // gridColumn25
@@ -954,8 +1024,18 @@
             this.gridColumn25.MinWidth = 22;
             this.gridColumn25.Name = "gridColumn25";
             this.gridColumn25.Visible = true;
-            this.gridColumn25.VisibleIndex = 27;
+            this.gridColumn25.VisibleIndex = 8;
             this.gridColumn25.Width = 82;
+            // 
+            // gridColumn52
+            // 
+            this.gridColumn52.Caption = "鐢熶骇绫诲瀷";
+            this.gridColumn52.FieldName = "daa025";
+            this.gridColumn52.MinWidth = 22;
+            this.gridColumn52.Name = "gridColumn52";
+            this.gridColumn52.Visible = true;
+            this.gridColumn52.VisibleIndex = 10;
+            this.gridColumn52.Width = 82;
             // 
             // pageBar1
             // 
@@ -996,11 +1076,12 @@
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.splitMx1.Size = new System.Drawing.Size(1444, 550);
-            this.splitMx1.SplitterPosition = 151;
+            this.splitMx1.SplitterPosition = 149;
             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);
@@ -1021,23 +1102,34 @@
             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.Controls.Add(this.txt_daa021);
             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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(657, 373, 812, 500);
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(797, 526, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1444, 151);
+            this.layoutMx1.Size = new System.Drawing.Size(1444, 149);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
+            // 
+            // txt_daa015
+            // 
+            this.txt_daa015.IsReadly = false;
+            this.txt_daa015.Location = new System.Drawing.Point(799, 132);
+            this.txt_daa015.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_daa015.Name = "txt_daa015";
+            this.txt_daa015.Size = new System.Drawing.Size(264, 20);
+            this.txt_daa015.TabIndex = 478;
             // 
             // lbGuid
             // 
@@ -1050,11 +1142,11 @@
             // 
             // txt_daa009
             // 
-            this.txt_daa009.Location = new System.Drawing.Point(96, 132);
+            this.txt_daa009.Location = new System.Drawing.Point(447, 132);
             this.txt_daa009.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa009.Name = "txt_daa009";
             this.txt_daa009.Properties.Appearance.Options.UseFont = true;
-            this.txt_daa009.Size = new System.Drawing.Size(615, 20);
+            this.txt_daa009.Size = new System.Drawing.Size(264, 20);
             this.txt_daa009.StyleController = this.layoutMx1;
             this.txt_daa009.TabIndex = 240;
             this.txt_daa009.Tag = "";
@@ -1171,7 +1263,7 @@
             // 
             // txt_dptName
             // 
-            this.txt_dptName.Location = new System.Drawing.Point(447, 60);
+            this.txt_dptName.Location = new System.Drawing.Point(447, 36);
             this.txt_dptName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_dptName.Name = "txt_dptName";
             this.txt_dptName.Properties.Appearance.Options.UseFont = true;
@@ -1193,7 +1285,7 @@
             // 
             // txt_daa029
             // 
-            this.txt_daa029.Location = new System.Drawing.Point(96, 60);
+            this.txt_daa029.Location = new System.Drawing.Point(96, 84);
             this.txt_daa029.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa029.Name = "txt_daa029";
             this.txt_daa029.Properties.Appearance.Options.UseFont = true;
@@ -1204,7 +1296,7 @@
             // 
             // txt_lineName
             // 
-            this.txt_lineName.Location = new System.Drawing.Point(447, 84);
+            this.txt_lineName.Location = new System.Drawing.Point(447, 60);
             this.txt_lineName.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_lineName.Name = "txt_lineName";
             this.txt_lineName.Properties.Appearance.Options.UseFont = true;
@@ -1226,7 +1318,7 @@
             // 
             // txt_daa003
             // 
-            this.txt_daa003.Location = new System.Drawing.Point(96, 84);
+            this.txt_daa003.Location = new System.Drawing.Point(96, 108);
             this.txt_daa003.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa003.Name = "txt_daa003";
             this.txt_daa003.Properties.Appearance.Options.UseFont = true;
@@ -1248,7 +1340,7 @@
             // 
             // txt_daa004
             // 
-            this.txt_daa004.Location = new System.Drawing.Point(96, 108);
+            this.txt_daa004.Location = new System.Drawing.Point(96, 132);
             this.txt_daa004.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_daa004.Name = "txt_daa004";
             this.txt_daa004.Properties.Appearance.Options.UseFont = true;
@@ -1257,32 +1349,25 @@
             this.txt_daa004.TabIndex = 222;
             this.txt_daa004.Tag = "readonly";
             // 
-            // txt_daa015
-            // 
-            this.txt_daa015.Location = new System.Drawing.Point(368, 96);
-            this.txt_daa015.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
-            this.txt_daa015.Name = "txt_daa015";
-            this.txt_daa015.Size = new System.Drawing.Size(175, 20);
-            this.txt_daa015.StyleController = this.layoutMx1;
-            this.txt_daa015.TabIndex = 473;
-            // 
             // txt_lineNo
             // 
-            this.txt_lineNo.Location = new System.Drawing.Point(447, 108);
+            this.txt_lineNo.Location = new System.Drawing.Point(447, 84);
             this.txt_lineNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_lineNo.Name = "txt_lineNo";
             this.txt_lineNo.Size = new System.Drawing.Size(264, 20);
             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(447, 36);
+            this.txt_dptNo.Location = new System.Drawing.Point(456, 53);
             this.txt_dptNo.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_dptNo.Name = "txt_dptNo";
-            this.txt_dptNo.Size = new System.Drawing.Size(264, 20);
+            this.txt_dptNo.Size = new System.Drawing.Size(263, 20);
             this.txt_dptNo.StyleController = this.layoutMx1;
             this.txt_dptNo.TabIndex = 475;
+            this.txt_dptNo.Tag = "readonly";
             // 
             // txt_isQiTao
             // 
@@ -1293,6 +1378,46 @@
             this.txt_isQiTao.Size = new System.Drawing.Size(348, 20);
             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(447, 108);
+            this.txt_daa018.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_daa018.Name = "txt_daa018";
+            this.txt_daa018.Size = new System.Drawing.Size(264, 20);
+            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(1151, 132);
+            this.txt_daa025.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            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(264, 20);
+            this.txt_daa025.StyleController = this.layoutMx1;
+            this.txt_daa025.TabIndex = 479;
+            // 
+            // txt_daa021
+            // 
+            this.txt_daa021.Location = new System.Drawing.Point(96, 60);
+            this.txt_daa021.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.txt_daa021.Name = "txt_daa021";
+            this.txt_daa021.Size = new System.Drawing.Size(263, 20);
+            this.txt_daa021.StyleController = this.layoutMx1;
+            this.txt_daa021.TabIndex = 480;
+            this.txt_daa021.Tag = "readonly";
             // 
             // layoutControlItem29
             // 
@@ -1306,17 +1431,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(79, 14);
-            // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_daa013;
@@ -1329,6 +1443,17 @@
             this.layoutControlItem18.Text = "杞﹂棿ID";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(79, 14);
             // 
+            // 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(79, 14);
+            // 
             // Root
             // 
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -1340,21 +1465,24 @@
             this.layoutControlItem7,
             this.layoutControlItem11,
             this.layoutControlItem6,
-            this.layoutControlItem14,
+            this.layoutControlItem20,
             this.layoutControlItem15,
             this.layoutControlItem4,
             this.layoutControlItem8,
             this.layoutControlItem12,
             this.layoutControlItem16,
-            this.layoutControlItem40,
             this.layoutControlItem9,
-            this.layoutControlItem13,
-            this.layoutControlItem19,
-            this.layoutControlItem17,
-            this.layoutControlItem28,
+            this.txt_daa015label,
+            this.layoutControlItem14,
             this.layoutControlItem46,
-            this.layoutControlItem20,
-            this.layoutControlItem41});
+            this.layoutControlItem48,
+            this.layoutControlItem40,
+            this.layoutControlItem27,
+            this.layoutControlItem28,
+            this.layoutControlItem17,
+            this.layoutControlItem19,
+            this.layoutControlItem13,
+            this.layoutControlItem49});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1453,16 +1581,16 @@
             this.layoutControlItem6.Text = "閫氱煡澶囨枡";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // layoutControlItem14
+            // layoutControlItem20
             // 
-            this.layoutControlItem14.Control = this.txt_lineName;
-            this.layoutControlItem14.Location = new System.Drawing.Point(351, 72);
-            this.layoutControlItem14.Name = "layoutControlItem14";
-            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(352, 24);
-            this.layoutControlItem14.Text = "鐢熶骇绾垮埆";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem20.Control = this.txt_dptName;
+            this.layoutControlItem20.Location = new System.Drawing.Point(351, 24);
+            this.layoutControlItem20.Name = "layoutControlItem20";
+            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem20.Size = new System.Drawing.Size(352, 24);
+            this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem15
             // 
@@ -1519,17 +1647,6 @@
             this.layoutControlItem16.Text = "瀹為檯瀹屽伐鏃堕棿";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // layoutControlItem40
-            // 
-            this.layoutControlItem40.Control = this.txt_lineNo;
-            this.layoutControlItem40.Location = new System.Drawing.Point(351, 96);
-            this.layoutControlItem40.Name = "layoutControlItem40";
-            this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem40.Size = new System.Drawing.Size(352, 24);
-            this.layoutControlItem40.Text = "绾垮埆缂栫爜";
-            this.layoutControlItem40.TextSize = new System.Drawing.Size(72, 14);
-            // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_saleOrderNo;
@@ -1541,46 +1658,27 @@
             this.layoutControlItem9.Text = "闇�姹傚崟鍙�";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // layoutControlItem13
+            // txt_daa015label
             // 
-            this.layoutControlItem13.Control = this.txt_daa029;
-            this.layoutControlItem13.Location = new System.Drawing.Point(0, 48);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(351, 24);
-            this.layoutControlItem13.Text = "浜у搧缂栫爜";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14);
+            this.txt_daa015label.Control = this.txt_daa015;
+            this.txt_daa015label.Location = new System.Drawing.Point(703, 120);
+            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(352, 24);
+            this.txt_daa015label.Text = "绾夸綋鍙樻洿";
+            this.txt_daa015label.TextSize = new System.Drawing.Size(72, 14);
             // 
-            // layoutControlItem19
+            // layoutControlItem14
             // 
-            this.layoutControlItem19.Control = this.txt_daa003;
-            this.layoutControlItem19.Location = new System.Drawing.Point(0, 72);
-            this.layoutControlItem19.Name = "layoutControlItem19";
-            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem19.Size = new System.Drawing.Size(351, 24);
-            this.layoutControlItem19.Text = "浜у搧鍚嶇О";
-            this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem17
-            // 
-            this.layoutControlItem17.Control = this.txt_daa004;
-            this.layoutControlItem17.Location = new System.Drawing.Point(0, 96);
-            this.layoutControlItem17.Name = "layoutControlItem17";
-            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
-            this.layoutControlItem17.Size = new System.Drawing.Size(351, 24);
-            this.layoutControlItem17.Text = "浜у搧瑙勬牸";
-            this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem28
-            // 
-            this.layoutControlItem28.Control = this.txt_daa009;
-            this.layoutControlItem28.Location = new System.Drawing.Point(0, 120);
-            this.layoutControlItem28.Name = "layoutControlItem28";
-            this.layoutControlItem28.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
-            this.layoutControlItem28.Size = new System.Drawing.Size(703, 24);
-            this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
-            this.layoutControlItem28.TextSize = new System.Drawing.Size(72, 14);
+            this.layoutControlItem14.Control = this.txt_lineName;
+            this.layoutControlItem14.Location = new System.Drawing.Point(351, 48);
+            this.layoutControlItem14.Name = "layoutControlItem14";
+            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem14.Size = new System.Drawing.Size(352, 24);
+            this.layoutControlItem14.Text = "绾垮埆鍚嶇О";
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem46
             // 
@@ -1590,8 +1688,93 @@
             this.layoutControlItem46.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem46.OptionsTableLayoutItem.RowIndex = 4;
             this.layoutControlItem46.Size = new System.Drawing.Size(352, 24);
+            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(351, 96);
+            this.layoutControlItem48.Name = "layoutControlItem48";
+            this.layoutControlItem48.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem48.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem48.Size = new System.Drawing.Size(352, 24);
+            this.layoutControlItem48.Text = "宸ュ崟鐘舵��";
+            this.layoutControlItem48.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem40
+            // 
+            this.layoutControlItem40.Control = this.txt_lineNo;
+            this.layoutControlItem40.Location = new System.Drawing.Point(351, 72);
+            this.layoutControlItem40.Name = "layoutControlItem40";
+            this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem40.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem40.Size = new System.Drawing.Size(352, 24);
+            this.layoutControlItem40.Text = "绾垮埆缂栫爜";
+            this.layoutControlItem40.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem27
+            // 
+            this.layoutControlItem27.Control = this.txt_daa025;
+            this.layoutControlItem27.Location = new System.Drawing.Point(1055, 120);
+            this.layoutControlItem27.Name = "layoutControlItem27";
+            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem27.Size = new System.Drawing.Size(352, 24);
+            this.layoutControlItem27.Text = "鐢熶骇绫诲瀷";
+            this.layoutControlItem27.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem28
+            // 
+            this.layoutControlItem28.Control = this.txt_daa009;
+            this.layoutControlItem28.Location = new System.Drawing.Point(351, 120);
+            this.layoutControlItem28.Name = "layoutControlItem28";
+            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem28.Size = new System.Drawing.Size(352, 24);
+            this.layoutControlItem28.Text = "宸ュ崟澶囨敞";
+            this.layoutControlItem28.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem17
+            // 
+            this.layoutControlItem17.Control = this.txt_daa004;
+            this.layoutControlItem17.Location = new System.Drawing.Point(0, 120);
+            this.layoutControlItem17.Name = "layoutControlItem17";
+            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
+            this.layoutControlItem17.Size = new System.Drawing.Size(351, 24);
+            this.layoutControlItem17.Text = "浜у搧瑙勬牸";
+            this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem19
+            // 
+            this.layoutControlItem19.Control = this.txt_daa003;
+            this.layoutControlItem19.Location = new System.Drawing.Point(0, 96);
+            this.layoutControlItem19.Name = "layoutControlItem19";
+            this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
+            this.layoutControlItem19.Size = new System.Drawing.Size(351, 24);
+            this.layoutControlItem19.Text = "浜у搧鍚嶇О";
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.txt_daa029;
+            this.layoutControlItem13.Location = new System.Drawing.Point(0, 72);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem13.Size = new System.Drawing.Size(351, 24);
+            this.layoutControlItem13.Text = "浜у搧缂栫爜";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem49
+            // 
+            this.layoutControlItem49.Control = this.txt_daa021;
+            this.layoutControlItem49.Location = new System.Drawing.Point(0, 48);
+            this.layoutControlItem49.Name = "layoutControlItem49";
+            this.layoutControlItem49.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem49.Size = new System.Drawing.Size(351, 24);
+            this.layoutControlItem49.Text = "浠诲姟鍗曞彿";
+            this.layoutControlItem49.TextSize = new System.Drawing.Size(72, 14);
             // 
             // tabMx
             // 
@@ -1600,10 +1783,13 @@
             this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1444, 389);
+            this.tabMx.Size = new System.Drawing.Size(1444, 391);
             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,
@@ -1611,10 +1797,12 @@
             // 
             // 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1442, 363);
+            this.tabMxPage1.Size = new System.Drawing.Size(1442, 365);
             this.tabMxPage1.Text = "澶囨枡鍗曡韩";
             // 
             // gcMx1
@@ -1625,7 +1813,7 @@
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1442, 363);
+            this.gcMx1.Size = new System.Drawing.Size(1442, 365);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1663,7 +1851,8 @@
             this.gvMx1dab019,
             this.gvMx1dab020,
             this.gvMx1dab022,
-            this.gvMx1dab023});
+            this.gvMx1dab023,
+            this.gridColumn58});
             this.gvMx1.DetailHeight = 272;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
@@ -1687,7 +1876,7 @@
             this.gridColumn13.Name = "gridColumn13";
             this.gridColumn13.Visible = true;
             this.gridColumn13.VisibleIndex = 0;
-            this.gridColumn13.Width = 82;
+            this.gridColumn13.Width = 78;
             // 
             // gvMx1dab001
             // 
@@ -1699,7 +1888,7 @@
             this.gvMx1dab001.Tag = "query_a.dab001";
             this.gvMx1dab001.Visible = true;
             this.gvMx1dab001.VisibleIndex = 1;
-            this.gvMx1dab001.Width = 82;
+            this.gvMx1dab001.Width = 78;
             // 
             // gvMx1dab003
             // 
@@ -1711,7 +1900,7 @@
             this.gvMx1dab003.Tag = "query_a.dab003";
             this.gvMx1dab003.Visible = true;
             this.gvMx1dab003.VisibleIndex = 2;
-            this.gvMx1dab003.Width = 82;
+            this.gvMx1dab003.Width = 78;
             // 
             // gvMx1dab004
             // 
@@ -1722,8 +1911,8 @@
             this.gvMx1dab004.Name = "gvMx1dab004";
             this.gvMx1dab004.Tag = "query_a.dab004";
             this.gvMx1dab004.Visible = true;
-            this.gvMx1dab004.VisibleIndex = 3;
-            this.gvMx1dab004.Width = 82;
+            this.gvMx1dab004.VisibleIndex = 4;
+            this.gvMx1dab004.Width = 78;
             // 
             // gvMx1dab005
             // 
@@ -1734,8 +1923,8 @@
             this.gvMx1dab005.Name = "gvMx1dab005";
             this.gvMx1dab005.Tag = "query_a.dab005";
             this.gvMx1dab005.Visible = true;
-            this.gvMx1dab005.VisibleIndex = 4;
-            this.gvMx1dab005.Width = 82;
+            this.gvMx1dab005.VisibleIndex = 5;
+            this.gvMx1dab005.Width = 78;
             // 
             // gvMx1dab006
             // 
@@ -1746,8 +1935,8 @@
             this.gvMx1dab006.Name = "gvMx1dab006";
             this.gvMx1dab006.Tag = "query_a.dab006";
             this.gvMx1dab006.Visible = true;
-            this.gvMx1dab006.VisibleIndex = 5;
-            this.gvMx1dab006.Width = 82;
+            this.gvMx1dab006.VisibleIndex = 6;
+            this.gvMx1dab006.Width = 78;
             // 
             // gvMx1dab007
             // 
@@ -1758,8 +1947,8 @@
             this.gvMx1dab007.Name = "gvMx1dab007";
             this.gvMx1dab007.Tag = "query_a.dab007";
             this.gvMx1dab007.Visible = true;
-            this.gvMx1dab007.VisibleIndex = 6;
-            this.gvMx1dab007.Width = 82;
+            this.gvMx1dab007.VisibleIndex = 7;
+            this.gvMx1dab007.Width = 78;
             // 
             // gridColumn14
             // 
@@ -1768,8 +1957,8 @@
             this.gridColumn14.MinWidth = 22;
             this.gridColumn14.Name = "gridColumn14";
             this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 7;
-            this.gridColumn14.Width = 82;
+            this.gridColumn14.VisibleIndex = 8;
+            this.gridColumn14.Width = 78;
             // 
             // gvMx1dab014
             // 
@@ -1780,8 +1969,8 @@
             this.gvMx1dab014.Name = "gvMx1dab014";
             this.gvMx1dab014.Tag = "query_a.dab014";
             this.gvMx1dab014.Visible = true;
-            this.gvMx1dab014.VisibleIndex = 8;
-            this.gvMx1dab014.Width = 82;
+            this.gvMx1dab014.VisibleIndex = 9;
+            this.gvMx1dab014.Width = 78;
             // 
             // gridColumn15
             // 
@@ -1790,8 +1979,8 @@
             this.gridColumn15.MinWidth = 22;
             this.gridColumn15.Name = "gridColumn15";
             this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 9;
-            this.gridColumn15.Width = 82;
+            this.gridColumn15.VisibleIndex = 10;
+            this.gridColumn15.Width = 78;
             // 
             // gridColumn16
             // 
@@ -1800,8 +1989,8 @@
             this.gridColumn16.MinWidth = 22;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Visible = true;
-            this.gridColumn16.VisibleIndex = 10;
-            this.gridColumn16.Width = 82;
+            this.gridColumn16.VisibleIndex = 11;
+            this.gridColumn16.Width = 78;
             // 
             // gvMx1dab012
             // 
@@ -1812,8 +2001,8 @@
             this.gvMx1dab012.Name = "gvMx1dab012";
             this.gvMx1dab012.Tag = "query_a.dab012";
             this.gvMx1dab012.Visible = true;
-            this.gvMx1dab012.VisibleIndex = 11;
-            this.gvMx1dab012.Width = 82;
+            this.gvMx1dab012.VisibleIndex = 12;
+            this.gvMx1dab012.Width = 78;
             // 
             // gvMx1dab009
             // 
@@ -1824,8 +2013,8 @@
             this.gvMx1dab009.Name = "gvMx1dab009";
             this.gvMx1dab009.Tag = "query_a.dab009";
             this.gvMx1dab009.Visible = true;
-            this.gvMx1dab009.VisibleIndex = 12;
-            this.gvMx1dab009.Width = 82;
+            this.gvMx1dab009.VisibleIndex = 13;
+            this.gvMx1dab009.Width = 215;
             // 
             // gvMx1scrapqty
             // 
@@ -1856,8 +2045,8 @@
             this.gvMx1zyBl.Name = "gvMx1zyBl";
             this.gvMx1zyBl.Tag = "query_a.zy_bl";
             this.gvMx1zyBl.Visible = true;
-            this.gvMx1zyBl.VisibleIndex = 17;
-            this.gvMx1zyBl.Width = 82;
+            this.gvMx1zyBl.VisibleIndex = 18;
+            this.gvMx1zyBl.Width = 63;
             // 
             // gvMx1llBl
             // 
@@ -1868,8 +2057,8 @@
             this.gvMx1llBl.Name = "gvMx1llBl";
             this.gvMx1llBl.Tag = "query_a.ll_bl";
             this.gvMx1llBl.Visible = true;
-            this.gvMx1llBl.VisibleIndex = 15;
-            this.gvMx1llBl.Width = 82;
+            this.gvMx1llBl.VisibleIndex = 16;
+            this.gvMx1llBl.Width = 51;
             // 
             // gvMx1lpTl
             // 
@@ -1880,8 +2069,8 @@
             this.gvMx1lpTl.Name = "gvMx1lpTl";
             this.gvMx1lpTl.Tag = "query_a.lp_tl";
             this.gvMx1lpTl.Visible = true;
-            this.gvMx1lpTl.VisibleIndex = 16;
-            this.gvMx1lpTl.Width = 82;
+            this.gvMx1lpTl.VisibleIndex = 17;
+            this.gvMx1lpTl.Width = 51;
             // 
             // gvMx1dab021
             // 
@@ -1892,8 +2081,8 @@
             this.gvMx1dab021.Name = "gvMx1dab021";
             this.gvMx1dab021.Tag = "query_a.dab021";
             this.gvMx1dab021.Visible = true;
-            this.gvMx1dab021.VisibleIndex = 13;
-            this.gvMx1dab021.Width = 82;
+            this.gvMx1dab021.VisibleIndex = 14;
+            this.gvMx1dab021.Width = 51;
             // 
             // gvMx1dab010
             // 
@@ -1974,15 +2163,452 @@
             this.gvMx1dab023.Name = "gvMx1dab023";
             this.gvMx1dab023.Tag = "query_a.dab023";
             this.gvMx1dab023.Visible = true;
-            this.gvMx1dab023.VisibleIndex = 14;
-            this.gvMx1dab023.Width = 82;
+            this.gvMx1dab023.VisibleIndex = 15;
+            this.gvMx1dab023.Width = 51;
+            // 
+            // gridColumn58
+            // 
+            this.gridColumn58.Caption = "棰嗘枡杩涘害";
+            this.gridColumn58.FieldName = "barbl";
+            this.gridColumn58.MinWidth = 22;
+            this.gridColumn58.Name = "gridColumn58";
+            this.gridColumn58.Visible = true;
+            this.gridColumn58.VisibleIndex = 3;
+            this.gridColumn58.Width = 82;
+            // 
+            // 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.xtraTabPage6.Name = "xtraTabPage6";
+            this.xtraTabPage6.Size = new System.Drawing.Size(1442, 365);
+            this.xtraTabPage6.Text = "澶囨枡鏄庣粏";
+            // 
+            // gcMx6
+            // 
+            this.gcMx6.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx6.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx6.Location = new System.Drawing.Point(0, 0);
+            this.gcMx6.MainView = this.gvMx6;
+            this.gcMx6.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx6.Name = "gcMx6";
+            this.gcMx6.Size = new System.Drawing.Size(1442, 365);
+            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 = 39;
+            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.DetailHeight = 272;
+            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 = 22;
+            this.gridColumn2.Name = "gridColumn2";
+            this.gridColumn2.Width = 82;
+            // 
+            // gridColumn9
+            // 
+            this.gridColumn9.AppearanceCell.Options.UseFont = true;
+            this.gridColumn9.Caption = "宸ュ崟鍗曞彿";
+            this.gridColumn9.FieldName = "daa001";
+            this.gridColumn9.MinWidth = 44;
+            this.gridColumn9.Name = "gridColumn9";
+            this.gridColumn9.Tag = "query_a.dab001";
+            this.gridColumn9.Visible = true;
+            this.gridColumn9.VisibleIndex = 0;
+            this.gridColumn9.Width = 82;
+            // 
+            // gridColumn11
+            // 
+            this.gridColumn11.AppearanceCell.Options.UseFont = true;
+            this.gridColumn11.Caption = "鏉愭枡缂栫爜";
+            this.gridColumn11.FieldName = "itemNo";
+            this.gridColumn11.MinWidth = 44;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Tag = "query_a.dab003";
+            this.gridColumn11.Visible = true;
+            this.gridColumn11.VisibleIndex = 1;
+            this.gridColumn11.Width = 82;
+            // 
+            // gridColumn20
+            // 
+            this.gridColumn20.AppearanceCell.Options.UseFont = true;
+            this.gridColumn20.Caption = "鏉愭枡鍚嶇О";
+            this.gridColumn20.FieldName = "itemName";
+            this.gridColumn20.MinWidth = 44;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Tag = "query_a.dab004";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 2;
+            this.gridColumn20.Width = 82;
+            // 
+            // gridColumn26
+            // 
+            this.gridColumn26.AppearanceCell.Options.UseFont = true;
+            this.gridColumn26.Caption = "鏉愭枡瑙勬牸";
+            this.gridColumn26.FieldName = "itemModel";
+            this.gridColumn26.MinWidth = 44;
+            this.gridColumn26.Name = "gridColumn26";
+            this.gridColumn26.Tag = "query_a.dab005";
+            this.gridColumn26.Visible = true;
+            this.gridColumn26.VisibleIndex = 3;
+            this.gridColumn26.Width = 82;
+            // 
+            // gridColumn28
+            // 
+            this.gridColumn28.Caption = "鐗╂枡鏉$爜";
+            this.gridColumn28.FieldName = "itemBarcode";
+            this.gridColumn28.MinWidth = 22;
+            this.gridColumn28.Name = "gridColumn28";
+            this.gridColumn28.Visible = true;
+            this.gridColumn28.VisibleIndex = 4;
+            this.gridColumn28.Width = 82;
+            // 
+            // gridColumn29
+            // 
+            this.gridColumn29.Caption = "鏉$爜鏁伴噺";
+            this.gridColumn29.FieldName = "quantity";
+            this.gridColumn29.MinWidth = 22;
+            this.gridColumn29.Name = "gridColumn29";
+            this.gridColumn29.Visible = true;
+            this.gridColumn29.VisibleIndex = 5;
+            this.gridColumn29.Width = 82;
+            // 
+            // gridColumn49
+            // 
+            this.gridColumn49.Caption = "澶囨枡璇︽儏";
+            this.gridColumn49.FieldName = "blDetail";
+            this.gridColumn49.MinWidth = 22;
+            this.gridColumn49.Name = "gridColumn49";
+            this.gridColumn49.Visible = true;
+            this.gridColumn49.VisibleIndex = 6;
+            this.gridColumn49.Width = 82;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "鏀舵枡璇︽儏";
+            this.gridColumn8.FieldName = "slDetail";
+            this.gridColumn8.MinWidth = 22;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 7;
+            this.gridColumn8.Width = 82;
+            // 
+            // gridColumn50
+            // 
+            this.gridColumn50.Caption = "鎶曟枡璇︽儏";
+            this.gridColumn50.FieldName = "tlDetail";
+            this.gridColumn50.MinWidth = 22;
+            this.gridColumn50.Name = "gridColumn50";
+            this.gridColumn50.Visible = true;
+            this.gridColumn50.VisibleIndex = 8;
+            this.gridColumn50.Width = 82;
+            // 
+            // gridColumn51
+            // 
+            this.gridColumn51.Caption = "閫�鏂欒鎯�";
+            this.gridColumn51.FieldName = "tuiDetail";
+            this.gridColumn51.MinWidth = 22;
+            this.gridColumn51.Name = "gridColumn51";
+            this.gridColumn51.Visible = true;
+            this.gridColumn51.VisibleIndex = 9;
+            this.gridColumn51.Width = 82;
+            // 
+            // 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.xtraTabPage7.Name = "xtraTabPage7";
+            this.xtraTabPage7.Size = new System.Drawing.Size(1442, 365);
+            this.xtraTabPage7.Text = "宸ュ簭鏄庣粏";
+            // 
+            // gcMx7
+            // 
+            this.gcMx7.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx7.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx7.Name = "gcMx7";
+            this.gcMx7.Size = new System.Drawing.Size(1442, 365);
+            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 = 39;
+            this.gvMx7.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx1daa002,
+            this.gvMx1daa010,
+            this.gvMx1daa004,
+            this.gridColumn63,
+            this.gridColumn64,
+            this.gridColumn65});
+            this.gvMx7.DetailHeight = 272;
+            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 = 44;
+            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 = 47;
+            // 
+            // gvMx1daa010
+            // 
+            this.gvMx1daa010.AppearanceCell.Options.UseFont = true;
+            this.gvMx1daa010.Caption = "宸ュ簭";
+            this.gvMx1daa010.FieldName = "processNo";
+            this.gvMx1daa010.MinWidth = 44;
+            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 = 113;
+            // 
+            // gvMx1daa004
+            // 
+            this.gvMx1daa004.AppearanceCell.Options.UseFont = true;
+            this.gvMx1daa004.Caption = "涓婂伐搴�";
+            this.gvMx1daa004.FieldName = "frontProcessNo";
+            this.gvMx1daa004.MinWidth = 131;
+            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 = 131;
+            // 
+            // gridColumn63
+            // 
+            this.gridColumn63.Caption = "鏄惁鍙繑宸�";
+            this.gridColumn63.FieldName = "isBack";
+            this.gridColumn63.MinWidth = 22;
+            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 = 82;
+            // 
+            // gridColumn64
+            // 
+            this.gridColumn64.Caption = "鏄惁杩旇拷婧爜";
+            this.gridColumn64.FieldName = "isZsm";
+            this.gridColumn64.MinWidth = 22;
+            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 = 82;
+            // 
+            // gridColumn65
+            // 
+            this.gridColumn65.Caption = "鏄惁杩旀墭鏉跨爜";
+            this.gridColumn65.FieldName = "isTbm";
+            this.gridColumn65.MinWidth = 22;
+            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 = 82;
+            // 
+            // 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.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.xtraTabPage8.Name = "xtraTabPage8";
+            this.xtraTabPage8.Size = new System.Drawing.Size(1442, 365);
+            this.xtraTabPage8.Text = "鏁版嵁閲囬泦鏄庣粏";
+            // 
+            // gcMx8
+            // 
+            this.gcMx8.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx8.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx8.Location = new System.Drawing.Point(0, 0);
+            this.gcMx8.MainView = this.gvMx8;
+            this.gcMx8.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.gcMx8.Name = "gcMx8";
+            this.gcMx8.Size = new System.Drawing.Size(1442, 365);
+            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.DetailHeight = 272;
+            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 = 22;
+            this.gridColumn53.Name = "gridColumn53";
+            this.gridColumn53.OptionsColumn.ReadOnly = true;
+            this.gridColumn53.Width = 82;
+            // 
+            // 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 = 44;
+            // 
+            // gvMx2pbillNo
+            // 
+            this.gvMx2pbillNo.AppearanceCell.Options.UseFont = true;
+            this.gvMx2pbillNo.Caption = "杩芥函鐮�";
+            this.gvMx2pbillNo.FieldName = "barCode";
+            this.gvMx2pbillNo.MinWidth = 17;
+            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 = 82;
+            // 
+            // gridColumn56
+            // 
+            this.gridColumn56.Caption = "鏁伴噺";
+            this.gridColumn56.FieldName = "quantity";
+            this.gridColumn56.MinWidth = 22;
+            this.gridColumn56.Name = "gridColumn56";
+            this.gridColumn56.OptionsColumn.ReadOnly = true;
+            this.gridColumn56.Visible = true;
+            this.gridColumn56.VisibleIndex = 2;
+            this.gridColumn56.Width = 82;
+            // 
+            // gridColumn57
+            // 
+            this.gridColumn57.Caption = "宸ュ簭";
+            this.gridColumn57.FieldName = "processNo";
+            this.gridColumn57.MinWidth = 22;
+            this.gridColumn57.Name = "gridColumn57";
+            this.gridColumn57.OptionsColumn.ReadOnly = true;
+            this.gridColumn57.Visible = true;
+            this.gridColumn57.VisibleIndex = 3;
+            this.gridColumn57.Width = 82;
+            // 
+            // gridColumn59
+            // 
+            this.gridColumn59.Caption = "缁撴灉";
+            this.gridColumn59.FieldName = "checkResult";
+            this.gridColumn59.MinWidth = 22;
+            this.gridColumn59.Name = "gridColumn59";
+            this.gridColumn59.OptionsColumn.ReadOnly = true;
+            this.gridColumn59.Visible = true;
+            this.gridColumn59.VisibleIndex = 4;
+            this.gridColumn59.Width = 82;
+            // 
+            // gridColumn60
+            // 
+            this.gridColumn60.Caption = "涓婃姤浜�";
+            this.gridColumn60.FieldName = "createBy";
+            this.gridColumn60.MinWidth = 22;
+            this.gridColumn60.Name = "gridColumn60";
+            this.gridColumn60.OptionsColumn.ReadOnly = true;
+            this.gridColumn60.Visible = true;
+            this.gridColumn60.VisibleIndex = 5;
+            this.gridColumn60.Width = 82;
+            // 
+            // gridColumn61
+            // 
+            this.gridColumn61.Caption = "鏈�鍚庝笂鎶ユ椂闂�";
+            this.gridColumn61.FieldName = "createDate";
+            this.gridColumn61.MinWidth = 22;
+            this.gridColumn61.Name = "gridColumn61";
+            this.gridColumn61.OptionsColumn.ReadOnly = true;
+            this.gridColumn61.Visible = true;
+            this.gridColumn61.VisibleIndex = 6;
+            this.gridColumn61.Width = 82;
+            // 
+            // gridColumn62
+            // 
+            this.gridColumn62.Caption = "鏁版嵁鐘舵��";
+            this.gridColumn62.FieldName = "bRemark";
+            this.gridColumn62.MinWidth = 22;
+            this.gridColumn62.Name = "gridColumn62";
+            this.gridColumn62.OptionsColumn.ReadOnly = true;
+            this.gridColumn62.Visible = true;
+            this.gridColumn62.VisibleIndex = 7;
+            this.gridColumn62.Width = 82;
             // 
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.splitMx99);
             this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1442, 363);
+            this.tabMxPage2.Size = new System.Drawing.Size(1442, 365);
             this.tabMxPage2.Text = "鎵樻澘鐮佹槑缁�";
             // 
             // splitMx99
@@ -2003,7 +2629,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(1442, 363);
+            this.splitMx99.Size = new System.Drawing.Size(1442, 365);
             this.splitMx99.SplitterPosition = 65;
             this.splitMx99.TabIndex = 2;
             // 
@@ -2333,8 +2959,8 @@
             this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx2.Name = "gcMx2";
             this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemCheckEdit1});
-            this.gcMx2.Size = new System.Drawing.Size(1442, 288);
+            this.rptTuoBanNbz});
+            this.gcMx2.Size = new System.Drawing.Size(1442, 290);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -2347,7 +2973,6 @@
             this.gvMx2.ColumnPanelRowHeight = 39;
             this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gvMx2guid,
-            this.gridColumn2,
             this.gridColumn19,
             this.gvMx2itemBarcode,
             this.gvMx2quantity,
@@ -2359,7 +2984,8 @@
             this.gvMx2createDate,
             this.gridColumn30,
             this.gridColumn31,
-            this.gridColumn32});
+            this.gridColumn32,
+            this.gridColumn54});
             this.gvMx2.DetailHeight = 272;
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
@@ -2378,22 +3004,6 @@
             this.gvMx2guid.Tag = "query_a.guid";
             this.gvMx2guid.Width = 82;
             // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "鎶ュ伐鏍囪瘑";
-            this.gridColumn2.ColumnEdit = this.repositoryItemCheckEdit1;
-            this.gridColumn2.FieldName = "isBg";
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.UnboundDataType = typeof(bool);
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 0;
-            this.gridColumn2.Width = 62;
-            // 
-            // repositoryItemCheckEdit1
-            // 
-            this.repositoryItemCheckEdit1.AutoHeight = false;
-            this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
-            // 
             // gridColumn19
             // 
             this.gridColumn19.Caption = "鍏ュ簱鏍囪瘑";
@@ -2402,7 +3012,7 @@
             this.gridColumn19.MinWidth = 44;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 1;
+            this.gridColumn19.VisibleIndex = 0;
             this.gridColumn19.Width = 44;
             // 
             // gvMx2itemBarcode
@@ -2414,8 +3024,8 @@
             this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
             this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
             this.gvMx2itemBarcode.Visible = true;
-            this.gvMx2itemBarcode.VisibleIndex = 2;
-            this.gvMx2itemBarcode.Width = 116;
+            this.gvMx2itemBarcode.VisibleIndex = 1;
+            this.gvMx2itemBarcode.Width = 82;
             // 
             // gvMx2quantity
             // 
@@ -2428,8 +3038,8 @@
             new DevExpress.XtraGrid.GridColumnSummaryItem(DevExpress.Data.SummaryItemType.Sum, "quantity", "鍚堣锛歿0:0.##}")});
             this.gvMx2quantity.Tag = "query_a.QUANTITY";
             this.gvMx2quantity.Visible = true;
-            this.gvMx2quantity.VisibleIndex = 3;
-            this.gvMx2quantity.Width = 116;
+            this.gvMx2quantity.VisibleIndex = 2;
+            this.gvMx2quantity.Width = 82;
             // 
             // gvMx2unit
             // 
@@ -2440,8 +3050,8 @@
             this.gvMx2unit.Name = "gvMx2unit";
             this.gvMx2unit.Tag = "query_a.UNIT";
             this.gvMx2unit.Visible = true;
-            this.gvMx2unit.VisibleIndex = 4;
-            this.gvMx2unit.Width = 116;
+            this.gvMx2unit.VisibleIndex = 3;
+            this.gvMx2unit.Width = 82;
             // 
             // gridColumn18
             // 
@@ -2450,8 +3060,8 @@
             this.gridColumn18.MinWidth = 22;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 5;
-            this.gridColumn18.Width = 116;
+            this.gridColumn18.VisibleIndex = 4;
+            this.gridColumn18.Width = 82;
             // 
             // gvMx2itemSname
             // 
@@ -2462,8 +3072,8 @@
             this.gvMx2itemSname.Name = "gvMx2itemSname";
             this.gvMx2itemSname.Tag = "query_a.ITEM_SNAME";
             this.gvMx2itemSname.Visible = true;
-            this.gvMx2itemSname.VisibleIndex = 6;
-            this.gvMx2itemSname.Width = 116;
+            this.gvMx2itemSname.VisibleIndex = 5;
+            this.gvMx2itemSname.Width = 82;
             // 
             // gridColumn17
             // 
@@ -2472,8 +3082,8 @@
             this.gridColumn17.MinWidth = 22;
             this.gridColumn17.Name = "gridColumn17";
             this.gridColumn17.Visible = true;
-            this.gridColumn17.VisibleIndex = 7;
-            this.gridColumn17.Width = 116;
+            this.gridColumn17.VisibleIndex = 6;
+            this.gridColumn17.Width = 82;
             // 
             // gvMx2createBy
             // 
@@ -2484,8 +3094,8 @@
             this.gvMx2createBy.Name = "gvMx2createBy";
             this.gvMx2createBy.Tag = "query_a.CREATE_BY";
             this.gvMx2createBy.Visible = true;
-            this.gvMx2createBy.VisibleIndex = 8;
-            this.gvMx2createBy.Width = 116;
+            this.gvMx2createBy.VisibleIndex = 7;
+            this.gvMx2createBy.Width = 82;
             // 
             // gvMx2createDate
             // 
@@ -2496,8 +3106,8 @@
             this.gvMx2createDate.Name = "gvMx2createDate";
             this.gvMx2createDate.Tag = "query_a.CREATE_DATE";
             this.gvMx2createDate.Visible = true;
-            this.gvMx2createDate.VisibleIndex = 9;
-            this.gvMx2createDate.Width = 116;
+            this.gvMx2createDate.VisibleIndex = 8;
+            this.gvMx2createDate.Width = 82;
             // 
             // gridColumn30
             // 
@@ -2506,8 +3116,8 @@
             this.gridColumn30.MinWidth = 22;
             this.gridColumn30.Name = "gridColumn30";
             this.gridColumn30.Visible = true;
-            this.gridColumn30.VisibleIndex = 10;
-            this.gridColumn30.Width = 116;
+            this.gridColumn30.VisibleIndex = 9;
+            this.gridColumn30.Width = 82;
             // 
             // gridColumn31
             // 
@@ -2516,8 +3126,8 @@
             this.gridColumn31.MinWidth = 22;
             this.gridColumn31.Name = "gridColumn31";
             this.gridColumn31.Visible = true;
-            this.gridColumn31.VisibleIndex = 11;
-            this.gridColumn31.Width = 116;
+            this.gridColumn31.VisibleIndex = 10;
+            this.gridColumn31.Width = 82;
             // 
             // gridColumn32
             // 
@@ -2526,8 +3136,29 @@
             this.gridColumn32.MinWidth = 22;
             this.gridColumn32.Name = "gridColumn32";
             this.gridColumn32.Visible = true;
-            this.gridColumn32.VisibleIndex = 12;
-            this.gridColumn32.Width = 151;
+            this.gridColumn32.VisibleIndex = 11;
+            this.gridColumn32.Width = 82;
+            // 
+            // gridColumn54
+            // 
+            this.gridColumn54.Caption = "鍙樻洿鍐呭寘瑁呮暟閲�";
+            this.gridColumn54.ColumnEdit = this.rptTuoBanNbz;
+            this.gridColumn54.MinWidth = 22;
+            this.gridColumn54.Name = "gridColumn54";
+            this.gridColumn54.Visible = true;
+            this.gridColumn54.VisibleIndex = 12;
+            this.gridColumn54.Width = 82;
+            // 
+            // rptTuoBanNbz
+            // 
+            this.rptTuoBanNbz.AutoHeight = false;
+            editorButtonImageOptions1.Image = ((System.Drawing.Image)(resources.GetObject("editorButtonImageOptions1.Image")));
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.rptTuoBanNbz.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "鍙樻洿鍐呭寘瑁呮暟閲�", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.rptTuoBanNbz.Name = "rptTuoBanNbz";
+            this.rptTuoBanNbz.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.rptTuoBanNbz.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptTuoBanNbz_ButtonClick);
             // 
             // xtraTabPage3
             // 
@@ -2535,7 +3166,7 @@
             this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage3.Name = "xtraTabPage3";
             this.xtraTabPage3.PageVisible = false;
-            this.xtraTabPage3.Size = new System.Drawing.Size(1442, 363);
+            this.xtraTabPage3.Size = new System.Drawing.Size(1442, 365);
             this.xtraTabPage3.Text = "杩芥函鐮佹槑缁�";
             // 
             // splitMx98
@@ -2556,7 +3187,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(1442, 363);
+            this.splitMx98.Size = new System.Drawing.Size(1442, 365);
             this.splitMx98.SplitterPosition = 40;
             this.splitMx98.TabIndex = 2;
             // 
@@ -2745,7 +3376,7 @@
             this.gcMx3.MainView = this.gvMx3;
             this.gcMx3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx3.Name = "gcMx3";
-            this.gcMx3.Size = new System.Drawing.Size(1442, 313);
+            this.gcMx3.Size = new System.Drawing.Size(1442, 315);
             this.gcMx3.TabIndex = 1;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
@@ -2764,7 +3395,8 @@
             this.gridColumn42,
             this.gridColumn43,
             this.gridColumn34,
-            this.gridColumn35});
+            this.gridColumn35,
+            this.gridColumn55});
             this.gvMx3.DetailHeight = 272;
             this.gvMx3.GridControl = this.gcMx3;
             this.gvMx3.Name = "gvMx3";
@@ -2858,8 +3490,6 @@
             this.gridColumn34.MinWidth = 22;
             this.gridColumn34.Name = "gridColumn34";
             this.gridColumn34.OptionsColumn.ReadOnly = true;
-            this.gridColumn34.Visible = true;
-            this.gridColumn34.VisibleIndex = 5;
             this.gridColumn34.Width = 82;
             // 
             // gridColumn35
@@ -2870,8 +3500,18 @@
             this.gridColumn35.Name = "gridColumn35";
             this.gridColumn35.OptionsColumn.ReadOnly = true;
             this.gridColumn35.Visible = true;
-            this.gridColumn35.VisibleIndex = 6;
+            this.gridColumn35.VisibleIndex = 5;
             this.gridColumn35.Width = 82;
+            // 
+            // gridColumn55
+            // 
+            this.gridColumn55.Caption = "鏁版嵁鐘舵��";
+            this.gridColumn55.FieldName = "bRemark";
+            this.gridColumn55.MinWidth = 22;
+            this.gridColumn55.Name = "gridColumn55";
+            this.gridColumn55.Visible = true;
+            this.gridColumn55.VisibleIndex = 6;
+            this.gridColumn55.Width = 82;
             // 
             // xtraTabPage4
             // 
@@ -2879,7 +3519,7 @@
             this.xtraTabPage4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage4.Name = "xtraTabPage4";
             this.xtraTabPage4.PageVisible = false;
-            this.xtraTabPage4.Size = new System.Drawing.Size(1442, 363);
+            this.xtraTabPage4.Size = new System.Drawing.Size(1442, 365);
             this.xtraTabPage4.Text = "鍚庣洊鐮佹槑缁�";
             // 
             // splitMx100
@@ -2900,7 +3540,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(1442, 363);
+            this.splitMx100.Size = new System.Drawing.Size(1442, 365);
             this.splitMx100.SplitterPosition = 40;
             this.splitMx100.TabIndex = 3;
             // 
@@ -2912,6 +3552,7 @@
             this.layMx100.Controls.Add(this.txt_yQty100);
             this.layMx100.Controls.Add(this.txt_kQty100);
             this.layMx100.Controls.Add(this.txt_iCount_100);
+            this.layMx100.Controls.Add(this.btnDesign);
             this.layMx100.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layMx100.Location = new System.Drawing.Point(0, 0);
             this.layMx100.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
@@ -2926,23 +3567,23 @@
             // 
             this.ucBtnPrint100.allClickKey = null;
             this.ucBtnPrint100.guidKey = null;
-            this.ucBtnPrint100.Location = new System.Drawing.Point(1029, 10);
+            this.ucBtnPrint100.Location = new System.Drawing.Point(945, 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(255, 26);
+            this.ucBtnPrint100.Size = new System.Drawing.Size(234, 26);
             this.ucBtnPrint100.TabIndex = 0;
             // 
             // btnIn
             // 
             this.btnIn.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exporttoxls_16x16;
-            this.btnIn.Location = new System.Drawing.Point(1286, 12);
+            this.btnIn.Location = new System.Drawing.Point(1181, 12);
             this.btnIn.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.btnIn.Name = "btnIn";
-            this.btnIn.Size = new System.Drawing.Size(127, 22);
+            this.btnIn.Size = new System.Drawing.Size(101, 22);
             this.btnIn.StyleController = this.layMx100;
             this.btnIn.TabIndex = 1;
-            this.btnIn.Text = "瀵煎叆鏉$爜";
+            this.btnIn.Text = "瀵煎叆鍚庣洊鐮�";
             // 
             // txt_zQty100
             // 
@@ -2950,38 +3591,49 @@
             this.txt_zQty100.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_zQty100.Name = "txt_zQty100";
             this.txt_zQty100.Properties.ReadOnly = true;
-            this.txt_zQty100.Size = new System.Drawing.Size(166, 20);
+            this.txt_zQty100.Size = new System.Drawing.Size(145, 20);
             this.txt_zQty100.StyleController = this.layMx100;
             this.txt_zQty100.TabIndex = 4;
             // 
             // txt_yQty100
             // 
-            this.txt_yQty100.Location = new System.Drawing.Point(350, 12);
+            this.txt_yQty100.Location = new System.Drawing.Point(329, 12);
             this.txt_yQty100.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_yQty100.Name = "txt_yQty100";
             this.txt_yQty100.Properties.ReadOnly = true;
-            this.txt_yQty100.Size = new System.Drawing.Size(167, 20);
+            this.txt_yQty100.Size = new System.Drawing.Size(146, 20);
             this.txt_yQty100.StyleController = this.layMx100;
             this.txt_yQty100.TabIndex = 5;
             // 
             // txt_kQty100
             // 
-            this.txt_kQty100.Location = new System.Drawing.Point(605, 12);
+            this.txt_kQty100.Location = new System.Drawing.Point(563, 12);
             this.txt_kQty100.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_kQty100.Name = "txt_kQty100";
             this.txt_kQty100.Properties.ReadOnly = true;
-            this.txt_kQty100.Size = new System.Drawing.Size(167, 20);
+            this.txt_kQty100.Size = new System.Drawing.Size(146, 20);
             this.txt_kQty100.StyleController = this.layMx100;
             this.txt_kQty100.TabIndex = 6;
             // 
             // txt_iCount_100
             // 
-            this.txt_iCount_100.Location = new System.Drawing.Point(860, 12);
+            this.txt_iCount_100.Location = new System.Drawing.Point(797, 12);
             this.txt_iCount_100.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.txt_iCount_100.Name = "txt_iCount_100";
-            this.txt_iCount_100.Size = new System.Drawing.Size(167, 20);
+            this.txt_iCount_100.Size = new System.Drawing.Size(146, 20);
             this.txt_iCount_100.StyleController = this.layMx100;
             this.txt_iCount_100.TabIndex = 7;
+            // 
+            // btnDesign
+            // 
+            this.btnDesign.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.print_16x16;
+            this.btnDesign.Location = new System.Drawing.Point(1286, 12);
+            this.btnDesign.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+            this.btnDesign.Name = "btnDesign";
+            this.btnDesign.Size = new System.Drawing.Size(127, 22);
+            this.btnDesign.StyleController = this.layMx100;
+            this.btnDesign.TabIndex = 8;
+            this.btnDesign.Text = "缁存姢瀹㈡埛妯℃澘";
             // 
             // layoutControlGroup4
             // 
@@ -2993,7 +3645,8 @@
             this.layoutControlItem44,
             this.layoutControlItem2,
             this.layoutControlItem10,
-            this.layoutControlItem45});
+            this.layoutControlItem45,
+            this.layoutControlItem47});
             this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.layoutControlGroup4.Name = "Root";
             columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -3007,14 +3660,17 @@
             columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
             columnDefinition22.Width = 100D;
             columnDefinition23.SizeType = System.Windows.Forms.SizeType.Absolute;
-            columnDefinition23.Width = 131D;
+            columnDefinition23.Width = 105D;
+            columnDefinition24.SizeType = System.Windows.Forms.SizeType.Absolute;
+            columnDefinition24.Width = 131D;
             this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
             columnDefinition18,
             columnDefinition19,
             columnDefinition20,
             columnDefinition21,
             columnDefinition22,
-            columnDefinition23});
+            columnDefinition23,
+            columnDefinition24});
             rowDefinition11.Height = 100D;
             rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
             this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
@@ -3027,17 +3683,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(254, 26);
+            this.layoutControlItem42.Size = new System.Drawing.Size(233, 26);
             this.layoutControlItem42.Text = "宸ュ崟鎬婚噺";
             this.layoutControlItem42.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem43
             // 
             this.layoutControlItem43.Control = this.txt_yQty100;
-            this.layoutControlItem43.Location = new System.Drawing.Point(254, 0);
+            this.layoutControlItem43.Location = new System.Drawing.Point(233, 0);
             this.layoutControlItem43.Name = "layoutControlItem43";
             this.layoutControlItem43.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem43.Size = new System.Drawing.Size(255, 26);
+            this.layoutControlItem43.Size = new System.Drawing.Size(234, 26);
             this.layoutControlItem43.Text = "宸叉墦鍗版暟";
             this.layoutControlItem43.TextSize = new System.Drawing.Size(72, 14);
             // 
@@ -3045,20 +3701,20 @@
             // 
             this.layoutControlItem44.Control = this.txt_kQty100;
             this.layoutControlItem44.CustomizationFormText = "鍙墦鍗版暟";
-            this.layoutControlItem44.Location = new System.Drawing.Point(509, 0);
+            this.layoutControlItem44.Location = new System.Drawing.Point(467, 0);
             this.layoutControlItem44.Name = "layoutControlItem44";
             this.layoutControlItem44.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem44.Size = new System.Drawing.Size(255, 26);
+            this.layoutControlItem44.Size = new System.Drawing.Size(234, 26);
             this.layoutControlItem44.Text = "鍙墦鍗版暟瀛�";
             this.layoutControlItem44.TextSize = new System.Drawing.Size(72, 14);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.btnIn;
-            this.layoutControlItem2.Location = new System.Drawing.Point(1274, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(1169, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 5;
-            this.layoutControlItem2.Size = new System.Drawing.Size(131, 26);
+            this.layoutControlItem2.Size = new System.Drawing.Size(105, 26);
             this.layoutControlItem2.Text = "瀵煎叆鎸夐挳";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem2.TextVisible = false;
@@ -3066,11 +3722,11 @@
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.ucBtnPrint100;
-            this.layoutControlItem10.Location = new System.Drawing.Point(1019, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(935, 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(255, 26);
+            this.layoutControlItem10.Size = new System.Drawing.Size(234, 26);
             this.layoutControlItem10.Text = "鎵撳嵃鎸夐挳";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem10.TextVisible = false;
@@ -3078,12 +3734,22 @@
             // layoutControlItem45
             // 
             this.layoutControlItem45.Control = this.txt_iCount_100;
-            this.layoutControlItem45.Location = new System.Drawing.Point(764, 0);
+            this.layoutControlItem45.Location = new System.Drawing.Point(701, 0);
             this.layoutControlItem45.Name = "layoutControlItem45";
             this.layoutControlItem45.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem45.Size = new System.Drawing.Size(255, 26);
+            this.layoutControlItem45.Size = new System.Drawing.Size(234, 26);
             this.layoutControlItem45.Text = "鏈鎵撳嵃寮犳暟";
             this.layoutControlItem45.TextSize = new System.Drawing.Size(72, 14);
+            // 
+            // layoutControlItem47
+            // 
+            this.layoutControlItem47.Control = this.btnDesign;
+            this.layoutControlItem47.Location = new System.Drawing.Point(1274, 0);
+            this.layoutControlItem47.Name = "layoutControlItem47";
+            this.layoutControlItem47.OptionsTableLayoutItem.ColumnIndex = 6;
+            this.layoutControlItem47.Size = new System.Drawing.Size(131, 26);
+            this.layoutControlItem47.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem47.TextVisible = false;
             // 
             // gcMx4
             // 
@@ -3093,7 +3759,7 @@
             this.gcMx4.MainView = this.gvMx4;
             this.gcMx4.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.gcMx4.Name = "gcMx4";
-            this.gcMx4.Size = new System.Drawing.Size(1442, 313);
+            this.gcMx4.Size = new System.Drawing.Size(1442, 315);
             this.gcMx4.TabIndex = 2;
             this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx4});
@@ -3227,7 +3893,7 @@
             this.xtraTabPage5.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
             this.xtraTabPage5.Name = "xtraTabPage5";
             this.xtraTabPage5.PageVisible = false;
-            this.xtraTabPage5.Size = new System.Drawing.Size(1442, 363);
+            this.xtraTabPage5.Size = new System.Drawing.Size(1442, 365);
             this.xtraTabPage5.Text = "鐗╂枡榻愬鏍囪瘑鍗�";
             // 
             // ucBtnPrint101
@@ -3240,29 +3906,6 @@
             this.ucBtnPrint101.rptParameter = null;
             this.ucBtnPrint101.Size = new System.Drawing.Size(203, 25);
             this.ucBtnPrint101.TabIndex = 0;
-            // 
-            // layoutControlItem20
-            // 
-            this.layoutControlItem20.Control = this.txt_dptName;
-            this.layoutControlItem20.Location = new System.Drawing.Point(351, 48);
-            this.layoutControlItem20.Name = "layoutControlItem20";
-            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem20.Size = new System.Drawing.Size(352, 24);
-            this.layoutControlItem20.Text = "杞﹂棿鍚嶇О";
-            this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 14);
-            // 
-            // layoutControlItem41
-            // 
-            this.layoutControlItem41.Control = this.txt_dptNo;
-            this.layoutControlItem41.CustomizationFormText = "浠诲姟鍗曞崟鍙�";
-            this.layoutControlItem41.Location = new System.Drawing.Point(351, 24);
-            this.layoutControlItem41.Name = "layoutControlItem41";
-            this.layoutControlItem41.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem41.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem41.Size = new System.Drawing.Size(352, 24);
-            this.layoutControlItem41.Text = "浠诲姟鍗曞崟鍙�";
-            this.layoutControlItem41.TextSize = new System.Drawing.Size(72, 14);
             // 
             // Frm_Womdaa
             // 
@@ -3312,13 +3955,15 @@
             ((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.txt_daa021.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();
@@ -3326,24 +3971,38 @@
             ((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.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.layoutControlItem28)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem49)).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);
@@ -3377,7 +4036,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem36)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptTuoBanNbz)).EndInit();
             this.xtraTabPage3.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.splitMx98.Panel1)).EndInit();
             this.splitMx98.Panel1.ResumeLayout(false);
@@ -3421,11 +4080,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem45)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem47)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
             this.xtraTabPage5.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem41)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -3576,8 +4234,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;
@@ -3616,18 +4272,14 @@
         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;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         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;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
         private DevExpress.XtraDataLayout.DataLayoutControl layMx100;
         private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup4;
         private DevExpress.XtraEditors.SimpleButton btnIn;
@@ -3644,12 +4296,64 @@
         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.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem41;
+        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;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptTuoBanNbz;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn55;
+        private DevExpress.XtraEditors.TextEdit txt_daa021;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem49;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn58;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3