From 9ce8cb1ee053fb5ad4b51d724a5736e0e27ff0aa Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期五, 23 五月 2025 09:10:52 +0800
Subject: [PATCH] 仓库

---
 DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs |  479 ++++++++++++++++++++++++++++-------------------------------
 1 files changed, 227 insertions(+), 252 deletions(-)

diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
index 8e2eb47..302fe21 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTui.Designer.cs
@@ -29,39 +29,40 @@
         /// </summary>
         private void InitializeComponent()
         {
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
-            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
-            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+            this.components = new System.ComponentModel.Container();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+            DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+            DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
             this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
             this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
             this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.split1 = new DevExpress.XtraEditors.SplitContainerControl();
             this.gcMain1 = new DevExpress.XtraGrid.GridControl();
             this.gridView1 = new DevExpress.XtraGrid.Views.Grid.GridView();
-            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_status = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_isFinish = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_isOut = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gv_returnType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_lastUpdateUser = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_lastUpdateTime = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_checkUser = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_checkDate = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_returnMethod = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gv_returnType = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_depotId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_suppId = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gv_remark = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+            this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.pageBar1 = new UserControls.Data.UcPageBar();
             this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
             this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -81,13 +82,13 @@
             this.txt_isFinish = new DevExpress.XtraEditors.CheckEdit();
             this.txt_lastUpdateUser = new DevExpress.XtraEditors.TextEdit();
             this.txt_lastUpdateTime = new DevExpress.XtraEditors.TextEdit();
+            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
             this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -95,8 +96,8 @@
             this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
-            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+            this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
             this.tabMx = new DevExpress.XtraTab.XtraTabControl();
             this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
             this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -113,12 +114,13 @@
             this.gvMx1sqNum = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1ysNum = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMx1remark = new DevExpress.XtraGrid.Columns.GridColumn();
-            this.gvMx1orderNo = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+            this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
             this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
             this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
             this.picCheckBox = new System.Windows.Forms.PictureBox();
+            this.tips = new DevExpress.Utils.ToolTipController(this.components);
             ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
             this.xtraTabControl1.SuspendLayout();
             this.xtraTabPage1.SuspendLayout();
@@ -148,13 +150,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateUser.Properties)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateTime.Properties)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
@@ -162,8 +164,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
             this.tabMx.SuspendLayout();
             this.tabMxPage1.SuspendLayout();
@@ -178,6 +180,7 @@
             // 
             this.toolBarMenu1.chkParameter = null;
             this.toolBarMenu1.currentAction = null;
+            this.toolBarMenu1.defaultActions = null;
             this.toolBarMenu1.Dock = System.Windows.Forms.DockStyle.Top;
             this.toolBarMenu1.guidKey = null;
             this.toolBarMenu1.isSetBtn = false;
@@ -223,15 +226,14 @@
             // 
             // split1.Panel2
             // 
-            this.split1.Panel2.Text = "Panel2";
+             this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             this.split1.Size = new System.Drawing.Size(1126, 570);
-            this.split1.SplitterPosition = 558;
+            this.split1.SplitterPosition = 0;
             this.split1.TabIndex = 0;
             // 
             // gcMain1
             // 
             this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;
-            this.gcMain1.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gcMain1.Location = new System.Drawing.Point(0, 0);
             this.gcMain1.MainView = this.gridView1;
             this.gcMain1.Name = "gcMain1";
@@ -244,24 +246,23 @@
             // 
             this.gridView1.Appearance.HeaderPanel.Options.UseTextOptions = true;
             this.gridView1.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
-            this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gridView1.Appearance.Row.Options.UseFont = true;
             this.gridView1.ColumnPanelRowHeight = 50;
             this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
-            this.gridColumn1,
             this.gv_status,
             this.gv_isFinish,
-            this.gv_isOut,
+            this.gv_returnType,
             this.gv_billNo,
             this.gv_lastUpdateUser,
             this.gv_lastUpdateTime,
             this.gv_checkUser,
             this.gv_checkDate,
             this.gv_returnMethod,
-            this.gv_returnType,
             this.gv_depotId,
             this.gv_suppId,
-            this.gv_remark});
+            this.gv_remark,
+            this.gridColumn1,
+            this.gridColumn7});
             this.gridView1.GridControl = this.gcMain1;
             this.gridView1.IndicatorWidth = 50;
             this.gridView1.Name = "gridView1";
@@ -269,64 +270,46 @@
             this.gridView1.OptionsView.ShowAutoFilterRow = true;
             this.gridView1.OptionsView.ShowGroupPanel = false;
             // 
-            // gridColumn1
-            // 
-            this.gridColumn1.Caption = "閫�璐х粍缁�";
-            this.gridColumn1.FieldName = "receivingOrg";
-            this.gridColumn1.Name = "gridColumn1";
-            this.gridColumn1.Tag = "org.fnamber";
-            this.gridColumn1.Visible = true;
-            this.gridColumn1.VisibleIndex = 0;
-            this.gridColumn1.Width = 250;
-            // 
             // gv_status
             // 
-            this.gv_status.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_status.AppearanceCell.Options.UseFont = true;
-            this.gv_status.Caption = "瀹℃牳鐘舵��";
-            this.gv_status.FieldName = "status";
-            this.gv_status.MaxWidth = 50;
-            this.gv_status.MinWidth = 50;
+            this.gv_status.Caption = "瀹℃牳鏍囪瘑";
+            this.gv_status.FieldName = "isCheck";
+            this.gv_status.MinWidth = 25;
             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 = 1;
