From c4f46e49677576ac7f1a74feee547b3238c0eeaf Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期三, 19 十一月 2025 16:07:53 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient

---
 DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs |  592 +++++++++++++++++++++++++++++++++++-----------------------
 1 files changed, 353 insertions(+), 239 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
index a2e74cc..995898c 100644
--- a/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/QC/Jyxm.Designer.cs
@@ -67,8 +67,6 @@
             this.layoutMx1 = new DevExpress.XtraDataLayout.DataLayoutControl();
             this.btnCopy = new DevExpress.XtraEditors.SimpleButton();
             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();
@@ -77,19 +75,23 @@
             this.txt_foneChecked = new DevExpress.XtraEditors.CheckEdit();
             this.txt_ftype = new DevExpress.XtraEditors.TextEdit();
             this.txt_isenabled = new DevExpress.XtraEditors.CheckEdit();
+            this.txt_itemId = new DevExpress.XtraEditors.ButtonEdit();
+            this.txt_mc = new DevExpress.XtraEditors.TextEdit();
+            this.txt_fSubsidiary = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
-            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -117,12 +119,15 @@
             this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+            this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.rptStation = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
+            this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.rptGroup = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
             this.tips = new DevExpress.Utils.ToolTipController(this.components);
-            this.repositoryItemCheckEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit();
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -150,19 +155,23 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_ftype.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mc.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -176,8 +185,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptStation)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptGroup)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
             this.SuspendLayout();
             // 
             // toolBarMenu1
@@ -189,9 +199,10 @@
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
             this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
+            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1129, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1411, 98);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -199,10 +210,11 @@
             // xtraTabControl1
             // 
             this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
+            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);
+            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1129, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1411, 736);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -211,8 +223,9 @@
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1127, 570);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1409, 698);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -221,6 +234,7 @@
             this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
             this.split1.Horizontal = false;
             this.split1.Location = new System.Drawing.Point(0, 0);
+            this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.split1.Name = "split1";
             // 
             // split1.Panel1
@@ -233,17 +247,19 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1127, 570);
+            this.split1.Size = new System.Drawing.Size(1409, 698);
             this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1127, 519);
+            this.gcMain1.Size = new System.Drawing.Size(1409, 635);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -253,7 +269,7 @@
             this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
             this.gridView1.Appearance.Row.Options.UseFont = true;
-            this.gridView1.ColumnPanelRowHeight = 50;
+            this.gridView1.ColumnPanelRowHeight = 61;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
             this.gv_isenabled,
             this.gv_foneChecked,
@@ -269,8 +285,9 @@
             this.gridColumn16,
             this.gridColumn8,
             this.gridColumn18});
+            this.gridView1.DetailHeight = 428;
             this.gridView1.GridControl = this.gcMain1;
-            this.gridView1.IndicatorWidth = 50;
+            this.gridView1.IndicatorWidth = 62;
             this.gridView1.Name = "gridView1";
             this.gridView1.OptionsFind.ShowSearchNavButtons = false;
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
@@ -281,189 +298,188 @@
             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.MaxWidth = 62;
+            this.gv_isenabled.MinWidth = 62;
             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.Width = 50;
+            this.gv_isenabled.Width = 62;
             // 
             // gv_foneChecked
             // 
             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.MaxWidth = 62;
+            this.gv_foneChecked.MinWidth = 62;
             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 = 0;
-            this.gv_foneChecked.Width = 50;
+            this.gv_foneChecked.Width = 62;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "鐗╂枡ID";
             this.gridColumn7.FieldName = "itemId";
-            this.gridColumn7.MinWidth = 50;
+            this.gridColumn7.MinWidth = 62;
             this.gridColumn7.Name = "gridColumn7";
             this.gridColumn7.OptionsColumn.AllowEdit = false;
             this.gridColumn7.Tag = "query_a.ITEM_ID";
-            this.gridColumn7.Visible = true;
-            this.gridColumn7.VisibleIndex = 1;
-            this.gridColumn7.Width = 94;
+            this.gridColumn7.Width = 117;
             // 
             // gv_itemNo
             // 
             this.gv_itemNo.AppearanceCell.Options.UseFont = true;
             this.gv_itemNo.Caption = "鐗╂枡缂栫爜";
             this.gv_itemNo.FieldName = "itemNo";
-            this.gv_itemNo.MinWidth = 50;
+            this.gv_itemNo.MinWidth = 62;
             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 = 2;
-            this.gv_itemNo.Width = 150;
+            this.gv_itemNo.VisibleIndex = 1;
+            this.gv_itemNo.Width = 187;
             // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn3.FieldName = "mc";
-            this.gridColumn3.MinWidth = 50;
+            this.gridColumn3.MinWidth = 62;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.OptionsColumn.AllowEdit = false;
             this.gridColumn3.Tag = "query_b.item_name";
             this.gridColumn3.Visible = true;
-            this.gridColumn3.VisibleIndex = 3;
-            this.gridColumn3.Width = 250;
+            this.gridColumn3.VisibleIndex = 2;
+            this.gridColumn3.Width = 312;
             // 
             // gridColumn2
             // 
             this.gridColumn2.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn2.FieldName = "gg";
-            this.gridColumn2.MaxWidth = 300;
-            this.gridColumn2.MinWidth = 50;
+            this.gridColumn2.MaxWidth = 375;
+            this.gridColumn2.MinWidth = 62;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.OptionsColumn.AllowEdit = false;
             this.gridColumn2.Tag = "query_b.item_model";
             this.gridColumn2.Visible = true;
