From aa8f2ab61f7c87640de7817b77758c78e9c45792 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 15 三月 2025 10:54:01 +0800
Subject: [PATCH] 样品检验

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs |  650 ++++++++++++++++++++++++++++++++++++++++++++--------------
 1 files changed, 490 insertions(+), 160 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
index c9ccd3f..129320c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQaItemsDetect01.Designer.cs
@@ -42,6 +42,11 @@
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
             DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
             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();
@@ -52,6 +57,12 @@
             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.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -104,8 +115,10 @@
             this.txt_fsubmitDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_fsubmit = new DevExpress.XtraEditors.CheckEdit();
             this.txt_slOrg = new DevExpress.XtraEditors.TextEdit();
+            this.txt_guid = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -144,20 +157,35 @@
             this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.splitYangLi = new DevExpress.XtraEditors.SplitContainerControl();
             this.groupControl1 = new DevExpress.XtraEditors.GroupControl();
             this.gcMx2 = new DevExpress.XtraGrid.GridControl();
             this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.panMsg = new DevExpress.XtraEditors.PanelControl();
-            this.btnLoad = new DevExpress.XtraEditors.SimpleButton();
-            this.txtJianYan = new DevExpress.XtraEditors.TextEdit();
-            this.labelControl3 = new DevExpress.XtraEditors.LabelControl();
-            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+            this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.groupControl2 = new DevExpress.XtraEditors.GroupControl();
             this.gcMx3 = new DevExpress.XtraGrid.GridControl();
             this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.panMsg = new DevExpress.XtraEditors.PanelControl();
+            this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+            this.btnIpt = new DevExpress.XtraEditors.SimpleButton();
+            this.btnLoad = new DevExpress.XtraEditors.SimpleButton();
+            this.txtJianYan = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+            this.gcMx4 = new DevExpress.XtraGrid.GridControl();
+            this.gvMx4 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -171,10 +199,12 @@
             this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.ucUpFile1 = new Gs.DevApp.UserControl.UCUpFile();
+            this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridView3 = new DevExpress.XtraGrid.Views.Grid.GridView();
             this.gridView4 = new DevExpress.XtraGrid.Views.Grid.GridView();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -210,8 +240,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_slOrg.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -239,24 +271,52 @@
             this.splitMx2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel1)).BeginInit();
+            this.splitYangLi.Panel1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel2)).BeginInit();
+            this.splitYangLi.Panel2.SuspendLayout();
+            this.splitYangLi.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).BeginInit();
             this.groupControl1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panMsg)).BeginInit();
-            this.panMsg.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtJianYan.Properties)).BeginInit();
-            this.xtraTabPage3.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.groupControl2)).BeginInit();
+            this.groupControl2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panMsg)).BeginInit();
+            this.panMsg.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
+            this.layoutControl1.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.txtJianYan.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+            this.tabMxPage2.SuspendLayout();
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView4)).BeginInit();
             this.SuspendLayout();
+            // 
+            // repositoryItemComboBox1
+            // 
+            this.repositoryItemComboBox1.AutoHeight = false;
+            this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox1.Items.AddRange(new object[] {
+            "鈭�",
+            "脳"});
+            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
             // 
             // toolBarMenu1
             // 
@@ -750,13 +810,15 @@
             this.layoutMx1.Controls.Add(this.txt_fsubmitDate);
             this.layoutMx1.Controls.Add(this.txt_fsubmit);
             this.layoutMx1.Controls.Add(this.txt_slOrg);
+            this.layoutMx1.Controls.Add(this.txt_guid);
             this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
             this.layoutControlItem17,
-            this.layoutControlItem7});
+            this.layoutControlItem7,
+            this.layoutControlItem21});
             this.layoutMx1.Location = new System.Drawing.Point(0, 0);
             this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(697, 213, 812, 500);
+            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1094, 495, 812, 500);
             this.layoutMx1.Root = this.Root;
             this.layoutMx1.Size = new System.Drawing.Size(1342, 141);
             this.layoutMx1.TabIndex = 0;
@@ -774,28 +836,28 @@
             // txt_suppName
             // 
             this.txt_suppName.Enabled = false;
-            this.txt_suppName.Location = new System.Drawing.Point(744, 76);
+            this.txt_suppName.Location = new System.Drawing.Point(734, 76);
             this.txt_suppName.Name = "txt_suppName";
-            this.txt_suppName.Size = new System.Drawing.Size(254, 24);
+            this.txt_suppName.Size = new System.Drawing.Size(249, 24);
             this.txt_suppName.StyleController = this.layoutMx1;
             this.txt_suppName.TabIndex = 801;
             this.txt_suppName.Tag = "readonly";
             // 
             // txt_remarks
             // 
-            this.txt_remarks.Location = new System.Drawing.Point(414, 108);
+            this.txt_remarks.Location = new System.Drawing.Point(409, 108);
             this.txt_remarks.Name = "txt_remarks";
             this.txt_remarks.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_remarks.Properties.Appearance.Options.UseFont = true;