+            this.gv_status.VisibleIndex = 0;
             this.gv_status.Width = 50;
             // 
             // gv_isFinish
             // 
-            this.gv_isFinish.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_isFinish.AppearanceCell.Options.UseFont = true;
-            this.gv_isFinish.Caption = "鏄惁瀹屾垚";
+            this.gv_isFinish.Caption = "瀹屾垚鏍囪瘑";
             this.gv_isFinish.FieldName = "isFinish";
-            this.gv_isFinish.MaxWidth = 50;
-            this.gv_isFinish.MinWidth = 50;
+            this.gv_isFinish.MinWidth = 25;
             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 = 2;
+            this.gv_isFinish.VisibleIndex = 1;
             this.gv_isFinish.Width = 50;
             // 
-            // gv_isOut
+            // gv_returnType
             // 
-            this.gv_isOut.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_isOut.AppearanceCell.Options.UseFont = true;
-            this.gv_isOut.Caption = "濮斿鏍囪瘑";
-            this.gv_isOut.FieldName = "isOut";
-            this.gv_isOut.MaxWidth = 50;
-            this.gv_isOut.MinWidth = 50;
-            this.gv_isOut.Name = "gv_isOut";
-            this.gv_isOut.OptionsColumn.AllowEdit = false;
-            this.gv_isOut.Tag = "query_a.IS_OUT";
-            this.gv_isOut.Visible = true;
-            this.gv_isOut.VisibleIndex = 3;
-            this.gv_isOut.Width = 50;
+            this.gv_returnType.AppearanceCell.Options.UseFont = true;
+            this.gv_returnType.Caption = "鏈夋棤婧愬崟";
+            this.gv_returnType.FieldName = "fIsLink";
+            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;
             // 
             // gv_billNo
             // 
-            this.gv_billNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_billNo.AppearanceCell.Options.UseFont = true;
             this.gv_billNo.Caption = "鍗曟嵁缂栫爜";
             this.gv_billNo.FieldName = "billNo";
@@ -334,38 +317,35 @@
             this.gv_billNo.OptionsColumn.AllowEdit = false;
             this.gv_billNo.Tag = "query_a.BILL_NO";
             this.gv_billNo.Visible = true;
-            this.gv_billNo.VisibleIndex = 4;
+            this.gv_billNo.VisibleIndex = 3;
             this.gv_billNo.Width = 120;
             // 
             // gv_lastUpdateUser
             // 
-            this.gv_lastUpdateUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_lastUpdateUser.AppearanceCell.Options.UseFont = true;
             this.gv_lastUpdateUser.Caption = "鏈�鍚庤窡鏂颁汉 ";
-            this.gv_lastUpdateUser.FieldName = "lastUpdateUser";
+            this.gv_lastUpdateUser.FieldName = "lastupdateBy";
             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 = 5;
+            this.gv_lastUpdateUser.VisibleIndex = 4;
             this.gv_lastUpdateUser.Width = 94;
             // 
             // gv_lastUpdateTime
             // 
-            this.gv_lastUpdateTime.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_lastUpdateTime.AppearanceCell.Options.UseFont = true;
             this.gv_lastUpdateTime.Caption = "鏈�鍚庝慨鏀规椂闂� ";
-            this.gv_lastUpdateTime.FieldName = "lastUpdateTime";
+            this.gv_lastUpdateTime.FieldName = "lastupdateDate";
             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 = 6;
+            this.gv_lastUpdateTime.VisibleIndex = 5;
             this.gv_lastUpdateTime.Width = 180;
             // 
             // gv_checkUser
             // 
-            this.gv_checkUser.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_checkUser.AppearanceCell.Options.UseFont = true;
             this.gv_checkUser.Caption = "瀹℃牳浜� ";
             this.gv_checkUser.FieldName = "checkUser";
@@ -373,12 +353,11 @@
             this.gv_checkUser.OptionsColumn.AllowEdit = false;
             this.gv_checkUser.Tag = "query_a.CHECK_USER";
             this.gv_checkUser.Visible = true;
-            this.gv_checkUser.VisibleIndex = 7;
+            this.gv_checkUser.VisibleIndex = 6;
             this.gv_checkUser.Width = 94;
             // 
             // gv_checkDate
             // 
-            this.gv_checkDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_checkDate.AppearanceCell.Options.UseFont = true;
             this.gv_checkDate.Caption = "瀹℃牳鏃堕棿 ";
             this.gv_checkDate.FieldName = "checkDate";
@@ -386,64 +365,47 @@
             this.gv_checkDate.OptionsColumn.AllowEdit = false;
             this.gv_checkDate.Tag = "query_a.CHECK_DATE";
             this.gv_checkDate.Visible = true;
-            this.gv_checkDate.VisibleIndex = 8;
+            this.gv_checkDate.VisibleIndex = 7;
             this.gv_checkDate.Width = 94;
             // 
             // gv_returnMethod
             // 
-            this.gv_returnMethod.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_returnMethod.AppearanceCell.Options.UseFont = true;
             this.gv_returnMethod.Caption = "閫�鏂欐柟寮� ";
-            this.gv_returnMethod.FieldName = "returnMethod";
+            this.gv_returnMethod.FieldName = "fReturnStyle";
             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 = 9;
