From 616aa52963443779d15f731c3477a7184bc41972 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 17 三月 2025 16:31:57 +0800
Subject: [PATCH] 巡检首检

---
 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.cs                |    4 
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs          |  768 -----------------
 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs                 |  180 ++-
 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJian.cs                 |    6 
 DevApp/Gs.DevApp/Gs.DevApp.csproj                           |   16 
 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.resx              |    0 
 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJian.Designer.cs        |    7 
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs | 1554 -----------------------------------
 DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.Designer.cs       |    7 
 9 files changed, 144 insertions(+), 2,398 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.Designer.cs
similarity index 90%
rename from DevApp/Gs.DevApp/DevFrm/IPQC/Frm_Jyxm.Designer.cs
rename to DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.Designer.cs
index 3536d03..d61ad4b 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.Designer.cs
@@ -1,6 +1,6 @@
 锘縩amespace Gs.DevApp.DevFrm.IPQC
 {
-    partial class Frm_Jyxm
+    partial class Frm_ShouJian
     {
         /// <summary>
         /// Required designer variable.
@@ -28,7 +28,8 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.jyxm1 = new QC.Jyxm("ipqc");
+            // this.jyxm1 = new QC.Jyxm("ipqc棣栨");
+            this.jyxm1 = new QC.Jyxm("ipqc棣栨");
             this.SuspendLayout();
             // 
             // jyxm1
@@ -46,7 +47,7 @@
             this.ClientSize = new System.Drawing.Size(1044, 711);
             this.Controls.Add(this.jyxm1);
             this.Name = "Frm_Jyxm";
-            this.Text = "IPQC妫�楠岄」鐩�";
+            this.Text = "IPQC棣栨";
             this.ResumeLayout(false);
 
         }
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.cs
similarity index 77%
rename from DevApp/Gs.DevApp/DevFrm/IPQC/Frm_Jyxm.cs
rename to DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.cs
index 963ada7..456feb5 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.cs
@@ -11,9 +11,9 @@
 
 namespace Gs.DevApp.DevFrm.IPQC
 {
-    public partial class Frm_Jyxm : DevExpress.XtraEditors.XtraForm
+    public partial class Frm_ShouJian : DevExpress.XtraEditors.XtraForm
     {
-        public Frm_Jyxm()
+        public Frm_ShouJian()
         {
             InitializeComponent();
         }
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_Jyxm.resx b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.resx
similarity index 100%
rename from DevApp/Gs.DevApp/DevFrm/IPQC/Frm_Jyxm.resx
rename to DevApp/Gs.DevApp/DevFrm/IPQC/Frm_ShouJian.resx
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJian.Designer.cs
similarity index 90%
copy from DevApp/Gs.DevApp/DevFrm/IPQC/Frm_Jyxm.Designer.cs
copy to DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJian.Designer.cs
index 3536d03..a747091 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJian.Designer.cs
@@ -1,6 +1,6 @@
 锘縩amespace Gs.DevApp.DevFrm.IPQC
 {
-    partial class Frm_Jyxm
+    partial class Frm_XunJian
     {
         /// <summary>
         /// Required designer variable.
@@ -28,7 +28,8 @@
         /// </summary>
         private void InitializeComponent()
         {
-            this.jyxm1 = new QC.Jyxm("ipqc");
+            // this.jyxm1 = new QC.Jyxm("ipqc宸℃");
+            this.jyxm1 = new QC.Jyxm("ipqc宸℃");
             this.SuspendLayout();
             // 
             // jyxm1
@@ -46,7 +47,7 @@
             this.ClientSize = new System.Drawing.Size(1044, 711);
             this.Controls.Add(this.jyxm1);
             this.Name = "Frm_Jyxm";
-            this.Text = "IPQC妫�楠岄」鐩�";
+            this.Text = "ipqc宸℃";
             this.ResumeLayout(false);
 
         }
diff --git a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_Jyxm.cs b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJian.cs
similarity index 77%
copy from DevApp/Gs.DevApp/DevFrm/IPQC/Frm_Jyxm.cs
copy to DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJian.cs
index 963ada7..9d1c658 100644
--- a/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_Jyxm.cs
+++ b/DevApp/Gs.DevApp/DevFrm/IPQC/Frm_XunJian.cs
@@ -11,13 +11,11 @@
 
 namespace Gs.DevApp.DevFrm.IPQC
 {
-    public partial class Frm_Jyxm : DevExpress.XtraEditors.XtraForm
+    public partial class Frm_XunJian : DevExpress.XtraEditors.XtraForm
     {
-        public Frm_Jyxm()
+        public Frm_XunJian()
         {
             InitializeComponent();
         }
-
-     
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
index f826724..7c8a422 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -3,6 +3,7 @@
 {
     partial class Frm_MesQmCheckitemDt
     {
+
         /// <summary>
         /// Required designer variable.
         /// </summary>
@@ -29,1553 +30,32 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.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.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
-            this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
-            this.gcMain1 = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_foneChecked = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_ftwoChecked = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_fversion = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_foneCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_foneCheckdate = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_ftwoCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.pageBar1 = new UserControls.Data.UcPageBar();
-            this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
-            this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
-            this.layoutMx1 = new DevExpress.XtraDataLayout.DataLayoutControl();
-            this.lbGuid = new System.Windows.Forms.Label();
-            this.txt_fSubsidiary = new Gs.DevApp.UserControl.UcLookOrg();
-            this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
-            this.txt_foneCheckdate = new DevExpress.XtraEditors.TextEdit();
-            this.txt_foneCheckor = new DevExpress.XtraEditors.TextEdit();
-            this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_memo = new DevExpress.XtraEditors.TextEdit();
-            this.txt_ftwoCheckor = new DevExpress.XtraEditors.TextEdit();
-            this.txt_fversion = new DevExpress.XtraEditors.TextEdit();
-            this.txt_ftwoCheckdate = new DevExpress.XtraEditors.TextEdit();
-            this.txt_gg = new DevExpress.XtraEditors.TextEdit();
-            this.txt_ftwoChecked = new DevExpress.XtraEditors.CheckEdit();
-            this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
-            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
-            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.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1forder = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gvMx1fcheckItem = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJYXM = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckTool = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJYGJ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gvMx1sampleSizeNo = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJYBZ = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.sampleSizeName = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fcheckLevel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJYSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.rptJSSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
-            this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fstand = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1fdownAllow = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.xtraTabPageCopy = new DevExpress.XtraTab.XtraTabPage();
-            this.gridControl2 = new DevExpress.XtraGrid.GridControl();
-            this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
-            this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.panelControl1 = new DevExpress.XtraEditors.PanelControl();
-            this.btnSave = new DevExpress.XtraEditors.SimpleButton();
-            this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
-            this.picCheckBox = new System.Windows.Forms.PictureBox();
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
-            this.xtraTabControl1.SuspendLayout();
-            this.xtraTabPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.split1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).BeginInit();
-            this.split1.Panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).BeginInit();
-            this.split1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
-            this.xtraTabPage2.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
-            this.splitMx1.Panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).BeginInit();
-            this.splitMx1.Panel2.SuspendLayout();
-            this.splitMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
-            this.layoutMx1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckor.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckdate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_gg.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
-            this.tabMx.SuspendLayout();
-            this.tabMxPage1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
-            this.xtraTabPageCopy.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
-            this.panelControl1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+            // this.jyxm1 = new QC.Jyxm("ipqc宸℃");
+            this.jyxm1 = new QC.Jyxm("iqc");
             this.SuspendLayout();
             // 
-            // toolBarMenu1
+            // jyxm1
             // 
-            this.toolBarMenu1.chkParameter = " 0,0,0,0,000chk_mes_CHECKITEM";
-            this.toolBarMenu1.currentAction = null;
-            this.toolBarMenu1.defaultActions = null;
-            this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.toolBarMenu1.guidKey = null;
-            this.toolBarMenu1.isSetBtn = false;
-            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
-            this.toolBarMenu1.Name = "toolBarMenu1";
-            this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1129, 80);
-            this.toolBarMenu1.TabIndex = 0;
-            this.toolBarMenu1.xlsInService = null;
-            this.toolBarMenu1.xlsOutParameter = null;
+            this.jyxm1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.jyxm1.Location = new System.Drawing.Point(0, 0);
+            this.jyxm1.Name = "jyxm1";
+            this.jyxm1.Size = new System.Drawing.Size(1044, 711);
+            this.jyxm1.TabIndex = 0;
             // 
-            // xtraTabControl1
-            // 
-            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
-            this.xtraTabControl1.Name = "xtraTabControl1";
-            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1129, 602);
-            this.xtraTabControl1.TabIndex = 3;
-            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.xtraTabPage1,
-            this.xtraTabPage2});
-            // 
-            // xtraTabPage1
-            // 
-            this.xtraTabPage1.Controls.Add(this.split1);
-            this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1127, 570);
-            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
-            // 
-            // split1
-            // 
-            this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.split1.Horizontal = false;
-            this.split1.Location = new System.Drawing.Point(0, 0);
-            this.split1.Name = "split1";
-            // 
-            // split1.Panel1
-            // 
-            this.split1.Panel1.Controls.Add(this.gcMain1);
-            this.split1.Panel1.Controls.Add(this.pageBar1);
-            this.split1.Panel1.Text = "Panel1";
-            // 
-            // split1.Panel2
-            // 
-            this.split1.Panel2.Text = "Panel2";
-            this.split1.Size = new System.Drawing.Size(1127, 570);
-            this.split1.SplitterPosition = 558;
-            this.split1.TabIndex = 0;
-            // 
-            // gcMain1
-            // 
-            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gcMain1.Location = new System.Drawing.Point(0, 0);
-            this.gcMain1.MainView = this.gridView1;
-            this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1127, 519);
-            this.gcMain1.TabIndex = 2;
-            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView1});
-            // 
-            // gridView1
-            // 
-            this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
-            this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gridView1.Appearance.Row.Options.UseFont = true;
-            this.gridView1.ColumnPanelRowHeight = 50;
-            this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn8,
-            this.gv_isenabled,
-            this.gv_foneChecked,
-            this.gv_ftwoChecked,
-            this.gv_fversion,
-            this.gridColumn7,
-            this.gv_itemNo,
-            this.gridColumn3,
-            this.gridColumn2,
-            this.gv_foneCheckor,
-            this.gv_foneCheckdate,
-            this.gv_ftwoCheckor,
-            this.gridColumn10,
-            this.gridColumn1,
-            this.gridColumn4,
-            this.gv_memo,
-            this.gridColumn16});
-            this.gridView1.GridControl = this.gcMain1;
-            this.gridView1.IndicatorWidth = 50;
-            this.gridView1.Name = "gridView1";
-            this.gridView1.OptionsFind.ShowSearchNavButtons = false;
-            this.gridView1.OptionsView.ShowAutoFilterRow = true;
-            this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gridColumn8
-            // 
-            this.gridColumn8.Caption = "浣跨敤缁勭粐";
-            this.gridColumn8.FieldName = "fSubsidiary";
-            this.gridColumn8.MinWidth = 50;
-            this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.OptionsColumn.AllowEdit = false;
-            this.gridColumn8.Tag = "org.fnumber";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 0;
-            this.gridColumn8.Width = 250;
-            // 
-            // gv_isenabled
-            // 
-            this.gv_isenabled.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_isenabled.AppearanceCell.Options.UseFont = true;
-            this.gv_isenabled.Caption = "鏄惁鍙敤";
-            this.gv_isenabled.FieldName = "isenabled";
-            this.gv_isenabled.MaxWidth = 50;
-            this.gv_isenabled.MinWidth = 50;
-            this.gv_isenabled.Name = "gv_isenabled";
-            this.gv_isenabled.OptionsColumn.AllowEdit = false;
-            this.gv_isenabled.Tag = "query_a.ISENABLED";
-            this.gv_isenabled.UnboundDataType = typeof(bool);
-            this.gv_isenabled.Visible = true;
-            this.gv_isenabled.VisibleIndex = 1;
-            this.gv_isenabled.Width = 50;
-            // 
-            // gv_foneChecked
-            // 
-            this.gv_foneChecked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_foneChecked.AppearanceCell.Options.UseFont = true;
-            this.gv_foneChecked.Caption = "瀹℃牳鏍囪";
-            this.gv_foneChecked.FieldName = "foneChecked";
-            this.gv_foneChecked.MaxWidth = 50;
-            this.gv_foneChecked.MinWidth = 50;
-            this.gv_foneChecked.Name = "gv_foneChecked";
-            this.gv_foneChecked.OptionsColumn.AllowEdit = false;
-            this.gv_foneChecked.Tag = "query_a.FONE_CHECKED";
-            this.gv_foneChecked.UnboundDataType = typeof(bool);
-            this.gv_foneChecked.Visible = true;
-            this.gv_foneChecked.VisibleIndex = 2;
-            this.gv_foneChecked.Width = 50;
-            // 
-            // gv_ftwoChecked
-            // 
-            this.gv_ftwoChecked.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_ftwoChecked.AppearanceCell.Options.UseFont = true;
-            this.gv_ftwoChecked.Caption = "鎵瑰噯鏍囪";
-            this.gv_ftwoChecked.FieldName = "ftwoChecked";
-            this.gv_ftwoChecked.MaxWidth = 50;
-            this.gv_ftwoChecked.MinWidth = 50;
-            this.gv_ftwoChecked.Name = "gv_ftwoChecked";
-            this.gv_ftwoChecked.OptionsColumn.AllowEdit = false;
-            this.gv_ftwoChecked.Tag = "query_a.FTWO_CHECKED";
-            this.gv_ftwoChecked.UnboundDataType = typeof(bool);
-            this.gv_ftwoChecked.Visible = true;
-            this.gv_ftwoChecked.VisibleIndex = 3;
-            this.gv_ftwoChecked.Width = 50;
-            // 
-            // gv_fversion
-            // 
-            this.gv_fversion.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_fversion.AppearanceCell.Options.UseFont = true;
-            this.gv_fversion.Caption = "鐗堟湰";
-            this.gv_fversion.FieldName = "fversion";
-            this.gv_fversion.MinWidth = 50;
-            this.gv_fversion.Name = "gv_fversion";
-            this.gv_fversion.OptionsColumn.AllowEdit = false;
-            this.gv_fversion.Tag = "query_a.FVERSION";
-            this.gv_fversion.Visible = true;
-            this.gv_fversion.VisibleIndex = 4;
-            this.gv_fversion.Width = 94;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "鐗╂枡ID";
-            this.gridColumn7.FieldName = "itemId";
-            this.gridColumn7.MinWidth = 50;
-            this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.OptionsColumn.AllowEdit = false;
-            this.gridColumn7.Tag = "query_a.ITEM_ID";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 5;
-            this.gridColumn7.Width = 94;
-            // 
-            // gv_itemNo
-            // 
-            this.gv_itemNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_itemNo.AppearanceCell.Options.UseFont = true;
-            this.gv_itemNo.Caption = "鐗╂枡浜у搧缂栫爜";
-            this.gv_itemNo.FieldName = "itemNo";
-            this.gv_itemNo.MinWidth = 50;
-            this.gv_itemNo.Name = "gv_itemNo";
-            this.gv_itemNo.OptionsColumn.AllowEdit = false;
-            this.gv_itemNo.Tag = "query_b.item_no";
-            this.gv_itemNo.Visible = true;
-            this.gv_itemNo.VisibleIndex = 6;
-            this.gv_itemNo.Width = 150;
-            // 
-            // gridColumn3
-            // 
-            this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn3.FieldName = "mc";
-            this.gridColumn3.MinWidth = 50;
-            this.gridColumn3.Name = "gridColumn3";
-            this.gridColumn3.OptionsColumn.AllowEdit = false;
-            this.gridColumn3.Tag = "query_b.item_name";
-            this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 7;
-            this.gridColumn3.Width = 250;
-            // 
-            // gridColumn2
-            // 
-            this.gridColumn2.Caption = "鐗╂枡瑙勬牸";
-            this.gridColumn2.FieldName = "gg";
-            this.gridColumn2.MaxWidth = 300;
-            this.gridColumn2.MinWidth = 50;
-            this.gridColumn2.Name = "gridColumn2";
-            this.gridColumn2.OptionsColumn.AllowEdit = false;
-            this.gridColumn2.Tag = "query_b.item_model";
-            this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 8;
-            this.gridColumn2.Width = 100;
-            // 
-            // gv_foneCheckor
-            // 
-            this.gv_foneCheckor.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_foneCheckor.AppearanceCell.Options.UseFont = true;
-            this.gv_foneCheckor.Caption = "瀹℃牳浜�";
-            this.gv_foneCheckor.FieldName = "foneCheckor";
-            this.gv_foneCheckor.MinWidth = 50;
-            this.gv_foneCheckor.Name = "gv_foneCheckor";
-            this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
-            this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
-            this.gv_foneCheckor.Visible = true;
-            this.gv_foneCheckor.VisibleIndex = 9;
-            this.gv_foneCheckor.Width = 94;
-            // 
-            // gv_foneCheckdate
-            // 
-            this.gv_foneCheckdate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true;
-            this.gv_foneCheckdate.Caption = "瀹℃牳鏃堕棿";
-            this.gv_foneCheckdate.FieldName = "foneCheckdate";
-            this.gv_foneCheckdate.MinWidth = 50;
-            this.gv_foneCheckdate.Name = "gv_foneCheckdate";
-            this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
-            this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
-            this.gv_foneCheckdate.Visible = true;
-            this.gv_foneCheckdate.VisibleIndex = 10;
-            this.gv_foneCheckdate.Width = 120;
-            // 
-            // gv_ftwoCheckor
-            // 
-            this.gv_ftwoCheckor.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_ftwoCheckor.AppearanceCell.Options.UseFont = true;
-            this.gv_ftwoCheckor.Caption = "鎵瑰噯浜�";
-            this.gv_ftwoCheckor.FieldName = "ftwoCheckor";
-            this.gv_ftwoCheckor.MinWidth = 50;
-            this.gv_ftwoCheckor.Name = "gv_ftwoCheckor";
-            this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false;
-            this.gv_ftwoCheckor.Tag = "query_a.FTWO_CHECKOR";
-            this.gv_ftwoCheckor.Visible = true;
-            this.gv_ftwoCheckor.VisibleIndex = 11;
-            this.gv_ftwoCheckor.Width = 94;
-            // 
-            // gridColumn10
-            // 
-            this.gridColumn10.Caption = "鎵瑰噯鏃堕棿";
-            this.gridColumn10.FieldName = "ftwoCheckdate";
-            this.gridColumn10.MinWidth = 25;
-            this.gridColumn10.Name = "gridColumn10";
-            this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 12;
-            this.gridColumn10.Width = 94;
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "鍒朵綔浜�";
-            this.gridColumn1.FieldName = "createBy";
-            this.gridColumn1.MinWidth = 50;
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.OptionsColumn.AllowEdit = false;
-            this.gridColumn1.Tag = "query_a.CREATE_BY";
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 13;
-            this.gridColumn1.Width = 94;
-            // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "鍒朵綔鏃堕棿";
-            this.gridColumn4.FieldName = "createDate";
-            this.gridColumn4.MinWidth = 50;
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.OptionsColumn.AllowEdit = false;
-            this.gridColumn4.Tag = "query_a.CREATE_DATE";
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 14;
-            this.gridColumn4.Width = 180;
-            // 
-            // gv_memo
-            // 
-            this.gv_memo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_memo.AppearanceCell.Options.UseFont = true;
-            this.gv_memo.Caption = "澶囨敞";
-            this.gv_memo.FieldName = "memo";
-            this.gv_memo.MinWidth = 50;
-            this.gv_memo.Name = "gv_memo";
-            this.gv_memo.OptionsColumn.AllowEdit = false;
-            this.gv_memo.Tag = "query_a.MEMO";
-            this.gv_memo.Visible = true;
-            this.gv_memo.VisibleIndex = 15;
-            this.gv_memo.Width = 150;
-            // 
-            // gridColumn16
-            // 
-            this.gridColumn16.Caption = "涓婚敭GUID";
-            this.gridColumn16.FieldName = "guid";
-            this.gridColumn16.MinWidth = 25;
-            this.gridColumn16.Name = "gridColumn16";
-            this.gridColumn16.Width = 94;
-            // 
-            // pageBar1
-            // 
-            this.pageBar1.CurrentPage = 1;
-            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 519);
-            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
-            this.pageBar1.Name = "pageBar1";
-            this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1127, 39);
-            this.pageBar1.TabIndex = 4;
-            this.pageBar1.TotalPages = 0;
-            // 
-            // xtraTabPage2
-            // 
-            this.xtraTabPage2.Controls.Add(this.splitMx1);
-            this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1127, 570);
-            this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
-            // 
-            // splitMx1
-            // 
-            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.splitMx1.Horizontal = false;
-            this.splitMx1.Location = new System.Drawing.Point(0, 0);
-            this.splitMx1.Name = "splitMx1";
-            // 
-            // splitMx1.Panel1
-            // 
-            this.splitMx1.Panel1.Controls.Add(this.layoutMx1);
-            this.splitMx1.Panel1.Text = "Panel1";
-            // 
-            // splitMx1.Panel2
-            // 
-            this.splitMx1.Panel2.Controls.Add(this.tabMx);
-            this.splitMx1.Panel2.Text = "Panel2";
-            this.splitMx1.Size = new System.Drawing.Size(1127, 570);
-            this.splitMx1.SplitterPosition = 114;
-            this.splitMx1.TabIndex = 0;
-            // 
-            // layoutMx1
-            // 
-            this.layoutMx1.Controls.Add(this.lbGuid);
-            this.layoutMx1.Controls.Add(this.txt_fSubsidiary);
-            this.layoutMx1.Controls.Add(this.txt_itemId);
-            this.layoutMx1.Controls.Add(this.txt_foneCheckdate);
-            this.layoutMx1.Controls.Add(this.txt_foneCheckor);
-            this.layoutMx1.Controls.Add(this.txt_itemNo);
-            this.layoutMx1.Controls.Add(this.txt_memo);
-            this.layoutMx1.Controls.Add(this.txt_ftwoCheckor);
-            this.layoutMx1.Controls.Add(this.txt_fversion);
-            this.layoutMx1.Controls.Add(this.txt_ftwoCheckdate);
-            this.layoutMx1.Controls.Add(this.txt_gg);
-            this.layoutMx1.Controls.Add(this.txt_ftwoChecked);
-            this.layoutMx1.Controls.Add(this.txt_foneChecked);
-            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem13});
-            this.layoutMx1.Location = new System.Drawing.Point(0, 0);
-            this.layoutMx1.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(852, 71, 812, 500);
-            this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1127, 114);
-            this.layoutMx1.TabIndex = 0;
-            this.layoutMx1.Text = "dataLayoutControl1";
-            // 
-            // lbGuid
-            // 
-            this.lbGuid.Location = new System.Drawing.Point(825, 102);
-            this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(269, 28);
-            this.lbGuid.TabIndex = 387;
-            this.lbGuid.Text = "label1";
-            // 
-            // txt_fSubsidiary
-            // 
-            this.txt_fSubsidiary.IsReadly = false;
-            this.txt_fSubsidiary.Location = new System.Drawing.Point(96, 12);
-            this.txt_fSubsidiary.Name = "txt_fSubsidiary";
-            this.txt_fSubsidiary.Size = new System.Drawing.Size(188, 28);
-            this.txt_fSubsidiary.TabIndex = 383;
-            // 
-            // txt_itemId
-            // 
-            this.txt_itemId.IsReadly = false;
-            this.txt_itemId.Location = new System.Drawing.Point(96, 44);
-            this.txt_itemId.Name = "txt_itemId";
-            this.txt_itemId.Size = new System.Drawing.Size(188, 28);
-            this.txt_itemId.TabIndex = 380;
-            this.txt_itemId.Tag = "no";
-            // 
-            // txt_foneCheckdate
-            // 
-            this.txt_foneCheckdate.Location = new System.Drawing.Point(926, 44);
-            this.txt_foneCheckdate.Name = "txt_foneCheckdate";
-            this.txt_foneCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
-            this.txt_foneCheckdate.Size = new System.Drawing.Size(189, 28);
-            this.txt_foneCheckdate.StyleController = this.layoutMx1;
-            this.txt_foneCheckdate.TabIndex = 267;
-            this.txt_foneCheckdate.Tag = "readOnly";
-            // 
-            // txt_foneCheckor
-            // 
-            this.txt_foneCheckor.Location = new System.Drawing.Point(926, 12);
-            this.txt_foneCheckor.Name = "txt_foneCheckor";
-            this.txt_foneCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
-            this.txt_foneCheckor.Size = new System.Drawing.Size(189, 28);
-            this.txt_foneCheckor.StyleController = this.layoutMx1;
-            this.txt_foneCheckor.TabIndex = 262;
-            this.txt_foneCheckor.Tag = "readOnly";
-            // 
-            // txt_itemNo
-            // 
-            this.txt_itemNo.Location = new System.Drawing.Point(372, 44);
-            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(189, 28);
-            this.txt_itemNo.StyleController = this.layoutMx1;
-            this.txt_itemNo.TabIndex = 370;
-            this.txt_itemNo.Tag = "readOnly";
-            // 
-            // txt_memo
-            // 
-            this.txt_memo.Location = new System.Drawing.Point(96, 76);
-            this.txt_memo.Name = "txt_memo";
-            this.txt_memo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_memo.Properties.Appearance.Options.UseFont = true;
-            this.txt_memo.Size = new System.Drawing.Size(188, 28);
-            this.txt_memo.StyleController = this.layoutMx1;
-            this.txt_memo.TabIndex = 219;
-            // 
-            // txt_ftwoCheckor
-            // 
-            this.txt_ftwoCheckor.Location = new System.Drawing.Point(649, 12);
-            this.txt_ftwoCheckor.Name = "txt_ftwoCheckor";
-            this.txt_ftwoCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true;
-            this.txt_ftwoCheckor.Size = new System.Drawing.Size(189, 28);
-            this.txt_ftwoCheckor.StyleController = this.layoutMx1;
-            this.txt_ftwoCheckor.TabIndex = 280;
-            this.txt_ftwoCheckor.Tag = "readOnly";
-            // 
-            // txt_fversion
-            // 
-            this.txt_fversion.Location = new System.Drawing.Point(372, 12);
-            this.txt_fversion.Name = "txt_fversion";
-            this.txt_fversion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_fversion.Properties.Appearance.Options.UseFont = true;
-            this.txt_fversion.Size = new System.Drawing.Size(189, 28);
-            this.txt_fversion.StyleController = this.layoutMx1;
-            this.txt_fversion.TabIndex = 298;
-            this.txt_fversion.Tag = "readOnly";
-            // 
-            // txt_ftwoCheckdate
-            // 
-            this.txt_ftwoCheckdate.Location = new System.Drawing.Point(649, 44);
-            this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate";
-            this.txt_ftwoCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true;
-            this.txt_ftwoCheckdate.Size = new System.Drawing.Size(189, 28);
-            this.txt_ftwoCheckdate.StyleController = this.layoutMx1;
-            this.txt_ftwoCheckdate.TabIndex = 285;
-            this.txt_ftwoCheckdate.Tag = "readOnly";
-            // 
-            // txt_gg
-            // 
-            this.txt_gg.Location = new System.Drawing.Point(372, 76);
-            this.txt_gg.Name = "txt_gg";
-            this.txt_gg.Size = new System.Drawing.Size(189, 24);
-            this.txt_gg.StyleController = this.layoutMx1;
-            this.txt_gg.TabIndex = 384;
-            this.txt_gg.Tag = "readOnly";
-            // 
-            // txt_ftwoChecked
-            // 
-            this.txt_ftwoChecked.Location = new System.Drawing.Point(565, 76);
-            this.txt_ftwoChecked.Name = "txt_ftwoChecked";
-            this.txt_ftwoChecked.Properties.Caption = "鎵瑰噯鏍囪瘑";
-            this.txt_ftwoChecked.Size = new System.Drawing.Size(273, 24);
-            this.txt_ftwoChecked.StyleController = this.layoutMx1;
-            this.txt_ftwoChecked.TabIndex = 385;
-            this.txt_ftwoChecked.Tag = "readOnly";
-            // 
-            // txt_foneChecked
-            // 
-            this.txt_foneChecked.Location = new System.Drawing.Point(842, 76);
-            this.txt_foneChecked.Name = "txt_foneChecked";
-            this.txt_foneChecked.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_foneChecked.Size = new System.Drawing.Size(273, 24);
-            this.txt_foneChecked.StyleController = this.layoutMx1;
-            this.txt_foneChecked.TabIndex = 386;
-            this.txt_foneChecked.Tag = "readOnly";
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.lbGuid;
-            this.layoutControlItem13.Location = new System.Drawing.Point(813, 96);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(273, 32);
-            this.layoutControlItem13.Text = "lbGuid";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem13.TextVisible = false;
-            // 
-            // Root
-            // 
-            this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
-            this.Root.GroupBordersVisible = false;
-            this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem1,
-            this.layoutControlItem3,
-            this.layoutControlItem4,
-            this.layoutControlItem6,
-            this.layoutControlItem9,
-            this.layoutControlItem10,
-            this.layoutControlItem11,
-            this.layoutControlItem12,
-            this.layoutControlItem2,
-            this.layoutControlItem5,
-            this.layoutControlItem8,
-            this.layoutControlItem7});
-            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
-            this.Root.Name = "Root";
-            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition1.Width = 100D;
-            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition2.Width = 100D;
-            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition3.Width = 100D;
-            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition4.Width = 100D;
-            this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition1,
-            columnDefinition2,
-            columnDefinition3,
-            columnDefinition4});
-            rowDefinition1.Height = 100D;
-            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition2.Height = 100D;
-            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition3.Height = 100D;
-            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
-            this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition1,
-            rowDefinition2,
-            rowDefinition3});
-            this.Root.Size = new System.Drawing.Size(1127, 116);
-            this.Root.TextVisible = false;
-            // 
-            // layoutControlItem1
-            // 
-            this.layoutControlItem1.Control = this.txt_fSubsidiary;
-            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
-            this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(276, 32);
-            this.layoutControlItem1.Text = "閫夋嫨缁勭粐";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 18);
-            // 
-            // layoutControlItem3
-            // 
-            this.layoutControlItem3.Control = this.txt_ftwoCheckor;
-            this.layoutControlItem3.Location = new System.Drawing.Point(553, 0);
-            this.layoutControlItem3.Name = "layoutControlItem3";
-            this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(277, 32);
-            this.layoutControlItem3.Text = "鎵瑰噯浜�";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 18);
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.txt_itemId;
-            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(276, 32);
-            this.layoutControlItem4.Text = "閫夋嫨鐗╂枡";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 18);
-            // 
-            // layoutControlItem6
-            // 
-            this.layoutControlItem6.Control = this.txt_ftwoCheckdate;
-            this.layoutControlItem6.Location = new System.Drawing.Point(553, 32);
-            this.layoutControlItem6.Name = "layoutControlItem6";
-            this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(277, 32);
-            this.layoutControlItem6.Text = "鎵瑰噯鏃ユ湡";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 18);
-            // 
-            // layoutControlItem9
-            // 
-            this.layoutControlItem9.Control = this.txt_ftwoChecked;
-            this.layoutControlItem9.Location = new System.Drawing.Point(553, 64);
-            this.layoutControlItem9.Name = "layoutControlItem9";
-            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(277, 32);
-            this.layoutControlItem9.Text = "鎵瑰噯鏍囪瘑";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem9.TextVisible = false;
-            // 
-            // layoutControlItem10
-            // 
-            this.layoutControlItem10.Control = this.txt_foneCheckor;
-            this.layoutControlItem10.Location = new System.Drawing.Point(830, 0);
-            this.layoutControlItem10.Name = "layoutControlItem10";
-            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(277, 32);
-            this.layoutControlItem10.Text = "瀹℃牳浜�";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 18);
-            // 
-            // layoutControlItem11
-            // 
-            this.layoutControlItem11.Control = this.txt_foneCheckdate;
-            this.layoutControlItem11.Location = new System.Drawing.Point(830, 32);
-            this.layoutControlItem11.Name = "layoutControlItem11";
-            this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(277, 32);
-            this.layoutControlItem11.Text = "瀹℃牳鏃堕棿";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 18);
-            // 
-            // layoutControlItem12
-            // 
-            this.layoutControlItem12.Control = this.txt_foneChecked;
-            this.layoutControlItem12.Location = new System.Drawing.Point(830, 64);
-            this.layoutControlItem12.Name = "layoutControlItem12";
-            this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(277, 32);
-            this.layoutControlItem12.Text = "瀹℃牳鏍囪瘑";
-            this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem12.TextVisible = false;
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txt_memo;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 64);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
-            this.layoutControlItem2.Text = "澶囨敞";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 18);
-            // 
-            // layoutControlItem5
-            // 
-            this.layoutControlItem5.Control = this.txt_fversion;
-            this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
-            this.layoutControlItem5.Name = "layoutControlItem5";
-            this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(277, 32);
-            this.layoutControlItem5.Text = "鐗堟湰(鑷姩)";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 18);
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txt_gg;
-            this.layoutControlItem8.Location = new System.Drawing.Point(276, 64);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(277, 32);
-            this.layoutControlItem8.Text = "鐗╂枡瑙勬牸";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 18);
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txt_itemNo;
-            this.layoutControlItem7.Location = new System.Drawing.Point(276, 32);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(277, 32);
-            this.layoutControlItem7.Text = "鐗╂枡缂栫爜";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 18);
-            // 
-            // tabMx
-            // 
-            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 0);
-            this.tabMx.Name = "tabMx";
-            this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1127, 444);
-            this.tabMx.TabIndex = 3;
-            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
-            this.tabMxPage1,
-            this.xtraTabPageCopy});
-            // 
-            // tabMxPage1
-            // 
-            this.tabMxPage1.Controls.Add(this.gcMx1);
-            this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1125, 412);
-            this.tabMxPage1.Text = "妫�楠岄」鐩槑缁�";
-            // 
-            // gcMx1
-            // 
-            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMx1.Location = new System.Drawing.Point(0, 0);
-            this.gcMx1.MainView = this.gvMx1;
-            this.gcMx1.Name = "gcMx1";
-            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.rptJYXM,
-            this.rptJYGJ,
-            this.rptJYBZ,
-            this.rptJSSP,
-            this.rptJYSP,
-            this.repositoryItemButtonEdit1,
-            this.repositoryItemComboBox1});
-            this.gcMx1.Size = new System.Drawing.Size(1125, 412);
-            this.gcMx1.TabIndex = 0;
-            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gvMx1});
-            // 
-            // gvMx1
-            // 
-            this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gvMx1guid,
-            this.gvMx1pid,
-            this.gvMx1forder,
-            this.gvMx1fcheckItem,
-            this.gridColumn5,
-            this.gvMx1memo,
-            this.gvMx1fcheckTool,
-            this.gvMx1sampleSizeNo,
-            this.sampleSizeName,
-            this.gvMx1fcheckLevel,
-            this.gvMx1facLevel,
-            this.gvMx1fupAllow,
-            this.gvMx1fstand,
-            this.gvMx1fdownAllow,
-            this.gvMxDel});
-            this.gvMx1.GridControl = this.gcMx1;
-            this.gvMx1.Name = "gvMx1";
-            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.ShowGroupPanel = false;
-            // 
-            // gvMx1guid
-            // 
-            this.gvMx1guid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1guid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1guid.Caption = "guid";
-            this.gvMx1guid.FieldName = "guid";
-            this.gvMx1guid.MinWidth = 50;
-            this.gvMx1guid.Name = "gvMx1guid";
-            this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Width = 94;
-            // 
-            // gvMx1pid
-            // 
-            this.gvMx1pid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1pid.AppearanceCell.Options.UseFont = true;
-            this.gvMx1pid.Caption = "pid";
-            this.gvMx1pid.FieldName = "pid";
-            this.gvMx1pid.MinWidth = 50;
-            this.gvMx1pid.Name = "gvMx1pid";
-            this.gvMx1pid.Tag = "query_a.pid";
-            this.gvMx1pid.Width = 94;
-            // 
-            // gvMx1forder
-            // 
-            this.gvMx1forder.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1forder.AppearanceCell.Options.UseFont = true;
-            this.gvMx1forder.Caption = "椤哄簭";
-            this.gvMx1forder.ColumnEdit = this.repositoryItemComboBox1;
-            this.gvMx1forder.FieldName = "forder";
-            this.gvMx1forder.MinWidth = 50;
-            this.gvMx1forder.Name = "gvMx1forder";
-            this.gvMx1forder.Tag = "yz_quantity_0_edit";
-            this.gvMx1forder.Visible = true;
-            this.gvMx1forder.VisibleIndex = 0;
-            this.gvMx1forder.Width = 50;
-            // 
-            // 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[] {
-            "1",
-            "2",
-            "3",
-            "4",
-            "5",
-            "6",
-            "7",
-            "8",
-            "9",
-            "10",
-            "11",
-            "12",
-            "13",
-            "14",
-            "15"});
-            this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
-            // 
-            // gvMx1fcheckItem
-            // 
-            this.gvMx1fcheckItem.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1fcheckItem.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
-            this.gvMx1fcheckItem.ColumnEdit = this.rptJYXM;
-            this.gvMx1fcheckItem.FieldName = "fcheckItem";
-            this.gvMx1fcheckItem.MinWidth = 150;
-            this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
-            this.gvMx1fcheckItem.Tag = "edit";
-            this.gvMx1fcheckItem.Visible = true;
-            this.gvMx1fcheckItem.VisibleIndex = 1;
-            this.gvMx1fcheckItem.Width = 150;
-            // 
-            // rptJYXM
-            // 
-            this.rptJYXM.AutoHeight = false;
-            this.rptJYXM.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJYXM.Name = "rptJYXM";
-            // 
-            // gridColumn5
-            // 
-            this.gridColumn5.Caption = "瑙勬牸瑕佹眰";
-            this.gridColumn5.FieldName = "fspecRequ";
-            this.gridColumn5.MinWidth = 150;
-            this.gridColumn5.Name = "gridColumn5";
-            this.gridColumn5.Tag = "edit";
-            this.gridColumn5.Visible = true;
-            this.gridColumn5.VisibleIndex = 2;
-            this.gridColumn5.Width = 150;
-            // 
-            // 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 = 150;
-            this.gvMx1memo.Name = "gvMx1memo";
-            this.gvMx1memo.Tag = "edit";
-            this.gvMx1memo.Visible = true;
-            this.gvMx1memo.VisibleIndex = 3;
-            this.gvMx1memo.Width = 150;
-            // 
-            // gvMx1fcheckTool
-            // 
-            this.gvMx1fcheckTool.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1fcheckTool.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
-            this.gvMx1fcheckTool.ColumnEdit = this.rptJYGJ;
-            this.gvMx1fcheckTool.FieldName = "fcheckTool";
-            this.gvMx1fcheckTool.MinWidth = 150;
-            this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
-            this.gvMx1fcheckTool.Tag = "edit";
-            this.gvMx1fcheckTool.Visible = true;
-            this.gvMx1fcheckTool.VisibleIndex = 4;
-            this.gvMx1fcheckTool.Width = 150;
-            // 
-            // rptJYGJ
-            // 
-            this.rptJYGJ.AutoHeight = false;
-            this.rptJYGJ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJYGJ.Name = "rptJYGJ";
-            this.rptJYGJ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            // 
-            // gvMx1sampleSizeNo
-            // 
-            this.gvMx1sampleSizeNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1sampleSizeNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗗悕绉�";
-            this.gvMx1sampleSizeNo.ColumnEdit = this.rptJYBZ;
-            this.gvMx1sampleSizeNo.FieldName = "sampleSizeName";
-            this.gvMx1sampleSizeNo.MinWidth = 150;
-            this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
-            this.gvMx1sampleSizeNo.Tag = "edit";
-            this.gvMx1sampleSizeNo.Visible = true;
-            this.gvMx1sampleSizeNo.VisibleIndex = 5;
-            this.gvMx1sampleSizeNo.Width = 150;
-            // 
-            // rptJYBZ
-            // 
-            this.rptJYBZ.AutoHeight = false;
-            this.rptJYBZ.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJYBZ.Name = "rptJYBZ";
-            this.rptJYBZ.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.rptJYBZ.EditValueChanged += new System.EventHandler(this.rptJYBZ_SelectedIndexChanged);
-            // 
-            // sampleSizeName
-            // 
-            this.sampleSizeName.Caption = "妫�楠屾爣鍑嗙紪鐮�";
-            this.sampleSizeName.FieldName = "sampleSizeNo";
-            this.sampleSizeName.MinWidth = 150;
-            this.sampleSizeName.Name = "sampleSizeName";
-            this.sampleSizeName.OptionsColumn.ReadOnly = true;
-            this.sampleSizeName.Tag = "edit";
-            this.sampleSizeName.Visible = true;
-            this.sampleSizeName.VisibleIndex = 6;
-            this.sampleSizeName.Width = 150;
-            // 
-            // gvMx1fcheckLevel
-            // 
-            this.gvMx1fcheckLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1fcheckLevel.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
-            this.gvMx1fcheckLevel.ColumnEdit = this.rptJYSP;
-            this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
-            this.gvMx1fcheckLevel.MinWidth = 200;
-            this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
-            this.gvMx1fcheckLevel.Tag = "edit";
-            this.gvMx1fcheckLevel.Visible = true;
-            this.gvMx1fcheckLevel.VisibleIndex = 7;
-            this.gvMx1fcheckLevel.Width = 200;
-            // 
-            // rptJYSP
-            // 
-            this.rptJYSP.AutoHeight = false;
-            this.rptJYSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJYSP.Name = "rptJYSP";
-            this.rptJYSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            // 
-            // gvMx1facLevel
-            // 
-            this.gvMx1facLevel.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1facLevel.AppearanceCell.Options.UseFont = true;
-            this.gvMx1facLevel.Caption = "鎺ユ敹姘村钩";
-            this.gvMx1facLevel.ColumnEdit = this.rptJSSP;
-            this.gvMx1facLevel.FieldName = "facLevel";
-            this.gvMx1facLevel.MinWidth = 150;
-            this.gvMx1facLevel.Name = "gvMx1facLevel";
-            this.gvMx1facLevel.Tag = "edit";
-            this.gvMx1facLevel.Visible = true;
-            this.gvMx1facLevel.VisibleIndex = 8;
-            this.gvMx1facLevel.Width = 150;
-            // 
-            // rptJSSP
-            // 
-            this.rptJSSP.AutoHeight = false;
-            this.rptJSSP.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
-            this.rptJSSP.Name = "rptJSSP";
-            this.rptJSSP.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            // 
-            // gvMx1fupAllow
-            // 
-            this.gvMx1fupAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fupAllow.Caption = "涓婇檺";
-            this.gvMx1fupAllow.FieldName = "fupAllow";
-            this.gvMx1fupAllow.MinWidth = 60;
-            this.gvMx1fupAllow.Name = "gvMx1fupAllow";
-            this.gvMx1fupAllow.Tag = "yz_quantity_0_edit";
-            this.gvMx1fupAllow.Visible = true;
-            this.gvMx1fupAllow.VisibleIndex = 9;
-            this.gvMx1fupAllow.Width = 60;
-            // 
-            // gvMx1fstand
-            // 
-            this.gvMx1fstand.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fstand.Caption = "鏍囧噯鍊�";
-            this.gvMx1fstand.FieldName = "fstand";
-            this.gvMx1fstand.MinWidth = 60;
-            this.gvMx1fstand.Name = "gvMx1fstand";
-            this.gvMx1fstand.Tag = "yz_quantity_0_edit";
-            this.gvMx1fstand.Visible = true;
-            this.gvMx1fstand.VisibleIndex = 10;
-            this.gvMx1fstand.Width = 60;
-            // 
-            // gvMx1fdownAllow
-            // 
-            this.gvMx1fdownAllow.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
-            this.gvMx1fdownAllow.Caption = "涓嬮檺";
-            this.gvMx1fdownAllow.FieldName = "fdownAllow";
-            this.gvMx1fdownAllow.MinWidth = 60;
-            this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
-            this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit";
-            this.gvMx1fdownAllow.Visible = true;
-            this.gvMx1fdownAllow.VisibleIndex = 11;
-            this.gvMx1fdownAllow.Width = 60;
-            // 
-            // gvMxDel
-            // 
-            this.gvMxDel.Caption = "绉婚櫎";
-            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 50;
-            this.gvMxDel.Name = "gvMxDel";
-            this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 12;
-            this.gvMxDel.Width = 100;
-            // 
-            // repositoryItemButtonEdit1
-            // 
-            this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.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)});
-            this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
-            this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
-            // 
-            // xtraTabPageCopy
-            // 
-            this.xtraTabPageCopy.Controls.Add(this.gridControl2);
-            this.xtraTabPageCopy.Controls.Add(this.panelControl1);
-            this.xtraTabPageCopy.Name = "xtraTabPageCopy";
-            this.xtraTabPageCopy.Size = new System.Drawing.Size(1125, 412);
-            this.xtraTabPageCopy.Text = "澶嶅埗鍒板叾瀹冪墿鏂�";
-            // 
-            // gridControl2
-            // 
-            this.gridControl2.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gridControl2.Location = new System.Drawing.Point(0, 43);
-            this.gridControl2.MainView = this.gridView2;
-            this.gridControl2.Name = "gridControl2";
-            this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
-            this.repositoryItemButtonEdit3});
-            this.gridControl2.Size = new System.Drawing.Size(1125, 369);
-            this.gridControl2.TabIndex = 1;
-            this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
-            this.gridView2});
-            // 
-            // gridView2
-            // 
-            this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn11,
-            this.gridColumn12,
-            this.gridColumn13,
-            this.gridColumn14,
-            this.gridColumn15,
-            this.gridColumn6,
-            this.gridColumn9});
-            this.gridView2.GridControl = this.gridControl2;
-            this.gridView2.Name = "gridView2";
-            this.gridView2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
-            this.gridView2.OptionsFind.ShowSearchNavButtons = false;
-            this.gridView2.OptionsView.ShowGroupPanel = false;
-            // 
-            // gridColumn11
-            // 
-            this.gridColumn11.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gridColumn11.AppearanceCell.Options.UseFont = true;
-            this.gridColumn11.Caption = "浣跨敤缁勭粐";
-            this.gridColumn11.FieldName = "fSubsidiary";
-            this.gridColumn11.MinWidth = 150;
-            this.gridColumn11.Name = "gridColumn11";
-            this.gridColumn11.OptionsColumn.ReadOnly = true;
-            this.gridColumn11.Tag = "query_a.FCHECK_ITEM";
-            this.gridColumn11.Visible = true;
-            this.gridColumn11.VisibleIndex = 0;
-            this.gridColumn11.Width = 150;
-            // 
-            // gridColumn12
-            // 
-            this.gridColumn12.Caption = "鐗╂枡ID";
-            this.gridColumn12.FieldName = "id";
-            this.gridColumn12.MinWidth = 150;
-            this.gridColumn12.Name = "gridColumn12";
-            this.gridColumn12.OptionsColumn.ReadOnly = true;
-            this.gridColumn12.Visible = true;
-            this.gridColumn12.VisibleIndex = 1;
-            this.gridColumn12.Width = 150;
-            // 
-            // gridColumn13
-            // 
-            this.gridColumn13.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gridColumn13.AppearanceCell.Options.UseFont = true;
-            this.gridColumn13.Caption = "鐗╂枡缂栧彿";
-            this.gridColumn13.FieldName = "itemNo";
-            this.gridColumn13.MinWidth = 150;
-            this.gridColumn13.Name = "gridColumn13";
-            this.gridColumn13.OptionsColumn.ReadOnly = true;
-            this.gridColumn13.Tag = "query_a.MEMO";
-            this.gridColumn13.Visible = true;
-            this.gridColumn13.VisibleIndex = 2;
-            this.gridColumn13.Width = 150;
-            // 
-            // gridColumn14
-            // 
-            this.gridColumn14.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gridColumn14.AppearanceCell.Options.UseFont = true;
-            this.gridColumn14.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn14.FieldName = "itemName";
-            this.gridColumn14.MinWidth = 150;
-            this.gridColumn14.Name = "gridColumn14";
-            this.gridColumn14.OptionsColumn.ReadOnly = true;
-            this.gridColumn14.Tag = "query_a.FCHECK_TOOL";
-            this.gridColumn14.Visible = true;
-            this.gridColumn14.VisibleIndex = 3;
-            this.gridColumn14.Width = 150;
-            // 
-            // gridColumn15
-            // 
-            this.gridColumn15.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gridColumn15.AppearanceCell.Options.UseFont = true;
-            this.gridColumn15.Caption = "瑙勬牸鍨嬪彿";
-            this.gridColumn15.FieldName = "itemModel";
-            this.gridColumn15.MinWidth = 150;
-            this.gridColumn15.Name = "gridColumn15";
-            this.gridColumn15.OptionsColumn.ReadOnly = true;
-            this.gridColumn15.Tag = "query_a.SAMPLE_SIZE_NO";
-            this.gridColumn15.Visible = true;
-            this.gridColumn15.VisibleIndex = 4;
-            this.gridColumn15.Width = 150;
-            // 
-            // gridColumn6
-            // 
-            this.gridColumn6.Caption = "绉诲嚭";
-            this.gridColumn6.ColumnEdit = this.repositoryItemButtonEdit3;
-            this.gridColumn6.MinWidth = 25;
-            this.gridColumn6.Name = "gridColumn6";
-            this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 5;
-            this.gridColumn6.Width = 94;
-            // 
-            // repositoryItemButtonEdit3
-            // 
-            this.repositoryItemButtonEdit3.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.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)});
-            this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
-            this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
-            this.repositoryItemButtonEdit3.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit3_ButtonClick);
-            // 
-            // gridColumn9
-            // 
-            this.gridColumn9.Caption = "gridColumn9";
-            this.gridColumn9.FieldName = "guid";
-            this.gridColumn9.MinWidth = 25;
-            this.gridColumn9.Name = "gridColumn9";
-            this.gridColumn9.Width = 94;
-            // 
-            // panelControl1
-            // 
-            this.panelControl1.Controls.Add(this.btnSave);
-            this.panelControl1.Controls.Add(this.btnSelect);
-            this.panelControl1.Dock = System.Windows.Forms.DockStyle.Top;
-            this.panelControl1.Location = new System.Drawing.Point(0, 0);
-            this.panelControl1.Name = "panelControl1";
-            this.panelControl1.Size = new System.Drawing.Size(1125, 43);
-            this.panelControl1.TabIndex = 0;
-            // 
-            // btnSave
-            // 
-            this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.exportfile_16x161;
-            this.btnSave.Location = new System.Drawing.Point(139, 6);
-            this.btnSave.Name = "btnSave";
-            this.btnSave.Size = new System.Drawing.Size(187, 29);
-            this.btnSave.TabIndex = 450;
-            this.btnSave.Text = "淇濆瓨澶嶅埗鐨勭墿鏂欏拰椤圭洰";
-            // 
-            // btnSelect
-            // 
-            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
-            this.btnSelect.Location = new System.Drawing.Point(10, 6);
-            this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(101, 29);
-            this.btnSelect.TabIndex = 449;
-            this.btnSelect.Text = "閫夋嫨鐗╂枡";
-            // 
-            // picCheckBox
-            // 
-            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(945, 55);
-            this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
-            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
-            this.picCheckBox.TabIndex = 6;
-            this.picCheckBox.TabStop = false;
-            this.picCheckBox.Visible = false;
-            // 
-            // Frm_MesQmCheckitemDt
+            // Frm_Jyxm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1129, 682);
-            this.Controls.Add(this.picCheckBox);
-            this.Controls.Add(this.xtraTabControl1);
-            this.Controls.Add(this.toolBarMenu1);
-            this.Name = "Frm_MesQmCheckitemDt";
-            this.Text = "IQC鐗╂枡妫�楠岄」鐩�";
-            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
-            this.xtraTabControl1.ResumeLayout(false);
-            this.xtraTabPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel1)).EndInit();
-            this.split1.Panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.split1.Panel2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.split1)).EndInit();
-            this.split1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
-            this.xtraTabPage2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).EndInit();
-            this.splitMx1.Panel1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel2)).EndInit();
-            this.splitMx1.Panel2.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.splitMx1)).EndInit();
-            this.splitMx1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
-            this.layoutMx1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemNo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckor.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fversion.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoCheckdate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_gg.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_ftwoChecked.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
-            this.tabMx.ResumeLayout(false);
-            this.tabMxPage1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
-            this.xtraTabPageCopy.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.gridControl2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).EndInit();
-            this.panelControl1.ResumeLayout(false);
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+            this.ClientSize = new System.Drawing.Size(1044, 711);
+            this.Controls.Add(this.jyxm1);
+            this.Name = "Frm_Jyxm";
+            this.Text = "iqc";
             this.ResumeLayout(false);
 
         }
