From f73f776ffbf1051eff523bd0205b89e381a41640 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期一, 10 三月 2025 15:46:09 +0800
Subject: [PATCH] 1

---
 DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs |  868 +++++++++++++++++++++++++++++++--------------------------
 1 files changed, 474 insertions(+), 394 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
index c051f7a..0198220 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Frm_MesQmCheckitemDt.Designer.cs
@@ -29,16 +29,16 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
             this.gvMx1pid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1facLevel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.rptJSSP = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
@@ -54,6 +54,7 @@
             this.rptJYXM = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gvMx1fupAllow = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1forder = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gvMx1memo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -65,42 +66,23 @@
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.lb_tname = new DevExpress.XtraEditors.LabelControl();
             this.txt_itemNo = new DevExpress.XtraEditors.TextEdit();
-            this.gv_isenabled = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_fversion = new DevExpress.XtraEditors.LabelControl();
             this.txt_fversion = new DevExpress.XtraEditors.TextEdit();
-            this.gv_fversion = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_ftwoCheckdate = new DevExpress.XtraEditors.LabelControl();
             this.txt_ftwoCheckdate = new DevExpress.XtraEditors.TextEdit();
             this.lb_ftwoCheckor = new DevExpress.XtraEditors.LabelControl();
             this.txt_ftwoCheckor = new DevExpress.XtraEditors.TextEdit();
-            this.gv_ftwoCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_ftwoChecked = new DevExpress.XtraEditors.LabelControl();
-            this.gv_ftwoChecked = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_foneCheckdate = new DevExpress.XtraEditors.LabelControl();
             this.txt_foneCheckdate = new DevExpress.XtraEditors.TextEdit();
-            this.gv_foneCheckdate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_foneCheckor = new DevExpress.XtraEditors.LabelControl();
             this.txt_foneCheckor = new DevExpress.XtraEditors.TextEdit();
-            this.gv_foneCheckor = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_foneChecked = new DevExpress.XtraEditors.LabelControl();
-            this.gv_foneChecked = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_itemNo = new DevExpress.XtraEditors.LabelControl();
-            this.gv_itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_memo = new DevExpress.XtraEditors.LabelControl();
             this.txt_memo = new DevExpress.XtraEditors.TextEdit();
-            this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
-            this.gcMain = new DevExpress.XtraGrid.GridControl();
-            this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn3 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
-            this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
-            this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPageCopy = new DevExpress.XtraTab.XtraTabPage();
@@ -118,18 +100,41 @@
             this.btnSave = new DevExpress.XtraEditors.SimpleButton();
             this.btnSelect = new DevExpress.XtraEditors.SimpleButton();
             this.panel1 = new System.Windows.Forms.Panel();
-            this.txt_itemModel = new DevExpress.XtraEditors.MemoEdit();
-            this.txt_ItemId = new Gs.DevApp.UserControl.UcLookItems();
+            this.txt_fSubsidiary = new Gs.DevApp.UserControl.UcLookOrg();
+            this.labelControl2 = new DevExpress.XtraEditors.LabelControl();
+            this.txt_gg = new DevExpress.XtraEditors.MemoEdit();
+            this.txt_itemId = new Gs.DevApp.UserControl.UcLookItems();
             this.txt_ftwoChecked = new DevExpress.XtraEditors.CheckEdit();
             this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
             this.lb_itemModel = new DevExpress.XtraEditors.LabelControl();
             this.lbGuid = new System.Windows.Forms.Label();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+            this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
+            this.gcMain = 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.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_memo = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.pageBar1 = new UserControls.Data.UcPageBar();
             ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYSP)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
             this.tabMxPage1.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
@@ -141,11 +146,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
-            this.xtraTabPage1.SuspendLayout();
             this.xtraTabPage2.SuspendLayout();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
@@ -156,10 +158,18 @@
             ((System.ComponentModel.ISupportInitialize)(this.panelControl1)).BeginInit();
             this.panelControl1.SuspendLayout();
             this.panel1.SuspendLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.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.picCheckBox)).BeginInit();