+            this.gv_returnMethod.VisibleIndex = 8;
             this.gv_returnMethod.Width = 94;
-            // 
-            // gv_returnType
-            // 
-            this.gv_returnType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gv_returnType.AppearanceCell.Options.UseFont = true;
-            this.gv_returnType.Caption = "閫�鏂欑被鍨� ";
-            this.gv_returnType.FieldName = "returnType";
-            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 = 10;
-            this.gv_returnType.Width = 94;
             // 
             // gv_depotId
             // 
-            this.gv_depotId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_depotId.AppearanceCell.Options.UseFont = true;
-            this.gv_depotId.Caption = "浠撳簱";
+            this.gv_depotId.Caption = "浠撳簱鍚嶇О";
             this.gv_depotId.FieldName = "dptName";
             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 = 11;
+            this.gv_depotId.VisibleIndex = 9;
             this.gv_depotId.Width = 94;
             // 
             // gv_suppId
             // 
-            this.gv_suppId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_suppId.AppearanceCell.Options.UseFont = true;
-            this.gv_suppId.Caption = "渚涘簲鍟�";
-            this.gv_suppId.FieldName = "supName";
+            this.gv_suppId.Caption = "瀹㈡埛鍚嶇О";
+            this.gv_suppId.FieldName = "cusName";
             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 = 12;
+            this.gv_suppId.VisibleIndex = 10;
             this.gv_suppId.Width = 94;
             // 
             // gv_remark
             // 
-            this.gv_remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gv_remark.AppearanceCell.Options.UseFont = true;
             this.gv_remark.Caption = "澶囨敞 ";
             this.gv_remark.FieldName = "remark";
@@ -451,8 +413,26 @@
             this.gv_remark.OptionsColumn.AllowEdit = false;
             this.gv_remark.Tag = "query_a.REMARK";
             this.gv_remark.Visible = true;
-            this.gv_remark.VisibleIndex = 13;
+            this.gv_remark.VisibleIndex = 12;
             this.gv_remark.Width = 94;
+            // 
+            // gridColumn1
+            // 
+            this.gridColumn1.Caption = "搴撳瓨缁勭粐";
+            this.gridColumn1.FieldName = "receivingOrg";
+            this.gridColumn1.Name = "gridColumn1";
+            this.gridColumn1.Tag = "org.fnamber";
+            this.gridColumn1.Visible = true;
+            this.gridColumn1.VisibleIndex = 11;
+            this.gridColumn1.Width = 250;
+            // 
+            // gridColumn7
+            // 
+            this.gridColumn7.Caption = "涓婚敭Guid";
+            this.gridColumn7.FieldName = "guid";
+            this.gridColumn7.MinWidth = 25;
+            this.gridColumn7.Name = "gridColumn7";
+            this.gridColumn7.Width = 94;
             // 
             // pageBar1
             // 
@@ -478,7 +458,7 @@
             this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
             this.splitMx1.Horizontal = false;
             this.splitMx1.Location = new System.Drawing.Point(0, 0);
-            this.splitMx1.Name = "splitMx1";
+             this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
             // 
             // splitMx1.Panel1
             // 
@@ -490,7 +470,7 @@
             this.splitMx1.Panel2.Controls.Add(this.tabMx);
             this.splitMx1.Panel2.Text = "Panel2";
             this.splitMx1.Size = new System.Drawing.Size(1126, 570);
-            this.splitMx1.SplitterPosition = 154;
+            this.splitMx1.SplitterPosition = 143;
             this.splitMx1.TabIndex = 0;
             // 
             // layoutMx1
@@ -511,39 +491,42 @@
             this.layoutMx1.Controls.Add(this.txt_lastUpdateUser);
             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.Name = "layoutMx1";
-            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(832, 224, 812, 500);
+            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, 154);
+            this.layoutMx1.Size = new System.Drawing.Size(1126, 143);
             this.layoutMx1.TabIndex = 0;
             this.layoutMx1.Text = "layoutControl1";
             // 
             // txt_fIsLink
             // 
-            this.txt_fIsLink.Location = new System.Drawing.Point(385, 120);
+            this.txt_fIsLink.EditValue = "1";
+            this.txt_fIsLink.Location = new System.Drawing.Point(385, 74);
             this.txt_fIsLink.Margin = new System.Windows.Forms.Padding(0);
             this.txt_fIsLink.Name = "txt_fIsLink";
             this.txt_fIsLink.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
-            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鏈夋簮鍗�"),
-            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鏃犳簮鍗�")});
+            new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
+            new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�", false)});
             this.txt_fIsLink.Properties.Padding = new System.Windows.Forms.Padding(0);
-            this.txt_fIsLink.Size = new System.Drawing.Size(165, 32);
+            this.txt_fIsLink.Size = new System.Drawing.Size(165, 27);
             this.txt_fIsLink.StyleController = this.layoutMx1;
             this.txt_fIsLink.TabIndex = 533;
             // 
             // txt_fCustId
             // 
             this.txt_fCustId.IsReadly = false;
-            this.txt_fCustId.Location = new System.Drawing.Point(385, 48);
+            this.txt_fCustId.Location = new System.Drawing.Point(385, 43);
             this.txt_fCustId.Name = "txt_fCustId";
-            this.txt_fCustId.Size = new System.Drawing.Size(165, 28);
+            this.txt_fCustId.Size = new System.Drawing.Size(165, 24);
             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, 120);