-            this.txt_remarks.Size = new System.Drawing.Size(584, 28);
+            this.txt_remarks.Size = new System.Drawing.Size(574, 28);
             this.txt_remarks.StyleController = this.layoutMx1;
             this.txt_remarks.TabIndex = 797;
             // 
             // txt_fcheckResu
             // 
-            this.txt_fcheckResu.Location = new System.Drawing.Point(414, 76);
+            this.txt_fcheckResu.Location = new System.Drawing.Point(409, 76);
             this.txt_fcheckResu.Name = "txt_fcheckResu";
-            this.txt_fcheckResu.Size = new System.Drawing.Size(254, 24);
+            this.txt_fcheckResu.Size = new System.Drawing.Size(249, 24);
             this.txt_fcheckResu.StyleController = this.layoutMx1;
             this.txt_fcheckResu.TabIndex = 798;
             this.txt_fcheckResu.Tag = "readonly";
@@ -806,7 +868,7 @@
             this.txt_itemName.Name = "txt_itemName";
             this.txt_itemName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_itemName.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemName.Size = new System.Drawing.Size(254, 28);
+            this.txt_itemName.Size = new System.Drawing.Size(249, 28);
             this.txt_itemName.StyleController = this.layoutMx1;
             this.txt_itemName.TabIndex = 800;
             this.txt_itemName.Tag = "readonly";
@@ -817,29 +879,29 @@
             this.txt_releaseNo.Name = "txt_releaseNo";
             this.txt_releaseNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_releaseNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_releaseNo.Size = new System.Drawing.Size(254, 28);
+            this.txt_releaseNo.Size = new System.Drawing.Size(249, 28);
             this.txt_releaseNo.StyleController = this.layoutMx1;
             this.txt_releaseNo.TabIndex = 213;
             this.txt_releaseNo.Tag = "readonly";
             // 
             // txt_fcheckDate
             // 
-            this.txt_fcheckDate.Location = new System.Drawing.Point(414, 12);
+            this.txt_fcheckDate.Location = new System.Drawing.Point(409, 12);
             this.txt_fcheckDate.Name = "txt_fcheckDate";
             this.txt_fcheckDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fcheckDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcheckDate.Size = new System.Drawing.Size(254, 28);
+            this.txt_fcheckDate.Size = new System.Drawing.Size(249, 28);
             this.txt_fcheckDate.StyleController = this.layoutMx1;
             this.txt_fcheckDate.TabIndex = 216;
             this.txt_fcheckDate.Tag = "readonly";
             // 
             // txt_lotNo
             // 
-            this.txt_lotNo.Location = new System.Drawing.Point(744, 12);
+            this.txt_lotNo.Location = new System.Drawing.Point(734, 12);
             this.txt_lotNo.Name = "txt_lotNo";
             this.txt_lotNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_lotNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_lotNo.Size = new System.Drawing.Size(254, 28);
+            this.txt_lotNo.Size = new System.Drawing.Size(249, 28);
             this.txt_lotNo.StyleController = this.layoutMx1;
             this.txt_lotNo.TabIndex = 262;
             this.txt_lotNo.Tag = "readonly";
@@ -850,7 +912,7 @@
             this.txt_itemNo.Name = "txt_itemNo";
             this.txt_itemNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(254, 28);
+            this.txt_itemNo.Size = new System.Drawing.Size(249, 28);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 789;
             this.txt_itemNo.Tag = "readonly";
@@ -859,7 +921,7 @@
             // 
             this.txt_itemModel.Location = new System.Drawing.Point(84, 108);
             this.txt_itemModel.Name = "txt_itemModel";
-            this.txt_itemModel.Size = new System.Drawing.Size(254, 24);
+            this.txt_itemModel.Size = new System.Drawing.Size(249, 24);
             this.txt_itemModel.StyleController = this.layoutMx1;
             this.txt_itemModel.TabIndex = 801;
             this.txt_itemModel.Tag = "readonly";
@@ -875,62 +937,71 @@
             // 
             // txt_fcheckBy
             // 
-            this.txt_fcheckBy.Location = new System.Drawing.Point(414, 44);
+            this.txt_fcheckBy.Location = new System.Drawing.Point(409, 44);
             this.txt_fcheckBy.Name = "txt_fcheckBy";
             this.txt_fcheckBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fcheckBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcheckBy.Size = new System.Drawing.Size(254, 28);
+            this.txt_fcheckBy.Size = new System.Drawing.Size(249, 28);
             this.txt_fcheckBy.StyleController = this.layoutMx1;
             this.txt_fcheckBy.TabIndex = 217;
             this.txt_fcheckBy.Tag = "readonly";
             // 
             // txt_fbatchQty
             // 
-            this.txt_fbatchQty.Location = new System.Drawing.Point(744, 44);
+            this.txt_fbatchQty.Location = new System.Drawing.Point(734, 44);
             this.txt_fbatchQty.Name = "txt_fbatchQty";
             this.txt_fbatchQty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fbatchQty.Properties.Appearance.Options.UseFont = true;
-            this.txt_fbatchQty.Size = new System.Drawing.Size(254, 28);
+            this.txt_fbatchQty.Size = new System.Drawing.Size(249, 28);
             this.txt_fbatchQty.StyleController = this.layoutMx1;
             this.txt_fbatchQty.TabIndex = 222;
             this.txt_fbatchQty.Tag = "readonly";
             // 
             // txt_fsubmitBy
             // 
