From a89f2c46d1f53a4d9e23dc76b949b40d2b2b18a6 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期六, 08 二月 2025 08:22:22 +0800
Subject: [PATCH] 采购退货

---
 DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs |  379 ++++++++++++-----------------------------------------
 1 files changed, 89 insertions(+), 290 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
index a82378a..5dd9d1d 100644
--- a/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/BasicData/Frm_MesUnit.Designer.cs
@@ -42,12 +42,10 @@
             this.txt_froundtype = new DevExpress.XtraEditors.TextEdit();
             this.gv_froundtype = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_fbaseunit = new DevExpress.XtraEditors.LabelControl();
-            this.txt_fbaseunit = new DevExpress.XtraEditors.TextEdit();
             this.lb_fconvertnumerator = new DevExpress.XtraEditors.LabelControl();
             this.txt_fconvertnumerator = new DevExpress.XtraEditors.TextEdit();
             this.gv_fconvertnumerator = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_fcurrentunitid = new DevExpress.XtraEditors.LabelControl();
-            this.txt_fcurrentunitid = new DevExpress.XtraEditors.TextEdit();
             this.lb_fconvertdenominator = new DevExpress.XtraEditors.LabelControl();
             this.txt_fconvertdenominator = new DevExpress.XtraEditors.TextEdit();
             this.gv_fconvertdenominator = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -60,29 +58,14 @@
             this.lb_fnumber = new DevExpress.XtraEditors.LabelControl();
             this.txt_fnumber = new DevExpress.XtraEditors.TextEdit();
             this.gv_fnumber = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.lb_lastupdate_by = new DevExpress.XtraEditors.LabelControl();
-            this.txt_lastupdateBy = new DevExpress.XtraEditors.TextEdit();
-            this.lb_lastupdate_date = new DevExpress.XtraEditors.LabelControl();
-            this.txt_lastupdateDate = new DevExpress.XtraEditors.TextEdit();
-            this.lb_create_by = new DevExpress.XtraEditors.LabelControl();
-            this.txt_createBy = new DevExpress.XtraEditors.TextEdit();
-            this.lb_create_date = new DevExpress.XtraEditors.LabelControl();
-            this.txt_createDate = new DevExpress.XtraEditors.TextEdit();
             this.lb_newqty = new DevExpress.XtraEditors.LabelControl();
             this.txt_newqty = new DevExpress.XtraEditors.TextEdit();
-            this.gv_newqty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_oldqty = new DevExpress.XtraEditors.LabelControl();
             this.txt_oldqty = new DevExpress.XtraEditors.TextEdit();
-            this.gv_oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_newunit = new DevExpress.XtraEditors.LabelControl();
-            this.txt_newunit = new DevExpress.XtraEditors.TextEdit();
-            this.gv_newunit = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_oldunit = new DevExpress.XtraEditors.LabelControl();
-            this.txt_oldunit = new DevExpress.XtraEditors.TextEdit();
-            this.gv_oldunit = new DevExpress.XtraGrid.Columns.GridColumn();
             this.lb_id = new DevExpress.XtraEditors.LabelControl();
             this.txt_id = new DevExpress.XtraEditors.TextEdit();
-            this.gv_id = 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();
@@ -91,27 +74,24 @@
             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.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fdescription.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fprecision.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_froundtype.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fbaseunit.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fconvertnumerator.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcurrentunitid.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fconvertdenominator.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_funitgroupid.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fname.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fnumber.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_newqty.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_oldqty.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_newunit.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_oldunit.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
@@ -149,11 +129,10 @@
             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;
-            this.gv_fforbidstatus.Width = 94;
+            this.gv_fforbidstatus.VisibleIndex = 8;
+            this.gv_fforbidstatus.Width = 91;
             // 
             // lb_fdescription
             // 
@@ -182,11 +161,10 @@
             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;
-            this.gv_fdescription.Width = 94;
+            this.gv_fdescription.VisibleIndex = 7;
+            this.gv_fdescription.Width = 91;
             // 
             // lb_fprecision
             // 
@@ -215,11 +193,10 @@
             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;
-            this.gv_fprecision.Width = 94;
+            this.gv_fprecision.VisibleIndex = 6;
+            this.gv_fprecision.Width = 91;
             // 
             // lb_froundtype
             // 
@@ -248,11 +225,10 @@
             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;