+            this.btnSelect.Location = new System.Drawing.Point(12, 105);
             this.btnSelect.Name = "btnSelect";
             this.btnSelect.Size = new System.Drawing.Size(116, 27);
             this.btnSelect.StyleController = this.layoutMx1;
@@ -552,9 +535,9 @@
             // 
             // lbGuid
             // 
-            this.lbGuid.Location = new System.Drawing.Point(825, 120);
+            this.lbGuid.Location = new System.Drawing.Point(825, 103);
             this.lbGuid.Name = "lbGuid";
-            this.lbGuid.Size = new System.Drawing.Size(268, 32);
+            this.lbGuid.Size = new System.Drawing.Size(268, 28);
             this.lbGuid.TabIndex = 1;
             this.lbGuid.Text = "lbGuid";
             this.lbGuid.Visible = false;
@@ -562,18 +545,17 @@
             // txt_fStockOrgId
             // 
             this.txt_fStockOrgId.IsReadly = false;
-            this.txt_fStockOrgId.Location = new System.Drawing.Point(114, 48);
+            this.txt_fStockOrgId.Location = new System.Drawing.Point(114, 43);
             this.txt_fStockOrgId.Name = "txt_fStockOrgId";
-            this.txt_fStockOrgId.Size = new System.Drawing.Size(165, 28);
+            this.txt_fStockOrgId.Size = new System.Drawing.Size(165, 24);
             this.txt_fStockOrgId.TabIndex = 526;
             // 
             // txt_billNo
             // 
             this.txt_billNo.Location = new System.Drawing.Point(114, 12);
             this.txt_billNo.Name = "txt_billNo";
-            this.txt_billNo.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_billNo.Properties.Appearance.Options.UseFont = true;
-            this.txt_billNo.Size = new System.Drawing.Size(165, 28);
+            this.txt_billNo.Size = new System.Drawing.Size(165, 24);
             this.txt_billNo.StyleController = this.layoutMx1;
             this.txt_billNo.TabIndex = 211;
             this.txt_billNo.Tag = "readonly";
@@ -596,11 +578,10 @@
             // 
             // txt_checkDate
             // 
-            this.txt_checkDate.Location = new System.Drawing.Point(927, 48);
+            this.txt_checkDate.Location = new System.Drawing.Point(927, 43);
             this.txt_checkDate.Name = "txt_checkDate";
-            this.txt_checkDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_checkDate.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkDate.Size = new System.Drawing.Size(166, 28);
+            this.txt_checkDate.Size = new System.Drawing.Size(166, 24);
             this.txt_checkDate.StyleController = this.layoutMx1;
             this.txt_checkDate.TabIndex = 226;
             this.txt_checkDate.Tag = "readonly";
@@ -608,19 +589,18 @@
             // txt_fStockId
             // 
             this.txt_fStockId.IsReadly = false;
-            this.txt_fStockId.Location = new System.Drawing.Point(114, 84);
+            this.txt_fStockId.Location = new System.Drawing.Point(114, 74);
             this.txt_fStockId.Margin = new System.Windows.Forms.Padding(0);
             this.txt_fStockId.Name = "txt_fStockId";
-            this.txt_fStockId.Size = new System.Drawing.Size(165, 28);
+            this.txt_fStockId.Size = new System.Drawing.Size(165, 24);
             this.txt_fStockId.TabIndex = 260;
             // 
             // txt_remark
             // 
-            this.txt_remark.Location = new System.Drawing.Point(385, 84);
+            this.txt_remark.Location = new System.Drawing.Point(385, 105);
             this.txt_remark.Name = "txt_remark";
-            this.txt_remark.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_remark.Properties.Appearance.Options.UseFont = true;
-            this.txt_remark.Size = new System.Drawing.Size(165, 28);
+            this.txt_remark.Size = new System.Drawing.Size(436, 24);
             this.txt_remark.StyleController = this.layoutMx1;
             this.txt_remark.TabIndex = 252;
             // 
@@ -628,16 +608,15 @@
             // 
             this.txt_checkUser.Location = new System.Drawing.Point(927, 12);
             this.txt_checkUser.Name = "txt_checkUser";
-            this.txt_checkUser.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
             this.txt_checkUser.Properties.Appearance.Options.UseFont = true;
-            this.txt_checkUser.Size = new System.Drawing.Size(166, 28);
+            this.txt_checkUser.Size = new System.Drawing.Size(166, 24);
             this.txt_checkUser.StyleController = this.layoutMx1;
             this.txt_checkUser.TabIndex = 222;
             this.txt_checkUser.Tag = "readonly";
             // 
             // txt_status
             // 
-            this.txt_status.Location = new System.Drawing.Point(825, 84);
+            this.txt_status.Location = new System.Drawing.Point(825, 74);
             this.txt_status.Name = "txt_status";
             this.txt_status.Properties.Caption = "瀹℃牳鏍囪瘑";
             this.txt_status.Size = new System.Drawing.Size(268, 24);
@@ -647,7 +626,7 @@
             // 
             // txt_isFinish
             // 
-            this.txt_isFinish.Location = new System.Drawing.Point(554, 84);
+            this.txt_isFinish.Location = new System.Drawing.Point(554, 74);
             this.txt_isFinish.Name = "txt_isFinish";
             this.txt_isFinish.Properties.Caption = "瀹岀粨鏍囪瘑";
             this.txt_isFinish.Size = new System.Drawing.Size(267, 24);