-            this.gridColumn2.VisibleIndex = 4;
-            this.gridColumn2.Width = 100;
+            this.gridColumn2.VisibleIndex = 3;
+            this.gridColumn2.Width = 125;
             // 
             // gv_foneCheckor
             // 
             this.gv_foneCheckor.AppearanceCell.Options.UseFont = true;
             this.gv_foneCheckor.Caption = "瀹℃牳浜�";
             this.gv_foneCheckor.FieldName = "foneCheckor";
-            this.gv_foneCheckor.MinWidth = 50;
+            this.gv_foneCheckor.MinWidth = 62;
             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 = 5;
-            this.gv_foneCheckor.Width = 94;
+            this.gv_foneCheckor.VisibleIndex = 4;
+            this.gv_foneCheckor.Width = 117;
             // 
             // gv_foneCheckdate
             // 
             this.gv_foneCheckdate.AppearanceCell.Options.UseFont = true;
             this.gv_foneCheckdate.Caption = "瀹℃牳鏃堕棿";
             this.gv_foneCheckdate.FieldName = "foneCheckdate";
-            this.gv_foneCheckdate.MinWidth = 50;
+            this.gv_foneCheckdate.MinWidth = 62;
             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 = 6;
-            this.gv_foneCheckdate.Width = 120;
+            this.gv_foneCheckdate.VisibleIndex = 5;
+            this.gv_foneCheckdate.Width = 150;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "鍒朵綔浜�";
             this.gridColumn1.FieldName = "createBy";
-            this.gridColumn1.MinWidth = 50;
+            this.gridColumn1.MinWidth = 62;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.OptionsColumn.AllowEdit = false;
             this.gridColumn1.Tag = "query_a.CREATE_BY";
             this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 7;
-            this.gridColumn1.Width = 94;
+            this.gridColumn1.VisibleIndex = 6;
+            this.gridColumn1.Width = 117;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "鍒朵綔鏃堕棿";
             this.gridColumn4.FieldName = "createDate";
-            this.gridColumn4.MinWidth = 50;
+            this.gridColumn4.MinWidth = 62;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.OptionsColumn.AllowEdit = false;
             this.gridColumn4.Tag = "query_a.CREATE_DATE";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 8;
-            this.gridColumn4.Width = 180;
+            this.gridColumn4.VisibleIndex = 7;
+            this.gridColumn4.Width = 225;
             // 
             // gv_memo
             // 
             this.gv_memo.AppearanceCell.Options.UseFont = true;
             this.gv_memo.Caption = "澶囨敞";
             this.gv_memo.FieldName = "memo";
-            this.gv_memo.MinWidth = 50;
+            this.gv_memo.MinWidth = 62;
             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 = 9;
-            this.gv_memo.Width = 150;
+            this.gv_memo.VisibleIndex = 8;
+            this.gv_memo.Width = 187;
             // 
             // gridColumn16
             // 
             this.gridColumn16.Caption = "涓婚敭GUID";
             this.gridColumn16.FieldName = "guid";
-            this.gridColumn16.MinWidth = 25;
+            this.gridColumn16.MinWidth = 31;
             this.gridColumn16.Name = "gridColumn16";
-            this.gridColumn16.Width = 94;
+            this.gridColumn16.Width = 117;
             // 
             // gridColumn8
             // 
             this.gridColumn8.Caption = "浣跨敤缁勭粐";
             this.gridColumn8.FieldName = "fSubsidiary";
-            this.gridColumn8.MinWidth = 50;
+            this.gridColumn8.MinWidth = 62;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.OptionsColumn.AllowEdit = false;
             this.gridColumn8.Tag = "org.fnumber";
             this.gridColumn8.Visible = true;
-            this.gridColumn8.VisibleIndex = 10;
-            this.gridColumn8.Width = 250;
+            this.gridColumn8.VisibleIndex = 9;
+            this.gridColumn8.Width = 312;
             // 
             // gridColumn18
             // 
             this.gridColumn18.Caption = "绫诲埆";
             this.gridColumn18.FieldName = "ftype";
-            this.gridColumn18.MinWidth = 25;
+            this.gridColumn18.MinWidth = 31;
             this.gridColumn18.Name = "gridColumn18";
             this.gridColumn18.Visible = true;
-            this.gridColumn18.VisibleIndex = 11;
-            this.gridColumn18.Width = 94;
+            this.gridColumn18.VisibleIndex = 10;
+            this.gridColumn18.Width = 117;
             // 
             // 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.Location = new System.Drawing.Point(0, 635);
+            this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);
             this.pageBar1.Name = "pageBar1";
             this.pageBar1.RecordCount = 0;
-            this.pageBar1.Size = new System.Drawing.Size(1127, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1409, 48);
             this.pageBar1.TabIndex = 4;
             this.pageBar1.TotalPages = 0;
             // 
             // xtraTabPage2
             // 
             this.xtraTabPage2.Controls.Add(this.splitMx1);
+            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1127, 570);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1409, 698);
             this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
             // 
             // splitMx1
@@ -471,6 +487,7 @@
             this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx1.Horizontal = false;
             this.splitMx1.Location = new System.Drawing.Point(0, 0);
+            this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.splitMx1.Name = "splitMx1";
             // 
             // splitMx1.Panel1
