From 777bbf3d0d9399e69c0718fc4c562803cd4f15ec Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 26 十二月 2024 08:34:28 +0800
Subject: [PATCH] 采购委外

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs |   21 
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs              |  256 +++--
 /dev/null                                                |  120 ---
 DevApp/Gs.DevApp/Gs.DevApp.csproj                        |   18 
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs          |   17 
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.Designer.cs |   19 
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs     | 1890 +++++++++++++++++++++++++++++++++-------------
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs          |    9 
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs |   15 
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs          |   17 
 10 files changed, 1,556 insertions(+), 826 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs
index a5ec7a0..7eefd86 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.Designer.cs
@@ -77,13 +77,13 @@
             this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
             this.gv_lastupdateDate.Caption = "鏇存柊鏃堕棿 ";
             this.gv_lastupdateDate.FieldName = "lastupdateDate";
-            this.gv_lastupdateDate.MinWidth = 50;
+            this.gv_lastupdateDate.MinWidth = 180;
             this.gv_lastupdateDate.Name = "gv_lastupdateDate";
             this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
             this.gv_lastupdateDate.Visible = true;
             this.gv_lastupdateDate.VisibleIndex = 8;
-            this.gv_lastupdateDate.Width = 94;
+            this.gv_lastupdateDate.Width = 180;
             // 
             // gv_lastupdateBy
             // 
@@ -105,13 +105,13 @@
             this.gv_createDate.AppearanceCell.Options.UseFont = true;
             this.gv_createDate.Caption = "鍒涘缓鏃堕棿 ";
             this.gv_createDate.FieldName = "createDate";
-            this.gv_createDate.MinWidth = 50;
+            this.gv_createDate.MinWidth = 180;
             this.gv_createDate.Name = "gv_createDate";
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.create_date";
             this.gv_createDate.Visible = true;
             this.gv_createDate.VisibleIndex = 6;
-            this.gv_createDate.Width = 94;
+            this.gv_createDate.Width = 180;
             // 
             // gv_createBy
             // 
@@ -133,13 +133,13 @@
             this.gv_defectRate.AppearanceCell.Options.UseFont = true;
             this.gv_defectRate.Caption = "缂洪櫡绫诲埆鎻忚堪";
             this.gv_defectRate.FieldName = "typeMemo";
-            this.gv_defectRate.MinWidth = 50;
+            this.gv_defectRate.MinWidth = 150;
             this.gv_defectRate.Name = "gv_defectRate";
             this.gv_defectRate.OptionsColumn.AllowEdit = false;
             this.gv_defectRate.Tag = "query_a.defect_rate";
             this.gv_defectRate.Visible = true;
             this.gv_defectRate.VisibleIndex = 4;
-            this.gv_defectRate.Width = 94;
+            this.gv_defectRate.Width = 150;
             // 
             // gv_defectSort
             // 
@@ -248,6 +248,7 @@
             // toolBarMenu1
             // 
             this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
             this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
@@ -328,7 +329,6 @@
             // 
             this.xtraTabPage2.Controls.Add(this.panel1);
             this.xtraTabPage2.Name = "xtraTabPage2";
-           
             this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
             this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
             // 
@@ -423,6 +423,7 @@
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_MesDefectCode";
+            this.Text = "缂洪櫡浠g爜";
             ((System.ComponentModel.ISupportInitialize)(this.txt_defectName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_defectCode.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
index 0a36097..5753bd7 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectCode.cs
@@ -169,7 +169,14 @@
                 return;
             }
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
-            UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+            {
+                getModel(rowGuid);
+            }
+            else
+            {
+                UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+            }
         }
         /// <summary>
         /// 鏂板浜嬩欢
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.Designer.cs
index 7472f49..7c9b44f 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.Designer.cs
@@ -76,13 +76,13 @@
             this.gv_typeMemo.AppearanceCell.Options.UseFont = true;
             this.gv_typeMemo.Caption = "缂洪櫡绫诲埆鎻忚堪";
             this.gv_typeMemo.FieldName = "typeMemo";
-            this.gv_typeMemo.MinWidth = 50;
+            this.gv_typeMemo.MinWidth = 150;
             this.gv_typeMemo.Name = "gv_typeMemo";
             this.gv_typeMemo.OptionsColumn.AllowEdit = false;
             this.gv_typeMemo.Tag = "query_a.type_memo";
             this.gv_typeMemo.Visible = true;
             this.gv_typeMemo.VisibleIndex = 1;
-            this.gv_typeMemo.Width = 94;
+            this.gv_typeMemo.Width = 200;
             // 
             // lb_typeNo
             // 
@@ -109,13 +109,13 @@
             this.gv_typeNo.AppearanceCell.Options.UseFont = true;
             this.gv_typeNo.Caption = "缂洪櫡绫诲埆缂栧彿";
             this.gv_typeNo.FieldName = "typeNo";
-            this.gv_typeNo.MinWidth = 50;
+            this.gv_typeNo.MinWidth = 100;
             this.gv_typeNo.Name = "gv_typeNo";
             this.gv_typeNo.OptionsColumn.AllowEdit = false;
             this.gv_typeNo.Tag = "query_a.type_no";
             this.gv_typeNo.Visible = true;
             this.gv_typeNo.VisibleIndex = 0;
-            this.gv_typeNo.Width = 94;
+            this.gv_typeNo.Width = 100;
             // 
             // gv_lastupdateDate
             // 
@@ -123,13 +123,13 @@
             this.gv_lastupdateDate.AppearanceCell.Options.UseFont = true;
             this.gv_lastupdateDate.Caption = "鏇存柊鏃堕棿";
             this.gv_lastupdateDate.FieldName = "lastupdateDate";
-            this.gv_lastupdateDate.MinWidth = 50;
+            this.gv_lastupdateDate.MinWidth = 180;
             this.gv_lastupdateDate.Name = "gv_lastupdateDate";
             this.gv_lastupdateDate.OptionsColumn.AllowEdit = false;
             this.gv_lastupdateDate.Tag = "query_a.lastupdate_date";
             this.gv_lastupdateDate.Visible = true;
             this.gv_lastupdateDate.VisibleIndex = 5;
-            this.gv_lastupdateDate.Width = 94;
+            this.gv_lastupdateDate.Width = 198;
             // 
             // gv_lastupdateBy
             // 
@@ -151,13 +151,13 @@
             this.gv_createDate.AppearanceCell.Options.UseFont = true;
             this.gv_createDate.Caption = "鍒涘缓鏃堕棿";
             this.gv_createDate.FieldName = "createDate";
-            this.gv_createDate.MinWidth = 50;
+            this.gv_createDate.MinWidth = 180;
             this.gv_createDate.Name = "gv_createDate";
             this.gv_createDate.OptionsColumn.AllowEdit = false;
             this.gv_createDate.Tag = "query_a.create_date";
             this.gv_createDate.Visible = true;
             this.gv_createDate.VisibleIndex = 3;
-            this.gv_createDate.Width = 94;
+            this.gv_createDate.Width = 192;
             // 
             // gv_createBy
             // 
@@ -176,6 +176,7 @@
             // toolBarMenu1
             // 
             this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
             this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
@@ -253,7 +254,6 @@
             // 
             this.xtraTabPage2.Controls.Add(this.panel1);
             this.xtraTabPage2.Name = "xtraTabPage2";
-           
             this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
             this.xtraTabPage2.Text = "鏁版嵁缂栬緫";
             // 
@@ -306,6 +306,7 @@
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_MesDefectType";
+            this.Text = "缂洪櫡绫诲埆";
             ((System.ComponentModel.ISupportInitialize)(this.txt_typeNo.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs
index 78543c2..7fa8010 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesDefectType.cs
@@ -45,7 +45,7 @@
             await Task.Delay(100);
             getPageList(1);
         }
-      
+
         /// <summary>
         /// 鍒嗛〉浜嬩欢
         /// </summary>
@@ -98,7 +98,7 @@
         private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
         {
             string rowGuid = "", rowName = "";
-             (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_typeNo, gridView1, "typeNo");
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_typeNo, gridView1, "typeNo");
             if (string.IsNullOrEmpty(rowGuid))
             {
                 ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
@@ -164,7 +164,14 @@
                 return;
             }
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
-            UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+            {
+                getModel(rowGuid);
+            }
+            else
+            {
+                UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+            }
         }
         /// <summary>
         /// 鏂板浜嬩欢
@@ -194,8 +201,8 @@
             var _obj = new MesDefectType()
             {
                 Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
-                TypeNo=txt_typeNo.Text.Trim(),
-                TypeMemo=txt_typeMemo.Text.Trim(),
+                TypeNo = txt_typeNo.Text.Trim(),
+                TypeMemo = txt_typeMemo.Text.Trim(),
             };
             try
             {
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
index a897761..c41ea8a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.Designer.cs
@@ -29,60 +29,101 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
-            this.gvMx2aql1Id = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql00065 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql00040 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql00025 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql00015 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql00010 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2sampleSizeWord = new DevExpress.XtraGrid.Columns.GridColumn();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
             this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gvMx2memo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql1000 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql0650 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql0400 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql0250 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql0150 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql0100 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql0065 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql0040 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql0025 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql0015 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2aql0010 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2fsampleSizeWord = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gvMxDel2 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx2 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
+            this.gvMx2guid = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql1Id = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2fsampleSizeWord = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2sampleSizeWord = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql00010 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql00015 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql00025 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql00040 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql00065 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql0010 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql0015 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql0025 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql0040 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql0065 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql0100 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql0150 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql0250 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql0400 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql0650 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2aql1000 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx2memo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMxDel2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.advBandedGridView1 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
+            this.gridBand16 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.bandedGridColumn3 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand17 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.bandedGridColumn4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.bandedGridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn6 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn7 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn8 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn9 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn10 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn11 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn12 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn13 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn14 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn15 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn16 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn17 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn18 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn19 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn20 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand15 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.bandedGridColumn21 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand18 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.bandedGridColumn22 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.bandedGridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
-            this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1aql1Id = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1lotFrom = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1lotTo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1flevelS1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1flevelS2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1flevelS3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1flevelS4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1flevelI = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1flevelIi = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1flevelIii = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gvMx1 = new DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView();
+            this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gvMx1lotFrom = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand3 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gvMx1lotTo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gvMx1flevelS1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gvMx1flevelS2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gvMx1flevelS3 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand8 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gvMx1flevelS4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand9 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand10 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gvMx1flevelI = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand11 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gvMx1flevelIi = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand12 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gvMx1flevelIii = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand13 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gvMx1memo = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gridBand14 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gvMxDel = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gvMx1guid = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
+            this.gvMx1aql1Id = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
             this.lb_isenabled = new DevExpress.XtraEditors.LabelControl();
             this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_fversion = new DevExpress.XtraEditors.LabelControl();
@@ -133,11 +174,33 @@
             this.txt_isenabled = new DevExpress.XtraEditors.CheckEdit();
             this.lbGuid = new System.Windows.Forms.Label();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.gridBand19 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand20 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand21 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand30 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand29 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand28 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand27 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand26 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand25 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand33 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand32 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand31 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand36 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand35 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand38 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand34 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand37 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand24 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand39 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand22 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
+            this.gridBand23 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
             this.tabMxPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.advBandedGridView1)).BeginInit();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -167,96 +230,6 @@
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
-            // gvMx2aql1Id
-            // 
-            this.gvMx2aql1Id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql1Id.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql1Id.Caption = "AQL鎶芥牱鍩哄噯ID";
-            this.gvMx2aql1Id.FieldName = "aql1Id";
-            this.gvMx2aql1Id.MinWidth = 50;
-            this.gvMx2aql1Id.Name = "gvMx2aql1Id";
-            this.gvMx2aql1Id.Tag = "query_a.AQL1_ID";
-            this.gvMx2aql1Id.Width = 94;
-            // 
-            // gvMx2aql00065
-            // 
-            this.gvMx2aql00065.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql00065.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql00065.Caption = "0.065";
-            this.gvMx2aql00065.FieldName = "aql00065";
-            this.gvMx2aql00065.MinWidth = 50;
-            this.gvMx2aql00065.Name = "gvMx2aql00065";
-            this.gvMx2aql00065.Tag = "yz_quantity_0";
-            this.gvMx2aql00065.Visible = true;
-            this.gvMx2aql00065.VisibleIndex = 6;
-            this.gvMx2aql00065.Width = 94;
-            // 
-            // gvMx2aql00040
-            // 
-            this.gvMx2aql00040.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql00040.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql00040.Caption = "0.040";
-            this.gvMx2aql00040.FieldName = "aql00040";
-            this.gvMx2aql00040.MinWidth = 50;
-            this.gvMx2aql00040.Name = "gvMx2aql00040";
-            this.gvMx2aql00040.Tag = "yz_quantity_0";
-            this.gvMx2aql00040.Visible = true;
-            this.gvMx2aql00040.VisibleIndex = 5;
-            this.gvMx2aql00040.Width = 94;
-            // 
-            // gvMx2aql00025
-            // 
-            this.gvMx2aql00025.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql00025.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql00025.Caption = "0.025";
-            this.gvMx2aql00025.FieldName = "aql00025";
-            this.gvMx2aql00025.MinWidth = 50;
-            this.gvMx2aql00025.Name = "gvMx2aql00025";
-            this.gvMx2aql00025.Tag = "yz_quantity_0";
-            this.gvMx2aql00025.Visible = true;
-            this.gvMx2aql00025.VisibleIndex = 4;
-            this.gvMx2aql00025.Width = 94;
-            // 
-            // gvMx2aql00015
-            // 
-            this.gvMx2aql00015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql00015.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql00015.Caption = "0.015";
-            this.gvMx2aql00015.FieldName = "aql00015";
-            this.gvMx2aql00015.MinWidth = 50;
-            this.gvMx2aql00015.Name = "gvMx2aql00015";
-            this.gvMx2aql00015.Tag = "yz_quantity_0";
-            this.gvMx2aql00015.Visible = true;
-            this.gvMx2aql00015.VisibleIndex = 3;
-            this.gvMx2aql00015.Width = 94;
-            // 
-            // gvMx2aql00010
-            // 
-            this.gvMx2aql00010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql00010.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql00010.Caption = "0.010";
-            this.gvMx2aql00010.FieldName = "aql00010";
-            this.gvMx2aql00010.MinWidth = 50;
-            this.gvMx2aql00010.Name = "gvMx2aql00010";
-            this.gvMx2aql00010.Tag = "yz_quantity_0";
-            this.gvMx2aql00010.Visible = true;
-            this.gvMx2aql00010.VisibleIndex = 2;
-            this.gvMx2aql00010.Width = 94;
-            // 
-            // gvMx2sampleSizeWord
-            // 
-            this.gvMx2sampleSizeWord.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2sampleSizeWord.AppearanceCell.Options.UseFont = true;
-            this.gvMx2sampleSizeWord.Caption = "鏍锋湰澶у皬瀛楃爜";
-            this.gvMx2sampleSizeWord.ColumnEdit = this.repositoryItemComboBox1;
-            this.gvMx2sampleSizeWord.FieldName = "sampleSizeWord";
-            this.gvMx2sampleSizeWord.MinWidth = 100;
-            this.gvMx2sampleSizeWord.Name = "gvMx2sampleSizeWord";
-            this.gvMx2sampleSizeWord.Tag = "query_a.SAMPLE_SIZE_WORD";
-            this.gvMx2sampleSizeWord.Visible = true;
-            this.gvMx2sampleSizeWord.VisibleIndex = 1;
-            this.gvMx2sampleSizeWord.Width = 100;
-            // 
             // repositoryItemComboBox1
             // 
             this.repositoryItemComboBox1.AutoHeight = false;