+            this.xtraTabPage3.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.gcMain)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
             this.SuspendLayout();
             // 
             // gvMx1pid
@@ -203,7 +213,7 @@
             this.gvMx1fstand.FieldName = "fstand";
             this.gvMx1fstand.MinWidth = 60;
             this.gvMx1fstand.Name = "gvMx1fstand";
-            this.gvMx1fstand.Tag = "yz_quantity_edit";
+            this.gvMx1fstand.Tag = "yz_quantity_0_edit";
             this.gvMx1fstand.Visible = true;
             this.gvMx1fstand.VisibleIndex = 10;
             this.gvMx1fstand.Width = 60;
@@ -238,7 +248,7 @@
             this.gvMx1fdownAllow.FieldName = "fdownAllow";
             this.gvMx1fdownAllow.MinWidth = 60;
             this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
-            this.gvMx1fdownAllow.Tag = "yz_quantity_edit";
+            this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit";
             this.gvMx1fdownAllow.Visible = true;
             this.gvMx1fdownAllow.VisibleIndex = 11;
             this.gvMx1fdownAllow.Width = 60;
@@ -308,7 +318,6 @@
             this.rptJYXM.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
             this.rptJYXM.Name = "rptJYXM";
-            this.rptJYXM.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
             // 
             // gvMx1fupAllow
             // 
@@ -318,7 +327,7 @@
             this.gvMx1fupAllow.FieldName = "fupAllow";
             this.gvMx1fupAllow.MinWidth = 60;
             this.gvMx1fupAllow.Name = "gvMx1fupAllow";
-            this.gvMx1fupAllow.Tag = "yz_quantity_edit";
+            this.gvMx1fupAllow.Tag = "yz_quantity_0_edit";
             this.gvMx1fupAllow.Visible = true;
             this.gvMx1fupAllow.VisibleIndex = 9;
             this.gvMx1fupAllow.Width = 60;
@@ -328,13 +337,37 @@
             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_edit";
+            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";
             // 
             // gvMx1memo
             // 
@@ -364,7 +397,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1125, 371);
+            this.tabMxPage1.Size = new System.Drawing.Size(1125, 352);
             this.tabMxPage1.Text = "妫�楠岄」鐩槑缁�";
             // 
             // gcMx1
@@ -379,8 +412,9 @@
             this.rptJYBZ,
             this.rptJSSP,
             this.rptJYSP,
-            this.repositoryItemButtonEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1125, 371);
+            this.repositoryItemButtonEdit1,
+            this.repositoryItemComboBox1});
+            this.gcMx1.Size = new System.Drawing.Size(1125, 352);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -446,10 +480,10 @@
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions7.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉婚櫎", -1, true, true, false, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", 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);
@@ -458,7 +492,7 @@
             // 
             this.lb_tname.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_tname.Appearance.Options.UseFont = true;
-            this.lb_tname.Location = new System.Drawing.Point(9, 54);
+            this.lb_tname.Location = new System.Drawing.Point(11, 83);
             this.lb_tname.Name = "lb_tname";
             this.lb_tname.Size = new System.Drawing.Size(68, 21);
             this.lb_tname.TabIndex = 370;
@@ -466,35 +500,19 @@
             // 
             // txt_itemNo
             // 
-            this.txt_itemNo.Enabled = false;
-            this.txt_itemNo.Location = new System.Drawing.Point(85, 50);
+            this.txt_itemNo.Location = new System.Drawing.Point(85, 79);
             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(262, 28);
+            this.txt_itemNo.Size = new System.Drawing.Size(301, 28);
             this.txt_itemNo.TabIndex = 370;
-            // 
-            // 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;
+            this.txt_itemNo.Tag = "readOnly";
             // 
             // lb_fversion
             // 
             this.lb_fversion.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_fversion.Appearance.Options.UseFont = true;