@@ -483,16 +500,14 @@
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.splitMx1.Size = new System.Drawing.Size(1127, 570);
-            this.splitMx1.SplitterPosition = 113;
+            this.splitMx1.Size = new System.Drawing.Size(1409, 698);
+            this.splitMx1.SplitterPosition = 138;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
             // 
             this.layoutMx1.Controls.Add(this.btnCopy);
             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);
@@ -501,23 +516,28 @@
             this.layoutMx1.Controls.Add(this.txt_foneChecked);
             this.layoutMx1.Controls.Add(this.txt_ftype);
             this.layoutMx1.Controls.Add(this.txt_isenabled);
+            this.layoutMx1.Controls.Add(this.txt_itemId);
+            this.layoutMx1.Controls.Add(this.txt_mc);
+            this.layoutMx1.Controls.Add(this.txt_fSubsidiary);
             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.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(599, 447, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1127, 113);
+            this.layoutMx1.Size = new System.Drawing.Size(1409, 138);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "dataLayoutControl1";
             // 
             // btnCopy
             // 
             this.btnCopy.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.chartswitchrowcolumn_16x16;
-            this.btnCopy.Location = new System.Drawing.Point(565, 74);
+            this.btnCopy.Location = new System.Drawing.Point(706, 90);
+            this.btnCopy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.btnCopy.Name = "btnCopy";
-            this.btnCopy.Size = new System.Drawing.Size(131, 27);
+            this.btnCopy.Size = new System.Drawing.Size(165, 34);
             this.btnCopy.StyleController = this.layoutMx1;
             this.btnCopy.TabIndex = 388;
             this.btnCopy.Tag = "gvBtnAlawys";
@@ -525,105 +545,129 @@
             // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(825, 102);
+            this.lbGuid.Location = new System.Drawing.Point(1031, 125);
+            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(269, 28);
+            this.lbGuid.Size = new System.Drawing.Size(336, 34);
             this.lbGuid.TabIndex = 387;
             this.lbGuid.Text = "label1";
             // 
-            // txt_fSubsidiary
-            // 
-            this.txt_fSubsidiary.IsReadly = false;
-            this.txt_fSubsidiary.Location = new System.Drawing.Point(84, 12);
-            this.txt_fSubsidiary.Name = "txt_fSubsidiary";
-            this.txt_fSubsidiary.Size = new System.Drawing.Size(200, 24);
-            this.txt_fSubsidiary.TabIndex = 383;
-            // 
-            // txt_itemId
-            // 
-            this.txt_itemId.IsReadly = false;
-            this.txt_itemId.Location = new System.Drawing.Point(84, 43);
-            this.txt_itemId.Name = "txt_itemId";
-            this.txt_itemId.Size = new System.Drawing.Size(200, 24);
-            this.txt_itemId.TabIndex = 380;
-            this.txt_itemId.Tag = "no";
-            // 
             // txt_foneCheckdate
             // 
-            this.txt_foneCheckdate.Location = new System.Drawing.Point(914, 43);
+            this.txt_foneCheckdate.Location = new System.Drawing.Point(1139, 52);
+            this.txt_foneCheckdate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_foneCheckdate.Name = "txt_foneCheckdate";
             this.txt_foneCheckdate.Properties.Appearance.Options.UseFont = true;