-            this.txt_fsubmitBy.Location = new System.Drawing.Point(1074, 44);
+            this.txt_fsubmitBy.Location = new System.Drawing.Point(1059, 44);
             this.txt_fsubmitBy.Name = "txt_fsubmitBy";
-            this.txt_fsubmitBy.Size = new System.Drawing.Size(256, 24);
+            this.txt_fsubmitBy.Size = new System.Drawing.Size(250, 24);
             this.txt_fsubmitBy.StyleController = this.layoutMx1;
             this.txt_fsubmitBy.TabIndex = 804;
             this.txt_fsubmitBy.Tag = "readonly";
             // 
             // txt_fsubmitDate
             // 
-            this.txt_fsubmitDate.Location = new System.Drawing.Point(1074, 76);
+            this.txt_fsubmitDate.Location = new System.Drawing.Point(1059, 76);
             this.txt_fsubmitDate.Name = "txt_fsubmitDate";
-            this.txt_fsubmitDate.Size = new System.Drawing.Size(256, 24);
+            this.txt_fsubmitDate.Size = new System.Drawing.Size(250, 24);
             this.txt_fsubmitDate.StyleController = this.layoutMx1;
             this.txt_fsubmitDate.TabIndex = 805;
             this.txt_fsubmitDate.Tag = "readonly";
             // 
             // txt_fsubmit
             // 
-            this.txt_fsubmit.Location = new System.Drawing.Point(1002, 12);
+            this.txt_fsubmit.Location = new System.Drawing.Point(987, 12);
             this.txt_fsubmit.Name = "txt_fsubmit";
             this.txt_fsubmit.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_fsubmit.Size = new System.Drawing.Size(328, 24);
+            this.txt_fsubmit.Size = new System.Drawing.Size(322, 24);
             this.txt_fsubmit.StyleController = this.layoutMx1;
             this.txt_fsubmit.TabIndex = 806;
             this.txt_fsubmit.Tag = "readonly";
             // 
             // txt_slOrg
             // 
-            this.txt_slOrg.Location = new System.Drawing.Point(1074, 108);
+            this.txt_slOrg.Location = new System.Drawing.Point(1059, 108);
             this.txt_slOrg.Name = "txt_slOrg";
-            this.txt_slOrg.Size = new System.Drawing.Size(256, 24);
+            this.txt_slOrg.Size = new System.Drawing.Size(250, 24);
             this.txt_slOrg.StyleController = this.layoutMx1;
             this.txt_slOrg.TabIndex = 807;
             this.txt_slOrg.Tag = "readonly";
+            // 
+            // txt_guid
+            // 
+            this.txt_guid.Location = new System.Drawing.Point(1065, 108);
+            this.txt_guid.Name = "txt_guid";
+            this.txt_guid.Size = new System.Drawing.Size(244, 24);
+            this.txt_guid.StyleController = this.layoutMx1;
+            this.txt_guid.TabIndex = 808;
+            this.txt_guid.Tag = "readonly";
             // 
             // layoutControlItem17
             // 
@@ -953,6 +1024,17 @@
             this.layoutControlItem7.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem7.Text = "鐗╂枡ID";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+            // 
+            // layoutControlItem21
+            // 
+            this.layoutControlItem21.Control = this.txt_guid;
+            this.layoutControlItem21.Location = new System.Drawing.Point(975, 96);
+            this.layoutControlItem21.Name = "layoutControlItem21";
+            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem21.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem21.Text = "涓婚敭GUID";
+            this.layoutControlItem21.TextSize = new System.Drawing.Size(50, 20);
             // 
             // Root
             // 
@@ -1002,7 +1084,7 @@
             rowDefinition2,
             rowDefinition3,
             rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1342, 148);
+            this.Root.Size = new System.Drawing.Size(1321, 148);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -1010,27 +1092,27 @@
             this.layoutControlItem1.Control = this.txt_releaseNo;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(330, 32);