@@ -666,12 +645,24 @@
             // 
             // txt_lastUpdateTime
             // 
-            this.txt_lastUpdateTime.Location = new System.Drawing.Point(656, 48);
+            this.txt_lastUpdateTime.Location = new System.Drawing.Point(656, 43);
             this.txt_lastUpdateTime.Name = "txt_lastUpdateTime";
             this.txt_lastUpdateTime.Size = new System.Drawing.Size(165, 24);
             this.txt_lastUpdateTime.StyleController = this.layoutMx1;
             this.txt_lastUpdateTime.TabIndex = 531;
             this.txt_lastUpdateTime.Tag = "readonly";
+            // 
+            // layoutControlItem13
+            // 
+            this.layoutControlItem13.Control = this.lbGuid;
+            this.layoutControlItem13.Location = new System.Drawing.Point(813, 96);
+            this.layoutControlItem13.Name = "layoutControlItem13";
+            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
+            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
+            this.layoutControlItem13.Size = new System.Drawing.Size(272, 32);
+            this.layoutControlItem13.Text = "lbGuid";
+            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
+            this.layoutControlItem13.TextVisible = false;
             // 
             // Root
             // 
@@ -683,7 +674,6 @@
             this.layoutControlItem3,
             this.layoutControlItem9,
             this.layoutControlItem10,
-            this.layoutControlItem13,
             this.layoutControlItem14,
             this.layoutControlItem15,
             this.layoutControlItem16,
@@ -691,37 +681,37 @@
             this.layoutControlItem11,
             this.layoutControlItem5,
             this.layoutControlItem4,
-            this.layoutControlItem7,
-            this.layoutControlItem6});
+            this.layoutControlItem6,
+            this.layoutControlItem7});
             this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
             this.Root.Name = "Root";
-            columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition5.Width = 100D;
-            columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition6.Width = 100D;
-            columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition7.Width = 100D;
-            columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
-            columnDefinition8.Width = 100D;
+            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1.Width = 100D;
+            columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition2.Width = 100D;
+            columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition3.Width = 100D;
+            columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition4.Width = 100D;
             this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
-            columnDefinition5,
-            columnDefinition6,
-            columnDefinition7,
-            columnDefinition8});
-            rowDefinition5.Height = 100D;
-            rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition6.Height = 100D;
-            rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition7.Height = 100D;
-            rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
-            rowDefinition8.Height = 100D;
-            rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+            columnDefinition1,
+            columnDefinition2,
+            columnDefinition3,
+            columnDefinition4});
+            rowDefinition1.Height = 100D;
+            rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition2.Height = 100D;
+            rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition3.Height = 100D;
+            rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+            rowDefinition4.Height = 100D;
+            rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
             this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
-            rowDefinition5,
-            rowDefinition6,
-            rowDefinition7,
-            rowDefinition8});
-            this.Root.Size = new System.Drawing.Size(1105, 164);
+            rowDefinition1,
+            rowDefinition2,
+            rowDefinition3,
+            rowDefinition4});
+            this.Root.Size = new System.Drawing.Size(1105, 144);
             this.Root.TextVisible = false;
             // 
             // layoutControlItem1
@@ -729,27 +719,27 @@
             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, 36);
+            this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem1.Text = "鐢宠鍗曞彿";
             this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem2
             // 
             this.layoutControlItem2.Control = this.txt_fStockOrgId;
-            this.layoutControlItem2.Location = new System.Drawing.Point(0, 36);
+            this.layoutControlItem2.Location = new System.Drawing.Point(0, 31);
             this.layoutControlItem2.Name = "layoutControlItem2";
             this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem2.Size = new System.Drawing.Size(271, 36);
+            this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem2.Text = "閫夋嫨缁勭粐";
             this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem3
             // 
             this.layoutControlItem3.Control = this.txt_fStockId;
-            this.layoutControlItem3.Location = new System.Drawing.Point(0, 72);
+            this.layoutControlItem3.Location = new System.Drawing.Point(0, 62);
             this.layoutControlItem3.Name = "layoutControlItem3";
             this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem3.Size = new System.Drawing.Size(271, 36);
+            this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem3.Text = "閫夋嫨浠撳簱";
             this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
             // 
@@ -759,32 +749,20 @@
             this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
             this.layoutControlItem9.Name = "layoutControlItem9";
             this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem9.Size = new System.Drawing.Size(272, 36);
+            this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
             this.layoutControlItem9.Text = "瀹℃牳浜�";
             this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem10
             // 
             this.layoutControlItem10.Control = this.txt_checkDate;
-            this.layoutControlItem10.Location = new System.Drawing.Point(813, 36);
+            this.layoutControlItem10.Location = new System.Drawing.Point(813, 31);
             this.layoutControlItem10.Name = "layoutControlItem10";
             this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem10.Size = new System.Drawing.Size(272, 36);
+            this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
             this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
             this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem13
-            // 
-            this.layoutControlItem13.Control = this.lbGuid;
-            this.layoutControlItem13.Location = new System.Drawing.Point(813, 108);
-            this.layoutControlItem13.Name = "layoutControlItem13";
-            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
-            this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem13.Size = new System.Drawing.Size(272, 36);
-            this.layoutControlItem13.Text = "lbGuid";
-            this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
-            this.layoutControlItem13.TextVisible = false;
             // 
             // layoutControlItem14
             // 