-            this.txt_foneCheckdate.Size = new System.Drawing.Size(201, 24);
+            this.txt_foneCheckdate.Size = new System.Drawing.Size(256, 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(914, 12);
+            this.txt_foneCheckor.Location = new System.Drawing.Point(1139, 14);
+            this.txt_foneCheckor.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_foneCheckor.Name = "txt_foneCheckor";
             this.txt_foneCheckor.Properties.Appearance.Options.UseFont = true;
-            this.txt_foneCheckor.Size = new System.Drawing.Size(201, 24);
+            this.txt_foneCheckor.Size = new System.Drawing.Size(256, 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(360, 12);
+            this.txt_itemNo.Location = new System.Drawing.Point(447, 14);
+            this.txt_itemNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_itemNo.Name = "txt_itemNo";
             this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_itemNo.Size = new System.Drawing.Size(201, 24);
+            this.txt_itemNo.Size = new System.Drawing.Size(255, 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(84, 74);
+            this.txt_memo.Location = new System.Drawing.Point(447, 90);
+            this.txt_memo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_memo.Name = "txt_memo";
             this.txt_memo.Properties.Appearance.Options.UseFont = true;
-            this.txt_memo.Size = new System.Drawing.Size(477, 24);
+            this.txt_memo.Size = new System.Drawing.Size(255, 28);
             this.txt_memo.StyleController = this.layoutMx1;
             this.txt_memo.TabIndex = 219;
             // 
             // txt_gg
             // 
-            this.txt_gg.Location = new System.Drawing.Point(360, 43);
+            this.txt_gg.Location = new System.Drawing.Point(447, 52);
+            this.txt_gg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_gg.Name = "txt_gg";
-            this.txt_gg.Size = new System.Drawing.Size(201, 24);
+            this.txt_gg.Size = new System.Drawing.Size(255, 28);
             this.txt_gg.StyleController = this.layoutMx1;
             this.txt_gg.TabIndex = 384;
             this.txt_gg.Tag = "readOnly";
             // 
             // txt_foneChecked
             // 
-            this.txt_foneChecked.Location = new System.Drawing.Point(842, 74);
+            this.txt_foneChecked.Location = new System.Drawing.Point(1052, 90);
+            this.txt_foneChecked.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             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(343, 27);
             this.txt_foneChecked.StyleController = this.layoutMx1;
             this.txt_foneChecked.TabIndex = 386;
             this.txt_foneChecked.Tag = "readOnly";
             // 
             // txt_ftype
             // 
-            this.txt_ftype.Location = new System.Drawing.Point(637, 12);
+            this.txt_ftype.Location = new System.Drawing.Point(793, 14);
+            this.txt_ftype.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_ftype.Name = "txt_ftype";
-            this.txt_ftype.Size = new System.Drawing.Size(201, 24);
+            this.txt_ftype.Size = new System.Drawing.Size(255, 28);
             this.txt_ftype.StyleController = this.layoutMx1;
             this.txt_ftype.TabIndex = 389;
             this.txt_ftype.Tag = "readOnly";
             // 
             // txt_isenabled
             // 
-            this.txt_isenabled.Location = new System.Drawing.Point(565, 43);
+            this.txt_isenabled.Location = new System.Drawing.Point(706, 52);
+            this.txt_isenabled.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.txt_isenabled.Name = "txt_isenabled";
             this.txt_isenabled.Properties.Caption = "鍙敤鏍囪瘑";
-            this.txt_isenabled.Size = new System.Drawing.Size(273, 24);
+            this.txt_isenabled.Size = new System.Drawing.Size(342, 27);
             this.txt_isenabled.StyleController = this.layoutMx1;
             this.txt_isenabled.TabIndex = 390;
             this.txt_isenabled.Tag = "readOnly";
+            // 
+            // txt_itemId
+            // 
+            this.txt_itemId.Location = new System.Drawing.Point(101, 14);
+            this.txt_itemId.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_itemId.Name = "txt_itemId";
+            this.txt_itemId.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton()});
+            this.txt_itemId.Properties.ReadOnly = true;
+            this.txt_itemId.Size = new System.Drawing.Size(255, 28);
+            this.txt_itemId.StyleController = this.layoutMx1;
+            this.txt_itemId.TabIndex = 391;
+            // 
+            // txt_mc
+            // 
+            this.txt_mc.Location = new System.Drawing.Point(101, 52);
+            this.txt_mc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_mc.Name = "txt_mc";
+            this.txt_mc.Size = new System.Drawing.Size(255, 28);
+            this.txt_mc.StyleController = this.layoutMx1;
+            this.txt_mc.TabIndex = 392;
+            this.txt_mc.Tag = "readOnly";
+            // 
+            // txt_fSubsidiary
+            // 
+            this.txt_fSubsidiary.Location = new System.Drawing.Point(101, 90);
+            this.txt_fSubsidiary.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.txt_fSubsidiary.Name = "txt_fSubsidiary";
+            this.txt_fSubsidiary.Size = new System.Drawing.Size(255, 28);
+            this.txt_fSubsidiary.StyleController = this.layoutMx1;
+            this.txt_fSubsidiary.TabIndex = 393;
+            this.txt_fSubsidiary.Tag = "readOnly";
             // 
             // layoutControlItem13
             // 
@@ -642,17 +686,18 @@
             this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
             this.Root.GroupBordersVisible = false;
             this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
-            this.layoutControlItem1,
-            this.layoutControlItem4,
-            this.layoutControlItem2,
             this.layoutControlItem10,
             this.layoutControlItem11,
             this.layoutControlItem12,
             this.layoutControlItem14,
             this.layoutControlItem3,
             this.layoutControlItem7,
+            this.layoutControlItem5,
+            this.layoutControlItem1,
             this.layoutControlItem8,
-            this.layoutControlItem5});
+            this.layoutControlItem2,
+            this.layoutControlItem4,
+            this.layoutControlItem6});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
             columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -678,68 +723,38 @@
             rowDefinition7,
             rowDefinition8,
             rowDefinition9});
-            this.Root.Size = new System.Drawing.Size(1127, 113);
+            this.Root.Size = new System.Drawing.Size(1409, 138);
             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, 31);
-            this.layoutControlItem1.Text = "閫夋嫨缁勭粐";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem4
-            // 
-            this.layoutControlItem4.Control = this.txt_itemId;
-            this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
-            this.layoutControlItem4.Name = "layoutControlItem4";
-            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
-            this.layoutControlItem4.Text = "閫夋嫨鐗╂枡";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem2
-            // 
-            this.layoutControlItem2.Control = this.txt_memo;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 62);
-            this.layoutControlItem2.Name = "layoutControlItem2";
-            this.layoutControlItem2.OptionsTableLayoutItem.ColumnSpan = 2;
-            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem2.Size = new System.Drawing.Size(553, 31);
-            this.layoutControlItem2.Text = "澶囨敞";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_foneCheckor;
-            this.layoutControlItem10.Location = new System.Drawing.Point(830, 0);
+            this.layoutControlItem10.Location = new System.Drawing.Point(1038, 0);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem10.Size = new System.Drawing.Size(277, 31);
+            this.layoutControlItem10.Size = new System.Drawing.Size(347, 38);
             this.layoutControlItem10.Text = "瀹℃牳浜哄憳";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_foneCheckdate;
-            this.layoutControlItem11.Location = new System.Drawing.Point(830, 31);
+            this.layoutControlItem11.Location = new System.Drawing.Point(1038, 38);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem11.Size = new System.Drawing.Size(277, 31);
+            this.layoutControlItem11.Size = new System.Drawing.Size(347, 38);
             this.layoutControlItem11.Text = "瀹℃牳鏃堕棿";