-            this.lb_fversion.Location = new System.Drawing.Point(361, 54);
+            this.lb_fversion.Location = new System.Drawing.Point(392, 52);
             this.lb_fversion.Name = "lb_fversion";
             this.lb_fversion.Size = new System.Drawing.Size(39, 21);
             this.lb_fversion.TabIndex = 298;
@@ -503,32 +521,18 @@
             // txt_fversion
             // 
             this.txt_fversion.Enabled = false;
-            this.txt_fversion.Location = new System.Drawing.Point(405, 50);
+            this.txt_fversion.Location = new System.Drawing.Point(436, 48);
             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(175, 28);
+            this.txt_fversion.Size = new System.Drawing.Size(170, 28);
             this.txt_fversion.TabIndex = 298;
-            // 
-            // 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;
             // 
             // lb_ftwoCheckdate
             // 
             this.lb_ftwoCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_ftwoCheckdate.Appearance.Options.UseFont = true;
-            this.lb_ftwoCheckdate.Location = new System.Drawing.Point(612, 54);
+            this.lb_ftwoCheckdate.Location = new System.Drawing.Point(612, 52);
             this.lb_ftwoCheckdate.Name = "lb_ftwoCheckdate";
             this.lb_ftwoCheckdate.Size = new System.Drawing.Size(73, 21);
             this.lb_ftwoCheckdate.TabIndex = 285;
@@ -536,19 +540,19 @@
             // 
             // txt_ftwoCheckdate
             // 
-            this.txt_ftwoCheckdate.Enabled = false;
-            this.txt_ftwoCheckdate.Location = new System.Drawing.Point(685, 50);
+            this.txt_ftwoCheckdate.Location = new System.Drawing.Point(685, 48);
             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(172, 28);
             this.txt_ftwoCheckdate.TabIndex = 285;
+            this.txt_ftwoCheckdate.Tag = "readOnly";
             // 
             // lb_ftwoCheckor
             // 
             this.lb_ftwoCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_ftwoCheckor.Appearance.Options.UseFont = true;
-            this.lb_ftwoCheckor.Location = new System.Drawing.Point(629, 20);
+            this.lb_ftwoCheckor.Location = new System.Drawing.Point(629, 19);
             this.lb_ftwoCheckor.Name = "lb_ftwoCheckor";
             this.lb_ftwoCheckor.Size = new System.Drawing.Size(56, 21);
             this.lb_ftwoCheckor.TabIndex = 280;
@@ -556,59 +560,29 @@
             // 
             // txt_ftwoCheckor
             // 
-            this.txt_ftwoCheckor.Enabled = false;
-            this.txt_ftwoCheckor.Location = new System.Drawing.Point(685, 16);
+            this.txt_ftwoCheckor.Location = new System.Drawing.Point(685, 15);
             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(172, 28);
             this.txt_ftwoCheckor.TabIndex = 280;
-            // 
-            // 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 = 80;
-            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;
+            this.txt_ftwoCheckor.Tag = "readOnly";
             // 
             // lb_ftwoChecked
             // 
             this.lb_ftwoChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_ftwoChecked.Appearance.Options.UseFont = true;
-            this.lb_ftwoChecked.Location = new System.Drawing.Point(361, 86);
+            this.lb_ftwoChecked.Location = new System.Drawing.Point(392, 83);
             this.lb_ftwoChecked.Name = "lb_ftwoChecked";
             this.lb_ftwoChecked.Size = new System.Drawing.Size(68, 21);
             this.lb_ftwoChecked.TabIndex = 273;
             this.lb_ftwoChecked.Text = "鎵瑰噯鏍囪";
             // 
-            // 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;
-            // 
             // lb_foneCheckdate
             // 
             this.lb_foneCheckdate.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_foneCheckdate.Appearance.Options.UseFont = true;
