From 2e3496c2bc19c1dcb25dbbde0022a6a6d2b4ff7b Mon Sep 17 00:00:00 2001
From: 快乐的昕的电脑 <快乐的昕的电脑@DESKTOP-C2BQPQU>
Date: 星期六, 22 十一月 2025 13:27:18 +0800
Subject: [PATCH] ID转人名:受托退料申请、受托退料单

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs |  379 ++++++++++++++++++++++++++++++------------------------
 1 files changed, 210 insertions(+), 169 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
index 6f81eea..1f0f27e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
@@ -77,10 +77,10 @@
             this.txt_checkDate = new DevExpress.XtraEditors.TextEdit();
             this.txt_fStockId = new Gs.DevApp.UserControl.UcLookCk();
             this.txt_remark = new DevExpress.XtraEditors.TextEdit();
-            this.txt_checkUser = new DevExpress.XtraEditors.TextEdit();
+            this.txt_checkUserName = new DevExpress.XtraEditors.TextEdit();
             this.txt_status = new DevExpress.XtraEditors.CheckEdit();
             this.txt_isFinish = new DevExpress.XtraEditors.CheckEdit();
-            this.txt_lastUpdateUser = new DevExpress.XtraEditors.TextEdit();
+            this.txt_lastupdateByName = new DevExpress.XtraEditors.TextEdit();
             this.txt_lastUpdateTime = new DevExpress.XtraEditors.TextEdit();
             this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -146,10 +146,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_fReturnStyle.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateUser.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateByName.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateTime.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
@@ -186,9 +186,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);
             this.toolBarMenu1.Name = "toolBarMenu1";
             this.toolBarMenu1.rptParameter = null;
-            this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
+            this.toolBarMenu1.Size = new System.Drawing.Size(1410, 98);
             this.toolBarMenu1.TabIndex = 0;
             this.toolBarMenu1.xlsInService = null;
             this.toolBarMenu1.xlsOutParameter = null;
@@ -196,10 +197,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);
             this.xtraTabControl1.Name = "xtraTabControl1";
             this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
-            this.xtraTabControl1.Size = new System.Drawing.Size(1128, 602);
+            this.xtraTabControl1.Size = new System.Drawing.Size(1410, 736);
             this.xtraTabControl1.TabIndex = 3;
             this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.xtraTabPage1,
@@ -208,8 +210,9 @@
             // xtraTabPage1
             // 
             this.xtraTabPage1.Controls.Add(this.split1);
+            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4);
             this.xtraTabPage1.Name = "xtraTabPage1";
-            this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage1.Size = new System.Drawing.Size(1408, 698);
             this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
             // 
             // split1
@@ -218,6 +221,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);
             this.split1.Name = "split1";
             // 
             // split1.Panel1
@@ -230,17 +234,19 @@
             // 
             this.split1.Panel2.Text = "Panel2";
             this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-            this.split1.Size = new System.Drawing.Size(1126, 570);
+            this.split1.Size = new System.Drawing.Size(1408, 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);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
+            this.gcMain1.Margin = new System.Windows.Forms.Padding(4);
             this.gcMain1.Name = "gcMain1";
-            this.gcMain1.Size = new System.Drawing.Size(1126, 519);
+            this.gcMain1.Size = new System.Drawing.Size(1408, 635);
             this.gcMain1.TabIndex = 2;
             this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gridView1});
@@ -250,7 +256,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_status,
             this.gv_isFinish,
@@ -266,8 +272,9 @@
             this.gv_remark,
             this.gridColumn1,
             this.gridColumn7});
+            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;
@@ -278,182 +285,194 @@
             this.gv_status.AppearanceCell.Options.UseFont = true;
             this.gv_status.Caption = "瀹℃牳鏍囪瘑";
             this.gv_status.FieldName = "isCheck";
-            this.gv_status.MinWidth = 25;
+            this.gv_status.MinWidth = 31;
             this.gv_status.Name = "gv_status";
             this.gv_status.OptionsColumn.AllowEdit = false;
             this.gv_status.Tag = "query_a.STATUS";
             this.gv_status.Visible = true;
             this.gv_status.VisibleIndex = 0;
-            this.gv_status.Width = 50;
+            this.gv_status.Width = 62;
             // 
             // gv_isFinish
             // 
             this.gv_isFinish.AppearanceCell.Options.UseFont = true;
             this.gv_isFinish.Caption = "瀹屾垚鏍囪瘑";
             this.gv_isFinish.FieldName = "isFinish";
-            this.gv_isFinish.MinWidth = 25;
+            this.gv_isFinish.MinWidth = 31;
             this.gv_isFinish.Name = "gv_isFinish";
             this.gv_isFinish.OptionsColumn.AllowEdit = false;
             this.gv_isFinish.Tag = "query_a.IS_FINISH";
             this.gv_isFinish.Visible = true;
             this.gv_isFinish.VisibleIndex = 1;
-            this.gv_isFinish.Width = 50;
+            this.gv_isFinish.Width = 62;
             // 
             // gv_returnType
             // 
             this.gv_returnType.AppearanceCell.Options.UseFont = true;
             this.gv_returnType.Caption = "鏈夋棤婧愬崟";
             this.gv_returnType.FieldName = "fHasLinkTxt";