-            this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem11.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_foneChecked;
-            this.layoutControlItem12.Location = new System.Drawing.Point(830, 62);
+            this.layoutControlItem12.Location = new System.Drawing.Point(1038, 76);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(277, 31);
+            this.layoutControlItem12.Size = new System.Drawing.Size(347, 38);
             this.layoutControlItem12.Text = "瀹℃牳鏍囪瘑";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
@@ -747,13 +762,13 @@
             // layoutControlItem14
             // 
             this.layoutControlItem14.Control = this.btnCopy;
-            this.layoutControlItem14.Location = new System.Drawing.Point(553, 62);
-            this.layoutControlItem14.MaxSize = new System.Drawing.Size(135, 31);
-            this.layoutControlItem14.MinSize = new System.Drawing.Size(135, 31);
+            this.layoutControlItem14.Location = new System.Drawing.Point(692, 76);
+            this.layoutControlItem14.MaxSize = new System.Drawing.Size(169, 38);
+            this.layoutControlItem14.MinSize = new System.Drawing.Size(169, 38);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(277, 31);
+            this.layoutControlItem14.Size = new System.Drawing.Size(346, 38);
             this.layoutControlItem14.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem14.Text = "澶嶅埗";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(0, 0);
@@ -762,53 +777,94 @@
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_ftype;
-            this.layoutControlItem3.Location = new System.Drawing.Point(553, 0);
+            this.layoutControlItem3.Location = new System.Drawing.Point(692, 0);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(277, 31);
+            this.layoutControlItem3.Size = new System.Drawing.Size(346, 38);
             this.layoutControlItem3.Text = "椤圭洰鍒嗙被";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_itemNo;
-            this.layoutControlItem7.Location = new System.Drawing.Point(276, 0);
+            this.layoutControlItem7.Location = new System.Drawing.Point(346, 0);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem7.Size = new System.Drawing.Size(277, 31);
+            this.layoutControlItem7.Size = new System.Drawing.Size(346, 38);
             this.layoutControlItem7.Text = "鐗╂枡缂栫爜";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
-            // 
-            // layoutControlItem8
-            // 
-            this.layoutControlItem8.Control = this.txt_gg;
-            this.layoutControlItem8.Location = new System.Drawing.Point(276, 31);
-            this.layoutControlItem8.Name = "layoutControlItem8";
-            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem8.Size = new System.Drawing.Size(277, 31);
-            this.layoutControlItem8.Text = "鐗╂枡瑙勬牸";
-            this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_isenabled;
-            this.layoutControlItem5.Location = new System.Drawing.Point(553, 31);
+            this.layoutControlItem5.Location = new System.Drawing.Point(692, 38);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(277, 31);
+            this.layoutControlItem5.Size = new System.Drawing.Size(346, 38);
             this.layoutControlItem5.Text = "鍙敤鏍囪瘑";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem5.TextVisible = false;
+            // 
+            // layoutControlItem1
+            // 
+            this.layoutControlItem1.Control = this.txt_itemId;
+            this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
+            this.layoutControlItem1.Name = "layoutControlItem1";
+            this.layoutControlItem1.Size = new System.Drawing.Size(346, 38);
+            this.layoutControlItem1.Text = "閫夋嫨鐗╂枡";
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem8
+            // 
+            this.layoutControlItem8.Control = this.txt_gg;
+            this.layoutControlItem8.Location = new System.Drawing.Point(346, 38);
+            this.layoutControlItem8.Name = "layoutControlItem8";
+            this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem8.Size = new System.Drawing.Size(346, 38);
+            this.layoutControlItem8.Text = "鐗╂枡瑙勬牸";
+            this.layoutControlItem8.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem2
+            // 
+            this.layoutControlItem2.Control = this.txt_memo;
+            this.layoutControlItem2.Location = new System.Drawing.Point(346, 76);
+            this.layoutControlItem2.Name = "layoutControlItem2";
+            this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+            this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem2.Size = new System.Drawing.Size(346, 38);
+            this.layoutControlItem2.Text = "澶囨敞";
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem4
+            // 
+            this.layoutControlItem4.Control = this.txt_mc;
+            this.layoutControlItem4.Location = new System.Drawing.Point(0, 38);
+            this.layoutControlItem4.Name = "layoutControlItem4";
+            this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
+            this.layoutControlItem4.Size = new System.Drawing.Size(346, 38);
+            this.layoutControlItem4.Text = "鐗╂枡鍚嶇О";
+            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);
+            // 
+            // layoutControlItem6
+            // 
+            this.layoutControlItem6.Control = this.txt_fSubsidiary;
+            this.layoutControlItem6.Location = new System.Drawing.Point(0, 76);
+            this.layoutControlItem6.Name = "layoutControlItem6";
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem6.Size = new System.Drawing.Size(346, 38);
+            this.layoutControlItem6.Text = "浣跨敤缁勭粐";
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
             // 
             // tabMx
             // 
             this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;
             this.tabMx.Location = new System.Drawing.Point(0, 0);
+            this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1127, 445);
+            this.tabMx.Size = new System.Drawing.Size(1409, 545);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -816,15 +872,18 @@
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
+            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1125, 413);
+            this.tabMxPage1.Size = new System.Drawing.Size(1407, 507);
             this.tabMxPage1.Text = "妫�楠岄」鐩槑缁�";
             // 
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.rptJYXM,
@@ -835,8 +894,9 @@
             this.repositoryItemButtonEdit1,
             this.rptShunXui,
             this.rptStation,