-            this.lb_foneCheckdate.Location = new System.Drawing.Point(612, 127);
+            this.lb_foneCheckdate.Location = new System.Drawing.Point(612, 113);
             this.lb_foneCheckdate.Name = "lb_foneCheckdate";
             this.lb_foneCheckdate.Size = new System.Drawing.Size(73, 21);
             this.lb_foneCheckdate.TabIndex = 267;
@@ -616,33 +590,19 @@
             // 
             // txt_foneCheckdate
             // 
-            this.txt_foneCheckdate.Enabled = false;
-            this.txt_foneCheckdate.Location = new System.Drawing.Point(685, 123);
+            this.txt_foneCheckdate.Location = new System.Drawing.Point(685, 113);
             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(172, 28);
             this.txt_foneCheckdate.TabIndex = 267;
-            // 
-            // 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 = 120;
-            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;
+            this.txt_foneCheckdate.Tag = "readOnly";
             // 
             // lb_foneCheckor
             // 
             this.lb_foneCheckor.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_foneCheckor.Appearance.Options.UseFont = true;
-            this.lb_foneCheckor.Location = new System.Drawing.Point(629, 86);
+            this.lb_foneCheckor.Location = new System.Drawing.Point(629, 83);
             this.lb_foneCheckor.Name = "lb_foneCheckor";
             this.lb_foneCheckor.Size = new System.Drawing.Size(56, 21);
             this.lb_foneCheckor.TabIndex = 262;
@@ -650,83 +610,39 @@
             // 
             // txt_foneCheckor
             // 
-            this.txt_foneCheckor.Enabled = false;
-            this.txt_foneCheckor.Location = new System.Drawing.Point(685, 86);
+            this.txt_foneCheckor.Location = new System.Drawing.Point(685, 79);
             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(172, 28);
             this.txt_foneCheckor.TabIndex = 262;
-            // 
-            // 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 = 80;
-            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;
+            this.txt_foneCheckor.Tag = "readOnly";
             // 
             // lb_foneChecked
             // 
             this.lb_foneChecked.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_foneChecked.Appearance.Options.UseFont = true;
-            this.lb_foneChecked.Location = new System.Drawing.Point(361, 127);
+            this.lb_foneChecked.Location = new System.Drawing.Point(392, 113);
             this.lb_foneChecked.Name = "lb_foneChecked";
             this.lb_foneChecked.Size = new System.Drawing.Size(68, 21);
             this.lb_foneChecked.TabIndex = 258;
             this.lb_foneChecked.Text = "瀹℃壒鏍囪";
             // 
-            // 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;
-            // 
             // lb_itemNo
             // 
             this.lb_itemNo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_itemNo.Appearance.Options.UseFont = true;
-            this.lb_itemNo.Location = new System.Drawing.Point(9, 20);
+            this.lb_itemNo.Location = new System.Drawing.Point(11, 52);
             this.lb_itemNo.Name = "lb_itemNo";
             this.lb_itemNo.Size = new System.Drawing.Size(68, 21);
             this.lb_itemNo.TabIndex = 222;
             this.lb_itemNo.Text = "閫夋嫨鐗╂枡";
             // 
-            // 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 = 150;
-            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;
-            // 
             // lb_memo
             // 
             this.lb_memo.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_memo.Appearance.Options.UseFont = true;
-            this.lb_memo.Location = new System.Drawing.Point(361, 20);
+            this.lb_memo.Location = new System.Drawing.Point(392, 19);
             this.lb_memo.Name = "lb_memo";
             this.lb_memo.Size = new System.Drawing.Size(39, 21);
             this.lb_memo.TabIndex = 219;
@@ -734,26 +650,12 @@
             // 
             // txt_memo
             // 
-            this.txt_memo.Location = new System.Drawing.Point(405, 16);
+            this.txt_memo.Location = new System.Drawing.Point(436, 15);
             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(175, 28);
+            this.txt_memo.Size = new System.Drawing.Size(170, 28);
             this.txt_memo.TabIndex = 219;
-            // 
-            // 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 = 150;
-            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 = 14;
-            this.gv_memo.Width = 150;
             // 
             // toolBarMenu1
             // 