-            this.gv_froundtype.Width = 94;
+            this.gv_froundtype.VisibleIndex = 5;
+            this.gv_froundtype.Width = 91;
             // 
             // lb_fbaseunit
             // 
@@ -263,15 +239,6 @@
             this.lb_fbaseunit.Size = new System.Drawing.Size(85, 21);
             this.lb_fbaseunit.TabIndex = 273;
             this.lb_fbaseunit.Text = "鍩哄噯鍗曚綅锛�";
-            // 
-            // txt_fbaseunit
-            // 
-            this.txt_fbaseunit.Location = new System.Drawing.Point(368, 119);
-            this.txt_fbaseunit.Name = "txt_fbaseunit";
-            this.txt_fbaseunit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_fbaseunit.Properties.Appearance.Options.UseFont = true;
-            this.txt_fbaseunit.Size = new System.Drawing.Size(150, 28);
-            this.txt_fbaseunit.TabIndex = 273;
             // 
             // lb_fconvertnumerator
             // 
@@ -300,11 +267,10 @@
             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;
-            this.gv_fconvertnumerator.Width = 94;
+            this.gv_fconvertnumerator.VisibleIndex = 4;
+            this.gv_fconvertnumerator.Width = 91;
             // 
             // lb_fcurrentunitid
             // 
@@ -315,15 +281,6 @@
             this.lb_fcurrentunitid.Size = new System.Drawing.Size(85, 21);
             this.lb_fcurrentunitid.TabIndex = 262;
             this.lb_fcurrentunitid.Text = "褰撳墠鍗曚綅锛�";
-            // 
-            // txt_fcurrentunitid
-            // 
-            this.txt_fcurrentunitid.Location = new System.Drawing.Point(368, 160);
-            this.txt_fcurrentunitid.Name = "txt_fcurrentunitid";
-            this.txt_fcurrentunitid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_fcurrentunitid.Properties.Appearance.Options.UseFont = true;
-            this.txt_fcurrentunitid.Size = new System.Drawing.Size(150, 28);
-            this.txt_fcurrentunitid.TabIndex = 262;
             // 
             // lb_fconvertdenominator
             // 
@@ -352,17 +309,17 @@
             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;
-            this.gv_fconvertdenominator.Width = 94;
+            this.gv_fconvertdenominator.VisibleIndex = 3;
+            this.gv_fconvertdenominator.Width = 91;
             // 
             // lb_funitgroupid
             // 
             this.lb_funitgroupid.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_funitgroupid.Appearance.Options.UseFont = true;
-            this.lb_funitgroupid.Location = new System.Drawing.Point(38, 204);
+            this.lb_funitgroupid.Location = new System.Drawing.Point(533, 164);
             this.lb_funitgroupid.Name = "lb_funitgroupid";
             this.lb_funitgroupid.Size = new System.Drawing.Size(85, 21);
             this.lb_funitgroupid.TabIndex = 252;
@@ -370,7 +327,7 @@
             // 
             // txt_funitgroupid
             // 
-            this.txt_funitgroupid.Location = new System.Drawing.Point(123, 200);
+            this.txt_funitgroupid.Location = new System.Drawing.Point(618, 160);
             this.txt_funitgroupid.Name = "txt_funitgroupid";
             this.txt_funitgroupid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_funitgroupid.Properties.Appearance.Options.UseFont = true;
@@ -385,11 +342,11 @@
             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;
-            this.gv_funitgroupid.Width = 94;
+            this.gv_funitgroupid.VisibleIndex = 2;
+            this.gv_funitgroupid.Width = 91;
             // 
             // lb_fname
             // 
@@ -418,11 +375,11 @@
             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;
-            this.gv_fname.Width = 94;
+            this.gv_fname.VisibleIndex = 1;
+            this.gv_fname.Width = 91;
             // 
             // lb_fnumber
             // 
@@ -451,93 +408,17 @@
             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;