-            this.repositoryItemCheckEdit1});
-            this.gcMx1.Size = new System.Drawing.Size(1125, 413);
+            this.repositoryItemCheckEdit1,
+            this.rptGroup});
+            this.gcMx1.Size = new System.Drawing.Size(1407, 507);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -860,8 +920,11 @@
             this.gvMx1fdownAllow,
             this.gridColumn19,
             this.gvMxDel,
+            this.gridColumn11,
             this.gridColumn6,
-            this.gridColumn9});
+            this.gridColumn9,
+            this.gridColumn10});
+            this.gvMx1.DetailHeight = 428;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -874,18 +937,22 @@
             this.gvMx1guid.AppearanceCell.Options.UseFont = true;
             this.gvMx1guid.Caption = "瀛愯〃涓婚敭GUID";
             this.gvMx1guid.FieldName = "guid";
+            this.gvMx1guid.MinWidth = 25;
             this.gvMx1guid.Name = "gvMx1guid";
+            this.gvMx1guid.OptionsColumn.ReadOnly = true;
             this.gvMx1guid.Tag = "query_a.guid";
-            this.gvMx1guid.Width = 94;
+            this.gvMx1guid.Width = 117;
             // 
             // gvMx1pid
             // 
             this.gvMx1pid.AppearanceCell.Options.UseFont = true;
             this.gvMx1pid.Caption = "涓昏〃涓婚敭GUID";
             this.gvMx1pid.FieldName = "pid";
+            this.gvMx1pid.MinWidth = 25;
             this.gvMx1pid.Name = "gvMx1pid";
+            this.gvMx1pid.OptionsColumn.ReadOnly = true;
             this.gvMx1pid.Tag = "query_a.pid";
-            this.gvMx1pid.Width = 94;
+            this.gvMx1pid.Width = 117;
             // 
             // gvMx1fcheckItem
             // 
@@ -893,11 +960,12 @@
             this.gvMx1fcheckItem.Caption = "妫�楠岄」鐩�";
             this.gvMx1fcheckItem.ColumnEdit = this.rptJYXM;
             this.gvMx1fcheckItem.FieldName = "fcheckItem";
+            this.gvMx1fcheckItem.MinWidth = 25;
             this.gvMx1fcheckItem.Name = "gvMx1fcheckItem";
             this.gvMx1fcheckItem.Tag = "edit";
             this.gvMx1fcheckItem.Visible = true;
-            this.gvMx1fcheckItem.VisibleIndex = 0;
-            this.gvMx1fcheckItem.Width = 150;
+            this.gvMx1fcheckItem.VisibleIndex = 1;
+            this.gvMx1fcheckItem.Width = 187;
             // 
             // rptJYXM
             // 
@@ -912,11 +980,12 @@
             this.gvMx1forder.Caption = "椤哄簭";
             this.gvMx1forder.ColumnEdit = this.rptShunXui;
             this.gvMx1forder.FieldName = "forder";
+            this.gvMx1forder.MinWidth = 25;
             this.gvMx1forder.Name = "gvMx1forder";
             this.gvMx1forder.Tag = "yz_quantity_0_edit";
             this.gvMx1forder.Visible = true;
-            this.gvMx1forder.VisibleIndex = 1;
-            this.gvMx1forder.Width = 50;
+            this.gvMx1forder.VisibleIndex = 0;
+            this.gvMx1forder.Width = 62;
             // 
             // rptShunXui
             // 
@@ -945,20 +1014,22 @@
             // 
             this.gridColumn5.Caption = "瑙勬牸瑕佹眰";
             this.gridColumn5.FieldName = "fspecRequ";
+            this.gridColumn5.MinWidth = 25;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Tag = "edit";
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 2;
-            this.gridColumn5.Width = 150;
+            this.gridColumn5.Width = 187;
             // 
             // gvMx1memo
             // 
             this.gvMx1memo.AppearanceCell.Options.UseFont = true;
             this.gvMx1memo.Caption = "妫�楠岄」鐩弿杩�";
             this.gvMx1memo.FieldName = "memo";
+            this.gvMx1memo.MinWidth = 25;
             this.gvMx1memo.Name = "gvMx1memo";
             this.gvMx1memo.Tag = "edit";
-            this.gvMx1memo.Width = 150;
+            this.gvMx1memo.Width = 187;
             // 
             // gvMx1fcheckTool
             // 
@@ -966,11 +1037,12 @@
             this.gvMx1fcheckTool.Caption = "妫�楠屽伐鍏�";
             this.gvMx1fcheckTool.ColumnEdit = this.rptJYGJ;
             this.gvMx1fcheckTool.FieldName = "fcheckTool";
+            this.gvMx1fcheckTool.MinWidth = 25;
             this.gvMx1fcheckTool.Name = "gvMx1fcheckTool";
             this.gvMx1fcheckTool.Tag = "edit";
             this.gvMx1fcheckTool.Visible = true;
             this.gvMx1fcheckTool.VisibleIndex = 3;
-            this.gvMx1fcheckTool.Width = 150;
+            this.gvMx1fcheckTool.Width = 187;
             // 
             // rptJYGJ
             // 