+            this.gv_returnType.MinWidth = 25;
             this.gv_returnType.Name = "gv_returnType";
             this.gv_returnType.OptionsColumn.AllowEdit = false;
             this.gv_returnType.Tag = "query_a.RETURN_TYPE";
             this.gv_returnType.Visible = true;
             this.gv_returnType.VisibleIndex = 2;
-            this.gv_returnType.Width = 94;
+            this.gv_returnType.Width = 117;
             // 
             // gv_billNo
             // 
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍗曟嵁缂栫爜";
             this.gv_billNo.FieldName = "billNo";
+            this.gv_billNo.MinWidth = 25;
             this.gv_billNo.Name = "gv_billNo";
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.BILL_NO";
             this.gv_billNo.Visible = true;
             this.gv_billNo.VisibleIndex = 3;
-            this.gv_billNo.Width = 120;
+            this.gv_billNo.Width = 150;
             // 
             // gv_lastUpdateUser
             // 
             this.gv_lastUpdateUser.AppearanceCell.Options.UseFont = true;
-            this.gv_lastUpdateUser.Caption = "鏈�鍚庤窡鏂颁汉 ";
-            this.gv_lastUpdateUser.FieldName = "lastupdateBy";
+            this.gv_lastUpdateUser.Caption = "鏈�鍚庢洿鏂颁汉 ";
+            this.gv_lastUpdateUser.FieldName = "lastupdateByName";
+            this.gv_lastUpdateUser.MinWidth = 25;
             this.gv_lastUpdateUser.Name = "gv_lastUpdateUser";
             this.gv_lastUpdateUser.OptionsColumn.AllowEdit = false;
             this.gv_lastUpdateUser.Tag = "query_a.LAST_UPDATE_USER";
             this.gv_lastUpdateUser.Visible = true;
             this.gv_lastUpdateUser.VisibleIndex = 4;
-            this.gv_lastUpdateUser.Width = 94;
+            this.gv_lastUpdateUser.Width = 117;
             // 
             // gv_lastUpdateTime
             // 
             this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
             this.gv_lastUpdateTime.Caption = "鏈�鍚庝慨鏀规椂闂� ";
             this.gv_lastUpdateTime.FieldName = "lastupdateDate";
+            this.gv_lastUpdateTime.MinWidth = 25;
             this.gv_lastUpdateTime.Name = "gv_lastUpdateTime";
             this.gv_lastUpdateTime.OptionsColumn.AllowEdit = false;
             this.gv_lastUpdateTime.Tag = "query_a.LAST_UPDATE_TIME";
             this.gv_lastUpdateTime.Visible = true;
             this.gv_lastUpdateTime.VisibleIndex = 5;
-            this.gv_lastUpdateTime.Width = 180;
+            this.gv_lastUpdateTime.Width = 225;
             // 
             // gv_checkUser
             // 
             this.gv_checkUser.AppearanceCell.Options.UseFont = true;
             this.gv_checkUser.Caption = "瀹℃牳浜� ";
-            this.gv_checkUser.FieldName = "checkUser";
+            this.gv_checkUser.FieldName = "checkUserName";
+            this.gv_checkUser.MinWidth = 25;
             this.gv_checkUser.Name = "gv_checkUser";
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.CHECK_USER";
             this.gv_checkUser.Visible = true;
             this.gv_checkUser.VisibleIndex = 6;
-            this.gv_checkUser.Width = 94;
+            this.gv_checkUser.Width = 117;
             // 
             // gv_checkDate
             // 
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "瀹℃牳鏃堕棿 ";
             this.gv_checkDate.FieldName = "checkDate";
+            this.gv_checkDate.MinWidth = 25;
             this.gv_checkDate.Name = "gv_checkDate";
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.CHECK_DATE";
             this.gv_checkDate.Visible = true;
             this.gv_checkDate.VisibleIndex = 7;
-            this.gv_checkDate.Width = 94;
+            this.gv_checkDate.Width = 117;
             // 
             // gv_returnMethod
             // 
             this.gv_returnMethod.AppearanceCell.Options.UseFont = true;
             this.gv_returnMethod.Caption = "閫�鏂欐柟寮� ";
             this.gv_returnMethod.FieldName = "fReturnStyle";
+            this.gv_returnMethod.MinWidth = 25;
             this.gv_returnMethod.Name = "gv_returnMethod";
             this.gv_returnMethod.OptionsColumn.AllowEdit = false;
             this.gv_returnMethod.Tag = "query_a.RETURN_METHOD";
             this.gv_returnMethod.Visible = true;
             this.gv_returnMethod.VisibleIndex = 8;
-            this.gv_returnMethod.Width = 94;
+            this.gv_returnMethod.Width = 117;
             // 
             // gv_depotId
             // 
             this.gv_depotId.AppearanceCell.Options.UseFont = true;
             this.gv_depotId.Caption = "浠撳簱鍚嶇О";
             this.gv_depotId.FieldName = "dptName";
+            this.gv_depotId.MinWidth = 25;
             this.gv_depotId.Name = "gv_depotId";
             this.gv_depotId.OptionsColumn.AllowEdit = false;
             this.gv_depotId.Tag = "query_a.DEPOT_ID";
             this.gv_depotId.Visible = true;
             this.gv_depotId.VisibleIndex = 9;
-            this.gv_depotId.Width = 94;
+            this.gv_depotId.Width = 117;
             // 
             // gv_suppId
             // 
             this.gv_suppId.AppearanceCell.Options.UseFont = true;
             this.gv_suppId.Caption = "瀹㈡埛鍚嶇О";
             this.gv_suppId.FieldName = "cusName";
