~tjx/GsMesClient.git

			@@ -75,12 +75,12 @@
			this.pageBar1 = new UserControls.Data.UcPageBar();
			this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
			this.panel1 = new System.Windows.Forms.Panel();
			this.txt_fcurrentunitid = new Gs.DevApp.UserControl.UcLookUnit();
			this.txt_fbaseunit = new Gs.DevApp.UserControl.UcLookUnit();
			this.txt_newunit = new Gs.DevApp.UserControl.UcLookUnit();
			this.txt_oldunit = new Gs.DevApp.UserControl.UcLookUnit();
			this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
			this.lbGuid = new System.Windows.Forms.Label();
			this.txt_oldunit = new Gs.DevApp.UserControl.UcLookUnit();
			this.txt_newunit = new Gs.DevApp.UserControl.UcLookUnit();
			this.txt_fbaseunit = new Gs.DevApp.UserControl.UcLookUnit();
			this.txt_fcurrentunitid = new Gs.DevApp.UserControl.UcLookUnit();
			((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_fdescription.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_fprecision.Properties)).BeginInit();
			@@ -129,7 +129,6 @@
			this.gv_fforbidstatus.FieldName = "fforbidstatus";
			this.gv_fforbidstatus.MinWidth = 50;
			this.gv_fforbidstatus.Name = "gv_fforbidstatus";
			this.gv_fforbidstatus.OptionsColumn.AllowEdit = false;
			this.gv_fforbidstatus.Tag = "query_a.fforbidstatus";
			this.gv_fforbidstatus.Visible = true;
			this.gv_fforbidstatus.VisibleIndex = 9;
			@@ -162,7 +161,6 @@
			this.gv_fdescription.FieldName = "fdescription";
			this.gv_fdescription.MinWidth = 50;
			this.gv_fdescription.Name = "gv_fdescription";
			this.gv_fdescription.OptionsColumn.AllowEdit = false;
			this.gv_fdescription.Tag = "query_a.fdescription";
			this.gv_fdescription.Visible = true;
			this.gv_fdescription.VisibleIndex = 8;
			@@ -195,7 +193,6 @@
			this.gv_fprecision.FieldName = "fprecision";
			this.gv_fprecision.MinWidth = 50;
			this.gv_fprecision.Name = "gv_fprecision";
			this.gv_fprecision.OptionsColumn.AllowEdit = false;
			this.gv_fprecision.Tag = "query_a.fprecision";
			this.gv_fprecision.Visible = true;
			this.gv_fprecision.VisibleIndex = 7;
			@@ -228,7 +225,6 @@
			this.gv_froundtype.FieldName = "froundtype";
			this.gv_froundtype.MinWidth = 50;
			this.gv_froundtype.Name = "gv_froundtype";
			this.gv_froundtype.OptionsColumn.AllowEdit = false;
			this.gv_froundtype.Tag = "query_a.froundtype";
			this.gv_froundtype.Visible = true;
			this.gv_froundtype.VisibleIndex = 6;
			@@ -271,7 +267,6 @@
			this.gv_fconvertnumerator.FieldName = "fconvertnumerator";
			this.gv_fconvertnumerator.MinWidth = 50;
			this.gv_fconvertnumerator.Name = "gv_fconvertnumerator";
			this.gv_fconvertnumerator.OptionsColumn.AllowEdit = false;
			this.gv_fconvertnumerator.Tag = "query_a.fconvertnumerator";
			this.gv_fconvertnumerator.Visible = true;
			this.gv_fconvertnumerator.VisibleIndex = 5;
			@@ -314,7 +309,7 @@
			this.gv_fconvertdenominator.FieldName = "fconvertdenominator";
			this.gv_fconvertdenominator.MinWidth = 50;
			this.gv_fconvertdenominator.Name = "gv_fconvertdenominator";
			this.gv_fconvertdenominator.OptionsColumn.AllowEdit = false;
			this.gv_fconvertdenominator.OptionsColumn.ReadOnly = true;
			this.gv_fconvertdenominator.Tag = "query_a.fconvertdenominator";
			this.gv_fconvertdenominator.Visible = true;
			this.gv_fconvertdenominator.VisibleIndex = 4;
			@@ -347,7 +342,7 @@
			this.gv_funitgroupid.FieldName = "funitgroupid";
			this.gv_funitgroupid.MinWidth = 50;
			this.gv_funitgroupid.Name = "gv_funitgroupid";
			this.gv_funitgroupid.OptionsColumn.AllowEdit = false;
			this.gv_funitgroupid.OptionsColumn.ReadOnly = true;
			this.gv_funitgroupid.Tag = "query_a.funitgroupid";
			this.gv_funitgroupid.Visible = true;
			this.gv_funitgroupid.VisibleIndex = 3;
			@@ -380,7 +375,7 @@
			this.gv_fname.FieldName = "fname";
			this.gv_fname.MinWidth = 50;
			this.gv_fname.Name = "gv_fname";
			this.gv_fname.OptionsColumn.AllowEdit = false;
			this.gv_fname.OptionsColumn.ReadOnly = true;
			this.gv_fname.Tag = "query_a.fname";
			this.gv_fname.Visible = true;
			this.gv_fname.VisibleIndex = 2;
			@@ -413,7 +408,7 @@
			this.gv_fnumber.FieldName = "fnumber";
			this.gv_fnumber.MinWidth = 50;
			this.gv_fnumber.Name = "gv_fnumber";
			this.gv_fnumber.OptionsColumn.AllowEdit = false;
			this.gv_fnumber.OptionsColumn.ReadOnly = true;
			this.gv_fnumber.Tag = "query_a.fnumber";
			this.gv_fnumber.Visible = true;
			this.gv_fnumber.VisibleIndex = 1;
			@@ -504,7 +499,7 @@
			this.gv_id.FieldName = "id";
			this.gv_id.MinWidth = 50;
			this.gv_id.Name = "gv_id";
			this.gv_id.OptionsColumn.AllowEdit = false;
			this.gv_id.OptionsColumn.ReadOnly = true;
			this.gv_id.Tag = "query_a.id";
			this.gv_id.Visible = true;
			this.gv_id.VisibleIndex = 0;
			@@ -576,7 +571,7 @@
			this.xtraTabPage1.Controls.Add(this.pageBar1);
			this.xtraTabPage1.Name = "xtraTabPage1";
			this.xtraTabPage1.Size = new System.Drawing.Size(970, 570);
			this.xtraTabPage1.Text = "数据查询";
			this.xtraTabPage1.Text = "数据列表";
			//
			// pageBar1
			//
			@@ -586,7 +581,6 @@
			this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
			this.pageBar1.Name = "pageBar1";
			this.pageBar1.RecordCount = 0;
			this.pageBar1.RowsCount = 50;
			this.pageBar1.Size = new System.Drawing.Size(970, 39);
			this.pageBar1.TabIndex = 3;
			this.pageBar1.TotalPages = 0;
			@@ -595,9 +589,8 @@
			//
			this.xtraTabPage2.Controls.Add(this.panel1);
			this.xtraTabPage2.Name = "xtraTabPage2";
			this.xtraTabPage2.PageEnabled = false;
			this.xtraTabPage2.Size = new System.Drawing.Size(970, 570);
			this.xtraTabPage2.Text = "数据编辑";
			this.xtraTabPage2.Text = "数据详细";
			//
			// panel1
			//
			@@ -642,6 +635,38 @@
			this.panel1.Size = new System.Drawing.Size(814, 426);
			this.panel1.TabIndex = 1;
			//
			// txt_fcurrentunitid
			//
			this.txt_fcurrentunitid.IsReadly = false;
			this.txt_fcurrentunitid.Location = new System.Drawing.Point(368, 160);
			this.txt_fcurrentunitid.Name = "txt_fcurrentunitid";
			this.txt_fcurrentunitid.Size = new System.Drawing.Size(150, 28);
			this.txt_fcurrentunitid.TabIndex = 302;
			//
			// txt_fbaseunit
			//
			this.txt_fbaseunit.IsReadly = false;
			this.txt_fbaseunit.Location = new System.Drawing.Point(368, 119);
			this.txt_fbaseunit.Name = "txt_fbaseunit";
			this.txt_fbaseunit.Size = new System.Drawing.Size(150, 28);
			this.txt_fbaseunit.TabIndex = 301;
			//
			// txt_newunit
			//
			this.txt_newunit.IsReadly = false;
			this.txt_newunit.Location = new System.Drawing.Point(123, 200);
			this.txt_newunit.Name = "txt_newunit";
			this.txt_newunit.Size = new System.Drawing.Size(150, 28);
			this.txt_newunit.TabIndex = 300;
			//
			// txt_oldunit
			//
			this.txt_oldunit.IsReadly = false;
			this.txt_oldunit.Location = new System.Drawing.Point(123, 119);
			this.txt_oldunit.Name = "txt_oldunit";
			this.txt_oldunit.Size = new System.Drawing.Size(150, 28);
			this.txt_oldunit.TabIndex = 299;
			//
			// labelControl11
			//
			this.labelControl11.Location = new System.Drawing.Point(53, 373);
			@@ -660,38 +685,6 @@
			this.lbGuid.Size = new System.Drawing.Size(0, 21);
			this.lbGuid.TabIndex = 1;
			this.lbGuid.Visible = false;
			//
			// txt_oldunit
			//
			this.txt_oldunit.IsReadly = false;
			this.txt_oldunit.Location = new System.Drawing.Point(123, 119);
			this.txt_oldunit.Name = "txt_oldunit";
			this.txt_oldunit.Size = new System.Drawing.Size(150, 28);
			this.txt_oldunit.TabIndex = 299;
			//
			// txt_newunit
			//
			this.txt_newunit.IsReadly = false;
			this.txt_newunit.Location = new System.Drawing.Point(123, 200);
			this.txt_newunit.Name = "txt_newunit";
			this.txt_newunit.Size = new System.Drawing.Size(150, 28);
			this.txt_newunit.TabIndex = 300;
			//
			// txt_fbaseunit
			//
			this.txt_fbaseunit.IsReadly = false;
			this.txt_fbaseunit.Location = new System.Drawing.Point(368, 119);
			this.txt_fbaseunit.Name = "txt_fbaseunit";
			this.txt_fbaseunit.Size = new System.Drawing.Size(150, 28);
			this.txt_fbaseunit.TabIndex = 301;
			//
			// txt_fcurrentunitid
			//
			this.txt_fcurrentunitid.IsReadly = false;
			this.txt_fcurrentunitid.Location = new System.Drawing.Point(368, 160);
			this.txt_fcurrentunitid.Name = "txt_fcurrentunitid";
			this.txt_fcurrentunitid.Size = new System.Drawing.Size(150, 28);
			this.txt_fcurrentunitid.TabIndex = 302;
			//
			// Frm_MesUnit
			//