@@ -985,11 +1057,12 @@
             this.gvMx1sampleSizeNo.Caption = "妫�楠屾爣鍑嗗悕绉�";
             this.gvMx1sampleSizeNo.ColumnEdit = this.rptJYBZ;
             this.gvMx1sampleSizeNo.FieldName = "sampleSizeName";
+            this.gvMx1sampleSizeNo.MinWidth = 25;
             this.gvMx1sampleSizeNo.Name = "gvMx1sampleSizeNo";
             this.gvMx1sampleSizeNo.Tag = "edit";
             this.gvMx1sampleSizeNo.Visible = true;
             this.gvMx1sampleSizeNo.VisibleIndex = 4;
-            this.gvMx1sampleSizeNo.Width = 150;
+            this.gvMx1sampleSizeNo.Width = 187;
             // 
             // rptJYBZ
             // 
@@ -1004,12 +1077,11 @@
             // 
             this.sampleSizeName.Caption = "妫�楠屾爣鍑嗙紪鐮�";
             this.sampleSizeName.FieldName = "sampleSizeNo";
+            this.sampleSizeName.MinWidth = 25;
             this.sampleSizeName.Name = "sampleSizeName";
             this.sampleSizeName.OptionsColumn.ReadOnly = true;
             this.sampleSizeName.Tag = "edit";
-            this.sampleSizeName.Visible = true;
-            this.sampleSizeName.VisibleIndex = 5;
-            this.sampleSizeName.Width = 150;
+            this.sampleSizeName.Width = 187;
             // 
             // gvMx1fcheckLevel
             // 
@@ -1017,11 +1089,12 @@
             this.gvMx1fcheckLevel.Caption = "妫�楠屾按骞�";
             this.gvMx1fcheckLevel.ColumnEdit = this.rptJYSP;
             this.gvMx1fcheckLevel.FieldName = "fcheckLevel";
+            this.gvMx1fcheckLevel.MinWidth = 25;
             this.gvMx1fcheckLevel.Name = "gvMx1fcheckLevel";
             this.gvMx1fcheckLevel.Tag = "edit";
             this.gvMx1fcheckLevel.Visible = true;
-            this.gvMx1fcheckLevel.VisibleIndex = 6;
-            this.gvMx1fcheckLevel.Width = 200;
+            this.gvMx1fcheckLevel.VisibleIndex = 5;
+            this.gvMx1fcheckLevel.Width = 250;
             // 
             // rptJYSP
             // 
@@ -1037,11 +1110,12 @@
             this.gvMx1facLevel.Caption = "鎺ユ敹姘村钩";
             this.gvMx1facLevel.ColumnEdit = this.rptJSSP;
             this.gvMx1facLevel.FieldName = "facLevel";
+            this.gvMx1facLevel.MinWidth = 25;
             this.gvMx1facLevel.Name = "gvMx1facLevel";
             this.gvMx1facLevel.Tag = "edit";
             this.gvMx1facLevel.Visible = true;
-            this.gvMx1facLevel.VisibleIndex = 7;
-            this.gvMx1facLevel.Width = 150;
+            this.gvMx1facLevel.VisibleIndex = 6;
+            this.gvMx1facLevel.Width = 187;
             // 
             // rptJSSP
             // 
@@ -1056,53 +1130,54 @@
             this.gvMx1fupAllow.AppearanceCell.Options.UseFont = true;
             this.gvMx1fupAllow.Caption = "涓婇檺";
             this.gvMx1fupAllow.FieldName = "fupAllow";
+            this.gvMx1fupAllow.MinWidth = 25;
             this.gvMx1fupAllow.Name = "gvMx1fupAllow";
             this.gvMx1fupAllow.Tag = "yz_quantity_0_edit";
             this.gvMx1fupAllow.Visible = true;
-            this.gvMx1fupAllow.VisibleIndex = 8;
-            this.gvMx1fupAllow.Width = 60;
+            this.gvMx1fupAllow.VisibleIndex = 7;
             // 
             // gvMx1fstand
             // 
             this.gvMx1fstand.AppearanceCell.Options.UseFont = true;
             this.gvMx1fstand.Caption = "鏍囧噯鍊�";
             this.gvMx1fstand.FieldName = "fstand";
+            this.gvMx1fstand.MinWidth = 25;
             this.gvMx1fstand.Name = "gvMx1fstand";
             this.gvMx1fstand.Tag = "yz_quantity_0_edit";
             this.gvMx1fstand.Visible = true;
-            this.gvMx1fstand.VisibleIndex = 9;
-            this.gvMx1fstand.Width = 60;
+            this.gvMx1fstand.VisibleIndex = 8;
             // 
             // gvMx1fdownAllow
             // 
             this.gvMx1fdownAllow.AppearanceCell.Options.UseFont = true;
             this.gvMx1fdownAllow.Caption = "涓嬮檺";
             this.gvMx1fdownAllow.FieldName = "fdownAllow";
+            this.gvMx1fdownAllow.MinWidth = 25;
             this.gvMx1fdownAllow.Name = "gvMx1fdownAllow";
             this.gvMx1fdownAllow.Tag = "yz_quantity_0_edit";
             this.gvMx1fdownAllow.Visible = true;
-            this.gvMx1fdownAllow.VisibleIndex = 10;
-            this.gvMx1fdownAllow.Width = 60;
+            this.gvMx1fdownAllow.VisibleIndex = 9;
             // 
             // gridColumn19
             // 
             this.gridColumn19.Caption = "鏍峰搧鍩烘暟";
             this.gridColumn19.FieldName = "ypsl";