-            this.gv_fnumber.Width = 94;
-            // 
-            // lb_lastupdate_by
-            // 
-            this.lb_lastupdate_by.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_lastupdate_by.Appearance.Options.UseFont = true;
-            this.lb_lastupdate_by.Location = new System.Drawing.Point(550, 244);
-            this.lb_lastupdate_by.Name = "lb_lastupdate_by";
-            this.lb_lastupdate_by.Size = new System.Drawing.Size(68, 21);
-            this.lb_lastupdate_by.TabIndex = 231;
-            this.lb_lastupdate_by.Text = "鏇存柊浜猴細";
-            // 
-            // txt_lastupdateBy
-            // 
-            this.txt_lastupdateBy.Location = new System.Drawing.Point(618, 240);
-            this.txt_lastupdateBy.Name = "txt_lastupdateBy";
-            this.txt_lastupdateBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_lastupdateBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_lastupdateBy.Size = new System.Drawing.Size(150, 28);
-            this.txt_lastupdateBy.TabIndex = 231;
-            // 
-            // lb_lastupdate_date
-            // 
-            this.lb_lastupdate_date.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_lastupdate_date.Appearance.Options.UseFont = true;
-            this.lb_lastupdate_date.Location = new System.Drawing.Point(528, 278);
-            this.lb_lastupdate_date.Name = "lb_lastupdate_date";
-            this.lb_lastupdate_date.Size = new System.Drawing.Size(90, 21);
-            this.lb_lastupdate_date.TabIndex = 228;
-            this.lb_lastupdate_date.Text = "鏇存柊鏃堕棿 锛�";
-            // 
-            // txt_lastupdateDate
-            // 
-            this.txt_lastupdateDate.Location = new System.Drawing.Point(618, 274);
-            this.txt_lastupdateDate.Name = "txt_lastupdateDate";
-            this.txt_lastupdateDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_lastupdateDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_lastupdateDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_lastupdateDate.TabIndex = 228;
-            // 
-            // lb_create_by
-            // 
-            this.lb_create_by.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_create_by.Appearance.Options.UseFont = true;
-            this.lb_create_by.Location = new System.Drawing.Point(550, 164);
-            this.lb_create_by.Name = "lb_create_by";
-            this.lb_create_by.Size = new System.Drawing.Size(68, 21);
-            this.lb_create_by.TabIndex = 226;
-            this.lb_create_by.Text = "鍒涘缓浜猴細";
-            // 
-            // txt_createBy
-            // 
-            this.txt_createBy.Location = new System.Drawing.Point(618, 160);
-            this.txt_createBy.Name = "txt_createBy";
-            this.txt_createBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_createBy.Properties.Appearance.Options.UseFont = true;
-            this.txt_createBy.Size = new System.Drawing.Size(150, 28);
-            this.txt_createBy.TabIndex = 226;
-            // 
-            // lb_create_date
-            // 
-            this.lb_create_date.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.lb_create_date.Appearance.Options.UseFont = true;
-            this.lb_create_date.Location = new System.Drawing.Point(533, 204);
-            this.lb_create_date.Name = "lb_create_date";
-            this.lb_create_date.Size = new System.Drawing.Size(85, 21);
-            this.lb_create_date.TabIndex = 222;
-            this.lb_create_date.Text = "鍒涘缓鏃堕棿锛�";
-            // 
-            // txt_createDate
-            // 
-            this.txt_createDate.Location = new System.Drawing.Point(618, 200);
-            this.txt_createDate.Name = "txt_createDate";
-            this.txt_createDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_createDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_createDate.Size = new System.Drawing.Size(150, 28);
-            this.txt_createDate.TabIndex = 222;
+            this.gv_fnumber.VisibleIndex = 0;
+            this.gv_fnumber.Width = 91;
             // 
             // lb_newqty
             // 
             this.lb_newqty.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_newqty.Appearance.Options.UseFont = true;
-            this.lb_newqty.Location = new System.Drawing.Point(4, 278);
+            this.lb_newqty.Location = new System.Drawing.Point(4, 244);
             this.lb_newqty.Name = "lb_newqty";
             this.lb_newqty.Size = new System.Drawing.Size(119, 21);
             this.lb_newqty.TabIndex = 219;
@@ -545,26 +426,12 @@
             // 
             // txt_newqty
             // 
-            this.txt_newqty.Location = new System.Drawing.Point(123, 274);
+            this.txt_newqty.Location = new System.Drawing.Point(123, 240);
             this.txt_newqty.Name = "txt_newqty";
             this.txt_newqty.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_newqty.Properties.Appearance.Options.UseFont = true;
             this.txt_newqty.Size = new System.Drawing.Size(150, 28);
             this.txt_newqty.TabIndex = 219;