+            this.layoutControlItem1.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem1.Text = "妫�楠屽崟鍙�";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_fcheckDate;
-            this.layoutControlItem2.Location = new System.Drawing.Point(330, 0);
+            this.layoutControlItem2.Location = new System.Drawing.Point(325, 0);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(330, 32);
+            this.layoutControlItem2.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem2.Text = "妫�楠屾棩鏈�";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_lotNo;
-            this.layoutControlItem3.Location = new System.Drawing.Point(660, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(650, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(330, 32);
+            this.layoutControlItem3.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem3.Text = "閫佹鎵瑰彿";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -1040,7 +1122,7 @@
             this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(330, 32);
+            this.layoutControlItem4.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -1050,7 +1132,7 @@
             this.layoutControlItem5.Location = new System.Drawing.Point(0, 64);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem5.Size = new System.Drawing.Size(330, 32);
+            this.layoutControlItem5.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -1060,106 +1142,107 @@
             this.layoutControlItem6.Location = new System.Drawing.Point(0, 96);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem6.Size = new System.Drawing.Size(330, 32);
+            this.layoutControlItem6.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem6.Text = "鐗╂枡瑙勬牸";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_fcheckBy;
-            this.layoutControlItem8.Location = new System.Drawing.Point(330, 32);
+            this.layoutControlItem8.Location = new System.Drawing.Point(325, 32);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(330, 32);
+            this.layoutControlItem8.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem8.Text = "妫�楠屼汉鍛�";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_fbatchQty;
-            this.layoutControlItem9.Location = new System.Drawing.Point(660, 32);
+            this.layoutControlItem9.Location = new System.Drawing.Point(650, 32);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem9.Size = new System.Drawing.Size(330, 32);
+            this.layoutControlItem9.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem9.Text = "鎵规鏁伴噺";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_fcheckResu;
-            this.layoutControlItem10.Location = new System.Drawing.Point(330, 64);
+            this.layoutControlItem10.Location = new System.Drawing.Point(325, 64);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem10.Size = new System.Drawing.Size(330, 32);
+            this.layoutControlItem10.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem10.Text = "妫�楠岀粨鏋�";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem13
             // 
             this.layoutControlItem13.Control = this.txt_suppName;
-            this.layoutControlItem13.Location = new System.Drawing.Point(660, 64);
+            this.layoutControlItem13.Location = new System.Drawing.Point(650, 64);
             this.layoutControlItem13.Name = "layoutControlItem13";
             this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem13.Size = new System.Drawing.Size(330, 32);
+            this.layoutControlItem13.Size = new System.Drawing.Size(325, 32);
             this.layoutControlItem13.Text = "渚涘簲鍟�";
             this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_fsubmitBy;
-            this.layoutControlItem15.Location = new System.Drawing.Point(990, 32);
+            this.layoutControlItem15.Location = new System.Drawing.Point(975, 32);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem15.Size = new System.Drawing.Size(332, 32);
+            this.layoutControlItem15.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem15.Text = "瀹℃牳鏃ユ湡";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.txt_fsubmitDate;
-            this.layoutControlItem16.Location = new System.Drawing.Point(990, 64);
+            this.layoutControlItem16.Location = new System.Drawing.Point(975, 64);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem16.Size = new System.Drawing.Size(332, 32);
+            this.layoutControlItem16.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem16.Text = "瀹℃牳浜�";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.txt_fsubmit;
-            this.layoutControlItem14.Location = new System.Drawing.Point(990, 0);
+            this.layoutControlItem14.Location = new System.Drawing.Point(975, 0);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem14.Size = new System.Drawing.Size(332, 32);
+            this.layoutControlItem14.Size = new System.Drawing.Size(326, 32);
+            this.layoutControlItem14.Text = "瀹℃牳鏍囪瘑";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem14.TextVisible = false;
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_remarks;
-            this.layoutControlItem12.Location = new System.Drawing.Point(330, 96);
+            this.layoutControlItem12.Location = new System.Drawing.Point(325, 96);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem12.Size = new System.Drawing.Size(660, 32);
+            this.layoutControlItem12.Size = new System.Drawing.Size(650, 32);
             this.layoutControlItem12.Text = "澶囨敞璇存槑";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem18
             // 
             this.layoutControlItem18.Control = this.txt_slOrg;
-            this.layoutControlItem18.Location = new System.Drawing.Point(990, 96);
+            this.layoutControlItem18.Location = new System.Drawing.Point(975, 96);
             this.layoutControlItem18.Name = "layoutControlItem18";
             this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem18.Size = new System.Drawing.Size(332, 32);
+            this.layoutControlItem18.Size = new System.Drawing.Size(326, 32);
             this.layoutControlItem18.Text = "鏀舵枡缁勭粐";
             this.layoutControlItem18.TextSize = new System.Drawing.Size(60, 18);
             // 
@@ -1173,7 +1256,7 @@
             this.xtraTabControl2.TabIndex = 3;
             this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
-            this.xtraTabPage3});
+            this.tabMxPage2});
             // 
             // tabMxPage1
             // 
@@ -1187,7 +1270,7 @@
             // 
             this.splitMx2.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx2.Horizontal = false;
-            this.splitMx2.Location = new System.Drawing.Point(0, 68);
+            this.splitMx2.Location = new System.Drawing.Point(0, 46);
             this.splitMx2.Name = "splitMx2";
             // 
             // splitMx2.Panel1
@@ -1197,10 +1280,10 @@
             // 
             // splitMx2.Panel2
             // 
-            this.splitMx2.Panel2.Controls.Add(this.groupControl1);
+            this.splitMx2.Panel2.Controls.Add(this.splitYangLi);
             this.splitMx2.Panel2.Text = "Panel2";
-            this.splitMx2.Size = new System.Drawing.Size(1340, 435);
-            this.splitMx2.SplitterPosition = 217;
+            this.splitMx2.Size = new System.Drawing.Size(1340, 457);
+            this.splitMx2.SplitterPosition = 201;
             this.splitMx2.TabIndex = 3;
             // 
             // gcMx1
@@ -1209,7 +1292,9 @@
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
             this.gcMx1.Name = "gcMx1";