@@ -792,30 +770,30 @@
             this.layoutControlItem14.Location = new System.Drawing.Point(542, 0);
             this.layoutControlItem14.Name = "layoutControlItem14";
             this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
-            this.layoutControlItem14.Size = new System.Drawing.Size(271, 36);
+            this.layoutControlItem14.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem14.Text = "鏈�鍚庢洿鏂颁汉";
             this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem15
             // 
             this.layoutControlItem15.Control = this.txt_lastUpdateTime;
-            this.layoutControlItem15.Location = new System.Drawing.Point(542, 36);
+            this.layoutControlItem15.Location = new System.Drawing.Point(542, 31);
             this.layoutControlItem15.Name = "layoutControlItem15";
             this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem15.Size = new System.Drawing.Size(271, 36);
+            this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem15.Text = "鏈�鍚庢洿鏂版椂闂�";
             this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem16
             // 
             this.layoutControlItem16.Control = this.btnSelect;
-            this.layoutControlItem16.Location = new System.Drawing.Point(0, 108);
+            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.Name = "layoutControlItem16";
             this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem16.Size = new System.Drawing.Size(271, 36);
+            this.layoutControlItem16.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem16.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem16.Text = "閫�璐ф槑缁�";
             this.layoutControlItem16.TextSize = new System.Drawing.Size(0, 0);
@@ -824,11 +802,11 @@
             // layoutControlItem12
             // 
             this.layoutControlItem12.Control = this.txt_isFinish;
-            this.layoutControlItem12.Location = new System.Drawing.Point(542, 72);
+            this.layoutControlItem12.Location = new System.Drawing.Point(542, 62);
             this.layoutControlItem12.Name = "layoutControlItem12";
             this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
             this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem12.Size = new System.Drawing.Size(271, 36);
+            this.layoutControlItem12.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem12.Text = "瀹岀粨鏍囪瘑";
             this.layoutControlItem12.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem12.TextVisible = false;
@@ -836,11 +814,11 @@
             // layoutControlItem11
             // 
             this.layoutControlItem11.Control = this.txt_status;
-            this.layoutControlItem11.Location = new System.Drawing.Point(813, 72);
+            this.layoutControlItem11.Location = new System.Drawing.Point(813, 62);
             this.layoutControlItem11.Name = "layoutControlItem11";
             this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
             this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem11.Size = new System.Drawing.Size(272, 36);
+            this.layoutControlItem11.Size = new System.Drawing.Size(272, 31);
             this.layoutControlItem11.Text = "瀹℃牳鏍囪瘑";
             this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
             this.layoutControlItem11.TextVisible = false;
@@ -851,42 +829,45 @@
             this.layoutControlItem5.Location = new System.Drawing.Point(271, 0);
             this.layoutControlItem5.Name = "layoutControlItem5";
             this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem5.Size = new System.Drawing.Size(271, 36);
+            this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem5.Text = "閫�鏂欐柟寮�";
             this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem4
             // 
             this.layoutControlItem4.Control = this.txt_fCustId;
-            this.layoutControlItem4.Location = new System.Drawing.Point(271, 36);
+            this.layoutControlItem4.Location = new System.Drawing.Point(271, 31);
             this.layoutControlItem4.Name = "layoutControlItem4";
             this.layoutControlItem4.OptionsTableLayoutItem.ColumnIndex = 1;
             this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
-            this.layoutControlItem4.Size = new System.Drawing.Size(271, 36);
+            this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
             this.layoutControlItem4.Text = "閫夋嫨瀹㈡埛";
             this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
-            // 
-            // layoutControlItem7
-            // 
-            this.layoutControlItem7.Control = this.txt_remark;
-            this.layoutControlItem7.Location = new System.Drawing.Point(271, 72);
-            this.layoutControlItem7.Name = "layoutControlItem7";
-            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
-            this.layoutControlItem7.Size = new System.Drawing.Size(271, 36);
-            this.layoutControlItem7.Text = "閫�璐у娉�";
-            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
             // layoutControlItem6
             // 
             this.layoutControlItem6.Control = this.txt_fIsLink;
-            this.layoutControlItem6.Location = new System.Drawing.Point(271, 108);
+            this.layoutControlItem6.Location = new System.Drawing.Point(271, 62);
+            this.layoutControlItem6.MinSize = new System.Drawing.Size(246, 30);
             this.layoutControlItem6.Name = "layoutControlItem6";
             this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
-            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 3;
-            this.layoutControlItem6.Size = new System.Drawing.Size(271, 36);
+            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
+            this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
+            this.layoutControlItem6.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
             this.layoutControlItem6.Text = "鏈夋棤婧愬崟";
             this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
+            // 
+            // layoutControlItem7
+            // 
+            this.layoutControlItem7.Control = this.txt_remark;
+            this.layoutControlItem7.Location = new System.Drawing.Point(271, 93);
+            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.Text = "鐢宠澶囨敞";
+            this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
             // 
             // tabMx
             // 
@@ -894,7 +875,7 @@
             this.tabMx.Location = new System.Drawing.Point(0, 0);
             this.tabMx.Name = "tabMx";
             this.tabMx.SelectedTabPage = this.tabMxPage1;