@@ -770,151 +672,17 @@
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
             // 
-            // gcMain
-            // 
-            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gcMain.Location = new System.Drawing.Point(0, 0);
-            this.gcMain.MainView = this.gridView1;
-            this.gcMain.Name = "gcMain";
-            this.gcMain.Size = new System.Drawing.Size(1127, 531);
-            this.gcMain.TabIndex = 1;
-            this.gcMain.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.gridColumn1,
-            this.gridColumn4,
-            this.gv_memo});
-            this.gridView1.GridControl = this.gcMain;
-            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 = 250;
-            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;
-            // 
-            // gridColumn7
-            // 
-            this.gridColumn7.Caption = "鐗╂枡ID";
-            this.gridColumn7.FieldName = "itemId";
-            this.gridColumn7.MinWidth = 80;
-            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;
-            // 
-            // gridColumn3
-            // 
-            this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
-            this.gridColumn3.FieldName = "mc";
-            this.gridColumn3.MinWidth = 250;
-            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.MinWidth = 100;
-            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;
-            // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "鍒朵綔浜�";
-            this.gridColumn1.FieldName = "createBy";
-            this.gridColumn1.MinWidth = 80;
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.OptionsColumn.AllowEdit = false;
-            this.gridColumn1.Tag = "query_a.CREATE_BY";
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 12;
-            this.gridColumn1.Width = 94;
-            // 
-            // gridColumn4
-            // 
-            this.gridColumn4.Caption = "鍒朵綔鏃堕棿";
-            this.gridColumn4.FieldName = "createDate";
-            this.gridColumn4.MinWidth = 180;
-            this.gridColumn4.Name = "gridColumn4";
-            this.gridColumn4.OptionsColumn.AllowEdit = false;
-            this.gridColumn4.Tag = "query_a.CREATE_DATE";
-            this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 13;
-            this.gridColumn4.Width = 180;
-            // 
             // 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.SelectedTabPage = this.xtraTabPage2;
             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.gcMain);
-            this.xtraTabPage1.Controls.Add(this.pageBar1);
-            this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1127, 570);
-            this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
-            // 
-            // pageBar1
-            // 
-            this.pageBar1.CurrentPage = 1;
-            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
-            this.pageBar1.Location = new System.Drawing.Point(0, 531);
-            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 = 3;
-            this.pageBar1.TotalPages = 0;
+            this.xtraTabPage2,
+            this.xtraTabPage3});
             // 
             // xtraTabPage2
             // 
@@ -927,10 +695,10 @@
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.tabMx.Location = new System.Drawing.Point(0, 167);
+            this.tabMx.Location = new System.Drawing.Point(0, 186);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1127, 403);
+            this.tabMx.Size = new System.Drawing.Size(1127, 384);
             this.tabMx.TabIndex = 2;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1,
@@ -941,7 +709,7 @@
             this.xtraTabPageCopy.Controls.Add(this.gridControl2);
             this.xtraTabPageCopy.Controls.Add(this.panelControl1);
             this.xtraTabPageCopy.Name = "xtraTabPageCopy";
-            this.xtraTabPageCopy.Size = new System.Drawing.Size(1125, 371);
+            this.xtraTabPageCopy.Size = new System.Drawing.Size(1125, 352);
             this.xtraTabPageCopy.Text = "澶嶅埗鍒板叾瀹冪墿鏂�";
             // 
             // gridControl2
@@ -952,7 +720,7 @@
             this.gridControl2.Name = "gridControl2";
             this.gridControl2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit3});
-            this.gridControl2.Size = new System.Drawing.Size(1125, 328);
+            this.gridControl2.Size = new System.Drawing.Size(1125, 309);
             this.gridControl2.TabIndex = 1;
             this.gridControl2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView2});
@@ -1053,10 +821,10 @@
             // repositoryItemButtonEdit3
             // 
             this.repositoryItemButtonEdit3.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions8.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", 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);