+            this.gv_suppId.MinWidth = 25;
             this.gv_suppId.Name = "gv_suppId";
             this.gv_suppId.OptionsColumn.AllowEdit = false;
             this.gv_suppId.Tag = "query_a.SUPP_ID";
             this.gv_suppId.Visible = true;
             this.gv_suppId.VisibleIndex = 10;
-            this.gv_suppId.Width = 94;
+            this.gv_suppId.Width = 117;
             // 
             // gv_remark
             // 
             this.gv_remark.AppearanceCell.Options.UseFont = true;
             this.gv_remark.Caption = "澶囨敞 ";
             this.gv_remark.FieldName = "remark";
+            this.gv_remark.MinWidth = 25;
             this.gv_remark.Name = "gv_remark";
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.REMARK";
             this.gv_remark.Visible = true;
             this.gv_remark.VisibleIndex = 12;
-            this.gv_remark.Width = 94;
+            this.gv_remark.Width = 117;
             // 
             // gridColumn1
             // 
             this.gridColumn1.Caption = "搴撳瓨缁勭粐";
             this.gridColumn1.FieldName = "receivingOrg";
+            this.gridColumn1.MinWidth = 25;
             this.gridColumn1.Name = "gridColumn1";
             this.gridColumn1.Tag = "org.fnamber";
             this.gridColumn1.Visible = true;
             this.gridColumn1.VisibleIndex = 11;
-            this.gridColumn1.Width = 250;
+            this.gridColumn1.Width = 312;
             // 
             // gridColumn7
             // 
             this.gridColumn7.Caption = "涓婚敭Guid";
             this.gridColumn7.FieldName = "guid";
-            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.MinWidth = 31;
             this.gridColumn7.Name = "gridColumn7";
-            this.gridColumn7.Width = 94;
+            this.gridColumn7.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(1126, 39);
+            this.pageBar1.Size = new System.Drawing.Size(1408, 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);
             this.xtraTabPage2.Name = "xtraTabPage2";
-            this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
+            this.xtraTabPage2.Size = new System.Drawing.Size(1408, 698);
             this.xtraTabPage2.Text = "鏁版嵁璇︽儏";
             // 
             // splitMx1
@@ -461,6 +480,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);
             this.splitMx1.Name = "splitMx1";
             // 
             // splitMx1.Panel1
@@ -473,8 +493,8 @@
             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(1126, 570);
-            this.splitMx1.SplitterPosition = 143;
+            this.splitMx1.Size = new System.Drawing.Size(1408, 698);
+            this.splitMx1.SplitterPosition = 175;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -489,59 +509,63 @@
             this.layoutMx1.Controls.Add(this.txt_checkDate);
             this.layoutMx1.Controls.Add(this.txt_fStockId);
             this.layoutMx1.Controls.Add(this.txt_remark);
-            this.layoutMx1.Controls.Add(this.txt_checkUser);
+            this.layoutMx1.Controls.Add(this.txt_checkUserName);
             this.layoutMx1.Controls.Add(this.txt_status);
             this.layoutMx1.Controls.Add(this.txt_isFinish);
-            this.layoutMx1.Controls.Add(this.txt_lastUpdateUser);
+            this.layoutMx1.Controls.Add(this.txt_lastupdateByName);
             this.layoutMx1.Controls.Add(this.txt_lastUpdateTime);
             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);
             this.layoutMx1.Name = "layoutMx1";
             this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(940, 409, 812, 500);
             this.layoutMx1.Root = this.Root;
-            this.layoutMx1.Size = new System.Drawing.Size(1126, 143);
+            this.layoutMx1.Size = new System.Drawing.Size(1408, 175);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
             // txt_fHasLinkRad
             // 
             this.txt_fHasLinkRad.EditValue = "1";
-            this.txt_fHasLinkRad.Location = new System.Drawing.Point(355, 43);
+            this.txt_fHasLinkRad.Location = new System.Drawing.Point(443, 50);
             this.txt_fHasLinkRad.Margin = new System.Windows.Forms.Padding(0);
             this.txt_fHasLinkRad.Name = "txt_fHasLinkRad";
             this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
             new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
             new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�", false)});
             this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);
-            this.txt_fHasLinkRad.Size = new System.Drawing.Size(195, 27);
+            this.txt_fHasLinkRad.Size = new System.Drawing.Size(259, 35);
             this.txt_fHasLinkRad.StyleController = this.layoutMx1;
             this.txt_fHasLinkRad.TabIndex = 533;
             // 
             // txt_fCustId
             // 
             this.txt_fCustId.IsReadly = false;
-            this.txt_fCustId.Location = new System.Drawing.Point(355, 74);
+            this.txt_fCustId.Location = new System.Drawing.Point(443, 89);
+            this.txt_fCustId.Margin = new System.Windows.Forms.Padding(5);
             this.txt_fCustId.Name = "txt_fCustId";
-            this.txt_fCustId.Size = new System.Drawing.Size(195, 24);
+            this.txt_fCustId.Size = new System.Drawing.Size(259, 28);
             this.txt_fCustId.TabIndex = 532;
             // 
             // btnSelect
             // 
             this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