@@ -285,191 +258,11 @@
             "T"});
             this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
             // 
-            // gvMx2memo
-            // 
-            this.gvMx2memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2memo.AppearanceCell.Options.UseFont = true;
-            this.gvMx2memo.Caption = "澶囨敞";
-            this.gvMx2memo.FieldName = "memo";
-            this.gvMx2memo.MinWidth = 50;
-            this.gvMx2memo.Name = "gvMx2memo";
-            this.gvMx2memo.Tag = "query_a.MEMO";
-            this.gvMx2memo.Visible = true;
-            this.gvMx2memo.VisibleIndex = 18;
-            this.gvMx2memo.Width = 94;
-            // 
-            // gvMx2aql1000
-            // 
-            this.gvMx2aql1000.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql1000.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql1000.Caption = "10";
-            this.gvMx2aql1000.FieldName = "aql1000";
-            this.gvMx2aql1000.MinWidth = 50;
-            this.gvMx2aql1000.Name = "gvMx2aql1000";
-            this.gvMx2aql1000.Tag = "yz_quantity_0";
-            this.gvMx2aql1000.Visible = true;
-            this.gvMx2aql1000.VisibleIndex = 17;
-            this.gvMx2aql1000.Width = 94;
-            // 
-            // gvMx2aql0650
-            // 
-            this.gvMx2aql0650.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql0650.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql0650.Caption = "6.5";
-            this.gvMx2aql0650.FieldName = "aql0650";
-            this.gvMx2aql0650.MinWidth = 50;
-            this.gvMx2aql0650.Name = "gvMx2aql0650";
-            this.gvMx2aql0650.Tag = "yz_quantity_0";
-            this.gvMx2aql0650.Visible = true;
-            this.gvMx2aql0650.VisibleIndex = 16;
-            this.gvMx2aql0650.Width = 94;
-            // 
-            // gvMx2aql0400
-            // 
-            this.gvMx2aql0400.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql0400.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql0400.Caption = "4.0";
-            this.gvMx2aql0400.FieldName = "aql0400";
-            this.gvMx2aql0400.MinWidth = 50;
-            this.gvMx2aql0400.Name = "gvMx2aql0400";
-            this.gvMx2aql0400.Tag = "yz_quantity_0";
-            this.gvMx2aql0400.Visible = true;
-            this.gvMx2aql0400.VisibleIndex = 15;
-            this.gvMx2aql0400.Width = 94;
-            // 
-            // gvMx2aql0250
-            // 
-            this.gvMx2aql0250.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql0250.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql0250.Caption = "2.5";
-            this.gvMx2aql0250.FieldName = "aql0250";
-            this.gvMx2aql0250.MinWidth = 50;
-            this.gvMx2aql0250.Name = "gvMx2aql0250";
-            this.gvMx2aql0250.Tag = "yz_quantity_0";
-            this.gvMx2aql0250.Visible = true;
-            this.gvMx2aql0250.VisibleIndex = 14;
-            this.gvMx2aql0250.Width = 94;
-            // 
-            // gvMx2aql0150
-            // 
-            this.gvMx2aql0150.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql0150.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql0150.Caption = "1.5";
-            this.gvMx2aql0150.FieldName = "aql0150";
-            this.gvMx2aql0150.MinWidth = 50;
-            this.gvMx2aql0150.Name = "gvMx2aql0150";
-            this.gvMx2aql0150.Tag = "yz_quantity_0";
-            this.gvMx2aql0150.Visible = true;
-            this.gvMx2aql0150.VisibleIndex = 13;
-            this.gvMx2aql0150.Width = 94;
-            // 
-            // gvMx2aql0100
-            // 
-            this.gvMx2aql0100.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql0100.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql0100.Caption = "1.0";
-            this.gvMx2aql0100.FieldName = "aql0100";
-            this.gvMx2aql0100.MinWidth = 50;
-            this.gvMx2aql0100.Name = "gvMx2aql0100";
-            this.gvMx2aql0100.Tag = "yz_quantity_0";
-            this.gvMx2aql0100.Visible = true;
-            this.gvMx2aql0100.VisibleIndex = 12;
-            this.gvMx2aql0100.Width = 94;
-            // 
-            // gvMx2aql0065
-            // 
-            this.gvMx2aql0065.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql0065.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql0065.Caption = "0.65";
-            this.gvMx2aql0065.FieldName = "aql0065";
-            this.gvMx2aql0065.MinWidth = 50;
-            this.gvMx2aql0065.Name = "gvMx2aql0065";
-            this.gvMx2aql0065.Tag = "yz_quantity_0";
-            this.gvMx2aql0065.Visible = true;
-            this.gvMx2aql0065.VisibleIndex = 11;
-            this.gvMx2aql0065.Width = 94;
-            // 
-            // gvMx2aql0040
-            // 
-            this.gvMx2aql0040.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql0040.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql0040.Caption = "0.40";
-            this.gvMx2aql0040.FieldName = "aql0040";
-            this.gvMx2aql0040.MinWidth = 50;
-            this.gvMx2aql0040.Name = "gvMx2aql0040";
-            this.gvMx2aql0040.Tag = "yz_quantity_0";
-            this.gvMx2aql0040.Visible = true;
-            this.gvMx2aql0040.VisibleIndex = 10;
-            this.gvMx2aql0040.Width = 94;
-            // 
-            // gvMx2aql0025
-            // 
-            this.gvMx2aql0025.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql0025.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql0025.Caption = "0.25";
-            this.gvMx2aql0025.FieldName = "aql0025";
-            this.gvMx2aql0025.MinWidth = 50;
-            this.gvMx2aql0025.Name = "gvMx2aql0025";
-            this.gvMx2aql0025.Tag = "yz_quantity_0";
-            this.gvMx2aql0025.Visible = true;
-            this.gvMx2aql0025.VisibleIndex = 9;
-            this.gvMx2aql0025.Width = 94;
-            // 
-            // gvMx2aql0015
-            // 
-            this.gvMx2aql0015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql0015.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql0015.Caption = "0.15";
-            this.gvMx2aql0015.FieldName = "aql0015";
-            this.gvMx2aql0015.MinWidth = 50;
-            this.gvMx2aql0015.Name = "gvMx2aql0015";
-            this.gvMx2aql0015.Tag = "yz_quantity_0";
-            this.gvMx2aql0015.Visible = true;
-            this.gvMx2aql0015.VisibleIndex = 8;
-            this.gvMx2aql0015.Width = 94;
-            // 
-            // gvMx2aql0010
-            // 
-            this.gvMx2aql0010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2aql0010.AppearanceCell.Options.UseFont = true;
-            this.gvMx2aql0010.Caption = "0.10";
-            this.gvMx2aql0010.FieldName = "aql0010";
-            this.gvMx2aql0010.MinWidth = 50;
-            this.gvMx2aql0010.Name = "gvMx2aql0010";
-            this.gvMx2aql0010.Tag = "yz_quantity_0";
-            this.gvMx2aql0010.Visible = true;
-            this.gvMx2aql0010.VisibleIndex = 7;
-            this.gvMx2aql0010.Width = 94;
-            // 
-            // gvMx2fsampleSizeWord
-            // 
-            this.gvMx2fsampleSizeWord.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2fsampleSizeWord.AppearanceCell.Options.UseFont = true;
-            this.gvMx2fsampleSizeWord.Caption = "鏍锋湰澶у皬";
-            this.gvMx2fsampleSizeWord.FieldName = "fsampleSizeWord";
-            this.gvMx2fsampleSizeWord.MinWidth = 50;
-            this.gvMx2fsampleSizeWord.Name = "gvMx2fsampleSizeWord";
-            this.gvMx2fsampleSizeWord.Tag = "query_a.FSAMPLE_SIZE_WORD";
-            this.gvMx2fsampleSizeWord.Visible = true;
-            this.gvMx2fsampleSizeWord.VisibleIndex = 0;
-            this.gvMx2fsampleSizeWord.Width = 94;
-            // 
-            // gvMx2guid
-            // 
-            this.gvMx2guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx2guid.Caption = "guid ";
-            this.gvMx2guid.FieldName = "guid";
-            this.gvMx2guid.MinWidth = 50;
-            this.gvMx2guid.Name = "gvMx2guid";
-            this.gvMx2guid.Tag = "query_a.guid";
-            this.gvMx2guid.Width = 94;
-            // 
             // tabMxPage2
             // 
             this.tabMxPage2.Controls.Add(this.gcMx2);
             this.tabMxPage2.Name = "tabMxPage2";
-            this.tabMxPage2.Size = new System.Drawing.Size(1124, 384);
+            this.tabMxPage2.Size = new System.Drawing.Size(1124, 410);
             this.tabMxPage2.Text = "鎶芥牱鏂规";
             // 
             // gcMx2
@@ -481,14 +274,24 @@
             this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemComboBox1,
             this.repositoryItemButtonEdit2});
-            this.gcMx2.Size = new System.Drawing.Size(1124, 384);
+            this.gcMx2.Size = new System.Drawing.Size(1124, 410);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx2});
+            this.gvMx2,
+            this.advBandedGridView1});
             // 
             // gvMx2
             // 
-            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx2.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+            this.gridBand19,
+            this.gridBand20,
+            this.gridBand21,
+            this.gridBand22,
+            this.gridBand23});
+            this.gvMx2.ColumnPanelRowHeight = 50;
+            this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
             this.gvMx2guid,
             this.gvMx2aql1Id,
             this.gvMx2fsampleSizeWord,
@@ -516,7 +319,261 @@
             this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
             this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
             this.gvMx2.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
+            this.gvMx2.OptionsView.ShowColumnHeaders = false;
             this.gvMx2.OptionsView.ShowGroupPanel = false;