-            this.tabMx.Size = new System.Drawing.Size(1126, 404);
+            this.tabMx.Size = new System.Drawing.Size(1126, 415);
             this.tabMx.TabIndex = 3;
             this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
             this.tabMxPage1});
@@ -903,7 +884,7 @@
             // 
             this.tabMxPage1.Controls.Add(this.gcMx1);
             this.tabMxPage1.Name = "tabMxPage1";
-            this.tabMxPage1.Size = new System.Drawing.Size(1124, 372);
+            this.tabMxPage1.Size = new System.Drawing.Size(1124, 383);
             this.tabMxPage1.Text = "鐢宠鏄庣粏";
             // 
             // gcMx1
@@ -915,7 +896,7 @@
             this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
             this.repositoryItemButtonEdit1,
             this.repositoryItemComboBox1});
-            this.gcMx1.Size = new System.Drawing.Size(1124, 372);
+            this.gcMx1.Size = new System.Drawing.Size(1124, 383);
             this.gcMx1.TabIndex = 0;
             this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
             this.gvMx1});
@@ -935,8 +916,8 @@
             this.gvMx1sqNum,
             this.gvMx1ysNum,
             this.gvMx1remark,
-            this.gvMx1orderNo,
             this.gridColumn6,
+            this.gridColumn8,
             this.gvMxDel});
             this.gvMx1.GridControl = this.gcMx1;
             this.gvMx1.Name = "gvMx1";
@@ -954,7 +935,6 @@
             // 
             // gvMx1id
             // 
-            this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1id.AppearanceCell.Options.UseFont = true;
             this.gvMx1id.Caption = "涓婚敭Guid";
             this.gvMx1id.FieldName = "guid";
@@ -965,7 +945,6 @@
             // 
             // gvMx1mid
             // 
-            this.gvMx1mid.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1mid.AppearanceCell.Options.UseFont = true;
             this.gvMx1mid.Caption = "澶栭敭Guid";
             this.gvMx1mid.FieldName = "pGuid";
@@ -976,7 +955,6 @@
             // 
             // gvMx1invBillNo
             // 
-            this.gvMx1invBillNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1invBillNo.AppearanceCell.Options.UseFont = true;
             this.gvMx1invBillNo.Caption = "鍏ュ簱鍗曞彿";
             this.gvMx1invBillNo.FieldName = "rkNo";
@@ -984,12 +962,11 @@
             this.gvMx1invBillNo.Name = "gvMx1invBillNo";
             this.gvMx1invBillNo.Tag = "query_a.INV_BILL_NO";
             this.gvMx1invBillNo.Visible = true;
-            this.gvMx1invBillNo.VisibleIndex = 1;
+            this.gvMx1invBillNo.VisibleIndex = 0;
             this.gvMx1invBillNo.Width = 94;
             // 
             // gvMx1itemId
             // 
-            this.gvMx1itemId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1itemId.AppearanceCell.Options.UseFont = true;
             this.gvMx1itemId.Caption = "鐗╂枡id ";
             this.gvMx1itemId.FieldName = "itemId";
@@ -997,7 +974,7 @@
             this.gvMx1itemId.Name = "gvMx1itemId";
             this.gvMx1itemId.Tag = "query_a.ITEM_ID";
             this.gvMx1itemId.Visible = true;
-            this.gvMx1itemId.VisibleIndex = 0;
+            this.gvMx1itemId.VisibleIndex = 1;
             this.gvMx1itemId.Width = 94;
             // 
             // gridColumn2
@@ -1037,12 +1014,11 @@
             this.gridColumn4.MinWidth = 25;
             this.gridColumn4.Name = "gridColumn4";
             this.gridColumn4.Visible = true;
-            this.gridColumn4.VisibleIndex = 6;
+            this.gridColumn4.VisibleIndex = 5;
             this.gridColumn4.Width = 94;
             // 
             // gvMx1sqNum
             // 
-            this.gvMx1sqNum.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1sqNum.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1sqNum.AppearanceCell.Options.UseFont = true;
             this.gvMx1sqNum.AppearanceCell.Options.UseForeColor = true;
@@ -1054,12 +1030,11 @@
             this.gvMx1sqNum.Name = "gvMx1sqNum";
             this.gvMx1sqNum.Tag = "yz_quantity_0_edit";
             this.gvMx1sqNum.Visible = true;
-            this.gvMx1sqNum.VisibleIndex = 5;
+            this.gvMx1sqNum.VisibleIndex = 6;
             this.gvMx1sqNum.Width = 94;
             // 
             // gvMx1ysNum
             // 
-            this.gvMx1ysNum.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1ysNum.AppearanceCell.Options.UseFont = true;
             this.gvMx1ysNum.Caption = "宸叉壂鏁伴噺";
             this.gvMx1ysNum.FieldName = "sQty";
@@ -1072,31 +1047,19 @@
             // 
             // gvMx1remark
             // 
-            this.gvMx1remark.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
             this.gvMx1remark.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1remark.AppearanceCell.Options.UseFont = true;
             this.gvMx1remark.AppearanceCell.Options.UseForeColor = true;
             this.gvMx1remark.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
             this.gvMx1remark.AppearanceHeader.Options.UseForeColor = true;