-            this.btnSelect.Location = new System.Drawing.Point(12, 105);
+            this.btnSelect.Location = new System.Drawing.Point(12, 128);
+            this.btnSelect.Margin = new System.Windows.Forms.Padding(4);
             this.btnSelect.Name = "btnSelect";
-            this.btnSelect.Size = new System.Drawing.Size(116, 27);
+            this.btnSelect.Size = new System.Drawing.Size(146, 34);
             this.btnSelect.StyleController = this.layoutMx1;
             this.btnSelect.TabIndex = 525;
             this.btnSelect.Text = "閫夋嫨閫�璐ф槑缁�";
             // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(825, 103);
+            this.lbGuid.Location = new System.Drawing.Point(1031, 126);
+            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(268, 28);
+            this.lbGuid.Size = new System.Drawing.Size(335, 34);
             this.lbGuid.TabIndex = 1;
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
@@ -549,17 +573,19 @@
             // txt_fStockOrgId
             // 
             this.txt_fStockOrgId.IsReadly = false;
-            this.txt_fStockOrgId.Location = new System.Drawing.Point(84, 43);
+            this.txt_fStockOrgId.Location = new System.Drawing.Point(96, 50);
+            this.txt_fStockOrgId.Margin = new System.Windows.Forms.Padding(5);
             this.txt_fStockOrgId.Name = "txt_fStockOrgId";
-            this.txt_fStockOrgId.Size = new System.Drawing.Size(195, 24);
+            this.txt_fStockOrgId.Size = new System.Drawing.Size(259, 28);
             this.txt_fStockOrgId.TabIndex = 526;
             // 
             // txt_billNo
             // 
-            this.txt_billNo.Location = new System.Drawing.Point(84, 12);
+            this.txt_billNo.Location = new System.Drawing.Point(96, 12);
+            this.txt_billNo.Margin = new System.Windows.Forms.Padding(4);
             this.txt_billNo.Name = "txt_billNo";
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(195, 24);
+            this.txt_billNo.Size = new System.Drawing.Size(259, 28);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             this.txt_billNo.Tag = "readonly";
@@ -567,7 +593,8 @@
             // txt_fReturnStyle
             // 
             this.txt_fReturnStyle.EditValue = "-璇烽�夋嫨-";
-            this.txt_fReturnStyle.Location = new System.Drawing.Point(355, 12);
+            this.txt_fReturnStyle.Location = new System.Drawing.Point(443, 12);
+            this.txt_fReturnStyle.Margin = new System.Windows.Forms.Padding(4);
             this.txt_fReturnStyle.Name = "txt_fReturnStyle";
             this.txt_fReturnStyle.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
             new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -576,16 +603,17 @@
             "閫�鏂欎笉琛ユ枡(ReturnNoFeed)",
             "閫�鏂欒ˉ鏂�(ReturnFeed)"});
             this.txt_fReturnStyle.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
-            this.txt_fReturnStyle.Size = new System.Drawing.Size(195, 24);
+            this.txt_fReturnStyle.Size = new System.Drawing.Size(259, 28);
             this.txt_fReturnStyle.StyleController = this.layoutMx1;
             this.txt_fReturnStyle.TabIndex = 520;
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(897, 43);
+            this.txt_checkDate.Location = new System.Drawing.Point(1137, 50);
+            this.txt_checkDate.Margin = new System.Windows.Forms.Padding(4);
             this.txt_checkDate.Name = "txt_checkDate";
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(196, 24);
+            this.txt_checkDate.Size = new System.Drawing.Size(259, 28);
             this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 226;
             this.txt_checkDate.Tag = "readonly";
@@ -593,65 +621,71 @@
             // txt_fStockId
             // 
             this.txt_fStockId.IsReadly = false;
-            this.txt_fStockId.Location = new System.Drawing.Point(84, 74);
+            this.txt_fStockId.Location = new System.Drawing.Point(96, 89);
             this.txt_fStockId.Margin = new System.Windows.Forms.Padding(0);
             this.txt_fStockId.Name = "txt_fStockId";
-            this.txt_fStockId.Size = new System.Drawing.Size(195, 24);
+            this.txt_fStockId.Size = new System.Drawing.Size(259, 28);
             this.txt_fStockId.TabIndex = 260;
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(355, 105);
+            this.txt_remark.Location = new System.Drawing.Point(443, 128);
+            this.txt_remark.Margin = new System.Windows.Forms.Padding(4);
             this.txt_remark.Name = "txt_remark";
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(466, 24);
+            this.txt_remark.Size = new System.Drawing.Size(606, 28);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 252;
             // 
-            // txt_checkUser
+            // txt_checkUserName
             // 
-            this.txt_checkUser.Location = new System.Drawing.Point(897, 12);
-            this.txt_checkUser.Name = "txt_checkUser";
-            this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(196, 24);
-            this.txt_checkUser.StyleController = this.layoutMx1;
-            this.txt_checkUser.TabIndex = 222;
-            this.txt_checkUser.Tag = "readonly";
+            this.txt_checkUserName.Location = new System.Drawing.Point(1137, 12);
+            this.txt_checkUserName.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_checkUserName.Name = "txt_checkUserName";
+            this.txt_checkUserName.Properties.Appearance.Options.UseFont = true;
+            this.txt_checkUserName.Size = new System.Drawing.Size(259, 28);
+            this.txt_checkUserName.StyleController = this.layoutMx1;
+            this.txt_checkUserName.TabIndex = 222;
+            this.txt_checkUserName.Tag = "readonly";
             // 
             // txt_status
             // 