+            // 
+            // gvMx2guid
+            // 
+            this.gvMx2guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2guid.AppearanceCell.Options.UseFont = true;
+            this.gvMx2guid.Caption = "guid ";
+            this.gvMx2guid.FieldName = "guid";
+            this.gvMx2guid.MinWidth = 50;
+            this.gvMx2guid.Name = "gvMx2guid";
+            this.gvMx2guid.RowIndex = 1;
+            this.gvMx2guid.Tag = "query_a.guid";
+            this.gvMx2guid.Width = 100;
+            // 
+            // gvMx2aql1Id
+            // 
+            this.gvMx2aql1Id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql1Id.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql1Id.Caption = "AQL鎶芥牱鍩哄噯ID";
+            this.gvMx2aql1Id.FieldName = "aql1Id";
+            this.gvMx2aql1Id.MinWidth = 50;
+            this.gvMx2aql1Id.Name = "gvMx2aql1Id";
+            this.gvMx2aql1Id.RowIndex = 1;
+            this.gvMx2aql1Id.Tag = "query_a.AQL1_ID";
+            this.gvMx2aql1Id.Width = 94;
+            // 
+            // gvMx2fsampleSizeWord
+            // 
+            this.gvMx2fsampleSizeWord.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2fsampleSizeWord.AppearanceCell.Options.UseFont = true;
+            this.gvMx2fsampleSizeWord.Caption = "鏍锋湰澶у皬";
+            this.gvMx2fsampleSizeWord.FieldName = "fsampleSizeWord";
+            this.gvMx2fsampleSizeWord.MinWidth = 50;
+            this.gvMx2fsampleSizeWord.Name = "gvMx2fsampleSizeWord";
+            this.gvMx2fsampleSizeWord.Tag = "yz_quantity_0_edit";
+            this.gvMx2fsampleSizeWord.Visible = true;
+            this.gvMx2fsampleSizeWord.Width = 81;
+            // 
+            // gvMx2sampleSizeWord
+            // 
+            this.gvMx2sampleSizeWord.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2sampleSizeWord.AppearanceCell.Options.UseFont = true;
+            this.gvMx2sampleSizeWord.Caption = "鏍锋湰澶у皬瀛楃爜";
+            this.gvMx2sampleSizeWord.ColumnEdit = this.repositoryItemComboBox1;
+            this.gvMx2sampleSizeWord.FieldName = "sampleSizeWord";
+            this.gvMx2sampleSizeWord.MinWidth = 100;
+            this.gvMx2sampleSizeWord.Name = "gvMx2sampleSizeWord";
+            this.gvMx2sampleSizeWord.Tag = "edit";
+            this.gvMx2sampleSizeWord.Visible = true;
+            this.gvMx2sampleSizeWord.Width = 100;
+            // 
+            // gvMx2aql00010
+            // 
+            this.gvMx2aql00010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql00010.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql00010.Caption = "0.010";
+            this.gvMx2aql00010.FieldName = "aql00010";
+            this.gvMx2aql00010.MinWidth = 50;
+            this.gvMx2aql00010.Name = "gvMx2aql00010";
+            this.gvMx2aql00010.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql00010.Visible = true;
+            this.gvMx2aql00010.Width = 50;
+            // 
+            // gvMx2aql00015
+            // 
+            this.gvMx2aql00015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql00015.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql00015.Caption = "0.015";
+            this.gvMx2aql00015.FieldName = "aql00015";
+            this.gvMx2aql00015.MinWidth = 50;
+            this.gvMx2aql00015.Name = "gvMx2aql00015";
+            this.gvMx2aql00015.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql00015.Visible = true;
+            this.gvMx2aql00015.Width = 50;
+            // 
+            // gvMx2aql00025
+            // 
+            this.gvMx2aql00025.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql00025.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql00025.Caption = "0.025";
+            this.gvMx2aql00025.FieldName = "aql00025";
+            this.gvMx2aql00025.MinWidth = 50;
+            this.gvMx2aql00025.Name = "gvMx2aql00025";
+            this.gvMx2aql00025.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql00025.Visible = true;
+            this.gvMx2aql00025.Width = 50;
+            // 
+            // gvMx2aql00040
+            // 
+            this.gvMx2aql00040.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql00040.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql00040.Caption = "0.040";
+            this.gvMx2aql00040.FieldName = "aql00040";
+            this.gvMx2aql00040.MinWidth = 50;
+            this.gvMx2aql00040.Name = "gvMx2aql00040";
+            this.gvMx2aql00040.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql00040.Visible = true;
+            this.gvMx2aql00040.Width = 50;
+            // 
+            // gvMx2aql00065
+            // 
+            this.gvMx2aql00065.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql00065.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql00065.Caption = "0.065";
+            this.gvMx2aql00065.FieldName = "aql00065";
+            this.gvMx2aql00065.MinWidth = 50;
+            this.gvMx2aql00065.Name = "gvMx2aql00065";
+            this.gvMx2aql00065.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql00065.Visible = true;
+            this.gvMx2aql00065.Width = 50;
+            // 
+            // gvMx2aql0010
+            // 
+            this.gvMx2aql0010.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql0010.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql0010.Caption = "0.10";
+            this.gvMx2aql0010.FieldName = "aql0010";
+            this.gvMx2aql0010.MinWidth = 50;
+            this.gvMx2aql0010.Name = "gvMx2aql0010";
+            this.gvMx2aql0010.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql0010.Visible = true;
+            this.gvMx2aql0010.Width = 50;
+            // 
+            // gvMx2aql0015
+            // 
+            this.gvMx2aql0015.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql0015.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql0015.Caption = "0.15";
+            this.gvMx2aql0015.FieldName = "aql0015";
+            this.gvMx2aql0015.MinWidth = 50;
+            this.gvMx2aql0015.Name = "gvMx2aql0015";
+            this.gvMx2aql0015.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql0015.Visible = true;
+            this.gvMx2aql0015.Width = 50;
+            // 
+            // gvMx2aql0025
+            // 
+            this.gvMx2aql0025.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql0025.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql0025.Caption = "0.25";
+            this.gvMx2aql0025.FieldName = "aql0025";
+            this.gvMx2aql0025.MinWidth = 50;
+            this.gvMx2aql0025.Name = "gvMx2aql0025";
+            this.gvMx2aql0025.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql0025.Visible = true;
+            this.gvMx2aql0025.Width = 50;
+            // 
+            // gvMx2aql0040
+            // 
+            this.gvMx2aql0040.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql0040.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql0040.Caption = "0.40";
+            this.gvMx2aql0040.FieldName = "aql0040";
+            this.gvMx2aql0040.MinWidth = 50;
+            this.gvMx2aql0040.Name = "gvMx2aql0040";
+            this.gvMx2aql0040.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql0040.Visible = true;
+            this.gvMx2aql0040.Width = 50;
+            // 
+            // gvMx2aql0065
+            // 
+            this.gvMx2aql0065.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql0065.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql0065.Caption = "0.65";
+            this.gvMx2aql0065.FieldName = "aql0065";
+            this.gvMx2aql0065.MinWidth = 50;
+            this.gvMx2aql0065.Name = "gvMx2aql0065";
+            this.gvMx2aql0065.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql0065.Visible = true;
+            this.gvMx2aql0065.Width = 50;
+            // 
+            // gvMx2aql0100
+            // 
+            this.gvMx2aql0100.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql0100.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql0100.Caption = "1.0";
+            this.gvMx2aql0100.FieldName = "aql0100";
+            this.gvMx2aql0100.MinWidth = 50;
+            this.gvMx2aql0100.Name = "gvMx2aql0100";
+            this.gvMx2aql0100.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql0100.Visible = true;
+            this.gvMx2aql0100.Width = 50;
+            // 
+            // gvMx2aql0150
+            // 
+            this.gvMx2aql0150.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql0150.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql0150.Caption = "1.5";
+            this.gvMx2aql0150.FieldName = "aql0150";
+            this.gvMx2aql0150.MinWidth = 50;
+            this.gvMx2aql0150.Name = "gvMx2aql0150";
+            this.gvMx2aql0150.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql0150.Visible = true;
+            this.gvMx2aql0150.Width = 50;
+            // 
+            // gvMx2aql0250
+            // 
+            this.gvMx2aql0250.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql0250.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql0250.Caption = "2.5";
+            this.gvMx2aql0250.FieldName = "aql0250";
+            this.gvMx2aql0250.MinWidth = 50;
+            this.gvMx2aql0250.Name = "gvMx2aql0250";
+            this.gvMx2aql0250.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql0250.Visible = true;
+            this.gvMx2aql0250.Width = 50;
+            // 
+            // gvMx2aql0400
+            // 
+            this.gvMx2aql0400.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql0400.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql0400.Caption = "4.0";
+            this.gvMx2aql0400.FieldName = "aql0400";
+            this.gvMx2aql0400.MinWidth = 50;
+            this.gvMx2aql0400.Name = "gvMx2aql0400";
+            this.gvMx2aql0400.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql0400.Visible = true;
+            this.gvMx2aql0400.Width = 50;
+            // 
+            // gvMx2aql0650
+            // 
+            this.gvMx2aql0650.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql0650.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql0650.Caption = "6.5";
+            this.gvMx2aql0650.FieldName = "aql0650";
+            this.gvMx2aql0650.MinWidth = 50;
+            this.gvMx2aql0650.Name = "gvMx2aql0650";
+            this.gvMx2aql0650.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql0650.Visible = true;
+            this.gvMx2aql0650.Width = 50;
+            // 
+            // gvMx2aql1000
+            // 
+            this.gvMx2aql1000.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2aql1000.AppearanceCell.Options.UseFont = true;
+            this.gvMx2aql1000.Caption = "10";
+            this.gvMx2aql1000.FieldName = "aql1000";
+            this.gvMx2aql1000.MinWidth = 50;
+            this.gvMx2aql1000.Name = "gvMx2aql1000";
+            this.gvMx2aql1000.Tag = "yz_quantity_0_edit";
+            this.gvMx2aql1000.Visible = true;
+            this.gvMx2aql1000.Width = 50;
+            // 
+            // gvMx2memo
+            // 
+            this.gvMx2memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx2memo.AppearanceCell.Options.UseFont = true;
+            this.gvMx2memo.Caption = "澶囨敞";
+            this.gvMx2memo.FieldName = "memo";
+            this.gvMx2memo.MinWidth = 50;
+            this.gvMx2memo.Name = "gvMx2memo";
+            this.gvMx2memo.Tag = "edit";
+            this.gvMx2memo.Visible = true;
+            this.gvMx2memo.Width = 100;
             // 
             // gvMxDel2
             // 
@@ -525,25 +582,383 @@
             this.gvMxDel2.MinWidth = 50;
             this.gvMxDel2.Name = "gvMxDel2";
             this.gvMxDel2.Visible = true;
-            this.gvMxDel2.VisibleIndex = 19;
-            this.gvMxDel2.Width = 94;
+            this.gvMxDel2.Width = 100;
             // 
             // repositoryItemButtonEdit2
             // 
             this.repositoryItemButtonEdit2.AutoHeight = false;
-            editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions7.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
             this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
+            // 
+            // advBandedGridView1
+            // 
+            this.advBandedGridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.advBandedGridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.advBandedGridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+            this.gridBand16,
+            this.gridBand17,
+            this.gridBand1,
+            this.gridBand15,
+            this.gridBand18});
+            this.advBandedGridView1.ColumnPanelRowHeight = 50;
+            this.advBandedGridView1.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
+            this.bandedGridColumn1,
+            this.bandedGridColumn2,
+            this.bandedGridColumn3,
+            this.bandedGridColumn4,
+            this.bandedGridColumn5,
+            this.bandedGridColumn6,
+            this.bandedGridColumn7,
+            this.bandedGridColumn8,
+            this.bandedGridColumn9,
+            this.bandedGridColumn10,
+            this.bandedGridColumn11,
+            this.bandedGridColumn12,
+            this.bandedGridColumn13,
+            this.bandedGridColumn14,
+            this.bandedGridColumn15,
+            this.bandedGridColumn16,
+            this.bandedGridColumn17,
+            this.bandedGridColumn18,
+            this.bandedGridColumn19,
+            this.bandedGridColumn20,
+            this.bandedGridColumn21,
+            this.bandedGridColumn22});
+            this.advBandedGridView1.CustomizationFormBounds = new System.Drawing.Rectangle(1121, 484, 328, 370);
+            this.advBandedGridView1.GridControl = this.gcMx2;
+            this.advBandedGridView1.Name = "advBandedGridView1";
+            this.advBandedGridView1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+            this.advBandedGridView1.OptionsFind.ShowSearchNavButtons = false;
+            this.advBandedGridView1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
+            this.advBandedGridView1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridBand16
+            // 
+            this.gridBand16.Caption = "gridBand16";
+            this.gridBand16.Columns.Add(this.bandedGridColumn3);
+            this.gridBand16.Name = "gridBand16";
+            this.gridBand16.VisibleIndex = 0;
+            this.gridBand16.Width = 81;
+            // 
+            // bandedGridColumn3
+            // 
+            this.bandedGridColumn3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn3.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn3.Caption = "鏍锋湰澶у皬";
+            this.bandedGridColumn3.FieldName = "fsampleSizeWord";
+            this.bandedGridColumn3.MinWidth = 50;
+            this.bandedGridColumn3.Name = "bandedGridColumn3";
+            this.bandedGridColumn3.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn3.Visible = true;
+            this.bandedGridColumn3.Width = 81;
+            // 
+            // gridBand17
+            // 
+            this.gridBand17.AutoFillDown = false;
+            this.gridBand17.Caption = "gridBand17";
+            this.gridBand17.Columns.Add(this.bandedGridColumn4);
+            this.gridBand17.Name = "gridBand17";
+            this.gridBand17.RowCount = 3;
+            this.gridBand17.VisibleIndex = 1;
+            this.gridBand17.Width = 102;
+            // 
+            // bandedGridColumn4
+            // 
+            this.bandedGridColumn4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn4.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn4.Caption = "鏍锋湰澶у皬瀛楃爜";
+            this.bandedGridColumn4.ColumnEdit = this.repositoryItemComboBox1;
+            this.bandedGridColumn4.FieldName = "sampleSizeWord";
+            this.bandedGridColumn4.MinWidth = 100;
+            this.bandedGridColumn4.Name = "bandedGridColumn4";
+            this.bandedGridColumn4.Tag = "edit";
+            this.bandedGridColumn4.Visible = true;
+            this.bandedGridColumn4.Width = 102;
+            // 
+            // gridBand1
+            // 
+            this.gridBand1.Caption = "gridBand1";
+            this.gridBand1.Columns.Add(this.bandedGridColumn5);
+            this.gridBand1.Columns.Add(this.bandedGridColumn6);
+            this.gridBand1.Columns.Add(this.bandedGridColumn7);
+            this.gridBand1.Columns.Add(this.bandedGridColumn8);
+            this.gridBand1.Columns.Add(this.bandedGridColumn9);
+            this.gridBand1.Columns.Add(this.bandedGridColumn10);
+            this.gridBand1.Columns.Add(this.bandedGridColumn11);
+            this.gridBand1.Columns.Add(this.bandedGridColumn12);
+            this.gridBand1.Columns.Add(this.bandedGridColumn13);
+            this.gridBand1.Columns.Add(this.bandedGridColumn14);
+            this.gridBand1.Columns.Add(this.bandedGridColumn15);
+            this.gridBand1.Columns.Add(this.bandedGridColumn16);
+            this.gridBand1.Columns.Add(this.bandedGridColumn17);
+            this.gridBand1.Columns.Add(this.bandedGridColumn18);
+            this.gridBand1.Columns.Add(this.bandedGridColumn19);
+            this.gridBand1.Columns.Add(this.bandedGridColumn20);
+            this.gridBand1.Name = "gridBand1";
+            this.gridBand1.VisibleIndex = 2;
+            this.gridBand1.Width = 800;
+            // 
+            // bandedGridColumn5
+            // 
+            this.bandedGridColumn5.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn5.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn5.Caption = "0.010";
+            this.bandedGridColumn5.FieldName = "aql00010";
+            this.bandedGridColumn5.MinWidth = 50;
+            this.bandedGridColumn5.Name = "bandedGridColumn5";
+            this.bandedGridColumn5.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn5.Visible = true;
+            this.bandedGridColumn5.Width = 50;
+            // 
+            // bandedGridColumn6
+            // 
+            this.bandedGridColumn6.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn6.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn6.Caption = "0.015";
+            this.bandedGridColumn6.FieldName = "aql00015";
+            this.bandedGridColumn6.MinWidth = 50;
+            this.bandedGridColumn6.Name = "bandedGridColumn6";
+            this.bandedGridColumn6.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn6.Visible = true;
+            this.bandedGridColumn6.Width = 50;
+            // 
+            // bandedGridColumn7
+            // 
+            this.bandedGridColumn7.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn7.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn7.Caption = "0.025";
+            this.bandedGridColumn7.FieldName = "aql00025";
+            this.bandedGridColumn7.MinWidth = 50;
+            this.bandedGridColumn7.Name = "bandedGridColumn7";
+            this.bandedGridColumn7.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn7.Visible = true;
+            this.bandedGridColumn7.Width = 50;
+            // 
+            // bandedGridColumn8
+            // 
+            this.bandedGridColumn8.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn8.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn8.Caption = "0.040";
+            this.bandedGridColumn8.FieldName = "aql00040";
+            this.bandedGridColumn8.MinWidth = 50;
+            this.bandedGridColumn8.Name = "bandedGridColumn8";
+            this.bandedGridColumn8.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn8.Visible = true;
+            this.bandedGridColumn8.Width = 50;
+            // 
+            // bandedGridColumn9
+            // 
+            this.bandedGridColumn9.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn9.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn9.Caption = "0.065";
+            this.bandedGridColumn9.FieldName = "aql00065";
+            this.bandedGridColumn9.MinWidth = 50;
+            this.bandedGridColumn9.Name = "bandedGridColumn9";
+            this.bandedGridColumn9.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn9.Visible = true;
+            this.bandedGridColumn9.Width = 50;
+            // 
+            // bandedGridColumn10
+            // 
+            this.bandedGridColumn10.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn10.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn10.Caption = "0.10";
+            this.bandedGridColumn10.FieldName = "aql0010";
+            this.bandedGridColumn10.MinWidth = 50;
+            this.bandedGridColumn10.Name = "bandedGridColumn10";
+            this.bandedGridColumn10.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn10.Visible = true;
+            this.bandedGridColumn10.Width = 50;
+            // 
+            // bandedGridColumn11
+            // 
+            this.bandedGridColumn11.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn11.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn11.Caption = "0.15";
+            this.bandedGridColumn11.FieldName = "aql0015";
+            this.bandedGridColumn11.MinWidth = 50;
+            this.bandedGridColumn11.Name = "bandedGridColumn11";
+            this.bandedGridColumn11.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn11.Visible = true;
+            this.bandedGridColumn11.Width = 50;
+            // 
+            // bandedGridColumn12
+            // 
+            this.bandedGridColumn12.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn12.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn12.Caption = "0.25";
+            this.bandedGridColumn12.FieldName = "aql0025";
+            this.bandedGridColumn12.MinWidth = 50;
+            this.bandedGridColumn12.Name = "bandedGridColumn12";
+            this.bandedGridColumn12.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn12.Visible = true;
+            this.bandedGridColumn12.Width = 50;
+            // 
+            // bandedGridColumn13
+            // 
+            this.bandedGridColumn13.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn13.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn13.Caption = "0.40";
+            this.bandedGridColumn13.FieldName = "aql0040";
+            this.bandedGridColumn13.MinWidth = 50;
+            this.bandedGridColumn13.Name = "bandedGridColumn13";
+            this.bandedGridColumn13.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn13.Visible = true;
+            this.bandedGridColumn13.Width = 50;
+            // 
+            // bandedGridColumn14
+            // 
+            this.bandedGridColumn14.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn14.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn14.Caption = "0.65";
+            this.bandedGridColumn14.FieldName = "aql0065";
+            this.bandedGridColumn14.MinWidth = 50;
+            this.bandedGridColumn14.Name = "bandedGridColumn14";
+            this.bandedGridColumn14.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn14.Visible = true;
+            this.bandedGridColumn14.Width = 50;
+            // 
+            // bandedGridColumn15
+            // 
+            this.bandedGridColumn15.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn15.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn15.Caption = "1.0";
+            this.bandedGridColumn15.FieldName = "aql0100";
+            this.bandedGridColumn15.MinWidth = 50;
+            this.bandedGridColumn15.Name = "bandedGridColumn15";
+            this.bandedGridColumn15.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn15.Visible = true;
+            this.bandedGridColumn15.Width = 50;
+            // 
+            // bandedGridColumn16
+            // 
+            this.bandedGridColumn16.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn16.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn16.Caption = "1.5";
+            this.bandedGridColumn16.FieldName = "aql0150";
+            this.bandedGridColumn16.MinWidth = 50;
+            this.bandedGridColumn16.Name = "bandedGridColumn16";
+            this.bandedGridColumn16.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn16.Visible = true;
+            this.bandedGridColumn16.Width = 50;
+            // 
+            // bandedGridColumn17
+            // 
+            this.bandedGridColumn17.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn17.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn17.Caption = "2.5";
+            this.bandedGridColumn17.FieldName = "aql0250";
+            this.bandedGridColumn17.MinWidth = 50;
+            this.bandedGridColumn17.Name = "bandedGridColumn17";
+            this.bandedGridColumn17.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn17.Visible = true;
+            this.bandedGridColumn17.Width = 50;
+            // 
+            // bandedGridColumn18
+            // 
+            this.bandedGridColumn18.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn18.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn18.Caption = "4.0";
+            this.bandedGridColumn18.FieldName = "aql0400";
+            this.bandedGridColumn18.MinWidth = 50;
+            this.bandedGridColumn18.Name = "bandedGridColumn18";
+            this.bandedGridColumn18.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn18.Visible = true;
+            this.bandedGridColumn18.Width = 50;
+            // 
+            // bandedGridColumn19
+            // 
+            this.bandedGridColumn19.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn19.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn19.Caption = "6.5";
+            this.bandedGridColumn19.FieldName = "aql0650";
+            this.bandedGridColumn19.MinWidth = 50;
+            this.bandedGridColumn19.Name = "bandedGridColumn19";
+            this.bandedGridColumn19.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn19.Visible = true;
+            this.bandedGridColumn19.Width = 50;
+            // 
+            // bandedGridColumn20
+            // 
+            this.bandedGridColumn20.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn20.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn20.Caption = "10";
+            this.bandedGridColumn20.FieldName = "aql1000";
+            this.bandedGridColumn20.MinWidth = 50;
+            this.bandedGridColumn20.Name = "bandedGridColumn20";
+            this.bandedGridColumn20.Tag = "yz_quantity_0_edit";
+            this.bandedGridColumn20.Visible = true;
+            this.bandedGridColumn20.Width = 50;
+            // 
+            // gridBand15
+            // 
+            this.gridBand15.Caption = "gridBand15";
+            this.gridBand15.Columns.Add(this.bandedGridColumn21);
+            this.gridBand15.Name = "gridBand15";
+            this.gridBand15.VisibleIndex = 3;
+            this.gridBand15.Width = 100;
+            // 
+            // bandedGridColumn21
+            // 
+            this.bandedGridColumn21.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn21.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn21.Caption = "澶囨敞";
+            this.bandedGridColumn21.FieldName = "memo";
+            this.bandedGridColumn21.MinWidth = 50;
+            this.bandedGridColumn21.Name = "bandedGridColumn21";
+            this.bandedGridColumn21.Tag = "edit";
+            this.bandedGridColumn21.Visible = true;
+            this.bandedGridColumn21.Width = 100;
+            // 
+            // gridBand18
+            // 
+            this.gridBand18.Caption = "gridBand18";
+            this.gridBand18.Columns.Add(this.bandedGridColumn22);
+            this.gridBand18.Name = "gridBand18";
+            this.gridBand18.VisibleIndex = 4;
+            this.gridBand18.Width = 100;
+            // 
+            // bandedGridColumn22
+            // 
+            this.bandedGridColumn22.Caption = "绉婚櫎";
+            this.bandedGridColumn22.ColumnEdit = this.repositoryItemButtonEdit2;
+            this.bandedGridColumn22.MinWidth = 50;
+            this.bandedGridColumn22.Name = "bandedGridColumn22";
+            this.bandedGridColumn22.Visible = true;
+            this.bandedGridColumn22.Width = 100;
+            // 
+            // bandedGridColumn1
+            // 
+            this.bandedGridColumn1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn1.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn1.Caption = "guid ";
+            this.bandedGridColumn1.FieldName = "guid";
+            this.bandedGridColumn1.MinWidth = 50;
+            this.bandedGridColumn1.Name = "bandedGridColumn1";
+            this.bandedGridColumn1.Tag = "query_a.guid";
+            this.bandedGridColumn1.Width = 100;
+            // 
+            // bandedGridColumn2
+            // 
+            this.bandedGridColumn2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.bandedGridColumn2.AppearanceCell.Options.UseFont = true;
+            this.bandedGridColumn2.Caption = "AQL鎶芥牱鍩哄噯ID";
+            this.bandedGridColumn2.FieldName = "aql1Id";
+            this.bandedGridColumn2.MinWidth = 50;
+            this.bandedGridColumn2.Name = "bandedGridColumn2";
+            this.bandedGridColumn2.Tag = "query_a.AQL1_ID";
+            this.bandedGridColumn2.Width = 94;
             // 
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 384);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 410);
             this.tabMxPage1.Text = "鏍锋湰閲忓瓧鐮�";
             // 
             // gcMx1