-            // 
-            // gv_newqty
-            // 
-            this.gv_newqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_newqty.AppearanceCell.Options.UseFont = true;
-            this.gv_newqty.Caption = "鐩殑鍗曚綅鏁伴噺";
-            this.gv_newqty.FieldName = "newqty";
-            this.gv_newqty.MinWidth = 80;
-            this.gv_newqty.Name = "gv_newqty";
-            this.gv_newqty.OptionsColumn.AllowEdit = false;
-            this.gv_newqty.Tag = "query_a.newqty";
-            this.gv_newqty.Visible = true;
-            this.gv_newqty.VisibleIndex = 13;
-            this.gv_newqty.Width = 94;
             // 
             // lb_oldqty
             // 
@@ -585,52 +452,15 @@
             this.txt_oldqty.Size = new System.Drawing.Size(150, 28);
             this.txt_oldqty.TabIndex = 217;
             // 
-            // gv_oldqty
-            // 
-            this.gv_oldqty.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_oldqty.AppearanceCell.Options.UseFont = true;
-            this.gv_oldqty.Caption = "鍘熷崟浣嶆暟閲�";
-            this.gv_oldqty.FieldName = "oldqty";
-            this.gv_oldqty.MinWidth = 80;
-            this.gv_oldqty.Name = "gv_oldqty";
-            this.gv_oldqty.OptionsColumn.AllowEdit = false;
-            this.gv_oldqty.Tag = "query_a.oldqty";
-            this.gv_oldqty.Visible = true;
-            this.gv_oldqty.VisibleIndex = 11;
-            this.gv_oldqty.Width = 94;
-            // 
             // lb_newunit
             // 
             this.lb_newunit.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.lb_newunit.Appearance.Options.UseFont = true;
-            this.lb_newunit.Location = new System.Drawing.Point(38, 244);
+            this.lb_newunit.Location = new System.Drawing.Point(38, 204);
             this.lb_newunit.Name = "lb_newunit";
             this.lb_newunit.Size = new System.Drawing.Size(85, 21);
             this.lb_newunit.TabIndex = 216;
             this.lb_newunit.Text = "鐩殑鍗曚綅锛�";
-            // 
-            // txt_newunit
-            // 
-            this.txt_newunit.Location = new System.Drawing.Point(123, 240);
-            this.txt_newunit.Name = "txt_newunit";
-            this.txt_newunit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_newunit.Properties.Appearance.Options.UseFont = true;
-            this.txt_newunit.Size = new System.Drawing.Size(150, 28);
-            this.txt_newunit.TabIndex = 216;
-            // 
-            // gv_newunit
-            // 
-            this.gv_newunit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_newunit.AppearanceCell.Options.UseFont = true;
-            this.gv_newunit.Caption = "鐩殑鍗曚綅";
-            this.gv_newunit.FieldName = "newunit";
-            this.gv_newunit.MinWidth = 50;
-            this.gv_newunit.Name = "gv_newunit";
-            this.gv_newunit.OptionsColumn.AllowEdit = false;
-            this.gv_newunit.Tag = "query_a.newunit";
-            this.gv_newunit.Visible = true;
-            this.gv_newunit.VisibleIndex = 12;
-            this.gv_newunit.Width = 94;
             // 
             // lb_oldunit
             // 
@@ -641,29 +471,6 @@
             this.lb_oldunit.Size = new System.Drawing.Size(68, 21);
             this.lb_oldunit.TabIndex = 213;
             this.lb_oldunit.Text = "鍘熷崟浣嶏細";
-            // 
-            // txt_oldunit
-            // 
-            this.txt_oldunit.Location = new System.Drawing.Point(123, 119);
-            this.txt_oldunit.Name = "txt_oldunit";
-            this.txt_oldunit.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.txt_oldunit.Properties.Appearance.Options.UseFont = true;
-            this.txt_oldunit.Size = new System.Drawing.Size(150, 28);
-            this.txt_oldunit.TabIndex = 213;
-            // 
-            // gv_oldunit
-            // 
-            this.gv_oldunit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_oldunit.AppearanceCell.Options.UseFont = true;
-            this.gv_oldunit.Caption = "鍘熷崟浣�";
-            this.gv_oldunit.FieldName = "oldunit";
-            this.gv_oldunit.MinWidth = 50;
-            this.gv_oldunit.Name = "gv_oldunit";
-            this.gv_oldunit.OptionsColumn.AllowEdit = false;
-            this.gv_oldunit.Tag = "query_a.oldunit";
-            this.gv_oldunit.Visible = true;
-            this.gv_oldunit.VisibleIndex = 10;
-            this.gv_oldunit.Width = 94;
             // 
             // lb_id
             // 