-            this.gcMx1.Size = new System.Drawing.Size(1340, 217);
+            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit4});
+            this.gcMx1.Size = new System.Drawing.Size(1340, 201);
             this.gcMx1.TabIndex = 1;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -1236,7 +1321,8 @@
             this.gvMx1fngQty,
             this.gvMx1sampleSizeNo,
             this.gvMx1fcheckLevel,
-            this.gvMx1facLevel});
+            this.gvMx1facLevel,
+            this.gridColumn21});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
@@ -1466,15 +1552,54 @@
             this.gvMx1facLevel.VisibleIndex = 15;
             this.gvMx1facLevel.Width = 200;
             // 
+            // gridColumn21
+            // 
+            this.gridColumn21.Caption = "娓呯┖";
+            this.gridColumn21.ColumnEdit = this.repositoryItemButtonEdit4;
+            this.gridColumn21.MinWidth = 25;
+            this.gridColumn21.Name = "gridColumn21";
+            this.gridColumn21.Visible = true;
+            this.gridColumn21.VisibleIndex = 16;
+            this.gridColumn21.Width = 94;
+            // 
+            // repositoryItemButtonEdit4
+            // 
+            this.repositoryItemButtonEdit4.AutoHeight = false;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.refresh_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            this.repositoryItemButtonEdit4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "娓呯┖", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            this.repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4";
+            this.repositoryItemButtonEdit4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+            // 
+            // splitYangLi
+            // 
+            this.splitYangLi.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.splitYangLi.Location = new System.Drawing.Point(0, 0);
+            this.splitYangLi.Name = "splitYangLi";
+            // 
+            // splitYangLi.Panel1
+            // 
+            this.splitYangLi.Panel1.Controls.Add(this.groupControl1);
+            this.splitYangLi.Panel1.Text = "Panel1";
+            // 
+            // splitYangLi.Panel2
+            // 
+            this.splitYangLi.Panel2.Controls.Add(this.groupControl2);
+            this.splitYangLi.Panel2.Text = "Panel2";
+            this.splitYangLi.Size = new System.Drawing.Size(1340, 244);
+            this.splitYangLi.SplitterPosition = 676;
+            this.splitYangLi.TabIndex = 4;
+            // 
             // groupControl1
             // 
             this.groupControl1.Controls.Add(this.gcMx2);
             this.groupControl1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.groupControl1.Location = new System.Drawing.Point(0, 0);
             this.groupControl1.Name = "groupControl1";
-            this.groupControl1.Size = new System.Drawing.Size(1340, 206);
+            this.groupControl1.Size = new System.Drawing.Size(676, 244);
             this.groupControl1.TabIndex = 3;
-            this.groupControl1.Text = "鎶芥牱缁撴灉";
+            this.groupControl1.Text = "妫�娴嬬粨鏋�";
             // 
             // gcMx2
             // 
@@ -1482,7 +1607,7 @@
             this.gcMx2.Location = new System.Drawing.Point(2, 28);
             this.gcMx2.MainView = this.gvMx2;
             this.gcMx2.Name = "gcMx2";
-            this.gcMx2.Size = new System.Drawing.Size(1336, 176);
+            this.gcMx2.Size = new System.Drawing.Size(672, 214);
             this.gcMx2.TabIndex = 0;
             this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx2});
@@ -1493,7 +1618,7 @@
             this.gridColumn4,
             this.gridColumn3,
             this.gridColumn2,
-            this.gridColumn1});
+            this.gridColumn20});
             this.gvMx2.GridControl = this.gcMx2;
             this.gvMx2.Name = "gvMx2";
             // 
@@ -1526,87 +1651,243 @@
             this.gridColumn2.MinWidth = 25;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.OptionsColumn.ReadOnly = true;
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 1;
             this.gridColumn2.Width = 80;
             // 
-            // gridColumn1
+            // gridColumn20
             // 
-            this.gridColumn1.Caption = "鍒ゅ畾鏍囧織";
-            this.gridColumn1.FieldName = "fstand";
-            this.gridColumn1.MaxWidth = 80;
-            this.gridColumn1.MinWidth = 25;
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.OptionsColumn.ReadOnly = true;
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 2;
-            this.gridColumn1.Width = 80;
+            this.gridColumn20.Caption = "鍒ゅ畾鏍囧織";
+            this.gridColumn20.ColumnEdit = this.repositoryItemComboBox1;
+            this.gridColumn20.FieldName = "fstand";
+            this.gridColumn20.MinWidth = 25;
+            this.gridColumn20.Name = "gridColumn20";
+            this.gridColumn20.Visible = true;
+            this.gridColumn20.VisibleIndex = 1;
+            this.gridColumn20.Width = 94;
             // 
-            // panMsg
+            // groupControl2
             // 