@@ -554,14 +969,24 @@
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 384);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 410);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
             // 
             // gvMx1
             // 
-            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gvMx1.Appearance.HeaderPanel.Options.UseTextOptions = true;
+            this.gvMx1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+            this.gvMx1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+            this.gridBand2,
+            this.gridBand3,
+            this.gridBand4,
+            this.gridBand9,
+            this.gridBand13,
+            this.gridBand14});
+            this.gvMx1.ColumnPanelRowHeight = 50;
+            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
             this.gvMx1guid,
             this.gvMx1aql1Id,
             this.gvMx1lotFrom,
@@ -580,7 +1005,263 @@
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
             this.gvMx1.OptionsFind.ShowSearchNavButtons = false;
             this.gvMx1.OptionsView.NewItemRowPosition = DevExpress.XtraGrid.Views.Grid.NewItemRowPosition.Bottom;
+            this.gvMx1.OptionsView.ShowColumnHeaders = false;
             this.gvMx1.OptionsView.ShowGroupPanel = false;
+            // 
+            // gridBand2
+            // 
+            this.gridBand2.Caption = "鎵归噺寮�濮�";
+            this.gridBand2.Columns.Add(this.gvMx1lotFrom);
+            this.gridBand2.Name = "gridBand2";
+            this.gridBand2.VisibleIndex = 0;
+            this.gridBand2.Width = 104;
+            // 
+            // gvMx1lotFrom
+            // 
+            this.gvMx1lotFrom.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1lotFrom.AppearanceCell.Options.UseFont = true;
+            this.gvMx1lotFrom.Caption = "鎵归噺寮�濮�";
+            this.gvMx1lotFrom.FieldName = "lotFrom";
+            this.gvMx1lotFrom.MinWidth = 50;
+            this.gvMx1lotFrom.Name = "gvMx1lotFrom";
+            this.gvMx1lotFrom.Tag = "yz_quantity_0_edit";
+            this.gvMx1lotFrom.Visible = true;
+            this.gvMx1lotFrom.Width = 104;
+            // 
+            // gridBand3
+            // 
+            this.gridBand3.Caption = "鎵归噺缁撴潫";
+            this.gridBand3.Columns.Add(this.gvMx1lotTo);
+            this.gridBand3.Name = "gridBand3";
+            this.gridBand3.VisibleIndex = 1;
+            this.gridBand3.Width = 104;
+            // 
+            // gvMx1lotTo
+            // 
+            this.gvMx1lotTo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1lotTo.AppearanceCell.Options.UseFont = true;
+            this.gvMx1lotTo.Caption = "鎵归噺缁撴潫";
+            this.gvMx1lotTo.FieldName = "lotTo";
+            this.gvMx1lotTo.MinWidth = 50;
+            this.gvMx1lotTo.Name = "gvMx1lotTo";
+            this.gvMx1lotTo.Tag = "yz_quantity_0_edit";
+            this.gvMx1lotTo.Visible = true;
+            this.gvMx1lotTo.Width = 104;
+            // 
+            // gridBand4
+            // 
+            this.gridBand4.AppearanceHeader.Options.UseTextOptions = true;
+            this.gridBand4.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.gridBand4.Caption = "鐗规畩妫�楠屾按骞�";
+            this.gridBand4.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+            this.gridBand5,
+            this.gridBand6,
+            this.gridBand7,
+            this.gridBand8});
+            this.gridBand4.Name = "gridBand4";
+            this.gridBand4.VisibleIndex = 2;
+            this.gridBand4.Width = 416;
+            // 
+            // gridBand5
+            // 
+            this.gridBand5.Caption = "S-1";
+            this.gridBand5.Columns.Add(this.gvMx1flevelS1);
+            this.gridBand5.Name = "gridBand5";
+            this.gridBand5.VisibleIndex = 0;
+            this.gridBand5.Width = 104;
+            // 
+            // gvMx1flevelS1
+            // 
+            this.gvMx1flevelS1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1flevelS1.AppearanceCell.Options.UseFont = true;
+            this.gvMx1flevelS1.Caption = "鐗规畩妫�楠屾按骞硘S-1";
+            this.gvMx1flevelS1.FieldName = "flevelS1";
+            this.gvMx1flevelS1.MinWidth = 50;
+            this.gvMx1flevelS1.Name = "gvMx1flevelS1";
+            this.gvMx1flevelS1.Tag = "edit";
+            this.gvMx1flevelS1.Visible = true;
+            this.gvMx1flevelS1.Width = 104;
+            // 
+            // gridBand6
+            // 
+            this.gridBand6.Caption = "S-2";
+            this.gridBand6.Columns.Add(this.gvMx1flevelS2);
+            this.gridBand6.Name = "gridBand6";
+            this.gridBand6.VisibleIndex = 1;
+            this.gridBand6.Width = 104;
+            // 
+            // gvMx1flevelS2
+            // 
+            this.gvMx1flevelS2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1flevelS2.AppearanceCell.Options.UseFont = true;
+            this.gvMx1flevelS2.Caption = "鐗规畩妫�楠屾按骞硘S-2";
+            this.gvMx1flevelS2.FieldName = "flevelS2";
+            this.gvMx1flevelS2.MinWidth = 50;
+            this.gvMx1flevelS2.Name = "gvMx1flevelS2";
+            this.gvMx1flevelS2.Tag = "edit";
+            this.gvMx1flevelS2.Visible = true;
+            this.gvMx1flevelS2.Width = 104;
+            // 
+            // gridBand7
+            // 
+            this.gridBand7.Caption = "S-3";
+            this.gridBand7.Columns.Add(this.gvMx1flevelS3);
+            this.gridBand7.Name = "gridBand7";
+            this.gridBand7.VisibleIndex = 2;
+            this.gridBand7.Width = 104;
+            // 
+            // gvMx1flevelS3
+            // 
+            this.gvMx1flevelS3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1flevelS3.AppearanceCell.Options.UseFont = true;
+            this.gvMx1flevelS3.Caption = "鐗规畩妫�楠屾按骞硘S-3";
+            this.gvMx1flevelS3.FieldName = "flevelS3";
+            this.gvMx1flevelS3.MinWidth = 50;
+            this.gvMx1flevelS3.Name = "gvMx1flevelS3";
+            this.gvMx1flevelS3.Tag = "edit";
+            this.gvMx1flevelS3.Visible = true;
+            this.gvMx1flevelS3.Width = 104;
+            // 
+            // gridBand8
+            // 
+            this.gridBand8.Caption = "S-4";
+            this.gridBand8.Columns.Add(this.gvMx1flevelS4);
+            this.gridBand8.Name = "gridBand8";
+            this.gridBand8.VisibleIndex = 3;
+            this.gridBand8.Width = 104;
+            // 
+            // gvMx1flevelS4
+            // 
+            this.gvMx1flevelS4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1flevelS4.AppearanceCell.Options.UseFont = true;
+            this.gvMx1flevelS4.Caption = "鐗规畩妫�楠屾按骞硘S-4";
+            this.gvMx1flevelS4.FieldName = "flevelS4";
+            this.gvMx1flevelS4.MinWidth = 50;
+            this.gvMx1flevelS4.Name = "gvMx1flevelS4";
+            this.gvMx1flevelS4.Tag = "edit";
+            this.gvMx1flevelS4.Visible = true;
+            this.gvMx1flevelS4.Width = 104;
+            // 
+            // gridBand9
+            // 
+            this.gridBand9.AppearanceHeader.Options.UseTextOptions = true;
+            this.gridBand9.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.gridBand9.Caption = "涓�鑸楠屾按骞�";
+            this.gridBand9.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+            this.gridBand10,
+            this.gridBand11,
+            this.gridBand12});
+            this.gridBand9.Name = "gridBand9";
+            this.gridBand9.VisibleIndex = 3;
+            this.gridBand9.Width = 312;
+            // 
+            // gridBand10
+            // 
+            this.gridBand10.Caption = "I";
+            this.gridBand10.Columns.Add(this.gvMx1flevelI);
+            this.gridBand10.Name = "gridBand10";
+            this.gridBand10.VisibleIndex = 0;
+            this.gridBand10.Width = 104;
+            // 
+            // gvMx1flevelI
+            // 
+            this.gvMx1flevelI.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1flevelI.AppearanceCell.Options.UseFont = true;
+            this.gvMx1flevelI.Caption = "涓�鑸楠屾按骞硘I";
+            this.gvMx1flevelI.FieldName = "flevelI";
+            this.gvMx1flevelI.MinWidth = 50;
+            this.gvMx1flevelI.Name = "gvMx1flevelI";
+            this.gvMx1flevelI.Tag = "edit";
+            this.gvMx1flevelI.Visible = true;
+            this.gvMx1flevelI.Width = 104;
+            // 
+            // gridBand11
+            // 
+            this.gridBand11.Caption = "II";
+            this.gridBand11.Columns.Add(this.gvMx1flevelIi);
+            this.gridBand11.Name = "gridBand11";
+            this.gridBand11.VisibleIndex = 1;
+            this.gridBand11.Width = 104;
+            // 
+            // gvMx1flevelIi
+            // 
+            this.gvMx1flevelIi.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1flevelIi.AppearanceCell.Options.UseFont = true;
+            this.gvMx1flevelIi.Caption = "涓�鑸楠屾按骞硘II";
+            this.gvMx1flevelIi.FieldName = "flevelIi";
+            this.gvMx1flevelIi.MinWidth = 50;
+            this.gvMx1flevelIi.Name = "gvMx1flevelIi";
+            this.gvMx1flevelIi.Tag = "edit";
+            this.gvMx1flevelIi.Visible = true;
+            this.gvMx1flevelIi.Width = 104;
+            // 
+            // gridBand12
+            // 
+            this.gridBand12.Caption = "III";
+            this.gridBand12.Columns.Add(this.gvMx1flevelIii);
+            this.gridBand12.Name = "gridBand12";
+            this.gridBand12.VisibleIndex = 2;
+            this.gridBand12.Width = 104;
+            // 
+            // gvMx1flevelIii
+            // 
+            this.gvMx1flevelIii.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1flevelIii.AppearanceCell.Options.UseFont = true;
+            this.gvMx1flevelIii.Caption = "涓�鑸楠屾按骞硘III";
+            this.gvMx1flevelIii.FieldName = "flevelIii";
+            this.gvMx1flevelIii.MinWidth = 50;
+            this.gvMx1flevelIii.Name = "gvMx1flevelIii";
+            this.gvMx1flevelIii.Tag = "edit";
+            this.gvMx1flevelIii.Visible = true;
+            this.gvMx1flevelIii.Width = 104;
+            // 
+            // gridBand13
+            // 
+            this.gridBand13.Caption = "澶囨敞";
+            this.gridBand13.Columns.Add(this.gvMx1memo);
+            this.gridBand13.Name = "gridBand13";
+            this.gridBand13.VisibleIndex = 4;
+            this.gridBand13.Width = 104;
+            // 
+            // gvMx1memo
+            // 
+            this.gvMx1memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gvMx1memo.AppearanceCell.Options.UseFont = true;
+            this.gvMx1memo.Caption = "澶囨敞";
+            this.gvMx1memo.FieldName = "memo";
+            this.gvMx1memo.MinWidth = 50;
+            this.gvMx1memo.Name = "gvMx1memo";
+            this.gvMx1memo.Tag = "edit";
+            this.gvMx1memo.Visible = true;
+            this.gvMx1memo.Width = 104;
+            // 
+            // gridBand14
+            // 
+            this.gridBand14.Caption = "绉诲嚭";
+            this.gridBand14.Columns.Add(this.gvMxDel);
+            this.gridBand14.Name = "gridBand14";
+            this.gridBand14.VisibleIndex = 5;
+            this.gridBand14.Width = 100;
+            // 
+            // gvMxDel
+            // 
+            this.gvMxDel.Caption = "绉诲嚭";
+            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
+            this.gvMxDel.MinWidth = 50;
+            this.gvMxDel.Name = "gvMxDel";
+            this.gvMxDel.Visible = true;
+            this.gvMxDel.Width = 100;
+            // 
+            // repositoryItemButtonEdit1
+            // 
+            this.repositoryItemButtonEdit1.AutoHeight = false;
+            editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
             // gvMx1guid
             // 