+
         #endregion
-        private UserControl.UcToolBarMenu toolBarMenu1;
-        private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
-        private System.Windows.Forms.PictureBox picCheckBox;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
-        private DevExpress.XtraEditors.SplitContainerControl split1;
-        private DevExpress.XtraGrid.GridControl gcMain1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_isenabled;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_foneChecked;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoChecked;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_fversion;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckor;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckdate;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoCheckor;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_memo;
-        private UserControls.Data.UcPageBar pageBar1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
-        private DevExpress.XtraEditors.SplitContainerControl splitMx1;
-        private DevExpress.XtraDataLayout.DataLayoutControl layoutMx1;
-        private DevExpress.XtraLayout.LayoutControlGroup Root;
-        private UserControl.UcLookOrg txt_fSubsidiary;
-        private UserControl.UcLookItems txt_itemId;
-        private DevExpress.XtraEditors.TextEdit txt_itemNo;
-        private DevExpress.XtraEditors.TextEdit txt_fversion;
-        private DevExpress.XtraEditors.TextEdit txt_ftwoCheckdate;
-        private DevExpress.XtraEditors.TextEdit txt_ftwoCheckor;
-        private DevExpress.XtraEditors.TextEdit txt_foneCheckdate;
-        private DevExpress.XtraEditors.TextEdit txt_foneCheckor;
-        private DevExpress.XtraEditors.TextEdit txt_memo;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
-        private DevExpress.XtraEditors.TextEdit txt_gg;
-        private DevExpress.XtraEditors.CheckEdit txt_ftwoChecked;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
-        private System.Windows.Forms.Label lbGuid;
-        private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraTab.XtraTabControl tabMx;
-        private DevExpress.XtraTab.XtraTabPage tabMxPage1;
-        private DevExpress.XtraGrid.GridControl gcMx1;
-        private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1pid;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1forder;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckItem;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYXM;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1memo;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckTool;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYGJ;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1sampleSizeNo;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
-        private DevExpress.XtraGrid.Columns.GridColumn sampleSizeName;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fcheckLevel;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYSP;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1facLevel;
-        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJSSP;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fupAllow;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fstand;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPageCopy;
-        private DevExpress.XtraGrid.GridControl gridControl2;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn14;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
-        private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
-        private DevExpress.XtraEditors.PanelControl panelControl1;
-        private DevExpress.XtraEditors.SimpleButton btnSave;
-        private DevExpress.XtraEditors.SimpleButton btnSelect;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+
+        private QC.Jyxm jyxm1;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
index 3165605..69955c8 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.cs
@@ -16,776 +16,10 @@
 {
     public partial class Frm_MesQmCheckitemDt : XtraForm
     {
-        private List<FilterEntity> _filterList = new List<FilterEntity>();
-        private readonly string _webServiceName = "MesQmCheckitemManager/";
+     
         public Frm_MesQmCheckitemDt()
         {
             InitializeComponent();
-            toolBarMenu1.btnAddClick += ToolBarMenu1_btnAddClick;
-            toolBarMenu1.btnEdtClick += ToolBarMenu1_btnEdtClick;
-            toolBarMenu1.btnSaveClick += ToolBarMenu1_btnSaveClick;
-            toolBarMenu1.btnLoadClick += ToolBarMenu1_btnLoadClick;
-            toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick1;
-            toolBarMenu1.btnEscClick += ToolBarMenu1_btnEscClick;
-            toolBarMenu1.btnQueryClick += ToolBarMenu1_btnQueryClick;
-            toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
-            toolBarMenu1.btnPiZhunClick += ToolBarMenu1_btnPiZhunClick;
-            this.toolBarMenu1.getXmlConfig();
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
-            Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "foneChecked", "", (value) =>
-            {
-                Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 0);
-            });
-            Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
-            {
-                getModel(value);
-            }, (value) =>
-            {
-                getPageList(this.pageBar1.CurrentPage);
-            });
-            getPageList(1);
-            pageBar1.PagerEvent += PageBar1_PagerEvent;
-            _setIno();
-            btnSelect.Click += (s, e) =>
-            {
-                var frm = new SelectCheckDt("jyxm");
-                frm.UpdateParent += (ss, ee) =>
-                {
-                    var lst = ee.DynamicList;
-                    var json = JsonConvert.SerializeObject(lst);
-                    DataTable _newTable = (DataTable)JsonConvert.DeserializeObject(json, (typeof(DataTable)));
-                    DataTable _oldTable = (DataTable)gridControl2.DataSource;
-                    DataRow[] sourceRows = _newTable.Select();
-                    for (int i = 0; i < sourceRows.Length; i++)
-                    {
-                        _oldTable.ImportRow(sourceRows[i]);
-                    }
-                    gridControl2.BindingContext = new BindingContext();
-                    gridControl2.DataSource = _oldTable;
-                    gridControl2.ForceInitialize();
-                };
-                frm.ShowDialog();
-            };
-            btnSave.Click += BtnSave_Click;
-        }
-        private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
-        {
-            Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
-            Task.Delay(100);
-            getPageList(1);
-        }
-
-        /// <summary>
-        ///     鍒嗛〉浜嬩欢
-        /// </summary>
-        /// <param name="curPage"></param>
-        /// <param name="pageSize"></param>
-        private void PageBar1_PagerEvent(int curPage, int pageSize)
-        {
-            getPageList(curPage);
-        }
-
-        /// <summary>
-        ///     鏌ヨ浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnQueryClick(object sender, EventArgs e)
-        {
-            gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-            gridView1.ActiveFilter.Clear();
-            gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-            var frm = new ShowFilter(gridView1.Columns, _filterList);
-            frm.UpdateParent += Frm_UpdateParent;
-            frm.ShowDialog();
-        }
-
-        /// <summary>
-        ///     鏌ヨ鍥炶皟
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void Frm_UpdateParent(object sender, UpdateParentEventArgs e)
-        {
-            _filterList = e.FilterList;
-            getPageList(1);
-        }
-        /// <summary>
-        /// 鎵瑰噯
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnPiZhunClick(object sender, EventArgs e)
-        {
-            _toolCk(2);
-        }
-
-        /// <summary>
-        ///     瀹℃牳浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnChkClick(object sender, EventArgs e)
-        {
-            _toolCk(1);
-        }
-        /// <summary>
-        ///     鍙栨秷浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnEscClick(object sender, EventArgs e)
-        {
-            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 1);
-        }
-
-        /// <summary>
-        ///     鍒犻櫎浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnDelClick1(object sender, EventArgs e)
-        {
-            _toolCk(-1);
-        }
-
-        /// <summary>
-        ///     鍒锋柊浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnLoadClick(object sender, EventArgs e)
-        {
-            if (xtraTabControl1.SelectedTabPageIndex == 1)
-                getModel(lbGuid.Text.Trim());
-            else
-            {
-                //_filterList.Clear();
-                //if (gridView1.ActiveFilter.Count > 0)
-                //{
-                //    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-                //    gridView1.ActiveFilter.Clear();
-                //    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-                //}
-                //getPageList(1);
-                getPageList(this.pageBar1.CurrentPage);
-            }
-        }
-
-        /// <summary>
-        ///     淇敼浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnEdtClick(object sender, EventArgs e)
-        {
-            string rowGuid = "", rowName = "";
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1);
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
-            if (xtraTabControl1.SelectedTabPageIndex == 1)
-            {
-                getModel(rowGuid);
-            }
-            else
-            {
-                List<DevExpress.XtraGrid.Views.Grid.GridView> gvList = new List<DevExpress.XtraGrid.Views.Grid.GridView>();
-                gvList.Add(gvMx1);
-                gvList.Add(gridView2);
-                UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
-            }
-        }
-
-        /// <summary>
-        ///     鏂板浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnAddClick(object sender, EventArgs e)
-        {
-            lbGuid.Text = "";
-            Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 4);
-            var gridViews = new List<GridView>();
-            gridViews.Add(gvMx1);
-            gridViews.Add(gridView2);
-            UtilityHelper.CleanValueByControl(this.layoutMx1.Controls, true, gridViews);
-            UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
-            xtraTabPageCopy.PageEnabled = false;
-        }
-      
-        /// <summary>
-        ///     淇濆瓨浜嬩欢
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void ToolBarMenu1_btnSaveClick(object sender, EventArgs e)
-        {
-            toolBarMenu1.isSetBtn = false;
-            string _ItemId = txt_itemId.GetId();
-            if (string.IsNullOrEmpty(_ItemId))
-            {
-                MsgHelper.Warning("璇烽�夋嫨鐗╂枡锛�");
-                txt_itemId.Focus();
-                return;
-            }
-            gvMx1.CloseEditor();
-            gvMx1.PostEditor();
-            gvMx1.UpdateCurrentRow();
-            if (gvMx1.DataRowCount <= 0)
-            {
-                MsgHelper.Warning("椤圭洰鏄庣粏涓嶈兘涓虹┖锛�");
-                return;
-            }
-            try
-            {
-                var lst = new List<MesQmCheckitemDt>();
-                for (var i = 0; i < gvMx1.DataRowCount; i++)
-                {
-                    var row = gvMx1.GetDataRow(i);
-                    if (row != null)
-                    {
-                        if (string.IsNullOrEmpty(row["forder"].ToString()))
-                        {
-                            MsgHelper.ShowError("椤哄簭涓嶈兘涓虹┖锛�");
-                            return;
-                        }
-                        if (string.IsNullOrEmpty(row["FcheckItem"].ToString()))
-                        {
-                            MsgHelper.ShowError("妫�楠岄」鐩笉鑳戒负绌猴紒");
-                            return;
-                        }
-                        if (string.IsNullOrEmpty(row["FcheckTool"].ToString()))
-                        {
-                            MsgHelper.ShowError("妫�楠屽伐鍏蜂笉鑳戒负绌猴紒");
-                            return;
-                        }
-                        if (string.IsNullOrEmpty(row["SampleSizeNo"].ToString()))
-                        {
-                            MsgHelper.ShowError("妫�楠屾爣鍑嗕笉鑳戒负绌猴紒");
-                            return;
-                        }
-                        if (string.IsNullOrEmpty(row["FcheckLevel"].ToString()))
-                        {
-                            MsgHelper.ShowError("妫�楠屾按骞充笉鑳戒负绌猴紒");
-                            return;
-                        }
-                        if (string.IsNullOrEmpty(row["FacLevel"].ToString()))
-                        {
-                            MsgHelper.ShowError("鎺ュ彈姘村钩涓嶈兘涓虹┖锛�");
-                            return;
-                        }
-                        string _Fstand = row["Fstand"].ToString();
-                        string _FupAllow = row["FupAllow"].ToString();
-                        string _FdownAllow = row["FdownAllow"].ToString();
-                        //鍋囧涓変釜閮戒负绌洪�氳繃
-                        if (string.IsNullOrEmpty(_Fstand) && string.IsNullOrEmpty(_FupAllow) && string.IsNullOrEmpty(_FdownAllow))
-                        {
-
-                        }
-                        else
-                        {
-                            if (!string.IsNullOrEmpty(_Fstand) && !string.IsNullOrEmpty(_FupAllow) && !string.IsNullOrEmpty(_FdownAllow))
-                            {
-                                decimal _Fstand_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_Fstand);
-                                decimal _FupAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FupAllow);
-                                decimal _FdownAllow_f = Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(_FdownAllow);
-                                if (_Fstand_f >= _FdownAllow_f && _Fstand_f <= _FupAllow_f) { }
-                                else
-                                {
-                                    MsgHelper.ShowError("鏍囧噯鍊煎繀椤诲湪涓婇檺鍜屼笅闄愪箣闂达紒");
-                                    return;
-                                }
-                            }
-                            else
-                            {
-                                MsgHelper.ShowError("璇峰~鍐欐纭殑涓婇檺锛屾爣鍑嗗�硷紝涓嬮檺锛�");
-                                return;
-                            }
-                        }
-                        lst.Add(new MesQmCheckitemDt
-                        {
-                            Guid = UtilityHelper.ToGuid(row["guid"].ToString()),
-                            Forder = int.Parse(row["forder"].ToString()),
-                            FcheckItem = row["FcheckItem"].ToString(),
-                            SampleSizeNo = row["SampleSizeNo"].ToString(),
-                            FcheckTool = row["FcheckTool"].ToString(),
-                            FcheckLevel = row["FcheckLevel"].ToString(),
-                            Fstand = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["Fstand"].ToString()),
-                            FacLevel = row["FacLevel"].ToString(),
-                            FspecRequ = row["FspecRequ"].ToString(),
-                            Memo = row["memo"].ToString(),
-                            FupAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FupAllow"].ToString()),
-                            FdownAllow = Gs.DevApp.ToolBox.UtilityHelper.GetDecimal(row["FdownAllow"].ToString()),
-                        });
-                    }
-                }
-                var _obj = new MesQmCheckitem
-                {
-                    Guid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
-                    ItemId = long.Parse(_ItemId),
-                    Memo = txt_memo.Text.Trim(),
-                    ItemNo = txt_itemNo.Text.Trim(),
-                    Ftype = "1",
-                    Fversion = Gs.DevApp.ToolBox.UtilityHelper.ToLong(txt_fversion.Text.Trim()),
-                    list = lst
-                };
-                try
-                {
-                    var strJson = UtilityHelper.HttpPost("",
-                        _webServiceName + "EditModel",
-                        JsonConvert.SerializeObject(_obj));
-                    var _rtn =
-                        UtilityHelper.ReturnToDynamic(strJson);
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                    if (_rtn.rtnCode > 0)
-                    {
-                        lbGuid.Text = _rtn.rtnData;
-                        toolBarMenu1.isSetBtn = true;
-                        var gridViews = new List<GridView>();
-                        gridViews.Add(gvMx1);
-                        gridViews.Add(gridView2);
-                        UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, false, gridViews);
-                    }
-                }
-                catch (Exception ex)
-                {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
-            }
-
-        }
-       
-        /// <summary>
-        /// </summary>
-        /// <param name="curPage">绗嚑椤�</param>
-        /// <param name="pageSize">姣忛〉鍑犳潯</param>
-        private void getPageList(int curPage)
-        {
-            var _sbSqlWhere = UtilityHelper.GetSearchWhere(_filterList);
-            _sbSqlWhere += " and b.guid is not null";
-            var pgq = new PageQueryModel(curPage, this.pageBar1.RowsCount,
-                "org.FNumber asc ,b.item_no asc,a.FVERSION desc", "", "", _sbSqlWhere.ToString());
-            var json = JsonConvert.SerializeObject(pgq);
-            try
-            {
-                var strReturn = UtilityHelper.HttpPost("",
-                _webServiceName + "GetListPage", json);
-                var dd =
-                    UtilityHelper.ReturnToTablePage(strReturn);
-                if (dd.rtnCode > 0)
-                {
-                    gcMain1.DataSource = null;
-                    DataTable dt = dd.rtnData.list;
-                    gcMain1.BindingContext = new BindingContext();
-                    gridView1.ColumnFilterChanged -= GridView1_ColumnFilterChanged;
-                    if (dt.Rows.Count > 0)
-                    {
-                        gcMain1.DataSource = dt;
-                        gcMain1.ForceInitialize();
-                        gridView1.BestFitColumns();
-                    }
-                    else
-                        UtilityHelper.SetDefaultTable(gcMain1, gridView1);
-                    gridView1.ColumnFilterChanged += GridView1_ColumnFilterChanged;
-                    pageBar1.TotalPages = dd.rtnData.pages;//鎬婚〉
-                    pageBar1.CurrentPage = curPage;//褰撳墠椤�
-                    pageBar1.RecordCount = dd.rtnData.total;//鎬昏褰曟暟
-                }
-                else
-                {
-                    MsgHelper.ShowError("鎻愮ず锛�" + dd.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        private void getModel(string strGuid)
-        {
-            bool isEdit = false;
-            if (toolBarMenu1.currentAction == "add") return;
-            if (toolBarMenu1.currentAction == "edit") isEdit = true;
-            if (string.IsNullOrEmpty(strGuid))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            xtraTabPageCopy.PageEnabled = !isEdit;
-            var _obj = new
-            {
-                guid = strGuid //涓诲缓
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("",
-                         _webServiceName + "GetModel",
-                    JsonConvert.SerializeObject(_obj));
-                var _rtn =
-                    UtilityHelper.ReturnToDynamic(strJson);
-                if (_rtn.rtnCode > 0)
-                {
-                    var dy = _rtn.rtnData;
-                    lbGuid.Text = strGuid;
-                    var gvList = new List<GridView>();
-                    gvList.Add(gvMx1);
-                    UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy,
-                        isEdit, gvList);
-                    var _job = JObject.Parse(strJson);
-                    var array = new JArray();
-                    foreach (var a in _job["rtnData"]["list"]) array.Add(a);
-                    var dt = JsonConvert.DeserializeObject<DataTable>(array.ToString());
-                    if (dt.Rows.Count > 0)
-                    {
-                        gcMx1.BindingContext = new BindingContext();
-                        gcMx1.DataSource = dt;
-                        gcMx1.ForceInitialize();
-                        gvMx1.BestFitColumns();
-                    }
-                    else
-                    {
-                        UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
-                    }
-                    UtilityHelper.SetDefaultTable(gridControl2, gridView2);
-                }
-                else
-                {
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 宸ュ叿鏉′簨浠�
-        /// </summary>
-        /// <param name="inFieldValue"></param>
-        private void _toolCk(int _inFieldValue)
-        {
-            string strMsg = "";
-            switch (_inFieldValue)
-            {
-                case -1:
-                    strMsg = "鍒犻櫎";
-                    break;
-                case 1:
-                    strMsg = "瀹℃牳";
-                    break;
-                case 2:
-                    strMsg = "鎵瑰噯";
-                    break;
-            };
-            toolBarMenu1.guidKey = "";
-            string rowGuid, rowName;
-            (rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_itemNo, gridView1, "itemNo");
-            if (string.IsNullOrEmpty(rowGuid))
-            {
-                MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
-                return;
-            }
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
-                return;
-            var _obj = new
-            {
-                guid = rowGuid,
-                inFieldValue = _inFieldValue,
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("",
-                    _webServiceName + "EditModelSubmit",
-                    JsonConvert.SerializeObject(_obj));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
-                if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
-                {
-                    if (xtraTabControl1.SelectedTabPageIndex == 1)
-                    {
-                        getModel(lbGuid.Text.Trim());
-                        UtilityHelper.SetCheckIco(gridView1, "foneChecked", "foneCheckor", "foneCheckdate", picCheckBox, this, _inFieldValue>0?"1":"0");
-                    }
-                    else {
-                        //娉ㄦ剰锛岃繖閲屽拰鍏跺畠椤甸潰鏈夌偣涓嶄竴鏍�
-                        getPageList(this.pageBar1.CurrentPage);
-                        int rowHandle = gridView1.LocateByValue("guid", rowGuid);
-                        gridView1.FocusedRowHandle = rowHandle;
-                    }
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        #region 浠ヤ笅涓虹绉嶄笅鎷�
-        private void _setIno()
-        {
-            this.txt_fSubsidiary.EditChanged += (s, e) =>
-            {
-                string _orgId = txt_fSubsidiary.GetId();
-                if (string.IsNullOrEmpty(_orgId))
-                    return;
-                txt_itemId.getSuppler(_orgId);
-                //txt_gg.Text ="";
-                //txt_itemNo.Text = "";
-            };
-            txt_itemId.EditChanged += (s, e) =>
-            {
-                if (!string.IsNullOrEmpty(this.txt_itemId.GetModel()))
-                    txt_gg.Text = this.txt_itemId.GetModel();
-                if (!string.IsNullOrEmpty(this.txt_itemId.GetCode()))
-                    txt_itemNo.Text = this.txt_itemId.GetCode();
-            };
-            _getListJyxm();
-            _getListJygj();
-            _getListJybz();
-            _getListJssp();
-            _getListJysp();
-        }
-        /// <summary>
-        /// 璇诲彇妫�楠岄」鐩�
-        /// </summary>
-        private void _getListJyxm()
-        {
-            var json = JsonConvert.SerializeObject("QCITEM");
-            try
-            {
-                var strReturn = UtilityHelper.HttpPost("", "MesSysLookupTypesManager/GetItemList", json);
-                var dd = UtilityHelper.ReturnToList(strReturn);
-                var dt = dd.rtnData;
-                foreach (DataRow dr in dt.Rows)
-                {
-                    rptJYXM.Items.Add(dr["lookUpName"].ToString());
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-
-        /// <summary>
-        /// 璇诲彇妫�楠屽伐鍏�
-        /// </summary>
-        private void _getListJygj()
-        {
-            var json = JsonConvert.SerializeObject("QATOOLS");
-            try
-            {
-                var strReturn = UtilityHelper.HttpPost("", "MesSysLookupTypesManager/GetItemList", json);
-                var dd = UtilityHelper.ReturnToList(strReturn);
-                var dt = dd.rtnData;
-                foreach (DataRow dr in dt.Rows)
-                {
-                    rptJYGJ.Items.Add(dr["lookUpName"].ToString());
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-        /// <summary>
-        /// 璇诲彇妫�楠屾爣鍑�
-        /// </summary>
-        private void _getListJybz()
-        {
-            var pgq = new PageQueryModel(1, 999999, "CREATE_DATE", "asc", "",
-                 " and 1=1");
-            var json = JsonConvert.SerializeObject(pgq);
-            try
-            {
-                var strReturn = UtilityHelper.HttpPost("",
-                    "MesQmAql1Manager/GetListPage", json);
-                var rtn = UtilityHelper.ReturnToTablePage(strReturn);
-                var dt = rtn.rtnData.list;
-                foreach (DataRow dr in dt.Rows)
-                {
-                    rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
-                    //rptJYBZ.Items.Add((new CboItemEntity(dr["SampleSizeNo"].ToString(), dr["SampleSizeName"].ToString())));
-                    //string ddddd = dr["SampleSizeName"].ToString();
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
-        }
-        /// <summary>
-        /// 璇诲彇鎺ュ彈姘村钩
-        /// </summary>
-        private void _getListJssp()
-        {
-            rptJSSP.Items.AddRange(new string[] {
-                "0.010---(AQL_0_0010)"
-                , "0.015---(AQL_0_0015)"
-                , "0.025---(AQL_0_0025)"
-                ,"0.040---(AQL_0_0040)"
-                ,"0.065---(AQL_0_0065)"
-                ,"0.10---(AQL_0_010)"
-                ,"0.15---(AQL_0_015)"
-                ,"0.25---(AQL_0_025)"
-                ,"0.40---(AQL_0_040)"
-                ,"0.65---(AQL_0_065)"
-                ,"1.00---(AQL_0_100)"
-                ,"1.50---(AQL_0_150)"
-                ,"2.00---(AQL_0_200)"
-                ,"2.50---(AQL_0_250)"
-            });
-        }
-        /// <summary>
-        /// 璇诲彇妫�楠屾按骞�
-        /// </summary>
-        private void _getListJysp()
-        {
-            rptJYSP.Items.AddRange(new string[] {
-                "1.涓�鑸楠屾按骞�(I)"
-                , "2.涓�鑸楠屾按骞�(II)"
-                ,"3.涓�鑸楠屾按骞�(III)"
-                ,"4.鐗规畩妫�楠屾按骞�(S1)"
-                ,"5.鐗规畩妫�楠屾按骞�(S2)"
-                ,"6.鐗规畩妫�楠屾按骞�(S3)"
-                ,"7.鐗规畩妫�楠屾按骞�(S4)"
-            });
-        }
-
-        /// <summary>
-        /// 鍏宠仈妫�楠屾爣鍑嗗悕绉�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void rptJYBZ_SelectedIndexChanged(object sender, EventArgs e)
-        {
-            ComboBoxEdit comboBox = sender as ComboBoxEdit;
-            if (comboBox != null)
-            {
-                GridView myView = (gcMx1.MainView as GridView);
-                int dataIndex = myView.GetDataSourceRowIndex(myView.FocusedRowHandle);
-                CboItemEntity _itm = comboBox.EditValue as CboItemEntity;
-                string _val = _itm.Value.ToString();
-                string _txt = _itm.Text.ToString();
-                gvMx1.CloseEditor();
-                gvMx1.UpdateCurrentRow();
-                gvMx1.SetRowCellValue(dataIndex, "sampleSizeNo", _val);
-                gvMx1.SetRowCellValue(dataIndex, "sampleSizeName", _txt);
-            }
-        }
-        private void repositoryItemButtonEdit1_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
-        {
-            gvMx1.CloseEditor();
-            gvMx1.UpdateCurrentRow();
-            var rowhandle = gvMx1.FocusedRowHandle;
-            if (rowhandle < 0)
-                return;
-            if (e.Button.Index == 0)
-            {
-                var dr = gvMx1.GetDataRow(rowhandle);
-                var mxGuid = dr["guid"].ToString();
-                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
-                    return;
-                if (string.IsNullOrEmpty(mxGuid))
-                {
-                    gvMx1.DeleteRow(rowhandle);
-                    return;
-                }
-                var strJson = "";
-                var lst = new List<string>();
-                lst.Add(mxGuid);
-                try
-                {
-                    strJson = UtilityHelper.HttpPost("",
-                        _webServiceName + "DeleteModelMx",
-                        JsonConvert.SerializeObject(lst));
-                    var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                    if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
-                    MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                }
-                catch (Exception ex)
-                {
-                    MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-                }
-            }
-        }
-        #endregion
-        /// <summary>
-        /// 鍒犻櫎澶嶅埗椤�
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        private void repositoryItemButtonEdit3_ButtonClick(object sender, DevExpress.XtraEditors.Controls.ButtonPressedEventArgs e)
-        {
-            gridView2.CloseEditor();
-            gridView2.UpdateCurrentRow();
-            var rowhandle = gridView2.FocusedRowHandle;
-            if (rowhandle < 0)
-                return;
-            if (e.Button.Index == 0)
-            {
-                var dr = gridView2.GetDataRow(rowhandle);
-                if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�1鏉℃暟鎹紝纭畾鍒犻櫎鍚楋紵"))
-                    return;
-                gridView2.DeleteRow(rowhandle);
-                return;
-            }
-        }
-        /// <summary>
-        /// 鎻愪氦鐗╂枡澶嶅埗
-        /// </summary>
-        /// <param name="sender"></param>
-        /// <param name="e"></param>
-        /// <exception cref="NotImplementedException"></exception>
-        private void BtnSave_Click(object sender, EventArgs e)
-        {
-            int _rows = gridView2.RowCount;
-            if (_rows <= 0)
-            {
-                MsgHelper.ShowInformation("璇烽�夋嫨浣犻渶瑕佸鍒剁殑鐗╂枡锛�");
-                return;
-            }
-
-            if (!MsgHelper.AskQuestion("浣犻�夋嫨浜�" + _rows.ToString() + "鏉℃暟鎹紝纭畾淇濆瓨鍚楋紵"))
-                return;
-            System.Text.StringBuilder _sbGuids = new System.Text.StringBuilder();
-            for (var i = 0; i < gridView2.DataRowCount; i++)
-            {
-                var row = gridView2.GetDataRow(i);
-                if (_sbGuids.Length > 0)
-                    _sbGuids.Append(",");
-                Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
-                _sbGuids.Append(_guid.ToString());
-            }
-            var _obj = new
-            {
-                sourceGuid = UtilityHelper.ToGuid(lbGuid.Text.Trim()),
-                itemGuids = _sbGuids.ToString()
-            };
-            try
-            {
-                var strJson = UtilityHelper.HttpPost("", _webServiceName + "ItemsComyMx", JsonConvert.SerializeObject(_obj));
-                var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-                MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
-                if (_rtn.rtnCode > 0)
-                {
-                    UtilityHelper.SetDefaultTable(gridControl2, gridView2);
-                }
-            }
-            catch (Exception ex)
-            {
-                MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
-            }
         }
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
index 1ab5b0f..7635899 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -51,7 +51,6 @@
             this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.gcMain1 = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_foneChecked = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_ftwoChecked = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -68,6 +67,8 @@
             this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -140,6 +141,7 @@
             this.btnSave = new DevExpress.XtraEditors.SimpleButton();
             this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -279,7 +281,6 @@
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn8,
             this.gv_isenabled,
             this.gv_foneChecked,
             this.gv_ftwoChecked,
@@ -295,25 +296,16 @@
             this.gridColumn1,
             this.gridColumn4,
             this.gv_memo,
-            this.gridColumn16});
+            this.gridColumn16,
+            this.gridColumn17,
+            this.gridColumn8,
+            this.gridColumn18});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
-            // 
-            // gridColumn8
-            // 
-            this.gridColumn8.Caption = "浣跨敤缁勭粐";
-            this.gridColumn8.FieldName = "fSubsidiary";
-            this.gridColumn8.MinWidth = 50;
-            this.gridColumn8.Name = "gridColumn8";
-            this.gridColumn8.OptionsColumn.AllowEdit = false;
-            this.gridColumn8.Tag = "org.fnumber";
-            this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 0;
-            this.gridColumn8.Width = 250;
             // 
             // gv_isenabled
             // 
@@ -328,7 +320,7 @@
             this.gv_isenabled.Tag = "query_a.ISENABLED";
             this.gv_isenabled.UnboundDataType = typeof(bool);
             this.gv_isenabled.Visible = true;
-            this.gv_isenabled.VisibleIndex = 1;
+            this.gv_isenabled.VisibleIndex = 0;
             this.gv_isenabled.Width = 50;
             // 
             // gv_foneChecked
@@ -344,7 +336,7 @@
             this.gv_foneChecked.Tag = "query_a.FONE_CHECKED";
             this.gv_foneChecked.UnboundDataType = typeof(bool);
             this.gv_foneChecked.Visible = true;
-            this.gv_foneChecked.VisibleIndex = 2;
+            this.gv_foneChecked.VisibleIndex = 1;
             this.gv_foneChecked.Width = 50;
             // 
             // gv_ftwoChecked
@@ -360,7 +352,7 @@
             this.gv_ftwoChecked.Tag = "query_a.FTWO_CHECKED";
             this.gv_ftwoChecked.UnboundDataType = typeof(bool);
             this.gv_ftwoChecked.Visible = true;
-            this.gv_ftwoChecked.VisibleIndex = 3;
+            this.gv_ftwoChecked.VisibleIndex = 2;
             this.gv_ftwoChecked.Width = 50;
             // 
             // gv_fversion
@@ -374,7 +366,7 @@
             this.gv_fversion.OptionsColumn.AllowEdit = false;
             this.gv_fversion.Tag = "query_a.FVERSION";
             this.gv_fversion.Visible = true;
-            this.gv_fversion.VisibleIndex = 4;
+            this.gv_fversion.VisibleIndex = 3;
             this.gv_fversion.Width = 94;
             // 
             // gridColumn7
@@ -386,7 +378,7 @@
             this.gridColumn7.OptionsColumn.AllowEdit = false;
             this.gridColumn7.Tag = "query_a.ITEM_ID";
             this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 5;
+            this.gridColumn7.VisibleIndex = 4;
             this.gridColumn7.Width = 94;
             // 
             // gv_itemNo
@@ -400,7 +392,7 @@
             this.gv_itemNo.OptionsColumn.AllowEdit = false;
             this.gv_itemNo.Tag = "query_b.item_no";
             this.gv_itemNo.Visible = true;
-            this.gv_itemNo.VisibleIndex = 6;
+            this.gv_itemNo.VisibleIndex = 5;
             this.gv_itemNo.Width = 150;
             // 
             // gridColumn3
@@ -412,7 +404,7 @@
             this.gridColumn3.OptionsColumn.AllowEdit = false;
             this.gridColumn3.Tag = "query_b.item_name";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 7;
+            this.gridColumn3.VisibleIndex = 6;
             this.gridColumn3.Width = 250;
             // 
             // gridColumn2
@@ -425,7 +417,7 @@
             this.gridColumn2.OptionsColumn.AllowEdit = false;
             this.gridColumn2.Tag = "query_b.item_model";
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 8;
+            this.gridColumn2.VisibleIndex = 7;
             this.gridColumn2.Width = 100;
             // 
             // gv_foneCheckor
@@ -439,7 +431,7 @@
             this.gv_foneCheckor.OptionsColumn.AllowEdit = false;
             this.gv_foneCheckor.Tag = "query_a.FONE_CHECKOR";
             this.gv_foneCheckor.Visible = true;
-            this.gv_foneCheckor.VisibleIndex = 9;
+            this.gv_foneCheckor.VisibleIndex = 8;
             this.gv_foneCheckor.Width = 94;
             // 
             // gv_foneCheckdate
@@ -453,7 +445,7 @@
             this.gv_foneCheckdate.OptionsColumn.AllowEdit = false;
             this.gv_foneCheckdate.Tag = "query_a.FONE_CHECKDATE";
             this.gv_foneCheckdate.Visible = true;
-            this.gv_foneCheckdate.VisibleIndex = 10;
+            this.gv_foneCheckdate.VisibleIndex = 9;
             this.gv_foneCheckdate.Width = 120;
             // 
             // gv_ftwoCheckor
@@ -467,7 +459,7 @@
             this.gv_ftwoCheckor.OptionsColumn.AllowEdit = false;
             this.gv_ftwoCheckor.Tag = "query_a.FTWO_CHECKOR";
             this.gv_ftwoCheckor.Visible = true;
-            this.gv_ftwoCheckor.VisibleIndex = 11;
+            this.gv_ftwoCheckor.VisibleIndex = 10;
             this.gv_ftwoCheckor.Width = 94;
             // 
             // gridColumn10
@@ -477,7 +469,7 @@
             this.gridColumn10.MinWidth = 25;
             this.gridColumn10.Name = "gridColumn10";
             this.gridColumn10.Visible = true;
-            this.gridColumn10.VisibleIndex = 12;
+            this.gridColumn10.VisibleIndex = 11;
             this.gridColumn10.Width = 94;
             // 
             // gridColumn1
@@ -489,7 +481,7 @@
             this.gridColumn1.OptionsColumn.AllowEdit = false;
             this.gridColumn1.Tag = "query_a.CREATE_BY";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 13;
+            this.gridColumn1.VisibleIndex = 12;
             this.gridColumn1.Width = 94;
             // 
             // gridColumn4
@@ -501,7 +493,7 @@
             this.gridColumn4.OptionsColumn.AllowEdit = false;
             this.gridColumn4.Tag = "query_a.CREATE_DATE";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 14;
+            this.gridColumn4.VisibleIndex = 13;
             this.gridColumn4.Width = 180;
             // 
             // gv_memo
@@ -515,7 +507,7 @@
             this.gv_memo.OptionsColumn.AllowEdit = false;
             this.gv_memo.Tag = "query_a.MEMO";
             this.gv_memo.Visible = true;
-            this.gv_memo.VisibleIndex = 15;
+            this.gv_memo.VisibleIndex = 14;
             this.gv_memo.Width = 150;
             // 
             // gridColumn16
@@ -525,6 +517,28 @@
             this.gridColumn16.MinWidth = 25;
             this.gridColumn16.Name = "gridColumn16";
             this.gridColumn16.Width = 94;
+            // 
+            // gridColumn17
+            // 
+            this.gridColumn17.Caption = "绫诲瀷";
+            this.gridColumn17.FieldName = "fType";
+            this.gridColumn17.MinWidth = 25;
+            this.gridColumn17.Name = "gridColumn17";
+            this.gridColumn17.Visible = true;
+            this.gridColumn17.VisibleIndex = 15;
+            this.gridColumn17.Width = 94;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "浣跨敤缁勭粐";
+            this.gridColumn8.FieldName = "fSubsidiary";
+            this.gridColumn8.MinWidth = 50;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.OptionsColumn.AllowEdit = false;
+            this.gridColumn8.Tag = "org.fnumber";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 16;
+            this.gridColumn8.Width = 250;
             // 
             // pageBar1
             // 
@@ -604,7 +618,7 @@
             this.txt_fSubsidiary.IsReadly = false;
             this.txt_fSubsidiary.Location = new System.Drawing.Point(96, 12);
             this.txt_fSubsidiary.Name = "txt_fSubsidiary";
-            this.txt_fSubsidiary.Size = new System.Drawing.Size(188, 28);
+            this.txt_fSubsidiary.Size = new System.Drawing.Size(183, 28);
             this.txt_fSubsidiary.TabIndex = 383;
             // 
             // txt_itemId
@@ -612,39 +626,39 @@
             this.txt_itemId.IsReadly = false;
             this.txt_itemId.Location = new System.Drawing.Point(96, 44);
             this.txt_itemId.Name = "txt_itemId";
-            this.txt_itemId.Size = new System.Drawing.Size(188, 28);
+            this.txt_itemId.Size = new System.Drawing.Size(183, 28);
             this.txt_itemId.TabIndex = 380;
             this.txt_itemId.Tag = "no";
             // 
             // txt_foneCheckdate
             // 
-            this.txt_foneCheckdate.Location = new System.Drawing.Point(926, 44);
+            this.txt_foneCheckdate.Location = new System.Drawing.Point(909, 44);
             this.txt_foneCheckdate.Name = "txt_foneCheckdate";
             this.txt_foneCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
-            this.txt_foneCheckdate.Size = new System.Drawing.Size(189, 28);
+            this.txt_foneCheckdate.Size = new System.Drawing.Size(185, 28);
             this.txt_foneCheckdate.StyleController = this.layoutMx1;
             this.txt_foneCheckdate.TabIndex = 267;
             this.txt_foneCheckdate.Tag = "readOnly";
             // 
             // txt_foneCheckor
             // 
-            this.txt_foneCheckor.Location = new System.Drawing.Point(926, 12);
+            this.txt_foneCheckor.Location = new System.Drawing.Point(909, 12);
             this.txt_foneCheckor.Name = "txt_foneCheckor";
             this.txt_foneCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
-            this.txt_foneCheckor.Size = new System.Drawing.Size(189, 28);
+            this.txt_foneCheckor.Size = new System.Drawing.Size(185, 28);
             this.txt_foneCheckor.StyleController = this.layoutMx1;
             this.txt_foneCheckor.TabIndex = 262;
             this.txt_foneCheckor.Tag = "readOnly";
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Location = new System.Drawing.Point(372, 44);
+            this.txt_itemNo.Location = new System.Drawing.Point(367, 44);
             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(189, 28);
+            this.txt_itemNo.Size = new System.Drawing.Size(183, 28);
             this.txt_itemNo.StyleController = this.layoutMx1;
             this.txt_itemNo.TabIndex = 370;
             this.txt_itemNo.Tag = "readOnly";
@@ -655,68 +669,68 @@
             this.txt_memo.Name = "txt_memo";
             this.txt_memo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_memo.Properties.Appearance.Options.UseFont = true;
-            this.txt_memo.Size = new System.Drawing.Size(188, 28);
+            this.txt_memo.Size = new System.Drawing.Size(183, 28);
             this.txt_memo.StyleController = this.layoutMx1;
             this.txt_memo.TabIndex = 219;
             // 
             // txt_ftwoCheckor
             // 
-            this.txt_ftwoCheckor.Location = new System.Drawing.Point(649, 12);
+            this.txt_ftwoCheckor.Location = new System.Drawing.Point(638, 12);
             this.txt_ftwoCheckor.Name = "txt_ftwoCheckor";
             this.txt_ftwoCheckor.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_ftwoCheckor.Properties.Appearance.Options.UseFont = true;
-            this.txt_ftwoCheckor.Size = new System.Drawing.Size(189, 28);
+            this.txt_ftwoCheckor.Size = new System.Drawing.Size(183, 28);
             this.txt_ftwoCheckor.StyleController = this.layoutMx1;
             this.txt_ftwoCheckor.TabIndex = 280;
             this.txt_ftwoCheckor.Tag = "readOnly";
             // 
             // txt_fversion
             // 
-            this.txt_fversion.Location = new System.Drawing.Point(372, 12);
+            this.txt_fversion.Location = new System.Drawing.Point(367, 12);
             this.txt_fversion.Name = "txt_fversion";
             this.txt_fversion.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_fversion.Properties.Appearance.Options.UseFont = true;
-            this.txt_fversion.Size = new System.Drawing.Size(189, 28);
+            this.txt_fversion.Size = new System.Drawing.Size(183, 28);
             this.txt_fversion.StyleController = this.layoutMx1;
             this.txt_fversion.TabIndex = 298;
             this.txt_fversion.Tag = "readOnly";
             // 
             // txt_ftwoCheckdate
             // 
-            this.txt_ftwoCheckdate.Location = new System.Drawing.Point(649, 44);
+            this.txt_ftwoCheckdate.Location = new System.Drawing.Point(638, 44);
             this.txt_ftwoCheckdate.Name = "txt_ftwoCheckdate";
             this.txt_ftwoCheckdate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_ftwoCheckdate.Properties.Appearance.Options.UseFont = true;
-            this.txt_ftwoCheckdate.Size = new System.Drawing.Size(189, 28);
+            this.txt_ftwoCheckdate.Size = new System.Drawing.Size(183, 28);
             this.txt_ftwoCheckdate.StyleController = this.layoutMx1;
             this.txt_ftwoCheckdate.TabIndex = 285;
             this.txt_ftwoCheckdate.Tag = "readOnly";
             // 
             // txt_gg
             // 
-            this.txt_gg.Location = new System.Drawing.Point(372, 76);
+            this.txt_gg.Location = new System.Drawing.Point(367, 76);
             this.txt_gg.Name = "txt_gg";
-            this.txt_gg.Size = new System.Drawing.Size(189, 24);
+            this.txt_gg.Size = new System.Drawing.Size(183, 24);
             this.txt_gg.StyleController = this.layoutMx1;
             this.txt_gg.TabIndex = 384;
             this.txt_gg.Tag = "readOnly";
             // 
             // txt_ftwoChecked
             // 
-            this.txt_ftwoChecked.Location = new System.Drawing.Point(565, 76);
+            this.txt_ftwoChecked.Location = new System.Drawing.Point(554, 76);
             this.txt_ftwoChecked.Name = "txt_ftwoChecked";
             this.txt_ftwoChecked.Properties.Caption = "鎵瑰噯鏍囪瘑";
-            this.txt_ftwoChecked.Size = new System.Drawing.Size(273, 24);
+            this.txt_ftwoChecked.Size = new System.Drawing.Size(267, 24);
             this.txt_ftwoChecked.StyleController = this.layoutMx1;
             this.txt_ftwoChecked.TabIndex = 385;
             this.txt_ftwoChecked.Tag = "readOnly";
             // 
             // txt_foneChecked
             // 
-            this.txt_foneChecked.Location = new System.Drawing.Point(842, 76);
+            this.txt_foneChecked.Location = new System.Drawing.Point(825, 76);
             this.txt_foneChecked.Name = "txt_foneChecked";
             this.txt_foneChecked.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_foneChecked.Size = new System.Drawing.Size(273, 24);
+            this.txt_foneChecked.Size = new System.Drawing.Size(269, 24);
             this.txt_foneChecked.StyleController = this.layoutMx1;
             this.txt_foneChecked.TabIndex = 386;
             this.txt_foneChecked.Tag = "readOnly";
@@ -775,7 +789,7 @@
             rowDefinition1,
             rowDefinition2,
             rowDefinition3});
-            this.Root.Size = new System.Drawing.Size(1127, 116);
+            this.Root.Size = new System.Drawing.Size(1106, 116);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -783,17 +797,17 @@
             this.layoutControlItem1.Control = this.txt_fSubsidiary;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(276, 32);
+            this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem1.Text = "閫夋嫨缁勭粐";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_ftwoCheckor;
-            this.layoutControlItem3.Location = new System.Drawing.Point(553, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(277, 32);
+            this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem3.Text = "鎵瑰噯浜�";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 18);
             // 
@@ -803,29 +817,29 @@
             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(276, 32);
+            this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem4.Text = "閫夋嫨鐗╂枡";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_ftwoCheckdate;
-            this.layoutControlItem6.Location = new System.Drawing.Point(553, 32);
+            this.layoutControlItem6.Location = new System.Drawing.Point(542, 32);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(277, 32);
+            this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem6.Text = "鎵瑰噯鏃ユ湡";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 18);
             // 
             // layoutControlItem9
             // 
             this.layoutControlItem9.Control = this.txt_ftwoChecked;
-            this.layoutControlItem9.Location = new System.Drawing.Point(553, 64);
+            this.layoutControlItem9.Location = new System.Drawing.Point(542, 64);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem9.Size = new System.Drawing.Size(277, 32);
+            this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem9.Text = "鎵瑰噯鏍囪瘑";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem9.TextVisible = false;
@@ -833,32 +847,32 @@
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_foneCheckor;
-            this.layoutControlItem10.Location = new System.Drawing.Point(830, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(813, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(277, 32);
+            this.layoutControlItem10.Size = new System.Drawing.Size(273, 32);
             this.layoutControlItem10.Text = "瀹℃牳浜�";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 18);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_foneCheckdate;
-            this.layoutControlItem11.Location = new System.Drawing.Point(830, 32);
+            this.layoutControlItem11.Location = new System.Drawing.Point(813, 32);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(277, 32);
+            this.layoutControlItem11.Size = new System.Drawing.Size(273, 32);
             this.layoutControlItem11.Text = "瀹℃牳鏃堕棿";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 18);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_foneChecked;
-            this.layoutControlItem12.Location = new System.Drawing.Point(830, 64);
+            this.layoutControlItem12.Location = new System.Drawing.Point(813, 64);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(277, 32);
+            this.layoutControlItem12.Size = new System.Drawing.Size(273, 32);
             this.layoutControlItem12.Text = "瀹℃牳鏍囪瘑";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
@@ -869,39 +883,39 @@
             this.layoutControlItem2.Location = new System.Drawing.Point(0, 64);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem2.Size = new System.Drawing.Size(276, 32);
+            this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem2.Text = "澶囨敞";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 18);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_fversion;
-            this.layoutControlItem5.Location = new System.Drawing.Point(276, 0);
+            this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(277, 32);
+            this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem5.Text = "鐗堟湰(鑷姩)";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 18);
             // 
             // layoutControlItem8
             // 
             this.layoutControlItem8.Control = this.txt_gg;
-            this.layoutControlItem8.Location = new System.Drawing.Point(276, 64);
+            this.layoutControlItem8.Location = new System.Drawing.Point(271, 64);
             this.layoutControlItem8.Name = "layoutControlItem8";
             this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem8.Size = new System.Drawing.Size(277, 32);
+            this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem8.Text = "鐗╂枡瑙勬牸";
             this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 18);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_itemNo;
-            this.layoutControlItem7.Location = new System.Drawing.Point(276, 32);
+            this.layoutControlItem7.Location = new System.Drawing.Point(271, 32);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(277, 32);
+            this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
             this.layoutControlItem7.Text = "鐗╂枡缂栫爜";
             this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 18);
             // 
@@ -1405,16 +1419,25 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
-            // Frm_MesQmCheckitemDt
+            // gridColumn18
+            // 
+            this.gridColumn18.Caption = "绫诲埆";
+            this.gridColumn18.FieldName = "ftype";
+            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.Name = "gridColumn18";
+            this.gridColumn18.Visible = true;
+            this.gridColumn18.VisibleIndex = 17;
+            this.gridColumn18.Width = 94;
+            // 
+            // Jyxm
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1129, 682);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
-            this.Name = "Frm_MesQmCheckitemDt";
-            this.Text = "IQC鐗╂枡妫�楠岄」鐩�";
+            this.Name = "Jyxm";
+            this.Size = new System.Drawing.Size(1129, 682);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
             this.xtraTabControl1.ResumeLayout(false);
             this.xtraTabPage1.ResumeLayout(false);
@@ -1478,6 +1501,7 @@
             this.panelControl1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
+
         }
         #endregion
         private UserControl.UcToolBarMenu toolBarMenu1;
@@ -1575,5 +1599,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
     }
 }
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 174dbf7..6e86e4b 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -303,11 +303,17 @@
     <Compile Include="DevFrm\Ck\UcBlclDj.Designer.cs">
       <DependentUpon>UcBlclDj.cs</DependentUpon>
     </Compile>
-    <Compile Include="DevFrm\IPQC\Frm_Jyxm.cs">
+    <Compile Include="DevFrm\IPQC\Frm_ShouJian.cs">
       <SubType>Form</SubType>
     </Compile>
-    <Compile Include="DevFrm\IPQC\Frm_Jyxm.Designer.cs">
-      <DependentUpon>Frm_Jyxm.cs</DependentUpon>
+    <Compile Include="DevFrm\IPQC\Frm_ShouJian.Designer.cs">
+      <DependentUpon>Frm_ShouJian.cs</DependentUpon>
+    </Compile>
+    <Compile Include="DevFrm\IPQC\Frm_XunJian.cs">
+      <SubType>Form</SubType>
+    </Compile>
+    <Compile Include="DevFrm\IPQC\Frm_XunJian.Designer.cs">
+      <DependentUpon>Frm_XunJian.cs</DependentUpon>
     </Compile>
     <Compile Include="DevFrm\QC\Frm_IQCLookups.cs">
       <SubType>Form</SubType>
@@ -1123,8 +1129,8 @@
     <EmbeddedResource Include="DevFrm\FrmMain.resx">
       <DependentUpon>FrmMain.cs</DependentUpon>
     </EmbeddedResource>
-    <EmbeddedResource Include="DevFrm\IPQC\Frm_Jyxm.resx">
-      <DependentUpon>Frm_Jyxm.cs</DependentUpon>
+    <EmbeddedResource Include="DevFrm\IPQC\Frm_ShouJian.resx">
+      <DependentUpon>Frm_ShouJian.cs</DependentUpon>
     </EmbeddedResource>
     <EmbeddedResource Include="DevFrm\QC\Frm_IQCLookups.resx">
       <DependentUpon>Frm_IQCLookups.cs</DependentUpon>

--
Gitblit v1.9.3