-            this.txt_status.Location = new System.Drawing.Point(825, 74);
+            this.txt_status.Location = new System.Drawing.Point(1053, 89);
+            this.txt_status.Margin = new System.Windows.Forms.Padding(4);
             this.txt_status.Name = "txt_status";
             this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
-            this.txt_status.Size = new System.Drawing.Size(268, 24);
+            this.txt_status.Size = new System.Drawing.Size(343, 27);
             this.txt_status.StyleController = this.layoutMx1;
             this.txt_status.TabIndex = 528;
             this.txt_status.Tag = "readonly";
             // 
             // txt_isFinish
             // 
-            this.txt_isFinish.Location = new System.Drawing.Point(554, 74);
+            this.txt_isFinish.Location = new System.Drawing.Point(706, 89);
+            this.txt_isFinish.Margin = new System.Windows.Forms.Padding(4);
             this.txt_isFinish.Name = "txt_isFinish";
             this.txt_isFinish.Properties.Caption = "瀹岀粨鏍囪瘑";
-            this.txt_isFinish.Size = new System.Drawing.Size(267, 24);
+            this.txt_isFinish.Size = new System.Drawing.Size(343, 27);
             this.txt_isFinish.StyleController = this.layoutMx1;
             this.txt_isFinish.TabIndex = 529;
             this.txt_isFinish.Tag = "readonly";
             // 
-            // txt_lastUpdateUser
+            // txt_lastupdateByName
             // 
-            this.txt_lastUpdateUser.Location = new System.Drawing.Point(626, 12);
-            this.txt_lastUpdateUser.Name = "txt_lastUpdateUser";
-            this.txt_lastUpdateUser.Size = new System.Drawing.Size(195, 24);
-            this.txt_lastUpdateUser.StyleController = this.layoutMx1;
-            this.txt_lastUpdateUser.TabIndex = 530;
-            this.txt_lastUpdateUser.Tag = "readonly";
+            this.txt_lastupdateByName.Location = new System.Drawing.Point(790, 12);
+            this.txt_lastupdateByName.Margin = new System.Windows.Forms.Padding(4);
+            this.txt_lastupdateByName.Name = "txt_lastupdateByName";
+            this.txt_lastupdateByName.Size = new System.Drawing.Size(259, 28);
+            this.txt_lastupdateByName.StyleController = this.layoutMx1;
+            this.txt_lastupdateByName.TabIndex = 530;
+            this.txt_lastupdateByName.Tag = "readonly";
             // 
             // txt_lastUpdateTime
             // 
-            this.txt_lastUpdateTime.Location = new System.Drawing.Point(626, 43);
+            this.txt_lastUpdateTime.Location = new System.Drawing.Point(790, 50);
+            this.txt_lastUpdateTime.Margin = new System.Windows.Forms.Padding(4);
             this.txt_lastUpdateTime.Name = "txt_lastUpdateTime";
-            this.txt_lastUpdateTime.Size = new System.Drawing.Size(195, 24);
+            this.txt_lastUpdateTime.Size = new System.Drawing.Size(259, 28);
             this.txt_lastUpdateTime.StyleController = this.layoutMx1;
             this.txt_lastUpdateTime.TabIndex = 531;
             this.txt_lastUpdateTime.Tag = "readonly";
@@ -715,7 +749,7 @@
             rowDefinition2,
             rowDefinition3,
             rowDefinition4});
-            this.Root.Size = new System.Drawing.Size(1105, 144);
+            this.Root.Size = new System.Drawing.Size(1408, 175);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -723,82 +757,82 @@
             this.layoutControlItem1.Control = this.txt_billNo;
             this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
             this.layoutControlItem1.Name = "layoutControlItem1";
-            this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem1.Size = new System.Drawing.Size(347, 38);
             this.layoutControlItem1.Text = "鐢宠鍗曞彿";
-            this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem1.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_fStockOrgId;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 38);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem2.Size = new System.Drawing.Size(347, 39);
             this.layoutControlItem2.Text = "閫夋嫨缁勭粐";
-            this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem2.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_fStockId;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 62);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 77);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem3.Size = new System.Drawing.Size(347, 39);
             this.layoutControlItem3.Text = "浠g浠撳簱";
-            this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem3.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem9
             // 
-            this.layoutControlItem9.Control = this.txt_checkUser;
-            this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
+            this.layoutControlItem9.Control = this.txt_checkUserName;
+            this.layoutControlItem9.Location = new System.Drawing.Point(1041, 0);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
+            this.layoutControlItem9.Size = new System.Drawing.Size(347, 38);
             this.layoutControlItem9.Text = "瀹℃牳浜�";
-            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_checkDate;
-            this.layoutControlItem10.Location = new System.Drawing.Point(813, 31);
+            this.layoutControlItem10.Location = new System.Drawing.Point(1041, 38);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
+            this.layoutControlItem10.Size = new System.Drawing.Size(347, 39);
             this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
-            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem14
             // 
-            this.layoutControlItem14.Control = this.txt_lastUpdateUser;
-            this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
+            this.layoutControlItem14.Control = this.txt_lastupdateByName;
+            this.layoutControlItem14.Location = new System.Drawing.Point(694, 0);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem14.Size = new System.Drawing.Size(347, 38);
             this.layoutControlItem14.Text = "鏇存柊浜哄憳";