@@ -1100,8 +868,10 @@
             // panel1
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
-            this.panel1.Controls.Add(this.txt_itemModel);
-            this.panel1.Controls.Add(this.txt_ItemId);
+            this.panel1.Controls.Add(this.txt_fSubsidiary);
+            this.panel1.Controls.Add(this.labelControl2);
+            this.panel1.Controls.Add(this.txt_gg);
+            this.panel1.Controls.Add(this.txt_itemId);
             this.panel1.Controls.Add(this.txt_ftwoChecked);
             this.panel1.Controls.Add(this.txt_foneChecked);
             this.panel1.Controls.Add(this.lb_itemModel);
@@ -1127,33 +897,50 @@
             this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.panel1.Location = new System.Drawing.Point(0, 0);
             this.panel1.Name = "panel1";
-            this.panel1.Size = new System.Drawing.Size(1127, 167);
+            this.panel1.Size = new System.Drawing.Size(1127, 186);
             this.panel1.TabIndex = 1;
             // 
-            // txt_itemModel
+            // txt_fSubsidiary
             // 
-            this.txt_itemModel.Enabled = false;
-            this.txt_itemModel.Location = new System.Drawing.Point(85, 86);
-            this.txt_itemModel.Name = "txt_itemModel";
-            this.txt_itemModel.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemModel.Size = new System.Drawing.Size(262, 64);
-            this.txt_itemModel.TabIndex = 381;
-            this.txt_itemModel.Tag = "itemName";
+            this.txt_fSubsidiary.IsReadly = false;
+            this.txt_fSubsidiary.Location = new System.Drawing.Point(84, 14);
+            this.txt_fSubsidiary.Name = "txt_fSubsidiary";
+            this.txt_fSubsidiary.Size = new System.Drawing.Size(302, 30);
+            this.txt_fSubsidiary.TabIndex = 383;
             // 
-            // txt_ItemId
+            // labelControl2
             // 
-            this.txt_ItemId.IsReadly = false;
-            this.txt_ItemId.Location = new System.Drawing.Point(85, 14);
-            this.txt_ItemId.Name = "txt_ItemId";
-            this.txt_ItemId.Size = new System.Drawing.Size(262, 33);
-            this.txt_ItemId.TabIndex = 380;
-            this.txt_ItemId.Tag = "no";
+            this.labelControl2.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.labelControl2.Appearance.Options.UseFont = true;
+            this.labelControl2.Location = new System.Drawing.Point(11, 19);
+            this.labelControl2.Name = "labelControl2";
+            this.labelControl2.Size = new System.Drawing.Size(68, 21);
+            this.labelControl2.TabIndex = 382;
+            this.labelControl2.Text = "閫夋嫨缁勭粐";
+            // 
+            // txt_gg
+            // 
+            this.txt_gg.Location = new System.Drawing.Point(85, 113);
+            this.txt_gg.Name = "txt_gg";
+            this.txt_gg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.txt_gg.Properties.Appearance.Options.UseFont = true;
+            this.txt_gg.Size = new System.Drawing.Size(301, 64);
+            this.txt_gg.TabIndex = 381;
+            this.txt_gg.Tag = "readOnly";
+            // 
+            // txt_itemId
+            // 
+            this.txt_itemId.IsReadly = false;
+            this.txt_itemId.Location = new System.Drawing.Point(85, 46);
+            this.txt_itemId.Name = "txt_itemId";
+            this.txt_itemId.Size = new System.Drawing.Size(301, 33);
+            this.txt_itemId.TabIndex = 380;
+            this.txt_itemId.Tag = "no";
             // 
             // txt_ftwoChecked
             // 
             this.txt_ftwoChecked.Enabled = false;
-            this.txt_ftwoChecked.Location = new System.Drawing.Point(434, 86);
+            this.txt_ftwoChecked.Location = new System.Drawing.Point(465, 81);
             this.txt_ftwoChecked.Name = "txt_ftwoChecked";
             this.txt_ftwoChecked.Properties.Caption = "";
             this.txt_ftwoChecked.Size = new System.Drawing.Size(94, 24);