-            this.panMsg.Controls.Add(this.btnLoad);
-            this.panMsg.Controls.Add(this.txtJianYan);
-            this.panMsg.Controls.Add(this.labelControl3);
-            this.panMsg.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panMsg.Location = new System.Drawing.Point(0, 0);
-            this.panMsg.Name = "panMsg";
-            this.panMsg.Size = new System.Drawing.Size(1340, 68);
-            this.panMsg.TabIndex = 1;
-            // 
-            // btnLoad
-            // 
-            this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.refresh_32x321;
-            this.btnLoad.Location = new System.Drawing.Point(848, 16);
-            this.btnLoad.Name = "btnLoad";
-            this.btnLoad.Size = new System.Drawing.Size(163, 34);
-            this.btnLoad.TabIndex = 3;
-            this.btnLoad.Text = "閲嶆柊鍔犺浇妫�楠岄」鐩�";
-            // 
-            // txtJianYan
-            // 
-            this.txtJianYan.Location = new System.Drawing.Point(494, 15);
-            this.txtJianYan.Name = "txtJianYan";
-            this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
-            this.txtJianYan.Properties.Appearance.Options.UseFont = true;
-            this.txtJianYan.Size = new System.Drawing.Size(197, 36);
-            this.txtJianYan.TabIndex = 2;
-            // 
-            // labelControl3
-            // 
-            this.labelControl3.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
-            this.labelControl3.Appearance.Options.UseFont = true;
-            this.labelControl3.Location = new System.Drawing.Point(73, 18);
-            this.labelControl3.Name = "labelControl3";
-            this.labelControl3.Size = new System.Drawing.Size(418, 30);
-            this.labelControl3.TabIndex = 1;
-            this.labelControl3.Text = "褰曞叆妫�楠岀粨鏋滐紙OK-19,NG-1,绾暟瀛楋級";
-            // 
-            // xtraTabPage3
-            // 
-            this.xtraTabPage3.Controls.Add(this.gcMx3);
-            this.xtraTabPage3.Controls.Add(this.ucUpFile1);
-            this.xtraTabPage3.Name = "xtraTabPage3";
-            this.xtraTabPage3.Size = new System.Drawing.Size(1340, 503);
-            this.xtraTabPage3.Text = "闄勪欢淇℃伅";
+            this.groupControl2.Controls.Add(this.gcMx3);
+            this.groupControl2.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.groupControl2.Location = new System.Drawing.Point(0, 0);
+            this.groupControl2.Name = "groupControl2";
+            this.groupControl2.Size = new System.Drawing.Size(652, 244);
+            this.groupControl2.TabIndex = 4;
+            this.groupControl2.Text = "鏍锋湰缁撴灉";
             // 
             // gcMx3
             // 
             this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx3.Location = new System.Drawing.Point(0, 57);
+            this.gcMx3.Location = new System.Drawing.Point(2, 28);
             this.gcMx3.MainView = this.gvMx3;
             this.gcMx3.Name = "gcMx3";
-            this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit1,
-            this.repositoryItemButtonEdit2,
-            this.repositoryItemButtonEdit3});
-            this.gcMx3.Size = new System.Drawing.Size(1340, 446);
-            this.gcMx3.TabIndex = 2;
+            this.gcMx3.Size = new System.Drawing.Size(648, 214);
+            this.gcMx3.TabIndex = 0;
             this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx3});
             // 
             // gvMx3
             // 
             this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+            this.gridColumn1,