@@ -604,166 +1285,15 @@
             this.gvMx1aql1Id.Tag = "query_a.AQL1_ID";
             this.gvMx1aql1Id.Width = 94;
             // 
-            // gvMx1lotFrom
-            // 
-            this.gvMx1lotFrom.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1lotFrom.AppearanceCell.Options.UseFont = true;
-            this.gvMx1lotFrom.Caption = "鎵归噺寮�濮�";
-            this.gvMx1lotFrom.FieldName = "lotFrom";
-            this.gvMx1lotFrom.MinWidth = 50;
-            this.gvMx1lotFrom.Name = "gvMx1lotFrom";
-            this.gvMx1lotFrom.Tag = "query_a.LOT_FROM";
-            this.gvMx1lotFrom.Visible = true;
-            this.gvMx1lotFrom.VisibleIndex = 0;
-            this.gvMx1lotFrom.Width = 99;
-            // 
-            // gvMx1lotTo
-            // 
-            this.gvMx1lotTo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1lotTo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1lotTo.Caption = "鎵归噺缁撴潫";
-            this.gvMx1lotTo.FieldName = "lotTo";
-            this.gvMx1lotTo.MinWidth = 50;
-            this.gvMx1lotTo.Name = "gvMx1lotTo";
-            this.gvMx1lotTo.Tag = "query_a.LOT_TO";
-            this.gvMx1lotTo.Visible = true;
-            this.gvMx1lotTo.VisibleIndex = 1;
-            this.gvMx1lotTo.Width = 99;
-            // 
-            // gvMx1flevelS1
-            // 
-            this.gvMx1flevelS1.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1flevelS1.AppearanceCell.Options.UseFont = true;
-            this.gvMx1flevelS1.Caption = "鐗规畩妫�楠屾按骞硘S-1";
-            this.gvMx1flevelS1.FieldName = "flevelS1";
-            this.gvMx1flevelS1.MinWidth = 50;
-            this.gvMx1flevelS1.Name = "gvMx1flevelS1";
-            this.gvMx1flevelS1.Tag = "query_a.FLEVEL_S1";
-            this.gvMx1flevelS1.Visible = true;
-            this.gvMx1flevelS1.VisibleIndex = 2;
-            this.gvMx1flevelS1.Width = 99;
-            // 
-            // gvMx1flevelS2
-            // 
-            this.gvMx1flevelS2.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1flevelS2.AppearanceCell.Options.UseFont = true;
-            this.gvMx1flevelS2.Caption = "鐗规畩妫�楠屾按骞硘S-2";
-            this.gvMx1flevelS2.FieldName = "flevelS2";
-            this.gvMx1flevelS2.MinWidth = 50;
-            this.gvMx1flevelS2.Name = "gvMx1flevelS2";
-            this.gvMx1flevelS2.Tag = "query_a.FLEVEL_S2";
-            this.gvMx1flevelS2.Visible = true;
-            this.gvMx1flevelS2.VisibleIndex = 3;
-            this.gvMx1flevelS2.Width = 99;
-            // 
-            // gvMx1flevelS3
-            // 
-            this.gvMx1flevelS3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1flevelS3.AppearanceCell.Options.UseFont = true;
-            this.gvMx1flevelS3.Caption = "鐗规畩妫�楠屾按骞硘S-3";
-            this.gvMx1flevelS3.FieldName = "flevelS3";
-            this.gvMx1flevelS3.MinWidth = 50;
-            this.gvMx1flevelS3.Name = "gvMx1flevelS3";
-            this.gvMx1flevelS3.Tag = "query_a.FLEVEL_S3";
-            this.gvMx1flevelS3.Visible = true;
-            this.gvMx1flevelS3.VisibleIndex = 4;
-            this.gvMx1flevelS3.Width = 99;
-            // 
-            // gvMx1flevelS4
-            // 
-            this.gvMx1flevelS4.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1flevelS4.AppearanceCell.Options.UseFont = true;
-            this.gvMx1flevelS4.Caption = "鐗规畩妫�楠屾按骞硘S-4";
-            this.gvMx1flevelS4.FieldName = "flevelS4";
-            this.gvMx1flevelS4.MinWidth = 50;
-            this.gvMx1flevelS4.Name = "gvMx1flevelS4";
-            this.gvMx1flevelS4.Tag = "query_a.FLEVEL_S4";
-            this.gvMx1flevelS4.Visible = true;
-            this.gvMx1flevelS4.VisibleIndex = 5;
-            this.gvMx1flevelS4.Width = 99;
-            // 
-            // gvMx1flevelI
-            // 
-            this.gvMx1flevelI.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1flevelI.AppearanceCell.Options.UseFont = true;
-            this.gvMx1flevelI.Caption = "涓�鑸楠屾按骞硘I";
-            this.gvMx1flevelI.FieldName = "flevelI";
-            this.gvMx1flevelI.MinWidth = 50;
-            this.gvMx1flevelI.Name = "gvMx1flevelI";
-            this.gvMx1flevelI.Tag = "query_a.FLEVEL_I";
-            this.gvMx1flevelI.Visible = true;
-            this.gvMx1flevelI.VisibleIndex = 6;
-            this.gvMx1flevelI.Width = 99;
-            // 
-            // gvMx1flevelIi
-            // 
-            this.gvMx1flevelIi.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1flevelIi.AppearanceCell.Options.UseFont = true;
-            this.gvMx1flevelIi.Caption = "涓�鑸楠屾按骞硘II";
-            this.gvMx1flevelIi.FieldName = "flevelIi";
-            this.gvMx1flevelIi.MinWidth = 50;
-            this.gvMx1flevelIi.Name = "gvMx1flevelIi";
-            this.gvMx1flevelIi.Tag = "query_a.FLEVEL_II";
-            this.gvMx1flevelIi.Visible = true;
-            this.gvMx1flevelIi.VisibleIndex = 7;
-            this.gvMx1flevelIi.Width = 99;
-            // 
-            // gvMx1flevelIii
-            // 
-            this.gvMx1flevelIii.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1flevelIii.AppearanceCell.Options.UseFont = true;
-            this.gvMx1flevelIii.Caption = "涓�鑸楠屾按骞硘III";
-            this.gvMx1flevelIii.FieldName = "flevelIii";
-            this.gvMx1flevelIii.MinWidth = 50;
-            this.gvMx1flevelIii.Name = "gvMx1flevelIii";
-            this.gvMx1flevelIii.Tag = "query_a.FLEVEL_III";
-            this.gvMx1flevelIii.Visible = true;
-            this.gvMx1flevelIii.VisibleIndex = 8;
-            this.gvMx1flevelIii.Width = 99;
-            // 
-            // gvMx1memo
-            // 
-            this.gvMx1memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1memo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1memo.Caption = "澶囨敞";
-            this.gvMx1memo.FieldName = "memo";
-            this.gvMx1memo.MinWidth = 50;
-            this.gvMx1memo.Name = "gvMx1memo";
-            this.gvMx1memo.Tag = "query_a.MEMO";
-            this.gvMx1memo.Visible = true;
-            this.gvMx1memo.VisibleIndex = 9;
-            this.gvMx1memo.Width = 99;
-            // 
-            // gvMxDel
-            // 
-            this.gvMxDel.Caption = "绉诲嚭";
-            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 50;
-            this.gvMxDel.Name = "gvMxDel";
-            this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 10;
-            this.gvMxDel.Width = 50;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions8.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
-            this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
-            // 
             // lb_isenabled
             // 
             this.lb_isenabled.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_isenabled.Appearance.Options.UseFont = true;
-            this.lb_isenabled.Location = new System.Drawing.Point(11, 120);
+            this.lb_isenabled.Location = new System.Drawing.Point(658, 88);
             this.lb_isenabled.Name = "lb_isenabled";
-            this.lb_isenabled.Size = new System.Drawing.Size(73, 21);
+            this.lb_isenabled.Size = new System.Drawing.Size(68, 21);
             this.lb_isenabled.TabIndex = 280;
-            this.lb_isenabled.Text = "鏄惁鍙敤 ";
+            this.lb_isenabled.Text = "鏄惁鍙敤";
             // 
             // gv_isenabled
             // 
@@ -783,11 +1313,11 @@
             // 
             this.lb_fversion.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fversion.Appearance.Options.UseFont = true;
-            this.lb_fversion.Location = new System.Drawing.Point(281, 88);
+            this.lb_fversion.Location = new System.Drawing.Point(286, 88);
             this.lb_fversion.Name = "lb_fversion";
-            this.lb_fversion.Size = new System.Drawing.Size(56, 21);
+            this.lb_fversion.Size = new System.Drawing.Size(51, 21);
             this.lb_fversion.TabIndex = 273;
-            this.lb_fversion.Text = "鐗堟湰鍙� ";
+            this.lb_fversion.Text = "鐗堟湰鍙�";
             // 
             // txt_fversion
             // 
@@ -816,11 +1346,11 @@
             // 
             this.lb_ftwoCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_ftwoCheckdate.Appearance.Options.UseFont = true;
-            this.lb_ftwoCheckdate.Location = new System.Drawing.Point(532, 54);
+            this.lb_ftwoCheckdate.Location = new System.Drawing.Point(538, 54);
             this.lb_ftwoCheckdate.Name = "lb_ftwoCheckdate";
-            this.lb_ftwoCheckdate.Size = new System.Drawing.Size(73, 21);
+            this.lb_ftwoCheckdate.Size = new System.Drawing.Size(68, 21);
             this.lb_ftwoCheckdate.TabIndex = 262;
-            this.lb_ftwoCheckdate.Text = "鎵瑰噯鏃ユ湡 ";
+            this.lb_ftwoCheckdate.Text = "鎵瑰噯鏃ユ湡";
             // 
             // txt_ftwoCheckdate
             // 
@@ -850,11 +1380,11 @@
             // 
             this.lb_ftwoCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_ftwoCheckor.Appearance.Options.UseFont = true;
-            this.lb_ftwoCheckor.Location = new System.Drawing.Point(549, 20);
+            this.lb_ftwoCheckor.Location = new System.Drawing.Point(555, 20);
             this.lb_ftwoCheckor.Name = "lb_ftwoCheckor";
-            this.lb_ftwoCheckor.Size = new System.Drawing.Size(56, 21);
+            this.lb_ftwoCheckor.Size = new System.Drawing.Size(51, 21);
             this.lb_ftwoCheckor.TabIndex = 258;
-            this.lb_ftwoCheckor.Text = "鎵瑰噯浜� ";
+            this.lb_ftwoCheckor.Text = "鎵瑰噯浜�";
             // 
             // txt_ftwoCheckor
             // 
@@ -884,11 +1414,11 @@
             // 
             this.lb_ftwoChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_ftwoChecked.Appearance.Options.UseFont = true;
-            this.lb_ftwoChecked.Location = new System.Drawing.Point(532, 88);
+            this.lb_ftwoChecked.Location = new System.Drawing.Point(538, 88);
             this.lb_ftwoChecked.Name = "lb_ftwoChecked";
-            this.lb_ftwoChecked.Size = new System.Drawing.Size(73, 21);
+            this.lb_ftwoChecked.Size = new System.Drawing.Size(68, 21);
             this.lb_ftwoChecked.TabIndex = 252;
-            this.lb_ftwoChecked.Text = "鎵瑰噯鏍囪 ";
+            this.lb_ftwoChecked.Text = "鎵瑰噯鏍囪";
             // 
             // gv_ftwoChecked
             // 
@@ -908,11 +1438,11 @@
             // 
             this.lb_foneCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_foneCheckdate.Appearance.Options.UseFont = true;
-            this.lb_foneCheckdate.Location = new System.Drawing.Point(782, 54);
+            this.lb_foneCheckdate.Location = new System.Drawing.Point(786, 54);
             this.lb_foneCheckdate.Name = "lb_foneCheckdate";
-            this.lb_foneCheckdate.Size = new System.Drawing.Size(73, 21);
+            this.lb_foneCheckdate.Size = new System.Drawing.Size(68, 21);
             this.lb_foneCheckdate.TabIndex = 247;
-            this.lb_foneCheckdate.Text = "瀹℃壒鏃ユ湡 ";
+            this.lb_foneCheckdate.Text = "瀹℃壒鏃ユ湡";
             // 
             // txt_foneCheckdate
             // 
@@ -942,11 +1472,11 @@
             // 
             this.lb_foneCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_foneCheckor.Appearance.Options.UseFont = true;
-            this.lb_foneCheckor.Location = new System.Drawing.Point(799, 20);
+            this.lb_foneCheckor.Location = new System.Drawing.Point(803, 20);
             this.lb_foneCheckor.Name = "lb_foneCheckor";
-            this.lb_foneCheckor.Size = new System.Drawing.Size(56, 21);
+            this.lb_foneCheckor.Size = new System.Drawing.Size(51, 21);
             this.lb_foneCheckor.TabIndex = 243;
-            this.lb_foneCheckor.Text = "瀹℃壒浜� ";
+            this.lb_foneCheckor.Text = "瀹℃壒浜�";
             // 
             // txt_foneCheckor
             // 