-            this.gvMx1remark.Caption = "澶囨敞";
+            this.gvMx1remark.Caption = "鐢宠澶囨敞";
             this.gvMx1remark.FieldName = "remark";
             this.gvMx1remark.MinWidth = 50;
             this.gvMx1remark.Name = "gvMx1remark";
             this.gvMx1remark.Tag = "edit";
             this.gvMx1remark.Visible = true;
-            this.gvMx1remark.VisibleIndex = 9;
+            this.gvMx1remark.VisibleIndex = 8;
             this.gvMx1remark.Width = 94;
-            // 
-            // gvMx1orderNo
-            // 
-            this.gvMx1orderNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
-            this.gvMx1orderNo.AppearanceCell.Options.UseFont = true;
-            this.gvMx1orderNo.Caption = "搴忓彿";
-            this.gvMx1orderNo.FieldName = "fIdx";
-            this.gvMx1orderNo.MinWidth = 50;
-            this.gvMx1orderNo.Name = "gvMx1orderNo";
-            this.gvMx1orderNo.Tag = "query_a.ORDER_NO";
-            this.gvMx1orderNo.Width = 94;
             // 
             // gridColumn6
             // 
@@ -1109,8 +1072,9 @@
             this.gridColumn6.FieldName = "fStockStatusId";
             this.gridColumn6.MinWidth = 25;
             this.gridColumn6.Name = "gridColumn6";
+            this.gridColumn6.Tag = "edit";
             this.gridColumn6.Visible = true;
-            this.gridColumn6.VisibleIndex = 8;
+            this.gridColumn6.VisibleIndex = 9;
             this.gridColumn6.Width = 94;
             // 
             // repositoryItemComboBox1
@@ -1121,18 +1085,28 @@
             this.repositoryItemComboBox1.Items.AddRange(new object[] {
             "-璇烽�夋嫨-",
             "涓嶅弬涓庢牳绠�(KCZT001)",
-            "鍙敤KCZT01_SYS)",
-            "寰呮KCZT02_SYS)",
-            "鍐荤粨KCZT03_SYS)",
-            "閫�鍥炲喕缁揔CZT04_SYS)",
-            "鍦ㄩ�擪CZT05_SYS)",
-            "鏀惰揣鍐荤粨KCZT06_SYS)",
-            "搴熷搧KCZT07_SYS)",
-            "涓嶈壇KCZT08_SYS)",
-            "澶栧�烱CZT99_SYS)"});
+            "鍙敤(KCZT01_SYS)",
+            "寰呮(KCZT02_SYS)",
+            "鍐荤粨(KCZT03_SYS)",
+            "閫�鍥炲喕缁�(KCZT04_SYS)",
+            "鍦ㄩ��(KCZT05_SYS)",
+            "鏀惰揣鍐荤粨(KCZT06_SYS)",
+            "搴熷搧(KCZT07_SYS)",
+            "涓嶈壇(KCZT08_SYS)",
+            "澶栧��(KCZT99_SYS)"});
             this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
             this.repositoryItemComboBox1.NullText = "璇烽�夋嫨";
             this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+            // 
+            // gridColumn8
+            // 
+            this.gridColumn8.Caption = "娆″簭";
+            this.gridColumn8.FieldName = "fidx";
+            this.gridColumn8.MinWidth = 25;
+            this.gridColumn8.Name = "gridColumn8";
+            this.gridColumn8.Visible = true;
+            this.gridColumn8.VisibleIndex = 10;
+            this.gridColumn8.Width = 94;
             // 
             // gvMxDel
             // 
@@ -1141,16 +1115,16 @@
             this.gvMxDel.MinWidth = 25;
             this.gvMxDel.Name = "gvMxDel";
             this.gvMxDel.Visible = true;
-            this.gvMxDel.VisibleIndex = 10;
+            this.gvMxDel.VisibleIndex = 11;
             this.gvMxDel.Width = 94;
             // 
             // repositoryItemButtonEdit1
             // 
             this.repositoryItemButtonEdit1.AutoHeight = false;
-            editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
-            editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+            editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+            editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
             this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
-            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
             this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
             this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
             this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1205,13 +1179,13 @@
             ((System.ComponentModel.ISupportInitialize)(this.txt_isFinish.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateUser.Properties)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.txt_lastUpdateTime.Properties)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
@@ -1219,8 +1193,8 @@
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
-            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
             ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
             this.tabMx.ResumeLayout(false);
             this.tabMxPage1.ResumeLayout(false);
@@ -1243,7 +1217,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
         private DevExpress.XtraGrid.Columns.GridColumn gv_status;
         private DevExpress.XtraGrid.Columns.GridColumn gv_isFinish;
-        private DevExpress.XtraGrid.Columns.GridColumn gv_isOut;
         private DevExpress.XtraGrid.Columns.GridColumn gv_billNo;
         private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateUser;
         private DevExpress.XtraGrid.Columns.GridColumn gv_lastUpdateTime;
@@ -1296,7 +1269,6 @@
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1sqNum;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1ysNum;
         private DevExpress.XtraGrid.Columns.GridColumn gvMx1remark;
-        private DevExpress.XtraGrid.Columns.GridColumn gvMx1orderNo;
         private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
         private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
@@ -1305,10 +1277,13 @@
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
         private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
         private DevExpress.XtraEditors.RadioGroup txt_fIsLink;
-        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
         private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
         private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+        private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+        private DevExpress.Utils.ToolTipController tips;
     }
 }
\ No newline at end of file

--
Gitblit v1.9.3