+            this.gridColumn22,
+            this.gridColumn23,
+            this.gridColumn24});
+            this.gvMx3.GridControl = this.gcMx3;
+            this.gvMx3.Name = "gvMx3";
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "guid涓嶈兘鍒犻櫎";
+            this.gridColumn1.FieldName = "guid";
+            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.OptionsColumn.ReadOnly = true;
+            this.gridColumn1.Width = 94;
+            // 
+            // gridColumn22
+            // 
+            this.gridColumn22.Caption = "椤圭洰";
+            this.gridColumn22.FieldName = "fcheckItem";
+            this.gridColumn22.MaxWidth = 192;
+            this.gridColumn22.MinWidth = 25;
+            this.gridColumn22.Name = "gridColumn22";
+            this.gridColumn22.OptionsColumn.ReadOnly = true;
+            this.gridColumn22.Visible = true;
+            this.gridColumn22.VisibleIndex = 0;
+            this.gridColumn22.Width = 192;
+            // 
+            // gridColumn23
+            // 
+            this.gridColumn23.Caption = "鎶芥缁撴灉";
+            this.gridColumn23.FieldName = "fcheckResu";
+            this.gridColumn23.MaxWidth = 80;
+            this.gridColumn23.MinWidth = 25;
+            this.gridColumn23.Name = "gridColumn23";
+            this.gridColumn23.OptionsColumn.ReadOnly = true;
+            this.gridColumn23.Width = 80;
+            // 
+            // gridColumn24
+            // 
+            this.gridColumn24.Caption = "鍒ゅ畾鏍囧織";
+            this.gridColumn24.ColumnEdit = this.repositoryItemComboBox1;
+            this.gridColumn24.FieldName = "fstand";
+            this.gridColumn24.MinWidth = 25;
+            this.gridColumn24.Name = "gridColumn24";
+            this.gridColumn24.Visible = true;
+            this.gridColumn24.VisibleIndex = 1;
+            this.gridColumn24.Width = 94;
+            // 
+            // panMsg
+            // 
+            this.panMsg.Controls.Add(this.layoutControl1);
+            this.panMsg.Dock = System.Windows.Forms.DockStyle.Top;
+            this.panMsg.Location = new System.Drawing.Point(0, 0);
+            this.panMsg.Name = "panMsg";
+            this.panMsg.Size = new System.Drawing.Size(1340, 46);
+            this.panMsg.TabIndex = 1;
+            // 
+            // layoutControl1
+            // 
+            this.layoutControl1.Controls.Add(this.btnIpt);
+            this.layoutControl1.Controls.Add(this.btnLoad);
+            this.layoutControl1.Controls.Add(this.txtJianYan);
+            this.layoutControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.layoutControl1.Location = new System.Drawing.Point(2, 2);
+            this.layoutControl1.Name = "layoutControl1";
+            this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(518, 355, 812, 500);
+            this.layoutControl1.Root = this.layoutControlGroup1;
+            this.layoutControl1.Size = new System.Drawing.Size(1336, 42);
+            this.layoutControl1.TabIndex = 0;
+            this.layoutControl1.Text = "layoutControl1";
+            // 
+            // btnIpt
+            // 
+            this.btnIpt.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.editname_32x321;
+            this.btnIpt.Location = new System.Drawing.Point(1202, 2);
+            this.btnIpt.Name = "btnIpt";
+            this.btnIpt.Size = new System.Drawing.Size(132, 36);
+            this.btnIpt.StyleController = this.layoutControl1;
+            this.btnIpt.TabIndex = 4;
+            this.btnIpt.Text = "鎵归噺褰曞叆鏍锋湰";
+            // 
+            // btnLoad
+            // 
+            this.btnLoad.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.refresh_32x321;
+            this.btnLoad.Location = new System.Drawing.Point(838, 2);
+            this.btnLoad.Name = "btnLoad";
+            this.btnLoad.Size = new System.Drawing.Size(162, 36);
+            this.btnLoad.StyleController = this.layoutControl1;
+            this.btnLoad.TabIndex = 3;
+            this.btnLoad.Text = "閲嶆柊鍔犺浇妫�楠岄」鐩�";
+            // 
+            // txtJianYan
+            // 
+            this.txtJianYan.Location = new System.Drawing.Point(221, 2);
+            this.txtJianYan.Name = "txtJianYan";
+            this.txtJianYan.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 15F);
+            this.txtJianYan.Properties.Appearance.Options.UseFont = true;
+            this.txtJianYan.Size = new System.Drawing.Size(445, 36);
+            this.txtJianYan.StyleController = this.layoutControl1;
+            this.txtJianYan.TabIndex = 2;
+            // 
+            // layoutControlGroup1
+            // 
+            this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+            this.layoutControlGroup1.GroupBordersVisible = false;
+            this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+            this.layoutControlItem11,
+            this.layoutControlItem20,
+            this.layoutControlItem19});
+            this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+            this.layoutControlGroup1.Name = "Root";
+            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition5.Width = 100D;
+            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition6.Width = 100D;
+            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition7.Width = 100D;
+            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition8.Width = 100D;
+            this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+            columnDefinition5,
+            columnDefinition6,
+            columnDefinition7,
+            columnDefinition8});
+            rowDefinition5.Height = 100D;
+            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+            this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+            rowDefinition5});
+            this.layoutControlGroup1.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+            this.layoutControlGroup1.Size = new System.Drawing.Size(1336, 42);
+            this.layoutControlGroup1.TextVisible = false;
+            // 
+            // layoutControlItem11
+            // 
+            this.layoutControlItem11.Control = this.txtJianYan;
+            this.layoutControlItem11.CustomizationFormText = "褰曞叆妫�楠岀粨鏋滐紙OK-19,NG-19锛�";
+            this.layoutControlItem11.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem11.Name = "layoutControlItem11";
+            this.layoutControlItem11.OptionsTableLayoutItem.ColumnSpan = 2;
+            this.layoutControlItem11.Size = new System.Drawing.Size(668, 42);
+            this.layoutControlItem11.Text = "褰曞叆妫�楠岀粨鏋滐紙OK-19,NG-19锛�";
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(207, 18);
+            // 
+            // layoutControlItem20
+            // 
+            this.layoutControlItem20.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
+            this.layoutControlItem20.Control = this.btnIpt;
+            this.layoutControlItem20.Location = new System.Drawing.Point(1002, 0);
+            this.layoutControlItem20.MaxSize = new System.Drawing.Size(136, 40);
+            this.layoutControlItem20.MinSize = new System.Drawing.Size(136, 40);
+            this.layoutControlItem20.Name = "layoutControlItem20";
+            this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem20.Size = new System.Drawing.Size(334, 42);
+            this.layoutControlItem20.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem20.Text = "鎵归噺褰曞叆";
+            this.layoutControlItem20.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem20.TextVisible = false;
+            // 
+            // layoutControlItem19
+            // 
+            this.layoutControlItem19.ContentHorzAlignment = DevExpress.Utils.HorzAlignment.Far;
+            this.layoutControlItem19.Control = this.btnLoad;
+            this.layoutControlItem19.Location = new System.Drawing.Point(668, 0);
+            this.layoutControlItem19.MaxSize = new System.Drawing.Size(166, 40);
+            this.layoutControlItem19.MinSize = new System.Drawing.Size(166, 40);
+            this.layoutControlItem19.Name = "layoutControlItem19";
+            this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
+            this.layoutControlItem19.Size = new System.Drawing.Size(334, 42);
+            this.layoutControlItem19.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+            this.layoutControlItem19.Text = "閲嶆柊鍔犺浇";
+            this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem19.TextVisible = false;
+            // 
+            // tabMxPage2
+            // 
+            this.tabMxPage2.Controls.Add(this.gcMx4);
+            this.tabMxPage2.Controls.Add(this.ucUpFile1);
+            this.tabMxPage2.Name = "tabMxPage2";
+            this.tabMxPage2.Size = new System.Drawing.Size(1340, 503);
+            this.tabMxPage2.Text = "闄勪欢淇℃伅";
+            // 
+            // gcMx4
+            // 
+            this.gcMx4.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx4.Location = new System.Drawing.Point(0, 57);
+            this.gcMx4.MainView = this.gvMx4;
+            this.gcMx4.Name = "gcMx4";
+            this.gcMx4.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+            this.repositoryItemButtonEdit1,
+            this.repositoryItemButtonEdit2,
+            this.repositoryItemButtonEdit3});
+            this.gcMx4.Size = new System.Drawing.Size(1340, 446);
+            this.gcMx4.TabIndex = 2;
+            this.gcMx4.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+            this.gvMx4});
+            // 
+            // gvMx4
+            // 
+            this.gvMx4.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gridColumn5,
             this.gridColumn6,
             this.gridColumn11,