@@ -976,11 +1506,11 @@
             // 
             this.lb_foneChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_foneChecked.Appearance.Options.UseFont = true;
-            this.lb_foneChecked.Location = new System.Drawing.Point(782, 88);
+            this.lb_foneChecked.Location = new System.Drawing.Point(786, 88);
             this.lb_foneChecked.Name = "lb_foneChecked";
-            this.lb_foneChecked.Size = new System.Drawing.Size(73, 21);
+            this.lb_foneChecked.Size = new System.Drawing.Size(68, 21);
             this.lb_foneChecked.TabIndex = 240;
-            this.lb_foneChecked.Text = "瀹℃壒鏍囪 ";
+            this.lb_foneChecked.Text = "瀹℃壒鏍囪";
             // 
             // gv_foneChecked
             // 
@@ -1099,11 +1629,11 @@
             // 
             this.lb_createDate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_createDate.Appearance.Options.UseFont = true;
-            this.lb_createDate.Location = new System.Drawing.Point(264, 54);
+            this.lb_createDate.Location = new System.Drawing.Point(269, 54);
             this.lb_createDate.Name = "lb_createDate";
-            this.lb_createDate.Size = new System.Drawing.Size(73, 21);
+            this.lb_createDate.Size = new System.Drawing.Size(68, 21);
             this.lb_createDate.TabIndex = 216;
-            this.lb_createDate.Text = "鍒朵綔鏃堕棿 ";
+            this.lb_createDate.Text = "鍒朵綔鏃堕棿";
             // 
             // txt_createDate
             // 
@@ -1164,6 +1694,7 @@
             // toolBarMenu1
             // 
             this.toolBarMenu1.chkParameter = "MES_QM_AQL1,FONE_CHECKDATE,FONE_CHECKED,FONE_CHECKOR,chk_mesQmAql1";
+            this.toolBarMenu1.currentAction = null;
             this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
@@ -1249,17 +1780,16 @@
             this.xtraTabPage2.Controls.Add(this.tabMx);
             this.xtraTabPage2.Controls.Add(this.panel1);
             this.xtraTabPage2.Name = "xtraTabPage2";
-           
             this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 154);
+            this.tabMx.Location = new System.Drawing.Point(0, 128);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 416);
+            this.tabMx.Size = new System.Drawing.Size(1126, 442);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -1299,7 +1829,7 @@
             this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1126, 154);
+            this.panel1.Size = new System.Drawing.Size(1126, 128);
             this.panel1.TabIndex = 1;
             // 
             // txt_ftwoChecked
@@ -1308,7 +1838,7 @@
             this.txt_ftwoChecked.Location = new System.Drawing.Point(611, 86);
             this.txt_ftwoChecked.Name = "txt_ftwoChecked";
             this.txt_ftwoChecked.Properties.Caption = "";
-            this.txt_ftwoChecked.Size = new System.Drawing.Size(94, 24);
+            this.txt_ftwoChecked.Size = new System.Drawing.Size(33, 24);
             this.txt_ftwoChecked.TabIndex = 283;
             // 
             // txt_foneChecked
@@ -1317,15 +1847,16 @@
             this.txt_foneChecked.Location = new System.Drawing.Point(858, 86);
             this.txt_foneChecked.Name = "txt_foneChecked";
             this.txt_foneChecked.Properties.Caption = "";
-            this.txt_foneChecked.Size = new System.Drawing.Size(94, 24);
+            this.txt_foneChecked.Size = new System.Drawing.Size(35, 24);
             this.txt_foneChecked.TabIndex = 282;
             // 
             // txt_isenabled
             // 
-            this.txt_isenabled.Location = new System.Drawing.Point(90, 120);
+            this.txt_isenabled.Enabled = false;
+            this.txt_isenabled.Location = new System.Drawing.Point(729, 86);
             this.txt_isenabled.Name = "txt_isenabled";
             this.txt_isenabled.Properties.Caption = "";
-            this.txt_isenabled.Size = new System.Drawing.Size(94, 24);
+            this.txt_isenabled.Size = new System.Drawing.Size(32, 24);
             this.txt_isenabled.TabIndex = 281;
             // 
             // lbGuid
@@ -1347,6 +1878,195 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
+            // gridBand19
+            // 
+            this.gridBand19.Caption = "鏍锋湰澶у皬";
+            this.gridBand19.Columns.Add(this.gvMx2fsampleSizeWord);
+            this.gridBand19.Columns.Add(this.gvMx2guid);
+            this.gridBand19.Columns.Add(this.gvMx2aql1Id);
+            this.gridBand19.Name = "gridBand19";
+            this.gridBand19.VisibleIndex = 0;
+            this.gridBand19.Width = 81;
+            // 
+            // gridBand20
+            // 
+            this.gridBand20.Caption = "鏍锋湰澶у皬瀛楃爜";
+            this.gridBand20.Columns.Add(this.gvMx2sampleSizeWord);
+            this.gridBand20.Name = "gridBand20";
+            this.gridBand20.VisibleIndex = 1;
+            this.gridBand20.Width = 100;
+            // 
+            // gridBand21
+            // 
+            this.gridBand21.AppearanceHeader.Options.UseTextOptions = true;
+            this.gridBand21.AppearanceHeader.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Center;
+            this.gridBand21.Caption = "鎷掓敹璐ㄩ噺姘村钩";
+            this.gridBand21.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
+            this.gridBand30,
+            this.gridBand29,
+            this.gridBand28,
+            this.gridBand27,
+            this.gridBand26,
+            this.gridBand25,
+            this.gridBand33,
+            this.gridBand32,
+            this.gridBand31,
+            this.gridBand36,
+            this.gridBand35,
+            this.gridBand38,
+            this.gridBand34,
+            this.gridBand37,
+            this.gridBand24,
+            this.gridBand39});
+            this.gridBand21.ImageOptions.Alignment = System.Drawing.StringAlignment.Center;
+            this.gridBand21.Name = "gridBand21";
+            this.gridBand21.VisibleIndex = 2;
+            this.gridBand21.Width = 800;
+            // 
+            // gridBand30
+            // 
+            this.gridBand30.Caption = "0.010";
+            this.gridBand30.Columns.Add(this.gvMx2aql00010);
+            this.gridBand30.Name = "gridBand30";
+            this.gridBand30.VisibleIndex = 0;
+            this.gridBand30.Width = 50;
+            // 
+            // gridBand29
+            // 
+            this.gridBand29.Caption = "0.015";
+            this.gridBand29.Columns.Add(this.gvMx2aql00015);
+            this.gridBand29.Name = "gridBand29";
+            this.gridBand29.VisibleIndex = 1;
+            this.gridBand29.Width = 50;
+            // 
+            // gridBand28
+            // 
+            this.gridBand28.Caption = "0.025";
+            this.gridBand28.Columns.Add(this.gvMx2aql00025);
+            this.gridBand28.Name = "gridBand28";
+            this.gridBand28.VisibleIndex = 2;
+            this.gridBand28.Width = 50;
+            // 
+            // gridBand27
+            // 
+            this.gridBand27.Caption = "0.040";
+            this.gridBand27.Columns.Add(this.gvMx2aql00040);
+            this.gridBand27.Name = "gridBand27";
+            this.gridBand27.VisibleIndex = 3;
+            this.gridBand27.Width = 50;
+            // 
+            // gridBand26
+            // 
+            this.gridBand26.Caption = "0.065";
+            this.gridBand26.Columns.Add(this.gvMx2aql00065);
+            this.gridBand26.Name = "gridBand26";
+            this.gridBand26.VisibleIndex = 4;
+            this.gridBand26.Width = 50;
+            // 
+            // gridBand25
+            // 
+            this.gridBand25.Caption = "0.10";
+            this.gridBand25.Columns.Add(this.gvMx2aql0010);
+            this.gridBand25.Name = "gridBand25";
+            this.gridBand25.VisibleIndex = 5;
+            this.gridBand25.Width = 50;
+            // 
+            // gridBand33
+            // 
+            this.gridBand33.Caption = "0.15";
+            this.gridBand33.Columns.Add(this.gvMx2aql0015);
+            this.gridBand33.Name = "gridBand33";
+            this.gridBand33.VisibleIndex = 6;
+            this.gridBand33.Width = 50;
+            // 
+            // gridBand32
+            // 
+            this.gridBand32.Caption = "0.25";
+            this.gridBand32.Columns.Add(this.gvMx2aql0025);
+            this.gridBand32.Name = "gridBand32";
+            this.gridBand32.VisibleIndex = 7;
+            this.gridBand32.Width = 50;
+            // 
+            // gridBand31
+            // 
+            this.gridBand31.Caption = "0.40";
+            this.gridBand31.Columns.Add(this.gvMx2aql0040);
+            this.gridBand31.Name = "gridBand31";
+            this.gridBand31.VisibleIndex = 8;
+            this.gridBand31.Width = 50;
+            // 
+            // gridBand36
+            // 
+            this.gridBand36.Caption = "0.65";
+            this.gridBand36.Columns.Add(this.gvMx2aql0065);
+            this.gridBand36.Name = "gridBand36";
+            this.gridBand36.VisibleIndex = 9;
+            this.gridBand36.Width = 50;
+            // 
+            // gridBand35
+            // 
+            this.gridBand35.Caption = "1.0";
+            this.gridBand35.Columns.Add(this.gvMx2aql0100);
+            this.gridBand35.Name = "gridBand35";
+            this.gridBand35.VisibleIndex = 10;
+            this.gridBand35.Width = 50;
+            // 
+            // gridBand38
+            // 
+            this.gridBand38.Caption = "1.5";
+            this.gridBand38.Columns.Add(this.gvMx2aql0150);
+            this.gridBand38.Name = "gridBand38";
+            this.gridBand38.VisibleIndex = 11;
+            this.gridBand38.Width = 50;
+            // 
+            // gridBand34
+            // 
+            this.gridBand34.Caption = "2.5";
+            this.gridBand34.Columns.Add(this.gvMx2aql0250);
+            this.gridBand34.Name = "gridBand34";
+            this.gridBand34.VisibleIndex = 12;
+            this.gridBand34.Width = 50;
+            // 
+            // gridBand37
+            // 
+            this.gridBand37.Caption = "4.0";
+            this.gridBand37.Columns.Add(this.gvMx2aql0400);
+            this.gridBand37.Name = "gridBand37";
+            this.gridBand37.VisibleIndex = 13;
+            this.gridBand37.Width = 50;
+            // 
+            // gridBand24
+            // 
+            this.gridBand24.Caption = "6.5";
+            this.gridBand24.Columns.Add(this.gvMx2aql0650);
+            this.gridBand24.Name = "gridBand24";
+            this.gridBand24.VisibleIndex = 14;
+            this.gridBand24.Width = 50;
+            // 
+            // gridBand39
+            // 
+            this.gridBand39.Caption = "10";
+            this.gridBand39.Columns.Add(this.gvMx2aql1000);
+            this.gridBand39.Name = "gridBand39";
+            this.gridBand39.VisibleIndex = 15;
+            this.gridBand39.Width = 50;
+            // 
+            // gridBand22
+            // 
+            this.gridBand22.Caption = "澶囨敞";
+            this.gridBand22.Columns.Add(this.gvMx2memo);
+            this.gridBand22.Name = "gridBand22";
+            this.gridBand22.VisibleIndex = 3;
+            this.gridBand22.Width = 100;
+            // 
+            // gridBand23
+            // 
+            this.gridBand23.Caption = "绉婚櫎";
+            this.gridBand23.Columns.Add(this.gvMxDel2);
+            this.gridBand23.Name = "gridBand23";
+            this.gridBand23.VisibleIndex = 4;
+            this.gridBand23.Width = 100;
+            // 
             // Frm_MesQmAql1
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1356,11 +2076,13 @@
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_MesQmAql1";
+            this.Text = "鎶芥牱鍩哄噯";
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
             this.tabMxPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.advBandedGridView1)).EndInit();
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
@@ -1403,32 +2125,8 @@
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraTab.XtraTabControl tabMx;
-
-        //BQCreateConrolObejct
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql1Id;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql00065;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql00040;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql00025;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql00015;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql00010;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2sampleSizeWord;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2memo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql1000;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql0650;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql0400;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql0250;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql0150;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql0100;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql0065;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql0040;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql0025;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql0015;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2aql0010;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2fsampleSizeWord;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx2guid;
         private DevExpress.XtraTab.XtraTabPage tabMxPage2;
         private DevExpress.XtraGrid.GridControl gcMx2;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
         private DevExpress.XtraTab.XtraTabPage tabMxPage1;
 
         private DevExpress.XtraEditors.LabelControl lb_isenabled;
@@ -1483,24 +2181,108 @@
         private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
         private DevExpress.XtraEditors.CheckEdit txt_ftwoChecked;
         private DevExpress.XtraGrid.GridControl gcMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1aql1Id;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotFrom;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotTo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelS1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelS2;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelS3;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelS4;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelI;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelIi;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1flevelIii;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel2;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
         private System.Windows.Forms.PictureBox picCheckBox;
+        private DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView gvMx1;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx1guid;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx1aql1Id;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx1lotFrom;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx1lotTo;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx1flevelS1;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx1flevelS2;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx1flevelS3;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx1flevelS4;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx1flevelI;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx1flevelIi;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx1flevelIii;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx1memo;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMxDel;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand3;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand8;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand9;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand10;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand11;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand12;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand13;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand14;
+        private DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView advBandedGridView1;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn1;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn2;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn3;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn4;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn5;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn6;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn7;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn8;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn9;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn10;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn11;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn12;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn13;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn14;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn15;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn16;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn17;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn18;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn19;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn20;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn21;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn bandedGridColumn22;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand16;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand17;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand15;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand18;
+        private DevExpress.XtraGrid.Views.BandedGrid.AdvBandedGridView gvMx2;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2guid;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql1Id;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2fsampleSizeWord;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2sampleSizeWord;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql00010;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql00015;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql00025;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql00040;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql00065;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql0010;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql0015;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql0025;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql0040;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql0065;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql0100;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql0150;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql0250;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql0400;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql0650;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2aql1000;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMx2memo;
+        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gvMxDel2;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand19;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand20;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand21;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand30;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand29;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand28;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand27;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand26;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand25;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand33;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand32;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand31;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand36;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand35;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand38;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand34;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand37;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand24;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand39;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand22;
+        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand23;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
index d05e320..84acee8 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmAql1.cs
@@ -8,7 +8,6 @@
 using System;
 using System.Collections.Generic;
 using System.Data;
-using System.Drawing;
 using System.Threading.Tasks;
 using System.Windows.Forms;
 
@@ -31,6 +30,7 @@
             toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
             toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
             toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
+            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx2);
             Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "foneChecked", "", (value) =>
             {
@@ -86,11 +86,7 @@
         /// <exception cref="NotImplementedException"></exception>
         private void ToolBarMenu1_btnFChkClick(object sender, EventArgs e)
         {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_sampleSizeNo, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
+            _toolCk(0);
         }
 
         /// <summary>
@@ -100,11 +96,7 @@
         /// <param name="e"></param>
         private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
         {
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1,
-                lbGuid, txt_sampleSizeNo, gridView1);
-            toolBarMenu1.guidKey = rowGuid;
+            _toolCk(1);
         }
        
         /// <summary>