@@ -1162,7 +949,7 @@
             // txt_foneChecked
             // 
             this.txt_foneChecked.Enabled = false;
-            this.txt_foneChecked.Location = new System.Drawing.Point(434, 125);
+            this.txt_foneChecked.Location = new System.Drawing.Point(465, 113);
             this.txt_foneChecked.Name = "txt_foneChecked";
             this.txt_foneChecked.Properties.Caption = "";
             this.txt_foneChecked.Size = new System.Drawing.Size(94, 24);
@@ -1172,7 +959,7 @@
             // 
             this.lb_itemModel.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_itemModel.Appearance.Options.UseFont = true;
-            this.lb_itemModel.Location = new System.Drawing.Point(9, 86);
+            this.lb_itemModel.Location = new System.Drawing.Point(11, 113);
             this.lb_itemModel.Name = "lb_itemModel";
             this.lb_itemModel.Size = new System.Drawing.Size(68, 21);
             this.lb_itemModel.TabIndex = 375;
@@ -1197,6 +984,289 @@
             this.picCheckBox.TabStop = false;
             this.picCheckBox.Visible = false;
             // 
+            // xtraTabPage3
+            // 
+            this.xtraTabPage3.Controls.Add(this.split1);
+            this.xtraTabPage3.Name = "xtraTabPage3";
+            this.xtraTabPage3.Size = new System.Drawing.Size(1127, 570);
+            this.xtraTabPage3.Text = "xtraTabPage3";
+            // 
+            // 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.split1_Panel1
+            // 
+            this.split1.Panel1.Controls.Add(this.gcMain);
+            this.split1.Panel1.Controls.Add(this.pageBar1);
+            this.split1.Panel1.Text = "Panel1";
+            // 
+            // split1.split1_Panel2
+            // 
+            this.split1.Panel2.Text = "Panel2";
+            this.split1.Size = new System.Drawing.Size(1127, 570);
+            this.split1.SplitterPosition = 558;
+            this.split1.TabIndex = 0;
+            // 
+            // gcMain
+            // 
+            this.gcMain.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain.Font = new System.Drawing.Font("Tahoma", 10F);
+            this.gcMain.Location = new System.Drawing.Point(0, 0);
+            this.gcMain.MainView = this.gridView1;
+            this.gcMain.Name = "gcMain";
+            this.gcMain.Size = new System.Drawing.Size(1127, 519);
+            this.gcMain.TabIndex = 2;
+            this.gcMain.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.gridColumn1,
+            this.gridColumn4,
+            this.gv_memo});
+            this.gridView1.GridControl = this.gcMain;
+            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.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 = 5;
+            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 = 6;
+            this.gridColumn3.Width = 250;
+            // 
+            // gridColumn2
+            // 
+            this.gridColumn2.Caption = "鐗╂枡瑙勬牸";
+            this.gridColumn2.FieldName = "gg";
+            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 = 7;
+            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 = 8;
+            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 = 9;
+            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 = 10;
+            this.gv_ftwoCheckor.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 = 11;
+            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 = 12;
+            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 = 13;
+            this.gv_memo.Width = 150;
+            // 
+            // 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;
+            // 
             // Frm_MesQmCheckitemDt
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1212,6 +1282,7 @@
             ((System.ComponentModel.ISupportInitialize)(this.rptJYGJ)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYBZ)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptJYXM)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
             this.tabMxPage1.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
@@ -1223,11 +1294,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckdate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_foneCheckor.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_memo.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
             this.xtraTabControl1.ResumeLayout(false);
-            this.xtraTabPage1.ResumeLayout(false);
             this.xtraTabPage2.ResumeLayout(false);
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
@@ -1239,21 +1307,25 @@
             this.panelControl1.ResumeLayout(false);
             this.panel1.ResumeLayout(false);
             this.panel1.PerformLayout();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_itemModel.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.picCheckBox)).EndInit();