-            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_lastUpdateTime;
             this.layoutControlItem15.CustomizationFormText = "鏇存柊鏃堕棿";
-            this.layoutControlItem15.Location = new System.Drawing.Point(542, 31);
+            this.layoutControlItem15.Location = new System.Drawing.Point(694, 38);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem15.Size = new System.Drawing.Size(347, 39);
             this.layoutControlItem15.Text = "鏇存柊鏃堕棿";
-            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.btnSelect;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 93);
-            this.layoutControlItem16.MaxSize = new System.Drawing.Size(120, 31);
-            this.layoutControlItem16.MinSize = new System.Drawing.Size(20, 31);
+            this.layoutControlItem16.Location = new System.Drawing.Point(0, 116);
+            this.layoutControlItem16.MaxSize = new System.Drawing.Size(150, 38);
+            this.layoutControlItem16.MinSize = new System.Drawing.Size(25, 38);
             this.layoutControlItem16.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem16.Size = new System.Drawing.Size(347, 39);
             this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem16.Text = "閫�璐ф槑缁�";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -807,11 +841,11 @@
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_isFinish;
-            this.layoutControlItem12.Location = new System.Drawing.Point(542, 62);
+            this.layoutControlItem12.Location = new System.Drawing.Point(694, 77);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem12.Size = new System.Drawing.Size(347, 39);
             this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
@@ -819,11 +853,11 @@
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_status;
-            this.layoutControlItem11.Location = new System.Drawing.Point(813, 62);
+            this.layoutControlItem11.Location = new System.Drawing.Point(1041, 77);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(272, 31);
+            this.layoutControlItem11.Size = new System.Drawing.Size(347, 39);
             this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
@@ -831,56 +865,57 @@
             // layoutControlItem5
             // 
             this.layoutControlItem5.Control = this.txt_fReturnStyle;
-            this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
+            this.layoutControlItem5.Location = new System.Drawing.Point(347, 0);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem5.Size = new System.Drawing.Size(347, 38);
             this.layoutControlItem5.Text = "閫�鏂欐柟寮�";
-            this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem5.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem7
             // 
             this.layoutControlItem7.Control = this.txt_remark;
-            this.layoutControlItem7.Location = new System.Drawing.Point(271, 93);
+            this.layoutControlItem7.Location = new System.Drawing.Point(347, 116);
             this.layoutControlItem7.Name = "layoutControlItem7";
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem7.OptionsTableLayoutItem.ColumnSpan = 2;
             this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem7.Size = new System.Drawing.Size(542, 31);
+            this.layoutControlItem7.Size = new System.Drawing.Size(694, 39);
             this.layoutControlItem7.Text = "鐢宠澶囨敞";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_fHasLinkRad;
-            this.layoutControlItem6.Location = new System.Drawing.Point(271, 31);
-            this.layoutControlItem6.MinSize = new System.Drawing.Size(246, 30);
+            this.layoutControlItem6.Location = new System.Drawing.Point(347, 38);
+            this.layoutControlItem6.MinSize = new System.Drawing.Size(307, 37);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem6.Size = new System.Drawing.Size(347, 39);
             this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem6.Text = "鏈夋棤婧愬崟";
-            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem6.TextSize = new System.Drawing.Size(72, 22);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_fCustId;
-            this.layoutControlItem4.Location = new System.Drawing.Point(271, 62);
+            this.layoutControlItem4.Location = new System.Drawing.Point(347, 77);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem4.Size = new System.Drawing.Size(347, 39);
             this.layoutControlItem4.Text = "閫夋嫨瀹㈡埛";
-            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
+            this.layoutControlItem4.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);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 415);
+            this.tabMx.Size = new System.Drawing.Size(1408, 508);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -888,20 +923,23 @@
             // tabMxPage1
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
+            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 383);
+            this.tabMxPage1.Size = new System.Drawing.Size(1406, 470);
             this.tabMxPage1.Text = "鐢宠鏄庣粏";
             // 
             // gcMx1
             // 
             this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4);
             this.gcMx1.Location = new System.Drawing.Point(0, 0);
             this.gcMx1.MainView = this.gvMx1;
+            this.gcMx1.Margin = new System.Windows.Forms.Padding(4);
             this.gcMx1.Name = "gcMx1";
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1,
             this.repositoryItemComboBox1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 383);
+            this.gcMx1.Size = new System.Drawing.Size(1406, 470);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -925,6 +963,7 @@
             this.gridColumn8,
             this.gvMxDel,
             this.gridColumn9});
+            this.gvMx1.DetailHeight = 428;
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
             this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -935,91 +974,91 @@
             // 
             this.rkmxGuid.Caption = "鍏ュ簱鏄庣粏Guid";
             this.rkmxGuid.FieldName = "aboutGuid";
-            this.rkmxGuid.MinWidth = 25;
+            this.rkmxGuid.MinWidth = 31;
             this.rkmxGuid.Name = "rkmxGuid";
-            this.rkmxGuid.Width = 94;
+            this.rkmxGuid.Width = 117;
             // 
             // gvMx1id
             // 
             this.gvMx1id.AppearanceCell.Options.UseFont = true;
             this.gvMx1id.Caption = "涓婚敭Guid";
             this.gvMx1id.FieldName = "guid";