@@ -224,7 +216,16 @@
                 return;
             }
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
-            UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+            {
+                getModel(rowGuid);
+            }
+            else {
+                List<GridView> gridViews = new List<GridView>();
+                gridViews.Add(gvMx1);
+                gridViews.Add(gvMx2);
+                UtilityHelper.ChangeEnableByControl(panel1.Controls, true, gridViews);
+            }
         }
         /// <summary>
         /// 鏂板浜嬩欢
@@ -243,7 +244,6 @@
             UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
             txt_createDate.Text = DateTime.Now.ToString("G");
             txt_fversion.Text = "1";
-             
         }
         /// <summary>
         /// 淇濆瓨浜嬩欢
@@ -270,98 +270,107 @@
             gvMx1.UpdateCurrentRow();
             gvMx2.CloseEditor();
             gvMx2.UpdateCurrentRow();
-            var qmaql2 = new List<MesQmAql2>();
-            for (var i = 0; i < gvMx1.DataRowCount; i++)
-            {
-                var row = gvMx1.GetDataRow(i);
-                if (row != null)
-                    qmaql2.Add(new MesQmAql2
-                    {
-                        Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
-                        LotFrom = Convert.ToInt32(row["LotFrom"].ToString()),
-                        LotTo = Convert.ToInt32(row["LotTo"].ToString()),
-                        FlevelS1 = row["FlevelS1"].ToString(),
-                        FlevelS2 = row["FlevelS2"].ToString(),
-                        FlevelS3 = row["FlevelS3"].ToString(),
-                        FlevelS4 = row["FlevelS4"].ToString(),
-                        FlevelI = row["FlevelI"].ToString(),
-                        FlevelIi = row["FlevelIi"].ToString(),
-                        FlevelIii = row["FlevelIii"].ToString(),
-                        Memo = row["Memo"].ToString()
-                    });
-            }
-            var qmaql3 = new List<MesQmAql3>();
-            for (var i = 0; i < gvMx2.DataRowCount; i++)
-            {
-                var row = gvMx2.GetDataRow(i);
-                if (row != null)
-                    qmaql3.Add(new MesQmAql3
-                    {
-                        Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
-                        FsampleSizeWord = Convert.ToInt32(row["FsampleSizeWord"].ToString()),
-                        SampleSizeWord = row["SampleSizeWord"].ToString(),
-                        Aql00010 = Convert.ToInt32(row["Aql00010"].ToString()),
-                        Aql00015 = Convert.ToInt32(row["Aql00015"].ToString()),
-                        Aql00025 = Convert.ToInt32(row["Aql00025"].ToString()),
-                        Aql00040 = Convert.ToInt32(row["Aql00040"].ToString()),
-                        Aql00065 = Convert.ToInt32(row["Aql00065"].ToString()),
-                        Aql0010 = Convert.ToInt32(row["Aql0010"].ToString()),
-                        Aql0015 = Convert.ToInt32(row["Aql0015"].ToString()),
-                        Aql0025 = Convert.ToInt32(row["Aql0025"].ToString()),
-                        Aql0040 = Convert.ToInt32(row["Aql0040"].ToString()),
-                        Aql0065 = Convert.ToInt32(row["Aql0065"].ToString()),
-                        Aql0100 = Convert.ToInt32(row["Aql0100"].ToString()),
-                        Aql0150 = Convert.ToInt32(row["Aql0150"].ToString()),
-                        Aql0250 = Convert.ToInt32(row["Aql0250"].ToString()),
-                        Aql0400 = Convert.ToInt32(row["Aql0400"].ToString()),
-                        Aql0650 = Convert.ToInt32(row["Aql0650"].ToString()),
-                        Aql1000 = Convert.ToInt32(row["Aql1000"].ToString()),
-                        Memo = row["Memo"].ToString()
-                    });
-            }
-            if (qmaql2.Count <= 0)
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("鏍锋湰閲忓瓙鐮佷笉鑳戒负绌猴紒");
-                return;
-            }
-            if (qmaql3.Count <= 0)
-            {
-                Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥牱鏂规涓嶈兘涓虹┖锛�");
-                return;
-            }
-            var _obj = new MesQmAql1
-            {
-                Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
-                SampleSizeNo = txt_sampleSizeNo.Text.Trim(),
-                SampleSizeName = txt_sampleSizeName.Text.Trim(),
-                Memo = txt_memo.Text.Trim(),
-                CreateDate = DateTime.Now,
-                FtwoChecked = false,
-                Isenabled = false,
-                FoneChecked = false,
-                Fversion = Convert.ToInt32(txt_fversion.Text.Trim()),
-                MesQmAql2s = qmaql2,
-                MesQmAql3s = qmaql3
-            };
             try
             {
-                string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
-                ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                if (_rtn.rtnCode > 0)
+                var qmaql2 = new List<MesQmAql2>();
+                for (var i = 0; i < gvMx1.DataRowCount; i++)
                 {
-                    lbGuid.Text = _rtn.rtnData;
-                    toolBarMenu1.isSetBtn = true;
-                    List<GridView> gridViews = new List<GridView>();
-                    gridViews.Add(gvMx1);
-                    gridViews.Add(gvMx2);
-                    UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gridViews);
+                    var row = gvMx1.GetDataRow(i);
+                    if (row != null)
+                        qmaql2.Add(new MesQmAql2
+                        {
+                            Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
+                            LotFrom = Convert.ToInt32(row["LotFrom"].ToString()),
+                            LotTo = Convert.ToInt32(row["LotTo"].ToString()),
+                            FlevelS1 = row["FlevelS1"].ToString(),
+                            FlevelS2 = row["FlevelS2"].ToString(),
+                            FlevelS3 = row["FlevelS3"].ToString(),
+                            FlevelS4 = row["FlevelS4"].ToString(),
+                            FlevelI = row["FlevelI"].ToString(),
+                            FlevelIi = row["FlevelIi"].ToString(),
+                            FlevelIii = row["FlevelIii"].ToString(),
+                            Memo = row["Memo"].ToString()
+                        });
+                }
+                var qmaql3 = new List<MesQmAql3>();
+                for (var i = 0; i < gvMx2.DataRowCount; i++)
+                {
+                    var row = gvMx2.GetDataRow(i);
+                    if (row != null)
+                        qmaql3.Add(new MesQmAql3
+                        {
+                            Guid = UtilityHelper.ToGuid(row["Guid"].ToString()),
+                            FsampleSizeWord = Convert.ToInt32(row["FsampleSizeWord"].ToString()),
+                            SampleSizeWord = row["SampleSizeWord"].ToString(),
+                            Aql00010 = Convert.ToInt32(row["Aql00010"].ToString()),
+                            Aql00015 = Convert.ToInt32(row["Aql00015"].ToString()),
+                            Aql00025 = Convert.ToInt32(row["Aql00025"].ToString()),
+                            Aql00040 = Convert.ToInt32(row["Aql00040"].ToString()),
+                            Aql00065 = Convert.ToInt32(row["Aql00065"].ToString()),
+                            Aql0010 = Convert.ToInt32(row["Aql0010"].ToString()),
+                            Aql0015 = Convert.ToInt32(row["Aql0015"].ToString()),
+                            Aql0025 = Convert.ToInt32(row["Aql0025"].ToString()),
+                            Aql0040 = Convert.ToInt32(row["Aql0040"].ToString()),
+                            Aql0065 = Convert.ToInt32(row["Aql0065"].ToString()),
+                            Aql0100 = Convert.ToInt32(row["Aql0100"].ToString()),
+                            Aql0150 = Convert.ToInt32(row["Aql0150"].ToString()),
+                            Aql0250 = Convert.ToInt32(row["Aql0250"].ToString()),
+                            Aql0400 = Convert.ToInt32(row["Aql0400"].ToString()),
+                            Aql0650 = Convert.ToInt32(row["Aql0650"].ToString()),
+                            Aql1000 = Convert.ToInt32(row["Aql1000"].ToString()),
+                            Memo = row["Memo"].ToString()
+                        });
+                }
+                if (qmaql2.Count <= 0)
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.Warning("鏍锋湰閲忓瓙鐮佷笉鑳戒负绌猴紒");
+                    return;
+                }
+                if (qmaql3.Count <= 0)
+                {
+                    Gs.DevApp.ToolBox.MsgHelper.Warning("鎶芥牱鏂规涓嶈兘涓虹┖锛�");
+                    return;
+                }
+                var _obj = new MesQmAql1
+                {
+                    Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
+                    SampleSizeNo = txt_sampleSizeNo.Text.Trim(),
+                    SampleSizeName = txt_sampleSizeName.Text.Trim(),
+                    Memo = txt_memo.Text.Trim(),
+                    CreateDate = DateTime.Now,
+                    FtwoChecked = false,
+                    Isenabled = false,
+                    FoneChecked = false,
+                    Fversion = Convert.ToInt32(txt_fversion.Text.Trim()),
+                    MesQmAql2s = qmaql2,
+                    MesQmAql3s = qmaql3
+                };
+                try
+                {
+                    string strJson = UtilityHelper.HttpPost("", _webServiceName + "EditModel", JsonConvert.SerializeObject(_obj));
+                    ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+                    if (_rtn.rtnCode > 0)
+                    {
+                        lbGuid.Text = _rtn.rtnData;
+                        toolBarMenu1.isSetBtn = true;
+                        List<GridView> gridViews = new List<GridView>();
+                        gridViews.Add(gvMx1);
+                        gridViews.Add(gvMx2);
+                        UtilityHelper.ChangeEnableByControl(this.panel1.Controls, false, gridViews);
+                    }
+                }
+                catch (Exception ex)
+                {
+                    ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
                 }
             }
             catch (Exception ex)
             {
-                ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+
+                ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
             }
+          
         }
 
         /// <summary>
@@ -551,5 +560,58 @@
                 }
             }
         }
+
+        /// <summary>
+        /// 宸ュ叿鏉′簨浠�
+        /// </summary>
+        /// <param name="inFieldValue"></param>
+        private void _toolCk(int _inFieldValue)
+        {
+            string strMsg = "";
+            switch (_inFieldValue)
+            {
+                case 1:
+                    strMsg = "瀹℃牳";
+                    break;
+                case 0:
+                    strMsg = "鍙嶅鏍�";
+                    break;
+            };
+            toolBarMenu1.guidKey = "";
+            string rowGuid, rowName;
+            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_sampleSizeNo, gridView1, "sampleSizeNo");
+            if (string.IsNullOrEmpty(rowGuid))
+            {
+                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+                return;
+            }
+            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
+                return;
+
+            var _obj = new
+            {
+                guid = rowGuid,
+                ckValue = _inFieldValue,
+                parameter = "MES_QM_AQL1,FONE_CHECKDATE,FONE_CHECKED,FONE_CHECKOR,chk_mesQmAql1"
+            };
+            try
+            {
+                var strJson = UtilityHelper.HttpPost("", "General/GeneralCheck",
+                    JsonConvert.SerializeObject(_obj));
+                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
+                if (_rtn.rtnCode > 0)
+                {
+                    if (xtraTabControl1.SelectedTabPageIndex == 1)
+                        getModel(lbGuid.Text.Trim());
+                    else
+                        getPageList(this.pageBar1.CurrentPage);
+                }
+            }
+            catch (Exception ex)
+            {
+                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
index 1cf2bdb..224bf5a 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.Designer.cs
@@ -29,11 +29,11 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
             this.gvMx1lookupName = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -88,7 +88,7 @@
             this.gvMx1lookupName.FieldName = "lookupName";
             this.gvMx1lookupName.MinWidth = 50;
             this.gvMx1lookupName.Name = "gvMx1lookupName";
-            this.gvMx1lookupName.Tag = "query_a.LOOKUP_NAME";
+            this.gvMx1lookupName.Tag = "edit";
             this.gvMx1lookupName.Visible = true;
             this.gvMx1lookupName.VisibleIndex = 0;
             this.gvMx1lookupName.Width = 509;
@@ -98,7 +98,7 @@
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
             this.tabMxPage1.Size = new System.Drawing.Size(1124, 478);
-            this.tabMxPage1.Text = "鏄庣粏";
+            this.tabMxPage1.Text = "宸ュ叿鏄庣粏";
             // 
             // gcMx1
             // 
@@ -147,10 +147,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.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)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -404,6 +404,7 @@
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_MesSysLookups";
+            this.Text = "妫�楠屽伐鍏�";
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
index 2655c60..eb43d25 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesSysLookups.cs
@@ -118,7 +118,16 @@
                 return;
             }
             Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
-            UtilityHelper.ChangeEnableByControl(panel1.Controls, true);
+            if (xtraTabControl1.SelectedTabPageIndex == 1)
+            {
+                getModel(rowGuid);
+            }
+            else
+            {
+                var gvList = new List<GridView>();
+                gvList.Add(gvMx1);
+                UtilityHelper.ChangeEnableByControl(panel1.Controls, true,gvList);
+            }
         }
 
         /// <summary>