@@ -684,23 +491,10 @@
             this.txt_id.Size = new System.Drawing.Size(150, 28);
             this.txt_id.TabIndex = 211;
             // 
-            // gv_id
-            // 
-            this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_id.AppearanceCell.Options.UseFont = true;
-            this.gv_id.Caption = "鍗曚綅ID";
-            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.Tag = "query_a.id";
-            this.gv_id.Visible = true;
-            this.gv_id.VisibleIndex = 0;
-            this.gv_id.Width = 94;
-            // 
             // toolBarMenu1
             // 
             this.toolBarMenu1.chkParameter = null;
+            this.toolBarMenu1.currentAction = null;
             this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
@@ -729,7 +523,6 @@
             this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gv_id,
             this.gv_fnumber,
             this.gv_fname,
             this.gv_funitgroupid,
@@ -739,10 +532,7 @@
             this.gv_fprecision,
             this.gv_fdescription,
             this.gv_fforbidstatus,
-            this.gv_oldunit,
-            this.gv_oldqty,
-            this.gv_newunit,
-            this.gv_newqty});
+            this.gridColumn1});
             this.gridView1.GridControl = this.gcMain;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -768,7 +558,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
             // 
@@ -778,7 +568,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;
@@ -787,13 +576,16 @@
             // 
             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
             // 
             this.panel1.BackColor = System.Drawing.Color.White;
+            this.panel1.Controls.Add(this.txt_fcurrentunitid);
+            this.panel1.Controls.Add(this.txt_fbaseunit);
+            this.panel1.Controls.Add(this.txt_newunit);
+            this.panel1.Controls.Add(this.txt_oldunit);
             this.panel1.Controls.Add(this.labelControl11);
             this.panel1.Controls.Add(this.lbGuid);
             this.panel1.Controls.Add(this.lb_fforbidstatus);
@@ -805,11 +597,9 @@
             this.panel1.Controls.Add(this.lb_froundtype);
             this.panel1.Controls.Add(this.txt_froundtype);
             this.panel1.Controls.Add(this.lb_fbaseunit);
-            this.panel1.Controls.Add(this.txt_fbaseunit);
             this.panel1.Controls.Add(this.lb_fconvertnumerator);
             this.panel1.Controls.Add(this.txt_fconvertnumerator);
             this.panel1.Controls.Add(this.lb_fcurrentunitid);
-            this.panel1.Controls.Add(this.txt_fcurrentunitid);
             this.panel1.Controls.Add(this.lb_fconvertdenominator);
             this.panel1.Controls.Add(this.txt_fconvertdenominator);
             this.panel1.Controls.Add(this.lb_funitgroupid);
@@ -818,22 +608,12 @@
             this.panel1.Controls.Add(this.txt_fname);
             this.panel1.Controls.Add(this.lb_fnumber);
             this.panel1.Controls.Add(this.txt_fnumber);
-            this.panel1.Controls.Add(this.lb_lastupdate_by);
-            this.panel1.Controls.Add(this.txt_lastupdateBy);
-            this.panel1.Controls.Add(this.lb_lastupdate_date);
-            this.panel1.Controls.Add(this.txt_lastupdateDate);
-            this.panel1.Controls.Add(this.lb_create_by);
-            this.panel1.Controls.Add(this.txt_createBy);
-            this.panel1.Controls.Add(this.lb_create_date);
-            this.panel1.Controls.Add(this.txt_createDate);
             this.panel1.Controls.Add(this.lb_newqty);
             this.panel1.Controls.Add(this.txt_newqty);
             this.panel1.Controls.Add(this.lb_oldqty);
             this.panel1.Controls.Add(this.txt_oldqty);
             this.panel1.Controls.Add(this.lb_newunit);
-            this.panel1.Controls.Add(this.txt_newunit);
             this.panel1.Controls.Add(this.lb_oldunit);