+            this.xtraTabPage3.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.gcMain)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
             this.ResumeLayout(false);
 
         }
         #endregion
       private UserControl.UcToolBarMenu toolBarMenu1;
-        private DevExpress.XtraGrid.GridControl gcMain;
-        private DevExpress.XtraGrid.Views.Grid.GridView gridView1;
         private DevExpress.XtraTab.XtraTabControl xtraTabControl1;
-        private DevExpress.XtraTab.XtraTabPage xtraTabPage1;
         private DevExpress.XtraTab.XtraTabPage xtraTabPage2;
-        private UserControls.Data.UcPageBar pageBar1;
         private System.Windows.Forms.Panel panel1;
         private System.Windows.Forms.Label lbGuid;
   private DevExpress.XtraTab.XtraTabControl tabMx;
@@ -1277,58 +1349,43 @@
 
 private DevExpress.XtraEditors.LabelControl lb_tname;
 private DevExpress.XtraEditors.TextEdit txt_itemNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_isenabled;
 
 private DevExpress.XtraEditors.LabelControl lb_fversion;
 private DevExpress.XtraEditors.TextEdit txt_fversion;
- private DevExpress.XtraGrid.Columns.GridColumn gv_fversion;
 
 private DevExpress.XtraEditors.LabelControl lb_ftwoCheckdate;
 private DevExpress.XtraEditors.TextEdit txt_ftwoCheckdate;
 
 private DevExpress.XtraEditors.LabelControl lb_ftwoCheckor;
 private DevExpress.XtraEditors.TextEdit txt_ftwoCheckor;
- private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoCheckor;
 
 private DevExpress.XtraEditors.LabelControl lb_ftwoChecked;
- private DevExpress.XtraGrid.Columns.GridColumn gv_ftwoChecked;
 
 private DevExpress.XtraEditors.LabelControl lb_foneCheckdate;
 private DevExpress.XtraEditors.TextEdit txt_foneCheckdate;
- private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckdate;
 
 private DevExpress.XtraEditors.LabelControl lb_foneCheckor;
 private DevExpress.XtraEditors.TextEdit txt_foneCheckor;
- private DevExpress.XtraGrid.Columns.GridColumn gv_foneCheckor;
 
 private DevExpress.XtraEditors.LabelControl lb_foneChecked;
- private DevExpress.XtraGrid.Columns.GridColumn gv_foneChecked;
 
 private DevExpress.XtraEditors.LabelControl lb_itemNo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_itemNo;
 
 private DevExpress.XtraEditors.LabelControl lb_memo;
 private DevExpress.XtraEditors.TextEdit txt_memo;
- private DevExpress.XtraGrid.Columns.GridColumn gv_memo;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
         private DevExpress.XtraGrid.Columns.GridColumn sampleSizeName;
         private DevExpress.XtraEditors.LabelControl lb_itemModel;
         private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
         private DevExpress.XtraEditors.CheckEdit txt_ftwoChecked;
-        private UserControl.UcLookItems txt_ItemId;
-        private DevExpress.XtraEditors.MemoEdit txt_itemModel;
+        private UserControl.UcLookItems txt_itemId;
+        private DevExpress.XtraEditors.MemoEdit txt_gg;
         private DevExpress.XtraEditors.SimpleButton btnSelect;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYXM;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYGJ;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYBZ;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJSSP;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptJYSP;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
-        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
         private System.Windows.Forms.PictureBox picCheckBox;
@@ -1345,5 +1402,28 @@
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
         private DevExpress.XtraEditors.SimpleButton btnSave;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+        private UserControl.UcLookOrg txt_fSubsidiary;
+        private DevExpress.XtraEditors.LabelControl labelControl2;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+        private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
+        private DevExpress.XtraEditors.SplitContainerControl split1;
+        private DevExpress.XtraGrid.GridControl gcMain;
+        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;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3