-            this.gvMx1id.MinWidth = 50;
+            this.gvMx1id.MinWidth = 62;
             this.gvMx1id.Name = "gvMx1id";
             this.gvMx1id.Tag = "query_a.ID";
-            this.gvMx1id.Width = 94;
+            this.gvMx1id.Width = 117;
             // 
             // gvMx1mid
             // 
             this.gvMx1mid.AppearanceCell.Options.UseFont = true;
             this.gvMx1mid.Caption = "澶栭敭Guid";
             this.gvMx1mid.FieldName = "pGuid";
-            this.gvMx1mid.MinWidth = 50;
+            this.gvMx1mid.MinWidth = 62;
             this.gvMx1mid.Name = "gvMx1mid";
             this.gvMx1mid.Tag = "query_a.MID";
-            this.gvMx1mid.Width = 94;
+            this.gvMx1mid.Width = 117;
             // 
             // gvMx1invBillNo
             // 
             this.gvMx1invBillNo.AppearanceCell.Options.UseFont = true;
             this.gvMx1invBillNo.Caption = "鍏ュ簱鍗曞彿";
             this.gvMx1invBillNo.FieldName = "rkNo";
-            this.gvMx1invBillNo.MinWidth = 50;
+            this.gvMx1invBillNo.MinWidth = 62;
             this.gvMx1invBillNo.Name = "gvMx1invBillNo";
             this.gvMx1invBillNo.Tag = "query_a.INV_BILL_NO";
             this.gvMx1invBillNo.Visible = true;
             this.gvMx1invBillNo.VisibleIndex = 0;
-            this.gvMx1invBillNo.Width = 94;
+            this.gvMx1invBillNo.Width = 117;
             // 
             // gvMx1itemId
             // 
             this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemId.Caption = "鐗╂枡id ";
             this.gvMx1itemId.FieldName = "itemId";
-            this.gvMx1itemId.MinWidth = 50;
+            this.gvMx1itemId.MinWidth = 62;
             this.gvMx1itemId.Name = "gvMx1itemId";
             this.gvMx1itemId.Tag = "query_a.ITEM_ID";
-            this.gvMx1itemId.Width = 94;
+            this.gvMx1itemId.Width = 117;
             // 
             // gridColumn2
             // 
             this.gridColumn2.Caption = "鐗╂枡缂栫爜";
             this.gridColumn2.FieldName = "wlbm";
-            this.gridColumn2.MinWidth = 25;
+            this.gridColumn2.MinWidth = 31;
             this.gridColumn2.Name = "gridColumn2";
             this.gridColumn2.Visible = true;
             this.gridColumn2.VisibleIndex = 1;
-            this.gridColumn2.Width = 94;
+            this.gridColumn2.Width = 117;
             // 
             // gridColumn5
             // 
             this.gridColumn5.Caption = "鐗╂枡鍚嶇О";
             this.gridColumn5.FieldName = "wlmc";
-            this.gridColumn5.MinWidth = 25;
+            this.gridColumn5.MinWidth = 31;
             this.gridColumn5.Name = "gridColumn5";
             this.gridColumn5.Visible = true;
             this.gridColumn5.VisibleIndex = 2;
-            this.gridColumn5.Width = 94;
+            this.gridColumn5.Width = 117;
             // 
             // gridColumn3
             // 
             this.gridColumn3.Caption = "鐗╂枡瑙勬牸";
             this.gridColumn3.FieldName = "wlgg";
-            this.gridColumn3.MinWidth = 25;
+            this.gridColumn3.MinWidth = 31;
             this.gridColumn3.Name = "gridColumn3";
             this.gridColumn3.Visible = true;
             this.gridColumn3.VisibleIndex = 8;
-            this.gridColumn3.Width = 94;
+            this.gridColumn3.Width = 117;
             // 
             // gridColumn4
             // 
             this.gridColumn4.Caption = "鍗曚綅";
             this.gridColumn4.FieldName = "dwName";
-            this.gridColumn4.MinWidth = 25;
+            this.gridColumn4.MinWidth = 31;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
             this.gridColumn4.VisibleIndex = 3;
-            this.gridColumn4.Width = 94;
+            this.gridColumn4.Width = 117;
             // 
             // gvMx1sqNum
             // 
@@ -1030,24 +1069,24 @@
             this.gvMx1sqNum.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1sqNum.Caption = "鏈鐢宠鏁伴噺";
             this.gvMx1sqNum.FieldName = "fQty";
-            this.gvMx1sqNum.MinWidth = 50;
+            this.gvMx1sqNum.MinWidth = 62;
             this.gvMx1sqNum.Name = "gvMx1sqNum";
             this.gvMx1sqNum.Tag = "yz_quantity_0_edit";
             this.gvMx1sqNum.Visible = true;
             this.gvMx1sqNum.VisibleIndex = 4;
-            this.gvMx1sqNum.Width = 94;
+            this.gvMx1sqNum.Width = 117;
             // 
             // gvMx1ysNum
             // 
             this.gvMx1ysNum.AppearanceCell.Options.UseFont = true;
             this.gvMx1ysNum.Caption = "鏈宸叉壂鏁伴噺";
             this.gvMx1ysNum.FieldName = "sQty";