-            this.panel1.Controls.Add(this.txt_oldunit);
             this.panel1.Controls.Add(this.lb_id);
             this.panel1.Controls.Add(this.txt_id);
             this.panel1.Font = new System.Drawing.Font("Tahoma", 10F);
@@ -841,6 +621,38 @@
             this.panel1.Name = "panel1";
             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
             // 
@@ -861,6 +673,17 @@
             this.lbGuid.TabIndex = 1;
             this.lbGuid.Visible = false;
             // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "鍚屾鏃堕棿";
+            this.gridColumn1.FieldName = "lastupdateDate";
+            this.gridColumn1.MinWidth = 25;
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Tag = "query_a.lastupdate_date";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 9;
+            this.gridColumn1.Width = 180;
+            // 
             // Frm_MesUnit
             // 
             this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -869,25 +692,18 @@
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
             this.Name = "Frm_MesUnit";
+            this.Text = "鍗曚綅淇℃伅";
             ((System.ComponentModel.ISupportInitialize)(this.txt_fforbidstatus.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fdescription.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fprecision.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_froundtype.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fbaseunit.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fconvertnumerator.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_fcurrentunitid.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fconvertdenominator.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_funitgroupid.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fname.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_fnumber.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateDate.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createBy.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_createDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_newqty.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_oldqty.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_newunit.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_oldunit.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gcMain)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
@@ -929,14 +745,12 @@
  private DevExpress.XtraGrid.Columns.GridColumn gv_froundtype;
 
 private DevExpress.XtraEditors.LabelControl lb_fbaseunit;
-private DevExpress.XtraEditors.TextEdit txt_fbaseunit;
 
 private DevExpress.XtraEditors.LabelControl lb_fconvertnumerator;
 private DevExpress.XtraEditors.TextEdit txt_fconvertnumerator;
  private DevExpress.XtraGrid.Columns.GridColumn gv_fconvertnumerator;
 
 private DevExpress.XtraEditors.LabelControl lb_fcurrentunitid;
-private DevExpress.XtraEditors.TextEdit txt_fcurrentunitid;
 
 private DevExpress.XtraEditors.LabelControl lb_fconvertdenominator;
 private DevExpress.XtraEditors.TextEdit txt_fconvertdenominator;
@@ -954,37 +768,22 @@
 private DevExpress.XtraEditors.TextEdit txt_fnumber;
  private DevExpress.XtraGrid.Columns.GridColumn gv_fnumber;
 
-private DevExpress.XtraEditors.LabelControl lb_lastupdate_by;
-private DevExpress.XtraEditors.TextEdit txt_lastupdateBy;
-
-private DevExpress.XtraEditors.LabelControl lb_lastupdate_date;
-private DevExpress.XtraEditors.TextEdit txt_lastupdateDate;
-
-private DevExpress.XtraEditors.LabelControl lb_create_by;
-private DevExpress.XtraEditors.TextEdit txt_createBy;
-
-private DevExpress.XtraEditors.LabelControl lb_create_date;
-private DevExpress.XtraEditors.TextEdit txt_createDate;
-
 private DevExpress.XtraEditors.LabelControl lb_newqty;
 private DevExpress.XtraEditors.TextEdit txt_newqty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_newqty;
 
 private DevExpress.XtraEditors.LabelControl lb_oldqty;
 private DevExpress.XtraEditors.TextEdit txt_oldqty;
- private DevExpress.XtraGrid.Columns.GridColumn gv_oldqty;
 
 private DevExpress.XtraEditors.LabelControl lb_newunit;
-private DevExpress.XtraEditors.TextEdit txt_newunit;
- private DevExpress.XtraGrid.Columns.GridColumn gv_newunit;
 
 private DevExpress.XtraEditors.LabelControl lb_oldunit;
-private DevExpress.XtraEditors.TextEdit txt_oldunit;
- private DevExpress.XtraGrid.Columns.GridColumn gv_oldunit;
 
 private DevExpress.XtraEditors.LabelControl lb_id;
 private DevExpress.XtraEditors.TextEdit txt_id;
- private DevExpress.XtraGrid.Columns.GridColumn gv_id;
-
+        private UserControl.UcLookUnit txt_oldunit;
+        private UserControl.UcLookUnit txt_newunit;
+        private UserControl.UcLookUnit txt_fcurrentunitid;
+        private UserControl.UcLookUnit txt_fbaseunit;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3