~tjx/GsMesClient.git

			@@ -29,6 +29,7 @@
			/// </summary>
			private void InitializeComponent()
			{
			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();
			@@ -43,11 +44,6 @@
			DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
			DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
			DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
			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.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
			this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
			this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
			@@ -57,14 +53,13 @@
			this.gv_id = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_billType = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_billNo = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_customerOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_salesOrg = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_salesDept = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_salesPerson = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_returnReason = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_inventoryOrg = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_createdBy = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_createdDate = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_modifiedBy = new DevExpress.XtraGrid.Columns.GridColumn();
			@@ -72,10 +67,16 @@
			this.gv_approvedBy = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_approvedDate = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gv_customerOrderNo = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.pageBar1 = new UserControls.Data.UcPageBar();
			this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
			this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
			this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
			this.txt_fIsLink = new DevExpress.XtraEditors.RadioGroup();
			this.txt_fstockid = new Gs.DevApp.UserControl.UcLookCk();
			this.lbGuid = new System.Windows.Forms.Label();
			this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit();
			this.txt_chkStatus = new DevExpress.XtraEditors.CheckEdit();
			@@ -95,16 +96,14 @@
			this.txt_createdDate = new DevExpress.XtraEditors.TextEdit();
			this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
			this.txt_createdBy = new DevExpress.XtraEditors.TextEdit();
			this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
			this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
			this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
			this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
			@@ -114,7 +113,11 @@
			this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
			this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
			this.tabMx = new DevExpress.XtraTab.XtraTabControl();
			this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
			this.gcMx1 = new DevExpress.XtraGrid.GridControl();
			@@ -138,6 +141,7 @@
			this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMx1salesUnitId = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMx1salesQuantity = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMx1note = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMx1returnDate = new DevExpress.XtraGrid.Columns.GridColumn();
			@@ -145,31 +149,11 @@
			this.gvMx1isFree = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMx1returnType = new DevExpress.XtraGrid.Columns.GridColumn();
			this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
			this.gvMx1inventoryUnit = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
			this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
			this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
			this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
			this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
			this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
			this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
			this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
			this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
			this.txtKdy = new DevExpress.XtraEditors.TextEdit();
			this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
			this.txtYdy = new DevExpress.XtraEditors.TextEdit();
			this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
			this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
			this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
			this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
			this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
			this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
			this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
			this.txtWlid = new DevExpress.XtraEditors.TextEdit();
			this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
			this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
			this.gcMx2 = new DevExpress.XtraGrid.GridControl();
			this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
			@@ -182,9 +166,12 @@
			this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMx1createBy = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvMx1lotDate = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
			this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
			this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
			this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
			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();
			@@ -204,6 +191,7 @@
			this.splitMx1.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
			this.layoutMx1.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit();
			@@ -221,16 +209,14 @@
			((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
			@@ -240,7 +226,11 @@
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
			this.tabMx.SuspendLayout();
			this.tabMxPage1.SuspendLayout();
			@@ -252,20 +242,9 @@
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
			this.panelMx1.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
			this.tabMxPage2.SuspendLayout();
			((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
			((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
			this.SuspendLayout();
			//
			@@ -273,13 +252,14 @@
			//
			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;
			this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
			this.toolBarMenu1.Name = "toolBarMenu1";
			this.toolBarMenu1.rptParameter = null;
			this.toolBarMenu1.Size = new System.Drawing.Size(1128, 80);
			this.toolBarMenu1.Size = new System.Drawing.Size(1276, 80);
			this.toolBarMenu1.TabIndex = 0;
			this.toolBarMenu1.xlsInService = null;
			this.toolBarMenu1.xlsOutParameter = null;
			@@ -290,7 +270,7 @@
			this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
			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(1276, 602);
			this.xtraTabControl1.TabIndex = 3;
			this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
			this.xtraTabPage1,
			@@ -300,12 +280,13 @@
			//
			this.xtraTabPage1.Controls.Add(this.split1);
			this.xtraTabPage1.Name = "xtraTabPage1";
			this.xtraTabPage1.Size = new System.Drawing.Size(1126, 570);
			this.xtraTabPage1.Size = new System.Drawing.Size(1274, 570);
			this.xtraTabPage1.Text = "数据列表";
			//
			// split1
			//
			this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
			this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
			this.split1.Horizontal = false;
			this.split1.Location = new System.Drawing.Point(0, 0);
			this.split1.Name = "split1";
			@@ -319,45 +300,47 @@
			// split1.Panel2
			//
			this.split1.Panel2.Text = "Panel2";
			this.split1.Size = new System.Drawing.Size(1126, 570);
			this.split1.SplitterPosition = 558;
			this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
			this.split1.Size = new System.Drawing.Size(1274, 570);
			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";
			this.gcMain1.Size = new System.Drawing.Size(1126, 519);
			this.gcMain1.Size = new System.Drawing.Size(1274, 519);
			this.gcMain1.TabIndex = 2;
			this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
			this.gridView1});
			//
			// gridView1
			//
			this.gridView1.Appearance.Row.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gridView1.Appearance.Row.Options.UseFont = true;
			this.gridView1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
			this.gv_id,
			this.gridColumn1,
			this.gridColumn19,
			this.gridColumn27,
			this.gv_billType,
			this.gv_billNo,
			this.gv_customerOrderNo,
			this.gv_salesOrg,
			this.gv_salesDept,
			this.gv_salesPerson,
			this.gv_returnReason,
			this.gv_inventoryOrg,
			this.gv_createdBy,
			this.gv_createdDate,
			this.gv_modifiedBy,
			this.gv_modifiedDate,
			this.gv_approvedBy,
			this.gv_approvedDate,
			this.gridColumn18});
			this.gridColumn18,
			this.gv_customerOrderNo,
			this.gridColumn24,
			this.gridColumn25,
			this.gridColumn26});
			this.gridView1.GridControl = this.gcMain1;
			this.gridView1.IndicatorWidth = 50;
			this.gridView1.Name = "gridView1";
			@@ -367,7 +350,6 @@
			//
			// gv_id
			//
			this.gv_id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_id.AppearanceCell.Options.UseFont = true;
			this.gv_id.Caption = "主键GUID";
			this.gv_id.FieldName = "id";
			@@ -375,8 +357,6 @@
			this.gv_id.Name = "gv_id";
			this.gv_id.OptionsColumn.AllowEdit = false;
			this.gv_id.Tag = "query_a.ID";
			this.gv_id.Visible = true;
			this.gv_id.VisibleIndex = 0;
			this.gv_id.Width = 94;
			//
			// gridColumn1
			@@ -386,7 +366,7 @@
			this.gridColumn1.MinWidth = 25;
			this.gridColumn1.Name = "gridColumn1";
			this.gridColumn1.Visible = true;
			this.gridColumn1.VisibleIndex = 1;
			this.gridColumn1.VisibleIndex = 0;
			this.gridColumn1.Width = 94;
			//
			// gridColumn19
			@@ -396,12 +376,21 @@
			this.gridColumn19.MinWidth = 25;
			this.gridColumn19.Name = "gridColumn19";
			this.gridColumn19.Visible = true;
			this.gridColumn19.VisibleIndex = 3;
			this.gridColumn19.VisibleIndex = 1;
			this.gridColumn19.Width = 94;
			//
			// gridColumn27
			//
			this.gridColumn27.Caption = "源单标识";
			this.gridColumn27.FieldName = "fIsLink";
			this.gridColumn27.MinWidth = 25;
			this.gridColumn27.Name = "gridColumn27";
			this.gridColumn27.Visible = true;
			this.gridColumn27.VisibleIndex = 3;
			this.gridColumn27.Width = 94;
			//
			// gv_billType
			//
			this.gv_billType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_billType.AppearanceCell.Options.UseFont = true;
			this.gv_billType.Caption = "单据类型 ";
			this.gv_billType.FieldName = "billType";
			@@ -415,7 +404,6 @@
			//
			// 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";
			@@ -427,23 +415,8 @@
			this.gv_billNo.VisibleIndex = 4;
			this.gv_billNo.Width = 94;
			//
			// gv_customerOrderNo
			//
			this.gv_customerOrderNo.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_customerOrderNo.AppearanceCell.Options.UseFont = true;
			this.gv_customerOrderNo.Caption = "销售订单";
			this.gv_customerOrderNo.FieldName = "xsNo";
			this.gv_customerOrderNo.MinWidth = 50;
			this.gv_customerOrderNo.Name = "gv_customerOrderNo";
			this.gv_customerOrderNo.OptionsColumn.AllowEdit = false;
			this.gv_customerOrderNo.Tag = "query_a.CUSTOMER_ORDER_NO";
			this.gv_customerOrderNo.Visible = true;
			this.gv_customerOrderNo.VisibleIndex = 7;
			this.gv_customerOrderNo.Width = 94;
			//
			// gv_salesOrg
			//
			this.gv_salesOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_salesOrg.AppearanceCell.Options.UseFont = true;
			this.gv_salesOrg.Caption = "销售组织 ";
			this.gv_salesOrg.FieldName = "xsOrgName";
			@@ -457,7 +430,6 @@
			//
			// gv_salesDept
			//
			this.gv_salesDept.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_salesDept.AppearanceCell.Options.UseFont = true;
			this.gv_salesDept.Caption = "销售部门 ";
			this.gv_salesDept.FieldName = "saleDeptName";
			@@ -471,7 +443,6 @@
			//
			// gv_salesPerson
			//
			this.gv_salesPerson.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_salesPerson.AppearanceCell.Options.UseFont = true;
			this.gv_salesPerson.Caption = "销售员 ";
			this.gv_salesPerson.FieldName = "salerName";
			@@ -480,12 +451,11 @@
			this.gv_salesPerson.OptionsColumn.AllowEdit = false;
			this.gv_salesPerson.Tag = "query_a.SALES_PERSON";
			this.gv_salesPerson.Visible = true;
			this.gv_salesPerson.VisibleIndex = 10;
			this.gv_salesPerson.VisibleIndex = 8;
			this.gv_salesPerson.Width = 94;
			//
			// gv_returnReason
			//
			this.gv_returnReason.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_returnReason.AppearanceCell.Options.UseFont = true;
			this.gv_returnReason.Caption = "退货原因 ";
			this.gv_returnReason.FieldName = "thyy";
			@@ -494,26 +464,11 @@
			this.gv_returnReason.OptionsColumn.AllowEdit = false;
			this.gv_returnReason.Tag = "query_a.RETURN_REASON";
			this.gv_returnReason.Visible = true;
			this.gv_returnReason.VisibleIndex = 8;
			this.gv_returnReason.VisibleIndex = 9;
			this.gv_returnReason.Width = 94;
			//
			// gv_inventoryOrg
			//
			this.gv_inventoryOrg.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_inventoryOrg.AppearanceCell.Options.UseFont = true;
			this.gv_inventoryOrg.Caption = "库存组织 ";
			this.gv_inventoryOrg.FieldName = "inventoryOrg";
			this.gv_inventoryOrg.MinWidth = 50;
			this.gv_inventoryOrg.Name = "gv_inventoryOrg";
			this.gv_inventoryOrg.OptionsColumn.AllowEdit = false;
			this.gv_inventoryOrg.Tag = "query_a.INVENTORY_ORG";
			this.gv_inventoryOrg.Visible = true;
			this.gv_inventoryOrg.VisibleIndex = 9;
			this.gv_inventoryOrg.Width = 94;
			//
			// gv_createdBy
			//
			this.gv_createdBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_createdBy.AppearanceCell.Options.UseFont = true;
			this.gv_createdBy.Caption = "创建人 ";
			this.gv_createdBy.FieldName = "createdBy";
			@@ -522,12 +477,11 @@
			this.gv_createdBy.OptionsColumn.AllowEdit = false;
			this.gv_createdBy.Tag = "query_a.CREATED_BY";
			this.gv_createdBy.Visible = true;
			this.gv_createdBy.VisibleIndex = 11;
			this.gv_createdBy.VisibleIndex = 10;
			this.gv_createdBy.Width = 94;
			//
			// gv_createdDate
			//
			this.gv_createdDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_createdDate.AppearanceCell.Options.UseFont = true;
			this.gv_createdDate.Caption = "创建时间 ";
			this.gv_createdDate.FieldName = "createdDate";
			@@ -536,12 +490,11 @@
			this.gv_createdDate.OptionsColumn.AllowEdit = false;
			this.gv_createdDate.Tag = "query_a.CREATED_DATE";
			this.gv_createdDate.Visible = true;
			this.gv_createdDate.VisibleIndex = 12;
			this.gv_createdDate.VisibleIndex = 11;
			this.gv_createdDate.Width = 94;
			//
			// gv_modifiedBy
			//
			this.gv_modifiedBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_modifiedBy.AppearanceCell.Options.UseFont = true;
			this.gv_modifiedBy.Caption = "修改人 ";
			this.gv_modifiedBy.FieldName = "modifiedBy";
			@@ -550,12 +503,11 @@
			this.gv_modifiedBy.OptionsColumn.AllowEdit = false;
			this.gv_modifiedBy.Tag = "query_a.MODIFIED_BY";
			this.gv_modifiedBy.Visible = true;
			this.gv_modifiedBy.VisibleIndex = 13;
			this.gv_modifiedBy.VisibleIndex = 12;
			this.gv_modifiedBy.Width = 94;
			//
			// gv_modifiedDate
			//
			this.gv_modifiedDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_modifiedDate.AppearanceCell.Options.UseFont = true;
			this.gv_modifiedDate.Caption = "修改时间 ";
			this.gv_modifiedDate.FieldName = "modifiedDate";
			@@ -564,12 +516,11 @@
			this.gv_modifiedDate.OptionsColumn.AllowEdit = false;
			this.gv_modifiedDate.Tag = "query_a.MODIFIED_DATE";
			this.gv_modifiedDate.Visible = true;
			this.gv_modifiedDate.VisibleIndex = 14;
			this.gv_modifiedDate.VisibleIndex = 13;
			this.gv_modifiedDate.Width = 94;
			//
			// gv_approvedBy
			//
			this.gv_approvedBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_approvedBy.AppearanceCell.Options.UseFont = true;
			this.gv_approvedBy.Caption = "审核人 ";
			this.gv_approvedBy.FieldName = "approvedBy";
			@@ -578,12 +529,11 @@
			this.gv_approvedBy.OptionsColumn.AllowEdit = false;
			this.gv_approvedBy.Tag = "query_a.APPROVED_BY";
			this.gv_approvedBy.Visible = true;
			this.gv_approvedBy.VisibleIndex = 15;
			this.gv_approvedBy.VisibleIndex = 14;
			this.gv_approvedBy.Width = 94;
			//
			// gv_approvedDate
			//
			this.gv_approvedDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gv_approvedDate.AppearanceCell.Options.UseFont = true;
			this.gv_approvedDate.Caption = "审核日期 ";
			this.gv_approvedDate.FieldName = "approvedDate";
			@@ -592,7 +542,7 @@
			this.gv_approvedDate.OptionsColumn.AllowEdit = false;
			this.gv_approvedDate.Tag = "query_a.APPROVED_DATE";
			this.gv_approvedDate.Visible = true;
			this.gv_approvedDate.VisibleIndex = 16;
			this.gv_approvedDate.VisibleIndex = 15;
			this.gv_approvedDate.Width = 94;
			//
			// gridColumn18
			@@ -602,8 +552,49 @@
			this.gridColumn18.MinWidth = 25;
			this.gridColumn18.Name = "gridColumn18";
			this.gridColumn18.Visible = true;
			this.gridColumn18.VisibleIndex = 17;
			this.gridColumn18.VisibleIndex = 16;
			this.gridColumn18.Width = 94;
			//
			// gv_customerOrderNo
			//
			this.gv_customerOrderNo.AppearanceCell.Options.UseFont = true;
			this.gv_customerOrderNo.Caption = "源销售订单";
			this.gv_customerOrderNo.FieldName = "xsNo";
			this.gv_customerOrderNo.MinWidth = 50;
			this.gv_customerOrderNo.Name = "gv_customerOrderNo";
			this.gv_customerOrderNo.OptionsColumn.AllowEdit = false;
			this.gv_customerOrderNo.Tag = "query_a.CUSTOMER_ORDER_NO";
			this.gv_customerOrderNo.Visible = true;
			this.gv_customerOrderNo.VisibleIndex = 7;
			this.gv_customerOrderNo.Width = 94;
			//
			// gridColumn24
			//
			this.gridColumn24.Caption = "仓库ID";
			this.gridColumn24.FieldName = "ckId";
			this.gridColumn24.MinWidth = 25;
			this.gridColumn24.Name = "gridColumn24";
			this.gridColumn24.Width = 94;
			//
			// gridColumn25
			//
			this.gridColumn25.Caption = "仓库名称";
			this.gridColumn25.FieldName = "ckName";
			this.gridColumn25.MinWidth = 25;
			this.gridColumn25.Name = "gridColumn25";
			this.gridColumn25.Visible = true;
			this.gridColumn25.VisibleIndex = 17;
			this.gridColumn25.Width = 94;
			//
			// gridColumn26
			//
			this.gridColumn26.Caption = "仓库编号";
			this.gridColumn26.FieldName = "ckNo";
			this.gridColumn26.MinWidth = 25;
			this.gridColumn26.Name = "gridColumn26";
			this.gridColumn26.Visible = true;
			this.gridColumn26.VisibleIndex = 18;
			this.gridColumn26.Width = 94;
			//
			// pageBar1
			//
			@@ -613,7 +604,7 @@
			this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
			this.pageBar1.Name = "pageBar1";
			this.pageBar1.RecordCount = 0;
			this.pageBar1.Size = new System.Drawing.Size(1126, 39);
			this.pageBar1.Size = new System.Drawing.Size(1274, 39);
			this.pageBar1.TabIndex = 4;
			this.pageBar1.TotalPages = 0;
			//
			@@ -621,7 +612,7 @@
			//
			this.xtraTabPage2.Controls.Add(this.splitMx1);
			this.xtraTabPage2.Name = "xtraTabPage2";
			this.xtraTabPage2.Size = new System.Drawing.Size(1126, 570);
			this.xtraTabPage2.Size = new System.Drawing.Size(1274, 570);
			this.xtraTabPage2.Text = "数据详细";
			//
			// splitMx1
			@@ -640,12 +631,15 @@
			//
			this.splitMx1.Panel2.Controls.Add(this.tabMx);
			this.splitMx1.Panel2.Text = "Panel2";
			this.splitMx1.Size = new System.Drawing.Size(1126, 570);
			this.splitMx1.SplitterPosition = 160;
			this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
			this.splitMx1.Size = new System.Drawing.Size(1274, 570);
			this.splitMx1.SplitterPosition = 184;
			this.splitMx1.TabIndex = 0;
			//
			// layoutMx1
			//
			this.layoutMx1.Controls.Add(this.txt_fIsLink);
			this.layoutMx1.Controls.Add(this.txt_fstockid);
			this.layoutMx1.Controls.Add(this.lbGuid);
			this.layoutMx1.Controls.Add(this.txt_wjStatus);
			this.layoutMx1.Controls.Add(this.txt_chkStatus);
			@@ -666,17 +660,43 @@
			this.layoutMx1.Controls.Add(this.txt_returnReason);
			this.layoutMx1.Controls.Add(this.txt_createdBy);
			this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
			this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
			this.layoutControlItem19,
			this.layoutControlItem1});
			this.layoutMx1.Location = new System.Drawing.Point(0, 0);
			this.layoutMx1.Name = "layoutMx1";
			this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(834, 92, 812, 500);
			this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(703, 289, 812, 500);
			this.layoutMx1.Root = this.Root;
			this.layoutMx1.Size = new System.Drawing.Size(1126, 160);
			this.layoutMx1.Size = new System.Drawing.Size(1274, 184);
			this.layoutMx1.TabIndex = 0;
			this.layoutMx1.Text = "layoutControl1";
			//
			// txt_fIsLink
			//
			this.txt_fIsLink.EditValue = "1";
			this.txt_fIsLink.Location = new System.Drawing.Point(84, 42);
			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("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(237, 33);
			this.txt_fIsLink.StyleController = this.layoutMx1;
			this.txt_fIsLink.TabIndex = 534;
			//
			// txt_fstockid
			//
			this.txt_fstockid.IsReadly = false;
			this.txt_fstockid.Location = new System.Drawing.Point(84, 110);
			this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0);
			this.txt_fstockid.Name = "txt_fstockid";
			this.txt_fstockid.Size = new System.Drawing.Size(237, 24);
			this.txt_fstockid.TabIndex = 454;
			//
			// lbGuid
			//
			this.lbGuid.Location = new System.Drawing.Point(825, 140);
			this.lbGuid.Location = new System.Drawing.Point(825, 131);
			this.lbGuid.Name = "lbGuid";
			this.lbGuid.Size = new System.Drawing.Size(268, 28);
			this.lbGuid.TabIndex = 1;
			@@ -684,20 +704,20 @@
			//
			// txt_wjStatus
			//
			this.txt_wjStatus.Location = new System.Drawing.Point(283, 140);
			this.txt_wjStatus.Location = new System.Drawing.Point(638, 143);
			this.txt_wjStatus.Name = "txt_wjStatus";
			this.txt_wjStatus.Properties.Caption = "完结标识";
			this.txt_wjStatus.Size = new System.Drawing.Size(267, 24);
			this.txt_wjStatus.Size = new System.Drawing.Size(309, 24);
			this.txt_wjStatus.StyleController = this.layoutMx1;
			this.txt_wjStatus.TabIndex = 453;
			this.txt_wjStatus.Tag = "readonly";
			//
			// txt_chkStatus
			//
			this.txt_chkStatus.Location = new System.Drawing.Point(554, 140);
			this.txt_chkStatus.Location = new System.Drawing.Point(951, 143);
			this.txt_chkStatus.Name = "txt_chkStatus";
			this.txt_chkStatus.Properties.Caption = "审核标识";
			this.txt_chkStatus.Size = new System.Drawing.Size(267, 24);
			this.txt_chkStatus.Size = new System.Drawing.Size(311, 24);
			this.txt_chkStatus.StyleController = this.layoutMx1;
			this.txt_chkStatus.TabIndex = 452;
			this.txt_chkStatus.Tag = "readonly";
			@@ -705,192 +725,195 @@
			// txt_billType
			//
			this.txt_billType.EditValue = "标准销售退货单(XSTHD01_SYS)";
			this.txt_billType.Location = new System.Drawing.Point(361, 108);
			this.txt_billType.Location = new System.Drawing.Point(397, 110);
			this.txt_billType.Name = "txt_billType";
			this.txt_billType.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
			new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
			this.txt_billType.Properties.Items.AddRange(new object[] {
			"标准销售退货单(XSTHD01_SYS)"});
			this.txt_billType.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
			this.txt_billType.Size = new System.Drawing.Size(189, 24);
			this.txt_billType.Size = new System.Drawing.Size(237, 24);
			this.txt_billType.StyleController = this.layoutMx1;
			this.txt_billType.TabIndex = 451;
			//
			// txt_salesOrderId
			//
			this.txt_salesOrderId.IsReadly = false;
			this.txt_salesOrderId.Location = new System.Drawing.Point(90, 76);
			this.txt_salesOrderId.Location = new System.Drawing.Point(84, 77);
			this.txt_salesOrderId.Name = "txt_salesOrderId";
			this.txt_salesOrderId.Size = new System.Drawing.Size(189, 28);
			this.txt_salesOrderId.Size = new System.Drawing.Size(237, 24);
			this.txt_salesOrderId.TabIndex = 0;
			//
			// txt_approvedDate
			//
			this.txt_approvedDate.Location = new System.Drawing.Point(903, 108);
			this.txt_approvedDate.Location = new System.Drawing.Point(1023, 110);
			this.txt_approvedDate.Name = "txt_approvedDate";
			this.txt_approvedDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;
			this.txt_approvedDate.Size = new System.Drawing.Size(190, 28);
			this.txt_approvedDate.Size = new System.Drawing.Size(239, 24);
			this.txt_approvedDate.StyleController = this.layoutMx1;
			this.txt_approvedDate.TabIndex = 378;
			this.txt_approvedDate.Tag = "readonly";
			//
			// txt_id
			//
			this.txt_id.Location = new System.Drawing.Point(90, 12);
			this.txt_id.Location = new System.Drawing.Point(90, 3);
			this.txt_id.Name = "txt_id";
			this.txt_id.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_id.Properties.Appearance.Options.UseFont = true;
			this.txt_id.Size = new System.Drawing.Size(189, 28);
			this.txt_id.Size = new System.Drawing.Size(189, 24);
			this.txt_id.StyleController = this.layoutMx1;
			this.txt_id.TabIndex = 210;
			this.txt_id.Tag = "readonly";
			//
			// txt_approvedBy
			//
			this.txt_approvedBy.Location = new System.Drawing.Point(903, 76);
			this.txt_approvedBy.Location = new System.Drawing.Point(1023, 77);
			this.txt_approvedBy.Name = "txt_approvedBy";
			this.txt_approvedBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_approvedBy.Properties.Appearance.Options.UseFont = true;
			this.txt_approvedBy.Size = new System.Drawing.Size(190, 28);
			this.txt_approvedBy.Size = new System.Drawing.Size(239, 24);
			this.txt_approvedBy.StyleController = this.layoutMx1;
			this.txt_approvedBy.TabIndex = 370;
			this.txt_approvedBy.Tag = "readonly";
			//
			// txt_xsOrgName
			//
			this.txt_xsOrgName.Location = new System.Drawing.Point(361, 12);
			this.txt_xsOrgName.Location = new System.Drawing.Point(397, 12);
			this.txt_xsOrgName.Name = "txt_xsOrgName";
			this.txt_xsOrgName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_xsOrgName.Properties.Appearance.Options.UseFont = true;
			this.txt_xsOrgName.Size = new System.Drawing.Size(189, 28);
			this.txt_xsOrgName.Size = new System.Drawing.Size(237, 24);
			this.txt_xsOrgName.StyleController = this.layoutMx1;
			this.txt_xsOrgName.TabIndex = 219;
			this.txt_xsOrgName.Tag = "readonly";
			//
			// txt_inventoryOrg
			//
			this.txt_inventoryOrg.Location = new System.Drawing.Point(632, 12);
			this.txt_inventoryOrg.Location = new System.Drawing.Point(710, 12);
			this.txt_inventoryOrg.Name = "txt_inventoryOrg";
			this.txt_inventoryOrg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_inventoryOrg.Properties.Appearance.Options.UseFont = true;
			this.txt_inventoryOrg.Size = new System.Drawing.Size(189, 28);
			this.txt_inventoryOrg.Size = new System.Drawing.Size(237, 24);
			this.txt_inventoryOrg.StyleController = this.layoutMx1;
			this.txt_inventoryOrg.TabIndex = 243;
			this.txt_inventoryOrg.Tag = "readonly";
			//
			// txt_modifiedDate
			//
			this.txt_modifiedDate.Location = new System.Drawing.Point(903, 44);
			this.txt_modifiedDate.Location = new System.Drawing.Point(1023, 44);
			this.txt_modifiedDate.Name = "txt_modifiedDate";
			this.txt_modifiedDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true;
			this.txt_modifiedDate.Size = new System.Drawing.Size(190, 28);
			this.txt_modifiedDate.Size = new System.Drawing.Size(239, 24);
			this.txt_modifiedDate.StyleController = this.layoutMx1;
			this.txt_modifiedDate.TabIndex = 336;
			this.txt_modifiedDate.Tag = "readonly";
			//
			// txt_billNo
			//
			this.txt_billNo.Location = new System.Drawing.Point(90, 44);
			this.txt_billNo.Location = new System.Drawing.Point(84, 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(189, 28);
			this.txt_billNo.Size = new System.Drawing.Size(237, 24);
			this.txt_billNo.StyleController = this.layoutMx1;
			this.txt_billNo.TabIndex = 213;
			this.txt_billNo.Tag = "readonly";
			//
			// txt_salerName
			//
			this.txt_salerName.Location = new System.Drawing.Point(361, 44);
			this.txt_salerName.Location = new System.Drawing.Point(397, 44);
			this.txt_salerName.Name = "txt_salerName";
			this.txt_salerName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_salerName.Properties.Appearance.Options.UseFont = true;
			this.txt_salerName.Size = new System.Drawing.Size(189, 28);
			this.txt_salerName.Size = new System.Drawing.Size(237, 24);
			this.txt_salerName.StyleController = this.layoutMx1;
			this.txt_salerName.TabIndex = 267;
			this.txt_salerName.Tag = "readonly";
			//
			// txt_modifiedBy
			//
			this.txt_modifiedBy.Location = new System.Drawing.Point(903, 12);
			this.txt_modifiedBy.Location = new System.Drawing.Point(1023, 12);
			this.txt_modifiedBy.Name = "txt_modifiedBy";
			this.txt_modifiedBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true;
			this.txt_modifiedBy.Size = new System.Drawing.Size(190, 28);
			this.txt_modifiedBy.Size = new System.Drawing.Size(239, 24);
			this.txt_modifiedBy.StyleController = this.layoutMx1;
			this.txt_modifiedBy.TabIndex = 327;
			this.txt_modifiedBy.Tag = "readonly";
			//
			// txt_saleDeptName
			//
			this.txt_saleDeptName.Location = new System.Drawing.Point(361, 76);
			this.txt_saleDeptName.Location = new System.Drawing.Point(397, 77);
			this.txt_saleDeptName.Name = "txt_saleDeptName";
			this.txt_saleDeptName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true;
			this.txt_saleDeptName.Size = new System.Drawing.Size(189, 28);
			this.txt_saleDeptName.Size = new System.Drawing.Size(237, 24);
			this.txt_saleDeptName.StyleController = this.layoutMx1;
			this.txt_saleDeptName.TabIndex = 222;
			this.txt_saleDeptName.Tag = "readonly";
			//
			// txt_custName
			//
			this.txt_custName.Location = new System.Drawing.Point(632, 44);
			this.txt_custName.Location = new System.Drawing.Point(710, 44);
			this.txt_custName.Name = "txt_custName";
			this.txt_custName.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_custName.Properties.Appearance.Options.UseFont = true;
			this.txt_custName.Size = new System.Drawing.Size(189, 28);
			this.txt_custName.Size = new System.Drawing.Size(237, 24);
			this.txt_custName.StyleController = this.layoutMx1;
			this.txt_custName.TabIndex = 252;
			this.txt_custName.Tag = "readonly";
			//
			// txt_createdDate
			//
			this.txt_createdDate.Location = new System.Drawing.Point(632, 108);
			this.txt_createdDate.Location = new System.Drawing.Point(710, 110);
			this.txt_createdDate.Name = "txt_createdDate";
			this.txt_createdDate.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_createdDate.Properties.Appearance.Options.UseFont = true;
			this.txt_createdDate.Size = new System.Drawing.Size(189, 28);
			this.txt_createdDate.Size = new System.Drawing.Size(237, 24);
			this.txt_createdDate.StyleController = this.layoutMx1;
			this.txt_createdDate.TabIndex = 319;
			this.txt_createdDate.Tag = "readonly";
			//
			// txt_returnReason
			//
			this.txt_returnReason.Location = new System.Drawing.Point(90, 108);
			this.txt_returnReason.Location = new System.Drawing.Point(84, 143);
			this.txt_returnReason.Name = "txt_returnReason";
			this.txt_returnReason.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_returnReason.Properties.Appearance.Options.UseFont = true;
			this.txt_returnReason.Size = new System.Drawing.Size(189, 28);
			this.txt_returnReason.Size = new System.Drawing.Size(550, 24);
			this.txt_returnReason.StyleController = this.layoutMx1;
			this.txt_returnReason.TabIndex = 235;
			//
			// txt_createdBy
			//
			this.txt_createdBy.Location = new System.Drawing.Point(632, 76);
			this.txt_createdBy.Location = new System.Drawing.Point(710, 77);
			this.txt_createdBy.Name = "txt_createdBy";
			this.txt_createdBy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_createdBy.Properties.Appearance.Options.UseFont = true;
			this.txt_createdBy.Size = new System.Drawing.Size(189, 28);
			this.txt_createdBy.Size = new System.Drawing.Size(237, 24);
			this.txt_createdBy.StyleController = this.layoutMx1;
			this.txt_createdBy.TabIndex = 312;
			this.txt_createdBy.Tag = "readonly";
			//
			// layoutControlItem19
			//
			this.layoutControlItem19.Control = this.lbGuid;
			this.layoutControlItem19.Location = new System.Drawing.Point(813, 128);
			this.layoutControlItem19.Name = "layoutControlItem19";
			this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
			this.layoutControlItem19.Size = new System.Drawing.Size(272, 32);
			this.layoutControlItem19.Text = "lbGuid";
			this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem19.TextVisible = false;
			//
			// layoutControlItem1
			//
			this.layoutControlItem1.Control = this.txt_id;
			this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
			this.layoutControlItem1.Name = "layoutControlItem1";
			this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem1.Text = "主键GUID";
			this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18);
			//
			// Root
			//
			this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
			this.Root.GroupBordersVisible = false;
			this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
			this.layoutControlItem1,
			this.layoutControlItem2,
			this.layoutControlItem3,
			this.layoutControlItem4,
			this.layoutControlItem5,
			this.layoutControlItem6,
			this.layoutControlItem7,
			this.layoutControlItem8,
			this.layoutControlItem9,
			this.layoutControlItem10,
			this.layoutControlItem11,
			this.layoutControlItem12,
			@@ -900,7 +923,11 @@
			this.layoutControlItem16,
			this.layoutControlItem17,
			this.layoutControlItem18,
			this.layoutControlItem19});
			this.layoutControlItem4,
			this.layoutControlItem9,
			this.layoutControlItem20,
			this.layoutControlItem5,
			this.layoutControlItem21});
			this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
			this.Root.Name = "Root";
			columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
			@@ -932,185 +959,146 @@
			rowDefinition3,
			rowDefinition4,
			rowDefinition5});
			this.Root.Size = new System.Drawing.Size(1105, 180);
			this.Root.Size = new System.Drawing.Size(1274, 184);
			this.Root.TextVisible = false;
			//
			// layoutControlItem1
			//
			this.layoutControlItem1.Control = this.txt_id;
			this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
			this.layoutControlItem1.Name = "layoutControlItem1";
			this.layoutControlItem1.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem1.Text = "主键GUID";
			this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18);
			//
			// layoutControlItem2
			//
			this.layoutControlItem2.Control = this.txt_xsOrgName;
			this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
			this.layoutControlItem2.Location = new System.Drawing.Point(313, 0);
			this.layoutControlItem2.Name = "layoutControlItem2";
			this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
			this.layoutControlItem2.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem2.Size = new System.Drawing.Size(313, 32);
			this.layoutControlItem2.Text = "销售组织";
			this.layoutControlItem2.TextSize = new System.Drawing.Size(66, 18);
			this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem3
			//
			this.layoutControlItem3.Control = this.txt_inventoryOrg;
			this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
			this.layoutControlItem3.Location = new System.Drawing.Point(626, 0);
			this.layoutControlItem3.Name = "layoutControlItem3";
			this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem3.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem3.Size = new System.Drawing.Size(313, 32);
			this.layoutControlItem3.Text = "库存组织";
			this.layoutControlItem3.TextSize = new System.Drawing.Size(66, 18);
			//
			// layoutControlItem4
			//
			this.layoutControlItem4.Control = this.txt_billNo;
			this.layoutControlItem4.Location = new System.Drawing.Point(0, 32);
			this.layoutControlItem4.Name = "layoutControlItem4";
			this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem4.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem4.Text = "申请单号";
			this.layoutControlItem4.TextSize = new System.Drawing.Size(66, 18);
			//
			// layoutControlItem5
			//
			this.layoutControlItem5.Control = this.txt_salesOrderId;
			this.layoutControlItem5.Location = new System.Drawing.Point(0, 64);
			this.layoutControlItem5.Name = "layoutControlItem5";
			this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
			this.layoutControlItem5.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem5.Text = "销售订单";
			this.layoutControlItem5.TextSize = new System.Drawing.Size(66, 18);
			this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem6
			//
			this.layoutControlItem6.Control = this.txt_salerName;
			this.layoutControlItem6.Location = new System.Drawing.Point(271, 32);
			this.layoutControlItem6.Location = new System.Drawing.Point(313, 32);
			this.layoutControlItem6.Name = "layoutControlItem6";
			this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
			this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem6.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem6.Text = "销售员";
			this.layoutControlItem6.TextSize = new System.Drawing.Size(66, 18);
			this.layoutControlItem6.Size = new System.Drawing.Size(313, 33);
			this.layoutControlItem6.Text = "销售员名";
			this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem7
			//
			this.layoutControlItem7.Control = this.txt_saleDeptName;
			this.layoutControlItem7.Location = new System.Drawing.Point(271, 64);
			this.layoutControlItem7.Location = new System.Drawing.Point(313, 65);
			this.layoutControlItem7.Name = "layoutControlItem7";
			this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
			this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
			this.layoutControlItem7.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem7.Size = new System.Drawing.Size(313, 33);
			this.layoutControlItem7.Text = "销售部门";
			this.layoutControlItem7.TextSize = new System.Drawing.Size(66, 18);
			this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem8
			//
			this.layoutControlItem8.Control = this.txt_custName;
			this.layoutControlItem8.Location = new System.Drawing.Point(542, 32);
			this.layoutControlItem8.Location = new System.Drawing.Point(626, 32);
			this.layoutControlItem8.Name = "layoutControlItem8";
			this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem8.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem8.Text = "客户";
			this.layoutControlItem8.TextSize = new System.Drawing.Size(66, 18);
			//
			// layoutControlItem9
			//
			this.layoutControlItem9.Control = this.txt_returnReason;
			this.layoutControlItem9.Location = new System.Drawing.Point(0, 96);
			this.layoutControlItem9.Name = "layoutControlItem9";
			this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem9.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem9.Text = "退货原因";
			this.layoutControlItem9.TextSize = new System.Drawing.Size(66, 18);
			this.layoutControlItem8.Size = new System.Drawing.Size(313, 33);
			this.layoutControlItem8.Text = "客户名称";
			this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem10
			//
			this.layoutControlItem10.Control = this.txt_billType;
			this.layoutControlItem10.Location = new System.Drawing.Point(271, 96);
			this.layoutControlItem10.Location = new System.Drawing.Point(313, 98);
			this.layoutControlItem10.Name = "layoutControlItem10";
			this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
			this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem10.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem10.Size = new System.Drawing.Size(313, 33);
			this.layoutControlItem10.Text = "单据类型";
			this.layoutControlItem10.TextSize = new System.Drawing.Size(66, 18);
			this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem11
			//
			this.layoutControlItem11.Control = this.txt_createdBy;
			this.layoutControlItem11.Location = new System.Drawing.Point(542, 64);
			this.layoutControlItem11.Location = new System.Drawing.Point(626, 65);
			this.layoutControlItem11.Name = "layoutControlItem11";
			this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
			this.layoutControlItem11.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem11.Text = "创建人";
			this.layoutControlItem11.TextSize = new System.Drawing.Size(66, 18);
			this.layoutControlItem11.Size = new System.Drawing.Size(313, 33);
			this.layoutControlItem11.Text = "创建人员";
			this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem12
			//
			this.layoutControlItem12.Control = this.txt_createdDate;
			this.layoutControlItem12.Location = new System.Drawing.Point(542, 96);
			this.layoutControlItem12.Location = new System.Drawing.Point(626, 98);
			this.layoutControlItem12.Name = "layoutControlItem12";
			this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem12.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem12.Size = new System.Drawing.Size(313, 33);
			this.layoutControlItem12.Text = "创建时间";
			this.layoutControlItem12.TextSize = new System.Drawing.Size(66, 18);
			this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem13
			//
			this.layoutControlItem13.Control = this.txt_modifiedBy;
			this.layoutControlItem13.Location = new System.Drawing.Point(813, 0);
			this.layoutControlItem13.Location = new System.Drawing.Point(939, 0);
			this.layoutControlItem13.Name = "layoutControlItem13";
			this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem13.Size = new System.Drawing.Size(272, 32);
			this.layoutControlItem13.Text = "修改人";
			this.layoutControlItem13.TextSize = new System.Drawing.Size(66, 18);
			this.layoutControlItem13.Size = new System.Drawing.Size(315, 32);
			this.layoutControlItem13.Text = "修改人员";
			this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem14
			//
			this.layoutControlItem14.Control = this.txt_modifiedDate;
			this.layoutControlItem14.Location = new System.Drawing.Point(813, 32);
			this.layoutControlItem14.Location = new System.Drawing.Point(939, 32);
			this.layoutControlItem14.Name = "layoutControlItem14";
			this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem14.Size = new System.Drawing.Size(272, 32);
			this.layoutControlItem14.Size = new System.Drawing.Size(315, 33);
			this.layoutControlItem14.Text = "修改时间";
			this.layoutControlItem14.TextSize = new System.Drawing.Size(66, 18);
			this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem15
			//
			this.layoutControlItem15.Control = this.txt_approvedBy;
			this.layoutControlItem15.Location = new System.Drawing.Point(813, 64);
			this.layoutControlItem15.Location = new System.Drawing.Point(939, 65);
			this.layoutControlItem15.Name = "layoutControlItem15";
			this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
			this.layoutControlItem15.Size = new System.Drawing.Size(272, 32);
			this.layoutControlItem15.Text = "审核人";
			this.layoutControlItem15.TextSize = new System.Drawing.Size(66, 18);
			this.layoutControlItem15.Size = new System.Drawing.Size(315, 33);
			this.layoutControlItem15.Text = "审核人员";
			this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem16
			//
			this.layoutControlItem16.Control = this.txt_approvedDate;
			this.layoutControlItem16.Location = new System.Drawing.Point(813, 96);
			this.layoutControlItem16.Location = new System.Drawing.Point(939, 98);
			this.layoutControlItem16.Name = "layoutControlItem16";
			this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem16.Size = new System.Drawing.Size(272, 32);
			this.layoutControlItem16.Text = "审核日期";
			this.layoutControlItem16.TextSize = new System.Drawing.Size(66, 18);
			this.layoutControlItem16.Size = new System.Drawing.Size(315, 33);
			this.layoutControlItem16.Text = "审核时间";
			this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem17
			//
			this.layoutControlItem17.Control = this.txt_chkStatus;
			this.layoutControlItem17.Location = new System.Drawing.Point(542, 128);
			this.layoutControlItem17.Location = new System.Drawing.Point(939, 131);
			this.layoutControlItem17.Name = "layoutControlItem17";
			this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
			this.layoutControlItem17.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem17.Size = new System.Drawing.Size(315, 33);
			this.layoutControlItem17.Text = "审核标识";
			this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem17.TextVisible = false;
			@@ -1118,26 +1106,66 @@
			// layoutControlItem18
			//
			this.layoutControlItem18.Control = this.txt_wjStatus;
			this.layoutControlItem18.Location = new System.Drawing.Point(271, 128);
			this.layoutControlItem18.Location = new System.Drawing.Point(626, 131);
			this.layoutControlItem18.Name = "layoutControlItem18";
			this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
			this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
			this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
			this.layoutControlItem18.Size = new System.Drawing.Size(271, 32);
			this.layoutControlItem18.Size = new System.Drawing.Size(313, 33);
			this.layoutControlItem18.Text = "完结标识";
			this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem18.TextVisible = false;
			//
			// layoutControlItem19
			// layoutControlItem4
			//
			this.layoutControlItem19.Control = this.lbGuid;
			this.layoutControlItem19.Location = new System.Drawing.Point(813, 128);
			this.layoutControlItem19.Name = "layoutControlItem19";
			this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
			this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
			this.layoutControlItem19.Size = new System.Drawing.Size(272, 32);
			this.layoutControlItem19.Text = "lbGuid";
			this.layoutControlItem19.TextSize = new System.Drawing.Size(0, 0);
			this.layoutControlItem19.TextVisible = false;
			this.layoutControlItem4.Control = this.txt_billNo;
			this.layoutControlItem4.Location = new System.Drawing.Point(0, 0);
			this.layoutControlItem4.Name = "layoutControlItem4";
			this.layoutControlItem4.Size = new System.Drawing.Size(313, 32);
			this.layoutControlItem4.Text = "申请单号";
			this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem9
			//
			this.layoutControlItem9.Control = this.txt_returnReason;
			this.layoutControlItem9.CustomizationFormText = "申请原因";
			this.layoutControlItem9.Location = new System.Drawing.Point(0, 131);
			this.layoutControlItem9.Name = "layoutControlItem9";
			this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
			this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
			this.layoutControlItem9.Size = new System.Drawing.Size(626, 33);
			this.layoutControlItem9.Text = "申请原因";
			this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem20
			//
			this.layoutControlItem20.Control = this.txt_fstockid;
			this.layoutControlItem20.Location = new System.Drawing.Point(0, 98);
			this.layoutControlItem20.Name = "layoutControlItem20";
			this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
			this.layoutControlItem20.Size = new System.Drawing.Size(313, 33);
			this.layoutControlItem20.Text = "选择仓库";
			this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem5
			//
			this.layoutControlItem5.Control = this.txt_salesOrderId;
			this.layoutControlItem5.Location = new System.Drawing.Point(0, 65);
			this.layoutControlItem5.Name = "layoutControlItem5";
			this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
			this.layoutControlItem5.Size = new System.Drawing.Size(313, 33);
			this.layoutControlItem5.Text = "销售订单";
			this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
			//
			// layoutControlItem21
			//
			this.layoutControlItem21.Control = this.txt_fIsLink;
			this.layoutControlItem21.Location = new System.Drawing.Point(0, 32);
			this.layoutControlItem21.Name = "layoutControlItem21";
			this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
			this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
			this.layoutControlItem21.Size = new System.Drawing.Size(313, 33);
			this.layoutControlItem21.Text = "有无源单";
			this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
			//
			// tabMx
			//
			@@ -1145,7 +1173,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, 398);
			this.tabMx.Size = new System.Drawing.Size(1274, 374);
			this.tabMx.TabIndex = 3;
			this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
			this.tabMxPage1,
			@@ -1154,15 +1182,14 @@
			// tabMxPage1
			//
			this.tabMxPage1.Controls.Add(this.gcMx1);
			this.tabMxPage1.Controls.Add(this.panelMx1);
			this.tabMxPage1.Name = "tabMxPage1";
			this.tabMxPage1.Size = new System.Drawing.Size(1124, 366);
			this.tabMxPage1.Size = new System.Drawing.Size(1272, 342);
			this.tabMxPage1.Text = "申请明细";
			//
			// gcMx1
			//
			this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
			this.gcMx1.Location = new System.Drawing.Point(0, 102);
			this.gcMx1.Location = new System.Drawing.Point(0, 0);
			this.gcMx1.MainView = this.gvMx1;
			this.gcMx1.Name = "gcMx1";
			this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
			@@ -1170,13 +1197,14 @@
			this.repositoryItemButtonEdit1,
			this.repositoryItemComboBox1,
			this.repositoryItemDateEdit1});
			this.gcMx1.Size = new System.Drawing.Size(1124, 264);
			this.gcMx1.Size = new System.Drawing.Size(1272, 342);
			this.gcMx1.TabIndex = 0;
			this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
			this.gvMx1});
			//
			// gvMx1
			//
			this.gvMx1.Appearance.Row.Options.UseFont = true;
			this.gvMx1.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
			this.gridColumn2,
			this.gvMx1id,
			@@ -1186,12 +1214,12 @@
			this.gridColumn20,
			this.gvMx1salesUnitId,
			this.gvMx1salesQuantity,
			this.gridColumn32,
			this.gvMx1note,
			this.gridColumn13,
			this.gvMx1returnDate,
			this.gvMx1isFree,
			this.gvMx1returnType,
			this.gvMx1inventoryUnit,
			this.gridColumn12,
			this.gridColumn21,
			this.gridColumn22,
			@@ -1306,22 +1334,17 @@
			this.gridColumn11.Caption = "出库明细Guid";
			this.gridColumn11.FieldName = "ckmxGuid";
			this.gridColumn11.Name = "gridColumn11";
			this.gridColumn11.Visible = true;
			this.gridColumn11.VisibleIndex = 7;
			//
			// gridColumn23
			//
			this.gridColumn23.Caption = "物料ID";
			this.gridColumn23.FieldName = "itemId";
			this.gridColumn23.Name = "gridColumn23";
			this.gridColumn23.Visible = true;
			this.gridColumn23.VisibleIndex = 8;
			//
			// gvMx1id
			//
			this.gvMx1id.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1id.AppearanceCell.Options.UseFont = true;
			this.gvMx1id.Caption = "GUID";
			this.gvMx1id.Caption = "主键GUID";
			this.gvMx1id.FieldName = "guid";
			this.gvMx1id.MinWidth = 50;
			this.gvMx1id.Name = "gvMx1id";
			@@ -1330,20 +1353,16 @@
			//
			// gvMx1materialId
			//
			this.gvMx1materialId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1materialId.AppearanceCell.Options.UseFont = true;
			this.gvMx1materialId.Caption = "物料ID ";
			this.gvMx1materialId.FieldName = "itemId";
			this.gvMx1materialId.MinWidth = 50;
			this.gvMx1materialId.Name = "gvMx1materialId";
			this.gvMx1materialId.Tag = "query_a.MATERIAL_ID";
			this.gvMx1materialId.Visible = true;
			this.gvMx1materialId.VisibleIndex = 1;
			this.gvMx1materialId.Width = 94;
			//
			// gvMx1materialName
			//
			this.gvMx1materialName.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1materialName.AppearanceCell.Options.UseFont = true;
			this.gvMx1materialName.Caption = "物料名称 ";
			this.gvMx1materialName.FieldName = "itemName";
			@@ -1351,12 +1370,11 @@
			this.gvMx1materialName.Name = "gvMx1materialName";
			this.gvMx1materialName.Tag = "query_a.MATERIAL_NAME";
			this.gvMx1materialName.Visible = true;
			this.gvMx1materialName.VisibleIndex = 2;
			this.gvMx1materialName.VisibleIndex = 1;
			this.gvMx1materialName.Width = 94;
			//
			// gvMx1materialSpecification
			//
			this.gvMx1materialSpecification.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1materialSpecification.AppearanceCell.Options.UseFont = true;
			this.gvMx1materialSpecification.Caption = "物料规格 ";
			this.gvMx1materialSpecification.FieldName = "itemModel";
			@@ -1364,7 +1382,7 @@
			this.gvMx1materialSpecification.Name = "gvMx1materialSpecification";
			this.gvMx1materialSpecification.Tag = "query_a.MATERIAL_SPECIFICATION";
			this.gvMx1materialSpecification.Visible = true;
			this.gvMx1materialSpecification.VisibleIndex = 3;
			this.gvMx1materialSpecification.VisibleIndex = 2;
			this.gvMx1materialSpecification.Width = 94;
			//
			// gridColumn20
			@@ -1374,25 +1392,23 @@
			this.gridColumn20.MinWidth = 25;
			this.gridColumn20.Name = "gridColumn20";
			this.gridColumn20.Visible = true;
			this.gridColumn20.VisibleIndex = 4;
			this.gridColumn20.VisibleIndex = 3;
			this.gridColumn20.Width = 94;
			//
			// gvMx1salesUnitId
			//
			this.gvMx1salesUnitId.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1salesUnitId.AppearanceCell.Options.UseFont = true;
			this.gvMx1salesUnitId.Caption = "销售单位 ";
			this.gvMx1salesUnitId.FieldName = "salesUnitId";
			this.gvMx1salesUnitId.FieldName = "xxDw";
			this.gvMx1salesUnitId.MinWidth = 50;
			this.gvMx1salesUnitId.Name = "gvMx1salesUnitId";
			this.gvMx1salesUnitId.Tag = "query_a.SALES_UNIT_ID";
			this.gvMx1salesUnitId.Visible = true;
			this.gvMx1salesUnitId.VisibleIndex = 5;
			this.gvMx1salesUnitId.VisibleIndex = 4;
			this.gvMx1salesUnitId.Width = 94;
			//
			// gvMx1salesQuantity
			//
			this.gvMx1salesQuantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1salesQuantity.AppearanceCell.Options.UseFont = true;
			this.gvMx1salesQuantity.Caption = "销售数量 ";
			this.gvMx1salesQuantity.FieldName = "salesQuantity";
			@@ -1400,12 +1416,21 @@
			this.gvMx1salesQuantity.Name = "gvMx1salesQuantity";
			this.gvMx1salesQuantity.Tag = "query_a.SALES_QUANTITY";
			this.gvMx1salesQuantity.Visible = true;
			this.gvMx1salesQuantity.VisibleIndex = 6;
			this.gvMx1salesQuantity.VisibleIndex = 5;
			this.gvMx1salesQuantity.Width = 94;
			//
			// gridColumn32
			//
			this.gridColumn32.Caption = "发货总量";
			this.gridColumn32.FieldName = "fhQuantity";
			this.gridColumn32.MinWidth = 25;
			this.gridColumn32.Name = "gridColumn32";
			this.gridColumn32.Visible = true;
			this.gridColumn32.VisibleIndex = 13;
			this.gridColumn32.Width = 94;
			//
			// gvMx1note
			//
			this.gvMx1note.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1note.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
			this.gvMx1note.AppearanceCell.Options.UseFont = true;
			this.gvMx1note.AppearanceCell.Options.UseForeColor = true;
			@@ -1432,12 +1457,11 @@
			this.gridColumn13.Name = "gridColumn13";
			this.gridColumn13.Tag = "yz_quantity_0_edit";
			this.gridColumn13.Visible = true;
			this.gridColumn13.VisibleIndex = 8;
			this.gridColumn13.VisibleIndex = 6;
			this.gridColumn13.Width = 94;
			//
			// gvMx1returnDate
			//
			this.gvMx1returnDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1returnDate.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
			this.gvMx1returnDate.AppearanceCell.Options.UseFont = true;
			this.gvMx1returnDate.AppearanceCell.Options.UseForeColor = true;
			@@ -1450,7 +1474,7 @@
			this.gvMx1returnDate.Name = "gvMx1returnDate";
			this.gvMx1returnDate.Tag = "edit";
			this.gvMx1returnDate.Visible = true;
			this.gvMx1returnDate.VisibleIndex = 9;
			this.gvMx1returnDate.VisibleIndex = 8;
			this.gvMx1returnDate.Width = 94;
			//
			// repositoryItemDateEdit1
			@@ -1464,10 +1488,9 @@
			//
			// gvMx1isFree
			//
			this.gvMx1isFree.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1isFree.AppearanceCell.Options.UseFont = true;
			this.gvMx1isFree.Caption = "是否赠品 ";
			this.gvMx1isFree.FieldName = "isFree";
			this.gvMx1isFree.FieldName = "isFreeChk";
			this.gvMx1isFree.MinWidth = 50;
			this.gvMx1isFree.Name = "gvMx1isFree";
			this.gvMx1isFree.Tag = "query_a.IS_FREE";
			@@ -1477,7 +1500,6 @@
			//
			// gvMx1returnType
			//
			this.gvMx1returnType.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1returnType.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
			this.gvMx1returnType.AppearanceCell.Options.UseFont = true;
			this.gvMx1returnType.AppearanceCell.Options.UseForeColor = true;
			@@ -1490,7 +1512,7 @@
			this.gvMx1returnType.Name = "gvMx1returnType";
			this.gvMx1returnType.Tag = "edit";
			this.gvMx1returnType.Visible = true;
			this.gvMx1returnType.VisibleIndex = 11;
			this.gvMx1returnType.VisibleIndex = 9;
			this.gvMx1returnType.Width = 94;
			//
			// repositoryItemComboBox1
			@@ -1499,30 +1521,16 @@
			this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
			new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
			this.repositoryItemComboBox1.Items.AddRange(new object[] {
			"辅助资料(THLX01_SYS)",
			"退货(THLX02_SYS)",
			"退货补货(THLX03_SYS)",
			"仅退款不退货()"});
			"退货(THLX01_SYS)",
			"退货补货(THLX02_SYS)",
			"仅退款不退货(THLX03_SYS)"});
			this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
			this.repositoryItemComboBox1.NullText = "请选择";
			this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
			//
			// gvMx1inventoryUnit
			//
			this.gvMx1inventoryUnit.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1inventoryUnit.AppearanceCell.Options.UseFont = true;
			this.gvMx1inventoryUnit.Caption = "库存单位 ";
			this.gvMx1inventoryUnit.FieldName = "inventoryUnit";
			this.gvMx1inventoryUnit.MinWidth = 50;
			this.gvMx1inventoryUnit.Name = "gvMx1inventoryUnit";
			this.gvMx1inventoryUnit.Tag = "query_a.INVENTORY_UNIT";
			this.gvMx1inventoryUnit.Visible = true;
			this.gvMx1inventoryUnit.VisibleIndex = 12;
			this.gvMx1inventoryUnit.Width = 94;
			//
			// gridColumn12
			//
			this.gridColumn12.Caption = "退货明细guid";
			this.gridColumn12.Caption = "送货明细guid";
			this.gridColumn12.FieldName = "deliveDetailGuid";
			this.gridColumn12.MinWidth = 25;
			this.gridColumn12.Name = "gridColumn12";
			@@ -1535,7 +1543,7 @@
			this.gridColumn21.MinWidth = 25;
			this.gridColumn21.Name = "gridColumn21";
			this.gridColumn21.Visible = true;
			this.gridColumn21.VisibleIndex = 13;
			this.gridColumn21.VisibleIndex = 11;
			this.gridColumn21.Width = 94;
			//
			// gridColumn22
			@@ -1545,7 +1553,7 @@
			this.gridColumn22.MinWidth = 25;
			this.gridColumn22.Name = "gridColumn22";
			this.gridColumn22.Visible = true;
			this.gridColumn22.VisibleIndex = 14;
			this.gridColumn22.VisibleIndex = 12;
			this.gridColumn22.Width = 94;
			//
			// gvMxDel
			@@ -1555,7 +1563,7 @@
			this.gvMxDel.MinWidth = 25;
			this.gvMxDel.Name = "gvMxDel";
			this.gvMxDel.Visible = true;
			this.gvMxDel.VisibleIndex = 15;
			this.gvMxDel.VisibleIndex = 14;
			this.gvMxDel.Width = 94;
			//
			// repositoryItemButtonEdit1
			@@ -1569,200 +1577,12 @@
			this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
			this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
			//
			// panelMx1
			//
			this.panelMx1.Controls.Add(this.ucBtnPrint1);
			this.panelMx1.Controls.Add(this.lbMxGuid);
			this.panelMx1.Controls.Add(this.txt_iCount_1);
			this.panelMx1.Controls.Add(this.labelControl14);
			this.panelMx1.Controls.Add(this.txt_psnQty_1);
			this.panelMx1.Controls.Add(this.labelControl12);
			this.panelMx1.Controls.Add(this.txtKdy);
			this.panelMx1.Controls.Add(this.labelControl13);
			this.panelMx1.Controls.Add(this.txtYdy);
			this.panelMx1.Controls.Add(this.labelControl1);
			this.panelMx1.Controls.Add(this.txtQuantity);
			this.panelMx1.Controls.Add(this.labelControl10);
			this.panelMx1.Controls.Add(this.txtWlgg);
			this.panelMx1.Controls.Add(this.labelControl9);
			this.panelMx1.Controls.Add(this.txtWlmc);
			this.panelMx1.Controls.Add(this.labelControl8);
			this.panelMx1.Controls.Add(this.txtWlid);
			this.panelMx1.Controls.Add(this.labelControl7);
			this.panelMx1.Dock = System.Windows.Forms.DockStyle.Top;
			this.panelMx1.Location = new System.Drawing.Point(0, 0);
			this.panelMx1.Name = "panelMx1";
			this.panelMx1.Size = new System.Drawing.Size(1124, 102);
			this.panelMx1.TabIndex = 3;
			//
			// ucBtnPrint1
			//
			this.ucBtnPrint1.guidKey = null;
			this.ucBtnPrint1.Location = new System.Drawing.Point(543, 59);
			this.ucBtnPrint1.Name = "ucBtnPrint1";
			this.ucBtnPrint1.rptParameter = null;
			this.ucBtnPrint1.Size = new System.Drawing.Size(218, 41);
			this.ucBtnPrint1.TabIndex = 230;
			//
			// lbMxGuid
			//
			this.lbMxGuid.Location = new System.Drawing.Point(835, 7);
			this.lbMxGuid.Name = "lbMxGuid";
			this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
			this.lbMxGuid.TabIndex = 229;
			this.lbMxGuid.Text = "lbMxGuid";
			this.lbMxGuid.Visible = false;
			//
			// txt_iCount_1
			//
			this.txt_iCount_1.Location = new System.Drawing.Point(654, 34);
			this.txt_iCount_1.Name = "txt_iCount_1";
			this.txt_iCount_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
			this.txt_iCount_1.Size = new System.Drawing.Size(96, 28);
			this.txt_iCount_1.TabIndex = 228;
			//
			// labelControl14
			//
			this.labelControl14.Location = new System.Drawing.Point(543, 39);
			this.labelControl14.Name = "labelControl14";
			this.labelControl14.Size = new System.Drawing.Size(105, 18);
			this.labelControl14.TabIndex = 227;
			this.labelControl14.Text = "打印条码张数：";
			//
			// txt_psnQty_1
			//
			this.txt_psnQty_1.Location = new System.Drawing.Point(654, 4);
			this.txt_psnQty_1.Name = "txt_psnQty_1";
			this.txt_psnQty_1.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
			this.txt_psnQty_1.Size = new System.Drawing.Size(96, 28);
			this.txt_psnQty_1.TabIndex = 226;
			//
			// labelControl12
			//
			this.labelControl12.Location = new System.Drawing.Point(543, 9);
			this.labelControl12.Name = "labelControl12";
			this.labelControl12.Size = new System.Drawing.Size(105, 18);
			this.labelControl12.TabIndex = 225;
			this.labelControl12.Text = "每张条码数量：";
			//
			// txtKdy
			//
			this.txtKdy.Location = new System.Drawing.Point(430, 65);
			this.txtKdy.Name = "txtKdy";
			this.txtKdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txtKdy.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;
			this.txtKdy.Properties.Appearance.Options.UseFont = true;
			this.txtKdy.Properties.Appearance.Options.UseForeColor = true;
			this.txtKdy.Properties.ReadOnly = true;
			this.txtKdy.Size = new System.Drawing.Size(96, 28);
			this.txtKdy.TabIndex = 224;
			//
			// labelControl13
			//
			this.labelControl13.Location = new System.Drawing.Point(346, 70);
			this.labelControl13.Name = "labelControl13";
			this.labelControl13.Size = new System.Drawing.Size(80, 18);
			this.labelControl13.TabIndex = 223;
			this.labelControl13.Text = "可打印总数:";
			//
			// txtYdy
			//
			this.txtYdy.Location = new System.Drawing.Point(430, 34);
			this.txtYdy.Name = "txtYdy";
			this.txtYdy.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txtYdy.Properties.Appearance.Options.UseFont = true;
			this.txtYdy.Properties.ReadOnly = true;
			this.txtYdy.Size = new System.Drawing.Size(96, 28);
			this.txtYdy.TabIndex = 222;
			//
			// labelControl1
			//
			this.labelControl1.Location = new System.Drawing.Point(346, 39);
			this.labelControl1.Name = "labelControl1";
			this.labelControl1.Size = new System.Drawing.Size(80, 18);
			this.labelControl1.TabIndex = 221;
			this.labelControl1.Text = "已打印总量:";
			//
			// txtQuantity
			//
			this.txtQuantity.Location = new System.Drawing.Point(430, 4);
			this.txtQuantity.Name = "txtQuantity";
			this.txtQuantity.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txtQuantity.Properties.Appearance.Options.UseFont = true;
			this.txtQuantity.Properties.ReadOnly = true;
			this.txtQuantity.Size = new System.Drawing.Size(96, 28);
			this.txtQuantity.TabIndex = 220;
			//
			// labelControl10
			//
			this.labelControl10.Location = new System.Drawing.Point(331, 9);
			this.labelControl10.Name = "labelControl10";
			this.labelControl10.Size = new System.Drawing.Size(95, 18);
			this.labelControl10.TabIndex = 219;
			this.labelControl10.Text = "本次申请总量:";
			//
			// txtWlgg
			//
			this.txtWlgg.Location = new System.Drawing.Point(90, 65);
			this.txtWlgg.Name = "txtWlgg";
			this.txtWlgg.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txtWlgg.Properties.Appearance.Options.UseFont = true;
			this.txtWlgg.Properties.ReadOnly = true;
			this.txtWlgg.Size = new System.Drawing.Size(236, 28);
			this.txtWlgg.TabIndex = 218;
			//
			// labelControl9
			//
			this.labelControl9.Location = new System.Drawing.Point(20, 70);
			this.labelControl9.Name = "labelControl9";
			this.labelControl9.Size = new System.Drawing.Size(65, 18);
			this.labelControl9.TabIndex = 217;
			this.labelControl9.Text = "物料规格:";
			//
			// txtWlmc
			//
			this.txtWlmc.Location = new System.Drawing.Point(90, 34);
			this.txtWlmc.Name = "txtWlmc";
			this.txtWlmc.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txtWlmc.Properties.Appearance.Options.UseFont = true;
			this.txtWlmc.Properties.ReadOnly = true;
			this.txtWlmc.Size = new System.Drawing.Size(236, 28);
			this.txtWlmc.TabIndex = 216;
			//
			// labelControl8
			//
			this.labelControl8.Location = new System.Drawing.Point(20, 39);
			this.labelControl8.Name = "labelControl8";
			this.labelControl8.Size = new System.Drawing.Size(65, 18);
			this.labelControl8.TabIndex = 215;
			this.labelControl8.Text = "物料名称:";
			//
			// txtWlid
			//
			this.txtWlid.Location = new System.Drawing.Point(90, 4);
			this.txtWlid.Name = "txtWlid";
			this.txtWlid.Properties.Appearance.Font = new System.Drawing.Font("Tahoma", 10F);
			this.txtWlid.Properties.Appearance.Options.UseFont = true;
			this.txtWlid.Properties.ReadOnly = true;
			this.txtWlid.Size = new System.Drawing.Size(236, 28);
			this.txtWlid.TabIndex = 214;
			//
			// labelControl7
			//
			this.labelControl7.Location = new System.Drawing.Point(20, 9);
			this.labelControl7.Name = "labelControl7";
			this.labelControl7.Size = new System.Drawing.Size(65, 18);
			this.labelControl7.TabIndex = 213;
			this.labelControl7.Text = "物料编码:";
			//
			// tabMxPage2
			//
			this.tabMxPage2.Controls.Add(this.gcMx2);
			this.tabMxPage2.Name = "tabMxPage2";
			this.tabMxPage2.Size = new System.Drawing.Size(1124, 366);
			this.tabMxPage2.Text = "扫码明细";
			this.tabMxPage2.Size = new System.Drawing.Size(1272, 342);
			this.tabMxPage2.Text = "已打印条码明细";
			//
			// gcMx2
			//
			@@ -1770,15 +1590,14 @@
			this.gcMx2.Location = new System.Drawing.Point(0, 0);
			this.gcMx2.MainView = this.gvMx2;
			this.gcMx2.Name = "gcMx2";
			this.gcMx2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
			this.repositoryItemButtonEdit2});
			this.gcMx2.Size = new System.Drawing.Size(1124, 366);
			this.gcMx2.Size = new System.Drawing.Size(1272, 342);
			this.gcMx2.TabIndex = 3;
			this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
			this.gvMx2});
			//
			// gvMx2
			//
			this.gvMx2.Appearance.Row.Options.UseFont = true;
			this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
			this.gridColumn3,
			this.gvMx1itemBarcode,
			@@ -1789,7 +1608,10 @@
			this.gridColumn17,
			this.gvMx1createBy,
			this.gvMx1lotDate,
			this.gvBtnAlawys});
			this.gridColumn28,
			this.gridColumn29,
			this.gridColumn30,
			this.gridColumn31});
			this.gvMx2.GridControl = this.gcMx2;
			this.gvMx2.Name = "gvMx2";
			this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
			@@ -1798,7 +1620,6 @@
			//
			// gridColumn3
			//
			this.gridColumn3.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gridColumn3.AppearanceCell.Options.UseFont = true;
			this.gridColumn3.Caption = "guid";
			this.gridColumn3.FieldName = "guid";
			@@ -1809,7 +1630,6 @@
			//
			// gvMx1itemBarcode
			//
			this.gvMx1itemBarcode.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;
			this.gvMx1itemBarcode.Caption = "物料条码";
			this.gvMx1itemBarcode.FieldName = "itemBarcode";
			@@ -1852,7 +1672,6 @@
			//
			// gvMx1quantity
			//
			this.gvMx1quantity.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1quantity.AppearanceCell.Options.UseFont = true;
			this.gvMx1quantity.Caption = "数量";
			this.gvMx1quantity.FieldName = "quantity";
			@@ -1875,7 +1694,6 @@
			//
			// gvMx1createBy
			//
			this.gvMx1createBy.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1createBy.AppearanceCell.Options.UseFont = true;
			this.gvMx1createBy.Caption = "创建人";
			this.gvMx1createBy.FieldName = "createBy";
			@@ -1888,7 +1706,6 @@
			//
			// gvMx1lotDate
			//
			this.gvMx1lotDate.AppearanceCell.Font = new System.Drawing.Font("Tahoma", 10F);
			this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;
			this.gvMx1lotDate.Caption = "创建日期";
			this.gvMx1lotDate.FieldName = "createDate";
			@@ -1899,25 +1716,45 @@
			this.gvMx1lotDate.VisibleIndex = 7;
			this.gvMx1lotDate.Width = 94;
			//
			// gvBtnAlawys
			// gridColumn28
			//
			this.gvBtnAlawys.Caption = "移出";
			this.gvBtnAlawys.ColumnEdit = this.repositoryItemButtonEdit2;
			this.gvBtnAlawys.MinWidth = 25;
			this.gvBtnAlawys.Name = "gvBtnAlawys";
			this.gvBtnAlawys.Visible = true;
			this.gvBtnAlawys.VisibleIndex = 8;
			this.gvBtnAlawys.Width = 94;
			this.gridColumn28.Caption = "是否入库";
			this.gridColumn28.FieldName = "isRk";
			this.gridColumn28.MinWidth = 25;
			this.gridColumn28.Name = "gridColumn28";
			this.gridColumn28.Visible = true;
			this.gridColumn28.VisibleIndex = 8;
			this.gridColumn28.Width = 94;
			//
			// repositoryItemButtonEdit2
			// gridColumn29
			//
			this.repositoryItemButtonEdit2.AutoHeight = false;
			editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
			editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
			this.repositoryItemButtonEdit2.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)});
			this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
			this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
			this.gridColumn29.Caption = "入库人";
			this.gridColumn29.FieldName = "rkUser";
			this.gridColumn29.MinWidth = 25;
			this.gridColumn29.Name = "gridColumn29";
			this.gridColumn29.Visible = true;
			this.gridColumn29.VisibleIndex = 9;
			this.gridColumn29.Width = 94;
			//
			// gridColumn30
			//
			this.gridColumn30.Caption = "入库日期";
			this.gridColumn30.FieldName = "rkDate";
			this.gridColumn30.MinWidth = 25;
			this.gridColumn30.Name = "gridColumn30";
			this.gridColumn30.Visible = true;
			this.gridColumn30.VisibleIndex = 10;
			this.gridColumn30.Width = 94;
			//
			// gridColumn31
			//
			this.gridColumn31.Caption = "入库位";
			this.gridColumn31.FieldName = "rkPositon";
			this.gridColumn31.MinWidth = 25;
			this.gridColumn31.Name = "gridColumn31";
			this.gridColumn31.Visible = true;
			this.gridColumn31.VisibleIndex = 11;
			this.gridColumn31.Width = 94;
			//
			// picCheckBox
			//
			@@ -1934,7 +1771,7 @@
			//
			this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
			this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
			this.ClientSize = new System.Drawing.Size(1128, 682);
			this.ClientSize = new System.Drawing.Size(1276, 682);
			this.Controls.Add(this.picCheckBox);
			this.Controls.Add(this.xtraTabControl1);
			this.Controls.Add(this.toolBarMenu1);
			@@ -1959,6 +1796,7 @@
			this.splitMx1.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
			this.layoutMx1.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit();
			@@ -1976,16 +1814,14 @@
			((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
			@@ -1995,7 +1831,11 @@
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
			this.tabMx.ResumeLayout(false);
			this.tabMxPage1.ResumeLayout(false);
			@@ -2007,21 +1847,9 @@
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
			this.panelMx1.ResumeLayout(false);
			this.panelMx1.PerformLayout();
			((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txtKdy.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
			this.tabMxPage2.ResumeLayout(false);
			((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
			((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
			this.ResumeLayout(false);

			@@ -2045,7 +1873,6 @@
			private DevExpress.XtraGrid.Columns.GridColumn gv_salesDept;
			private DevExpress.XtraGrid.Columns.GridColumn gv_salesPerson;
			private DevExpress.XtraGrid.Columns.GridColumn gv_returnReason;
			private DevExpress.XtraGrid.Columns.GridColumn gv_inventoryOrg;
			private DevExpress.XtraGrid.Columns.GridColumn gv_createdBy;
			private DevExpress.XtraGrid.Columns.GridColumn gv_createdDate;
			private DevExpress.XtraGrid.Columns.GridColumn gv_modifiedBy;
			@@ -2079,12 +1906,9 @@
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
			@@ -2092,8 +1916,6 @@
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
			private DevExpress.XtraTab.XtraTabControl tabMx;
			private DevExpress.XtraTab.XtraTabPage tabMxPage1;
			@@ -2123,30 +1945,27 @@
			private DevExpress.XtraGrid.Columns.GridColumn gvMx1isFree;
			private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnType;
			private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
			private DevExpress.XtraGrid.Columns.GridColumn gvMx1inventoryUnit;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
			private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
			private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
			private DevExpress.XtraEditors.PanelControl panelMx1;
			private UserControl.UcBtnPrint ucBtnPrint1;
			private DevExpress.XtraEditors.LabelControl lbMxGuid;
			private DevExpress.XtraEditors.TextEdit txt_iCount_1;
			private DevExpress.XtraEditors.LabelControl labelControl14;
			private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
			private DevExpress.XtraEditors.LabelControl labelControl12;
			private DevExpress.XtraEditors.TextEdit txtKdy;
			private DevExpress.XtraEditors.LabelControl labelControl13;
			private DevExpress.XtraEditors.TextEdit txtYdy;
			private DevExpress.XtraEditors.LabelControl labelControl1;
			private DevExpress.XtraEditors.TextEdit txtQuantity;
			private DevExpress.XtraEditors.LabelControl labelControl10;
			private DevExpress.XtraEditors.TextEdit txtWlgg;
			private DevExpress.XtraEditors.LabelControl labelControl9;
			private DevExpress.XtraEditors.TextEdit txtWlmc;
			private DevExpress.XtraEditors.LabelControl labelControl8;
			private DevExpress.XtraEditors.TextEdit txtWlid;
			private DevExpress.XtraEditors.LabelControl labelControl7;
			private DevExpress.XtraTab.XtraTabPage tabMxPage2;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
			private UserControl.UcLookCk txt_fstockid;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
			private DevExpress.XtraEditors.RadioGroup txt_fIsLink;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
			private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
			private DevExpress.XtraGrid.GridControl gcMx2;
			private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn3;
			@@ -2158,11 +1977,11 @@
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
			private DevExpress.XtraGrid.Columns.GridColumn gvMx1createBy;
			private DevExpress.XtraGrid.Columns.GridColumn gvMx1lotDate;
			private DevExpress.XtraGrid.Columns.GridColumn gvBtnAlawys;
			private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
			private DevExpress.Utils.ToolTipController tips;
			private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
			}
			}