@@ -249,11 +258,9 @@
                 {
                     var dy = _rtn.rtnData;
                     lbGuid.Text = strGuid;
-                    var gvList =
-                        new List<GridView>();
+                    var gvList = new List<GridView>();
                     gvList.Add(gvMx1);
-                    UtilityHelper.SetValueByObj(panel1.Controls, dy,
-                        isEdit, gvList);
+                    UtilityHelper.SetValueByObj(panel1.Controls, dy, isEdit, gvList);
                     var _job = JObject.Parse(strJson);
                     var array = new JArray();
                     foreach (var a in _job["rtnData"]["list"]) array.Add(a);
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 5203e40..49eed56 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -619,18 +619,6 @@
       <DesignTime>True</DesignTime>
       <DependentUpon>Resources.resx</DependentUpon>
     </Compile>
-    <Compile Include="TestForm\XtraForm1.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="TestForm\XtraForm1.Designer.cs">
-      <DependentUpon>XtraForm1.cs</DependentUpon>
-    </Compile>
-    <Compile Include="TestForm\XtraForm2.cs">
-      <SubType>Form</SubType>
-    </Compile>
-    <Compile Include="TestForm\XtraForm2.Designer.cs">
-      <DependentUpon>XtraForm2.cs</DependentUpon>
-    </Compile>
     <Compile Include="ToolBox\LogHelper.cs" />
     <Compile Include="ToolBox\MsgHelper.cs" />
     <Compile Include="ToolBox\UpdateParentEventArgs.cs" />
@@ -1046,12 +1034,6 @@
       <Generator>ResXFileCodeGenerator</Generator>
       <SubType>Designer</SubType>
       <LastGenOutput>Resources.Designer.cs</LastGenOutput>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TestForm\XtraForm1.resx">
-      <DependentUpon>XtraForm1.cs</DependentUpon>
-    </EmbeddedResource>
-    <EmbeddedResource Include="TestForm\XtraForm2.resx">
-      <DependentUpon>XtraForm2.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="UserControl\SelectCgMx.resx">
       <DependentUpon>SelectCgMx.cs</DependentUpon>
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
deleted file mode 100644
index d6f72fd..0000000
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.Designer.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-锘縩amespace Gs.DevApp.TestForm
-{
-    partial class XtraForm1
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.simpleButton1 = new DevExpress.XtraEditors.SimpleButton();
-            this.ucLookSupplier1 = new Gs.DevApp.UserControl.UcLookSupplier();
-            this.ucLookItems1 = new Gs.DevApp.UserControl.UcLookItems();
-            this.txt_ItemId = new Gs.DevApp.UserControl.UcLookCk();
-            this.SuspendLayout();
-            // 
-            // simpleButton1
-            // 
-            this.simpleButton1.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.deletelist2_16x16;
-            this.simpleButton1.Location = new System.Drawing.Point(608, 78);
-            this.simpleButton1.Name = "simpleButton1";
-            this.simpleButton1.Size = new System.Drawing.Size(94, 29);
-            this.simpleButton1.TabIndex = 3;
-            this.simpleButton1.Text = "simpleButton1";
-            this.simpleButton1.Click += new System.EventHandler(this.simpleButton1_Click);
-            // 
-            // ucLookSupplier1
-            // 
-            this.ucLookSupplier1.IsReadly = false;
-            this.ucLookSupplier1.Location = new System.Drawing.Point(201, 231);
-            this.ucLookSupplier1.Margin = new System.Windows.Forms.Padding(0);
-            this.ucLookSupplier1.Name = "ucLookSupplier1";
-            this.ucLookSupplier1.Size = new System.Drawing.Size(228, 30);
-            this.ucLookSupplier1.TabIndex = 2;
-            // 
-            // ucLookItems1
-            // 
-            this.ucLookItems1.IsReadly = false;
-            this.ucLookItems1.Location = new System.Drawing.Point(187, 119);
-            this.ucLookItems1.Name = "ucLookItems1";
-            this.ucLookItems1.Size = new System.Drawing.Size(266, 33);
-            this.ucLookItems1.TabIndex = 1;
-            this.ucLookItems1.Tag = "no";
-            // 
-            // txt_ItemId
-            // 
-            this.txt_ItemId.IsReadly = false;
-            this.txt_ItemId.Location = new System.Drawing.Point(187, 54);
-            this.txt_ItemId.Margin = new System.Windows.Forms.Padding(0);
-            this.txt_ItemId.Name = "txt_ItemId";
-            this.txt_ItemId.Size = new System.Drawing.Size(219, 30);
-            this.txt_ItemId.TabIndex = 0;
-            // 
-            // XtraForm1
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1009, 612);
-            this.Controls.Add(this.simpleButton1);
-            this.Controls.Add(this.ucLookSupplier1);
-            this.Controls.Add(this.ucLookItems1);
-            this.Controls.Add(this.txt_ItemId);
-            this.Name = "XtraForm1";
-            this.Text = "XtraForm1";
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private UserControl.UcLookCk txt_ItemId;
-        private UserControl.UcLookItems ucLookItems1;
-        private UserControl.UcLookSupplier ucLookSupplier1;
-        private DevExpress.XtraEditors.SimpleButton simpleButton1;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs b/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
deleted file mode 100644
index 0daa8ba..0000000
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.cs
+++ /dev/null
@@ -1,50 +0,0 @@
-锘縰sing System;
-using System.Data;
-using System.Diagnostics;
-using System.IO;
-using System.Net;
-using System.Text;
-using System.Text.RegularExpressions;
-using System.Threading.Tasks;
-using System.Windows.Media.Animation;
-using DevExpress.Internal.WinApi.Windows.UI.Notifications;
-using DevExpress.XtraEditors;
-using DevExpress.XtraRichEdit.Import.OpenXml;
-using DevExpress.XtraTreeList.Data;
-using Gs.DevApp.Entity;
-using Gs.DevApp.ToolBox;
-using Gs.DevApp.UserControl;
-using Newtonsoft.Json;
-using static DevExpress.XtraPrinting.Native.ExportOptionsPropertiesNames;
-
-namespace Gs.DevApp.TestForm
-{
-    public partial class XtraForm1 : XtraForm
-    {
-
-        //https://www.cnblogs.com/China3S/p/3452008.html
-        public XtraForm1()
-        {
-            InitializeComponent();
-            
-        }
-
-        private void simpleButton1_Click(object sender, EventArgs e)
-        {
-            Random random = new Random();
-            int randomValue = 0;
-            //杩涘害鏉�
-            DevExpress.Utils.WaitDialogForm wdf = new DevExpress.Utils.WaitDialogForm("鎻愮ず", "姝e湪瀵煎叆鏁版嵁......");
-
-            randomValue = (int)random.Next(1, 38);
-            wdf.SetCaption("鎵ц杩涘害锛�" + randomValue + "%锛�");
-
-            randomValue = (int)random.Next(randomValue, 80);
-
-            wdf.SetCaption("鎵ц杩涘害锛�" + randomValue + "%锛�");
-
-            wdf.Close();
- 
-        }
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm1.resx b/DevApp/Gs.DevApp/TestForm/XtraForm1.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/DevApp/Gs.DevApp/TestForm/XtraForm1.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm2.Designer.cs b/DevApp/Gs.DevApp/TestForm/XtraForm2.Designer.cs
deleted file mode 100644
index f0bedb5..0000000
--- a/DevApp/Gs.DevApp/TestForm/XtraForm2.Designer.cs
+++ /dev/null
@@ -1,190 +0,0 @@
-锘縩amespace Gs.DevApp.TestForm
-{
-    partial class XtraForm2
-    {
-        /// <summary>
-        /// Required designer variable.
-        /// </summary>
-        private System.ComponentModel.IContainer components = null;
-
-        /// <summary>
-        /// Clean up any resources being used.
-        /// </summary>
-        /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
-        protected override void Dispose(bool disposing)
-        {
-            if (disposing && (components != null))
-            {
-                components.Dispose();
-            }
-            base.Dispose(disposing);
-        }
-
-        #region Windows Form Designer generated code
-
-        /// <summary>
-        /// Required method for Designer support - do not modify
-        /// the contents of this method with the code editor.
-        /// </summary>
-        private void InitializeComponent()
-        {
-            this.gridControl1 = new DevExpress.XtraGrid.GridControl();
-            this.bandedGridView1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridView();
-            this.gridColumn1 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gridColumn3 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gridColumn4 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gridColumn5 = new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn();
-            this.gridBand1 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand5 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand2 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand4 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand6 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            this.gridBand7 = new DevExpress.XtraGrid.Views.BandedGrid.GridBand();
-            ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bandedGridView1)).BeginInit();
-            this.SuspendLayout();
-            // 
-            // gridControl1
-            // 
-            this.gridControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl1.Location = new System.Drawing.Point(0, 0);
-            this.gridControl1.MainView = this.bandedGridView1;
-            this.gridControl1.Name = "gridControl1";
-            this.gridControl1.Size = new System.Drawing.Size(967, 467);
-            this.gridControl1.TabIndex = 0;
-            this.gridControl1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.bandedGridView1});
-            // 
-            // bandedGridView1
-            // 
-            this.bandedGridView1.Bands.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
-            this.gridBand1,
-            this.gridBand4,
-            this.gridBand6,
-            this.gridBand7});
-            this.bandedGridView1.Columns.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn[] {
-            this.gridColumn1,
-            this.gridColumn2,
-            this.gridColumn3,
-            this.gridColumn4,
-            this.gridColumn5});
-            this.bandedGridView1.GridControl = this.gridControl1;
-            this.bandedGridView1.Name = "bandedGridView1";
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "gridColumn1";
-            this.gridColumn1.MinWidth = 25;
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.Width = 479;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "gridColumn2";
-            this.gridColumn2.MinWidth = 25;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.Width = 94;
-            // 
-            // gridColumn3
-            // 
-            this.gridColumn3.Caption = "gridColumn3";
-            this.gridColumn3.MinWidth = 25;
-            this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.Width = 478;
-            // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "gridColumn4";
-            this.gridColumn4.MinWidth = 25;
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.Width = 94;
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "gridColumn5";
-            this.gridColumn5.MinWidth = 25;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Width = 94;
-            // 
-            // gridBand1
-            // 
-            this.gridBand1.Caption = "gridBand1";
-            this.gridBand1.Children.AddRange(new DevExpress.XtraGrid.Views.BandedGrid.GridBand[] {
-            this.gridBand5,
-            this.gridBand2});
-            this.gridBand1.Name = "gridBand1";
-            this.gridBand1.VisibleIndex = 0;
-            this.gridBand1.Width = 886;
-            // 
-            // gridBand5
-            // 
-            this.gridBand5.Caption = "gridBand5";
-            this.gridBand5.Columns.Add(this.gridColumn3);
-            this.gridBand5.Name = "gridBand5";
-            this.gridBand5.VisibleIndex = 0;
-            this.gridBand5.Width = 440;
-            // 
-            // gridBand2
-            // 
-            this.gridBand2.Caption = "gridBand2";
-            this.gridBand2.Columns.Add(this.gridColumn1);
-            this.gridBand2.Columns.Add(this.gridColumn2);
-            this.gridBand2.Columns.Add(this.gridColumn4);
-            this.gridBand2.Columns.Add(this.gridColumn5);
-            this.gridBand2.Name = "gridBand2";
-            this.gridBand2.VisibleIndex = 1;
-            this.gridBand2.Width = 446;
-            // 
-            // gridBand4
-            // 
-            this.gridBand4.Caption = "gridBand4";
-            this.gridBand4.Name = "gridBand4";
-            this.gridBand4.VisibleIndex = 1;
-            this.gridBand4.Width = 220;
-            // 
-            // gridBand6
-            // 
-            this.gridBand6.Caption = "gridBand6";
-            this.gridBand6.Name = "gridBand6";
-            this.gridBand6.VisibleIndex = 2;
-            this.gridBand6.Width = 150;
-            // 
-            // gridBand7
-            // 
-            this.gridBand7.Caption = "gridBand7";
-            this.gridBand7.Name = "gridBand7";
-            this.gridBand7.VisibleIndex = 3;
-            this.gridBand7.Width = 183;
-            // 
-            // XtraForm2
-            // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
-            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(967, 467);
-            this.Controls.Add(this.gridControl1);
-            this.Name = "XtraForm2";
-            this.Text = "XtraForm2";
-            ((System.ComponentModel.ISupportInitialize)(this.gridControl1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.bandedGridView1)).EndInit();
-            this.ResumeLayout(false);
-
-        }
-
-        #endregion
-
-        private DevExpress.XtraGrid.GridControl gridControl1;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridView bandedGridView1;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn1;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn2;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn3;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn4;
-        private DevExpress.XtraGrid.Views.BandedGrid.BandedGridColumn gridColumn5;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand1;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand5;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand2;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand4;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand6;
-        private DevExpress.XtraGrid.Views.BandedGrid.GridBand gridBand7;
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm2.cs b/DevApp/Gs.DevApp/TestForm/XtraForm2.cs
deleted file mode 100644
index 8a8b3e4..0000000
--- a/DevApp/Gs.DevApp/TestForm/XtraForm2.cs
+++ /dev/null
@@ -1,32 +0,0 @@
-锘縰sing DevExpress.Data;
-using DevExpress.XtraEditors;
-using DevExpress.XtraGrid.Views.BandedGrid;
-using DevExpress.XtraGrid.Views.Grid;
-using System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Data;
-using System.Drawing;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using System.Windows.Forms;
-
-namespace Gs.DevApp.TestForm
-{
-    public partial class XtraForm2 : DevExpress.XtraEditors.XtraForm
-    {
-        public XtraForm2()
-        {
-            InitializeComponent();
-            bandedGridView1 = new BandedGridView();
-            bandedGridView1.OptionsView.EnableAppearanceEvenRow = true;
-            bandedGridView1.OptionsView.EnableAppearanceOddRow = true;
-            bandedGridView1.OptionsCustomization.AllowSort = true;
-           // bandedGridView1.OptionsBehavior.AllowRecorderClickSort = true;
-            // ... 鍏朵粬鍒濆鍖栦唬鐮�
-        }
-
-       
-    }
-}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/TestForm/XtraForm2.resx b/DevApp/Gs.DevApp/TestForm/XtraForm2.resx
deleted file mode 100644
index 1af7de1..0000000
--- a/DevApp/Gs.DevApp/TestForm/XtraForm2.resx
+++ /dev/null
@@ -1,120 +0,0 @@
-锘�<?xml version="1.0" encoding="utf-8"?>
-<root>
-  <!-- 
-    Microsoft ResX Schema 
-    
-    Version 2.0
-    
-    The primary goals of this format is to allow a simple XML format 
-    that is mostly human readable. The generation and parsing of the 
-    various data types are done through the TypeConverter classes 
-    associated with the data types.
-    
-    Example:
-    
-    ... ado.net/XML headers & schema ...
-    <resheader name="resmimetype">text/microsoft-resx</resheader>
-    <resheader name="version">2.0</resheader>
-    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
-    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
-    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
-    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
-    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
-        <value>[base64 mime encoded serialized .NET Framework object]</value>
-    </data>
-    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
-        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
-        <comment>This is a comment</comment>
-    </data>
-                
-    There are any number of "resheader" rows that contain simple 
-    name/value pairs.
-    
-    Each data row contains a name, and value. The row also contains a 
-    type or mimetype. Type corresponds to a .NET class that support 
-    text/value conversion through the TypeConverter architecture. 
-    Classes that don't support this are serialized and stored with the 
-    mimetype set.
-    
-    The mimetype is used for serialized objects, and tells the 
-    ResXResourceReader how to depersist the object. This is currently not 
-    extensible. For a given mimetype the value must be set accordingly:
-    
-    Note - application/x-microsoft.net.object.binary.base64 is the format 
-    that the ResXResourceWriter will generate, however the reader can 
-    read any of the formats listed below.
-    
-    mimetype: application/x-microsoft.net.object.binary.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
-            : and then encoded with base64 encoding.
-    
-    mimetype: application/x-microsoft.net.object.soap.base64
-    value   : The object must be serialized with 
-            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
-            : and then encoded with base64 encoding.
-
-    mimetype: application/x-microsoft.net.object.bytearray.base64
-    value   : The object must be serialized into a byte array 
-            : using a System.ComponentModel.TypeConverter
-            : and then encoded with base64 encoding.
-    -->
-  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
-    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
-    <xsd:element name="root" msdata:IsDataSet="true">
-      <xsd:complexType>
-        <xsd:choice maxOccurs="unbounded">
-          <xsd:element name="metadata">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" />
-              </xsd:sequence>
-              <xsd:attribute name="name" use="required" type="xsd:string" />
-              <xsd:attribute name="type" type="xsd:string" />
-              <xsd:attribute name="mimetype" type="xsd:string" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="assembly">
-            <xsd:complexType>
-              <xsd:attribute name="alias" type="xsd:string" />
-              <xsd:attribute name="name" type="xsd:string" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="data">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
-              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
-              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
-              <xsd:attribute ref="xml:space" />
-            </xsd:complexType>
-          </xsd:element>
-          <xsd:element name="resheader">
-            <xsd:complexType>
-              <xsd:sequence>
-                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
-              </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" use="required" />
-            </xsd:complexType>
-          </xsd:element>
-        </xsd:choice>
-      </xsd:complexType>
-    </xsd:element>
-  </xsd:schema>
-  <resheader name="resmimetype">
-    <value>text/microsoft-resx</value>
-  </resheader>
-  <resheader name="version">
-    <value>2.0</value>
-  </resheader>
-  <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-  <resheader name="writer">
-    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </resheader>
-</root>
\ No newline at end of file

--
Gitblit v1.9.3