-            this.gvMx1ysNum.MinWidth = 50;
+            this.gvMx1ysNum.MinWidth = 62;
             this.gvMx1ysNum.Name = "gvMx1ysNum";
             this.gvMx1ysNum.Tag = "query_a.YS_NUM";
             this.gvMx1ysNum.Visible = true;
             this.gvMx1ysNum.VisibleIndex = 5;
-            this.gvMx1ysNum.Width = 94;
+            this.gvMx1ysNum.Width = 117;
             // 
             // gvMx1remark
             // 
@@ -1058,12 +1097,12 @@
             this.gvMx1remark.AppearanceHeader.Options.UseForeColor = true;
             this.gvMx1remark.Caption = "鐢宠澶囨敞";
             this.gvMx1remark.FieldName = "remark";
-            this.gvMx1remark.MinWidth = 50;
+            this.gvMx1remark.MinWidth = 62;
             this.gvMx1remark.Name = "gvMx1remark";
             this.gvMx1remark.Tag = "edit";
             this.gvMx1remark.Visible = true;
             this.gvMx1remark.VisibleIndex = 6;
-            this.gvMx1remark.Width = 94;
+            this.gvMx1remark.Width = 117;
             // 
             // gridColumn6
             // 
@@ -1074,12 +1113,12 @@
             this.gridColumn6.Caption = "搴撳瓨鐘舵��";
             this.gridColumn6.ColumnEdit = this.repositoryItemComboBox1;
             this.gridColumn6.FieldName = "fStockStatusId";
-            this.gridColumn6.MinWidth = 25;
+            this.gridColumn6.MinWidth = 31;
             this.gridColumn6.Name = "gridColumn6";
             this.gridColumn6.Tag = "edit";
             this.gridColumn6.Visible = true;
             this.gridColumn6.VisibleIndex = 7;
-            this.gridColumn6.Width = 94;
+            this.gridColumn6.Width = 117;
             // 
             // repositoryItemComboBox1
             // 
@@ -1106,21 +1145,21 @@
             // 
             this.gridColumn8.Caption = "娆″簭";
             this.gridColumn8.FieldName = "fidx";
-            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.MinWidth = 31;
             this.gridColumn8.Name = "gridColumn8";
             this.gridColumn8.Visible = true;
             this.gridColumn8.VisibleIndex = 9;
-            this.gridColumn8.Width = 94;
+            this.gridColumn8.Width = 117;
             // 
             // gvMxDel
             // 
             this.gvMxDel.Caption = "绉诲嚭";
             this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;
-            this.gvMxDel.MinWidth = 25;
+            this.gvMxDel.MinWidth = 31;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
             this.gvMxDel.VisibleIndex = 11;
-            this.gvMxDel.Width = 94;
+            this.gvMxDel.Width = 117;
             // 
             // repositoryItemButtonEdit1
             // 
@@ -1137,18 +1176,19 @@
             // 
             this.gridColumn9.Caption = "鍏ュ簱鎬婚噺";
             this.gridColumn9.FieldName = "rkQty";
-            this.gridColumn9.MinWidth = 25;
+            this.gridColumn9.MinWidth = 31;
             this.gridColumn9.Name = "gridColumn9";
             this.gridColumn9.Visible = true;
             this.gridColumn9.VisibleIndex = 10;
-            this.gridColumn9.Width = 94;
+            this.gridColumn9.Width = 117;
             // 
             // picCheckBox
             // 
             this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;
-            this.picCheckBox.Location = new System.Drawing.Point(965, 64);
+            this.picCheckBox.Location = new System.Drawing.Point(1206, 78);
+            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4);
             this.picCheckBox.Name = "picCheckBox";
-            this.picCheckBox.Size = new System.Drawing.Size(100, 50);
+            this.picCheckBox.Size = new System.Drawing.Size(125, 61);
             this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;
             this.picCheckBox.TabIndex = 8;
             this.picCheckBox.TabStop = false;
@@ -1156,12 +1196,13 @@
             // 
             // Frm_MesShouTui
             // 
-            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
-            this.ClientSize = new System.Drawing.Size(1128, 682);
+            this.ClientSize = new System.Drawing.Size(1410, 834);
             this.Controls.Add(this.picCheckBox);
             this.Controls.Add(this.xtraTabControl1);
             this.Controls.Add(this.toolBarMenu1);
+            this.Margin = new System.Windows.Forms.Padding(4);
             this.Name = "Frm_MesShouTui";
             this.Text = "鍙楁墭閫�鏂欑敵璇�";
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
@@ -1188,10 +1229,10 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_fReturnStyle.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_checkDate.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_remark.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUser.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_checkUserName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_status.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateUser.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.txt_lastupdateByName.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateTime.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
@@ -1253,7 +1294,7 @@
         private System.Windows.Forms.Label lbGuid;
         private DevExpress.XtraEditors.TextEdit txt_remark;
         private DevExpress.XtraEditors.TextEdit txt_checkDate;
-        private DevExpress.XtraEditors.TextEdit txt_checkUser;
+        private DevExpress.XtraEditors.TextEdit txt_checkUserName;
         private DevExpress.XtraEditors.TextEdit txt_billNo;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
@@ -1263,7 +1304,7 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
-        private DevExpress.XtraEditors.TextEdit txt_lastUpdateUser;
+        private DevExpress.XtraEditors.TextEdit txt_lastupdateByName;
         private DevExpress.XtraEditors.TextEdit txt_lastUpdateTime;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;

--
Gitblit v1.9.3