@@ -1616,8 +1897,8 @@
             this.gridColumn10,
             this.gridColumn16,
             this.gridColumn12});
-            this.gvMx3.GridControl = this.gcMx3;
-            this.gvMx3.Name = "gvMx3";
+            this.gvMx4.GridControl = this.gcMx4;
+            this.gvMx4.Name = "gvMx4";
             // 
             // gridColumn5
             // 
@@ -1696,9 +1977,9 @@
             // repositoryItemButtonEdit2
             // 
             this.repositoryItemButtonEdit2.AutoHeight = false;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions2.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, 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.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
             this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             // 
@@ -1715,10 +1996,10 @@
             // repositoryItemButtonEdit3
             // 
             this.repositoryItemButtonEdit3.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.download_16x16;
+            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            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)});
+            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.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
             this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             // 
@@ -1735,10 +2016,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            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;
             // 
@@ -1750,6 +2031,16 @@
             this.ucUpFile1.parentGuid = null;
             this.ucUpFile1.Size = new System.Drawing.Size(1340, 57);
             this.ucUpFile1.TabIndex = 1;
+            // 
+            // repositoryItemComboBox2
+            // 
+            this.repositoryItemComboBox2.AutoHeight = false;
+            this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.repositoryItemComboBox2.Items.AddRange(new object[] {
+            "鈭�",
+            "脳"});
+            this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
             // 
             // picCheckBox
             // 
@@ -1784,6 +2075,7 @@
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_MesQaItemsDetect01";
             this.Text = "鏉ユ枡妫�楠岀敵璇�";
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
             this.xtraTabControl1.ResumeLayout(false);
             this.xtraTabPage1.ResumeLayout(false);
@@ -1819,8 +2111,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmitDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fsubmit.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_slOrg.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_guid.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1848,20 +2142,37 @@
             this.splitMx2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel1)).EndInit();
+            this.splitYangLi.Panel1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi.Panel2)).EndInit();
+            this.splitYangLi.Panel2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.splitYangLi)).EndInit();
+            this.splitYangLi.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.groupControl1)).EndInit();
             this.groupControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panMsg)).EndInit();
-            this.panMsg.ResumeLayout(false);
-            this.panMsg.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txtJianYan.Properties)).EndInit();
-            this.xtraTabPage3.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.groupControl2)).EndInit();
+            this.groupControl2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.panMsg)).EndInit();
+            this.panMsg.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
+            this.layoutControl1.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.txtJianYan.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+            this.tabMxPage2.ResumeLayout(false);
+            ((System.ComponentModel.ISupportInitialize)(this.gcMx4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gvMx4)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView3)).EndInit();
@@ -1965,14 +2276,12 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraEditors.PanelControl panMsg;
         private DevExpress.XtraEditors.SimpleButton btnLoad;
         private DevExpress.XtraEditors.TextEdit txtJianYan;
-        private DevExpress.XtraEditors.LabelControl labelControl3;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
-        private DevExpress.XtraGrid.GridControl gcMx3;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
+        private DevExpress.XtraTab.XtraTabPage tabMxPage2;
+        private DevExpress.XtraGrid.GridControl gcMx4;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx4;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
@@ -1992,6 +2301,27 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+        private DevExpress.XtraEditors.SimpleButton btnIpt;
+        private DevExpress.XtraLayout.LayoutControl layoutControl1;
+        private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
+        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+        private DevExpress.XtraEditors.SplitContainerControl splitYangLi;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
+        private DevExpress.XtraEditors.GroupControl groupControl2;
+        private DevExpress.XtraGrid.GridControl gcMx3;
+        private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+        private DevExpress.XtraEditors.TextEdit txt_guid;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3