+            this.gridColumn19.MinWidth = 25;
             this.gridColumn19.Name = "gridColumn19";
             this.gridColumn19.Tag = "edit";
             this.gridColumn19.Visible = true;
-            this.gridColumn19.VisibleIndex = 11;
-            this.gridColumn19.Width = 94;
+            this.gridColumn19.VisibleIndex = 10;
+            this.gridColumn19.Width = 117;
             // 
             // gvMxDel
             // 
             this.gvMxDel.Caption = "绉婚櫎";
             this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 50;
+            this.gvMxDel.MinWidth = 62;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 14;
-            this.gvMxDel.Width = 100;
+            this.gvMxDel.VisibleIndex = 13;
+            this.gvMxDel.Width = 125;
             // 
             // repositoryItemButtonEdit1
             // 
@@ -1115,17 +1190,26 @@
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
             // 
+            // gridColumn11
+            // 
+            this.gridColumn11.Caption = "鍗曚綅";
+            this.gridColumn11.FieldName = "funit";
+            this.gridColumn11.MinWidth = 31;
+            this.gridColumn11.Name = "gridColumn11";
+            this.gridColumn11.Tag = "edit";
+            this.gridColumn11.Width = 117;
+            // 
             // gridColumn6
             // 
             this.gridColumn6.Caption = "宸ヤ綅";
             this.gridColumn6.ColumnEdit = this.rptStation;
             this.gridColumn6.FieldName = "stationName";
-            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.MinWidth = 31;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Tag = "edit";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 12;
-            this.gridColumn6.Width = 94;
+            this.gridColumn6.VisibleIndex = 11;
+            this.gridColumn6.Width = 117;
             // 
             // rptStation
             // 
@@ -1140,38 +1224,58 @@
             this.gridColumn9.Caption = "鏄惁棣栨璁よ瘉";
             this.gridColumn9.ColumnEdit = this.repositoryItemCheckEdit1;
             this.gridColumn9.FieldName = "isRzxx";
-            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.MinWidth = 31;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Tag = "edit";
-            this.gridColumn9.Visible = true;
-            this.gridColumn9.VisibleIndex = 13;
-            this.gridColumn9.Width = 94;
-            // 
-            // 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;
+            this.gridColumn9.UnboundDataType = typeof(bool);
+            this.gridColumn9.Width = 117;
             // 
             // repositoryItemCheckEdit1
             // 
             this.repositoryItemCheckEdit1.AutoHeight = false;
             this.repositoryItemCheckEdit1.Name = "repositoryItemCheckEdit1";
             // 
+            // gridColumn10
+            // 
+            this.gridColumn10.Caption = "鎵�灞炲ぇ绫�";
+            this.gridColumn10.ColumnEdit = this.rptGroup;
+            this.gridColumn10.FieldName = "fcheckType";
+            this.gridColumn10.MinWidth = 31;
+            this.gridColumn10.Name = "gridColumn10";
+            this.gridColumn10.Tag = "edit";
+            this.gridColumn10.Visible = true;
+            this.gridColumn10.VisibleIndex = 12;
+            this.gridColumn10.Width = 117;
+            // 
+            // rptGroup
+            // 
+            this.rptGroup.AutoHeight = false;
+            this.rptGroup.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+            this.rptGroup.Name = "rptGroup";
+            // 
+            // picCheckBox
+            // 
+            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
+            this.picCheckBox.Location = new System.Drawing.Point(1181, 67);
+            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
+            this.picCheckBox.Name = "picCheckBox";
+            this.picCheckBox.Size = new System.Drawing.Size(125, 61);
+            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
+            this.picCheckBox.TabIndex = 6;
+            this.picCheckBox.TabStop = false;
+            this.picCheckBox.Visible = false;
+            // 
             // Jyxm
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);
             this.Name = "Jyxm";
-            this.Size = new System.Drawing.Size(1129, 682);
+            this.Size = new System.Drawing.Size(1411, 834);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
             this.xtraTabControl1.ResumeLayout(false);
             this.xtraTabPage1.ResumeLayout(false);
@@ -1199,19 +1303,23 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_foneChecked.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_ftype.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isenabled.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_itemId.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_mc.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_fSubsidiary.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -1225,8 +1333,9 @@
             ((System.ComponentModel.ISupportInitialize)(this.rptJSSP)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.rptStation)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.repositoryItemCheckEdit1)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.rptGroup)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
             this.ResumeLayout(false);
 
         }
@@ -1255,14 +1364,10 @@
         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_foneCheckdate;
         private DevExpress.XtraEditors.TextEdit txt_foneCheckor;
         private DevExpress.XtraEditors.TextEdit txt_memo;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
         private DevExpress.XtraEditors.TextEdit txt_gg;
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.CheckEdit txt_foneChecked;
@@ -1293,7 +1398,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1fdownAllow;
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
@@ -1307,11 +1411,21 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptStation;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
         private DevExpress.XtraEditors.Repository.RepositoryItemCheckEdit repositoryItemCheckEdit1;
+        private DevExpress.XtraEditors.ButtonEdit txt_itemId;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+        private DevExpress.XtraEditors.TextEdit txt_mc;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
+        private DevExpress.XtraEditors.TextEdit txt_fSubsidiary;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+        private DevExpress.XtraEditors.Repository.RepositoryItemComboBox rptGroup;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3