dev前台代码
blame | 历史 | 补丁 | 提交 | 提交对比 | 忽略空白
lu
2025-10-28 ce5738884e2830f2e299670f6a2c5bc821f5c9e2 
 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs


@@ -100,11 +100,11 @@


            this.txt_billType = new DevExpress.XtraEditors.ComboBoxEdit();


            this.txt_approvedDate = new DevExpress.XtraEditors.TextEdit();


            this.txt_id = new DevExpress.XtraEditors.TextEdit();


            this.txt_approvedBy = new DevExpress.XtraEditors.TextEdit();


            this.txt_shUserName2 = new DevExpress.XtraEditors.TextEdit();


            this.txt_modifiedDate = new DevExpress.XtraEditors.TextEdit();


            this.txt_billNo = new DevExpress.XtraEditors.TextEdit();


            this.txt_salerName = new DevExpress.XtraEditors.TextEdit();


            this.txt_modifiedBy = new DevExpress.XtraEditors.TextEdit();


            this.txt_xgUserName1 = new DevExpress.XtraEditors.TextEdit();


            this.txt_saleDeptName = new DevExpress.XtraEditors.TextEdit();


            this.txt_createdDate = new DevExpress.XtraEditors.TextEdit();


            this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();


@@ -234,11 +234,11 @@


            ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_shUserName2.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_xgUserName1.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit();


@@ -330,9 +330,10 @@


            this.toolBarMenu1.guidKey = null;


            this.toolBarMenu1.isSetBtn = false;


            this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);


            this.toolBarMenu1.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);


            this.toolBarMenu1.Name = "toolBarMenu1";


            this.toolBarMenu1.rptParameter = null;


            this.toolBarMenu1.Size = new System.Drawing.Size(1439, 80);


            this.toolBarMenu1.Size = new System.Drawing.Size(1799, 98);


            this.toolBarMenu1.TabIndex = 0;


            this.toolBarMenu1.xlsInService = null;


            this.toolBarMenu1.xlsOutParameter = null;


@@ -340,10 +341,11 @@


            // xtraTabControl1


            // 


            this.xtraTabControl1.Dock = System.Windows.Forms.DockStyle.Fill;


            this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);


            this.xtraTabControl1.Location = new System.Drawing.Point(0, 98);


            this.xtraTabControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.xtraTabControl1.Name = "xtraTabControl1";


            this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;


            this.xtraTabControl1.Size = new System.Drawing.Size(1439, 602);


            this.xtraTabControl1.Size = new System.Drawing.Size(1799, 736);


            this.xtraTabControl1.TabIndex = 3;


            this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {


            this.xtraTabPage1,


@@ -352,8 +354,9 @@


            // xtraTabPage1


            // 


            this.xtraTabPage1.Controls.Add(this.split1);


            this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.xtraTabPage1.Name = "xtraTabPage1";


            this.xtraTabPage1.Size = new System.Drawing.Size(1437, 570);


            this.xtraTabPage1.Size = new System.Drawing.Size(1797, 698);


            this.xtraTabPage1.Text = "数据列表";


            // 


            // split1


@@ -362,6 +365,7 @@


            this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;


            this.split1.Horizontal = false;


            this.split1.Location = new System.Drawing.Point(0, 0);


            this.split1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.split1.Name = "split1";


            // 


            // split1.Panel1


@@ -374,17 +378,19 @@


            // 


            this.split1.Panel2.Text = "Panel2";


            this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;


            this.split1.Size = new System.Drawing.Size(1437, 570);


            this.split1.Size = new System.Drawing.Size(1797, 698);


            this.split1.SplitterPosition = 0;


            this.split1.TabIndex = 0;


            // 


            // gcMain1


            // 


            this.gcMain1.Dock = System.Windows.Forms.DockStyle.Fill;


            this.gcMain1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.gcMain1.Location = new System.Drawing.Point(0, 0);


            this.gcMain1.MainView = this.gridView1;


            this.gcMain1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.gcMain1.Name = "gcMain1";


            this.gcMain1.Size = new System.Drawing.Size(1437, 519);


            this.gcMain1.Size = new System.Drawing.Size(1797, 635);


            this.gcMain1.TabIndex = 2;


            this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {


            this.gridView1});


@@ -415,8 +421,9 @@


            this.gridColumn25,


            this.gridColumn26,


            this.gridColumn2});


            this.gridView1.DetailHeight = 428;


            this.gridView1.GridControl = this.gcMain1;


            this.gridView1.IndicatorWidth = 50;


            this.gridView1.IndicatorWidth = 62;


            this.gridView1.Name = "gridView1";


            this.gridView1.OptionsFind.ShowSearchNavButtons = false;


            this.gridView1.OptionsView.ShowAutoFilterRow = true;


@@ -427,268 +434,269 @@


            this.gv_id.AppearanceCell.Options.UseFont = true;


            this.gv_id.Caption = "主键GUID";


            this.gv_id.FieldName = "id";


            this.gv_id.MinWidth = 50;


            this.gv_id.MinWidth = 62;


            this.gv_id.Name = "gv_id";


            this.gv_id.OptionsColumn.AllowEdit = false;


            this.gv_id.Tag = "query_a.ID";


            this.gv_id.Width = 94;


            this.gv_id.Width = 117;


            // 


            // gridColumn1


            // 


            this.gridColumn1.Caption = "审核标识";


            this.gridColumn1.FieldName = "chkStatus";


            this.gridColumn1.MinWidth = 25;


            this.gridColumn1.MinWidth = 31;


            this.gridColumn1.Name = "gridColumn1";


            this.gridColumn1.Visible = true;


            this.gridColumn1.VisibleIndex = 0;


            this.gridColumn1.Width = 94;


            this.gridColumn1.Width = 117;


            // 


            // gridColumn19


            // 


            this.gridColumn19.Caption = "完结标识";


            this.gridColumn19.FieldName = "txtColor";


            this.gridColumn19.MinWidth = 25;


            this.gridColumn19.MinWidth = 31;


            this.gridColumn19.Name = "gridColumn19";


            this.gridColumn19.Visible = true;


            this.gridColumn19.VisibleIndex = 1;


            this.gridColumn19.Width = 94;


            this.gridColumn19.Width = 117;


            // 


            // gridColumn27


            // 


            this.gridColumn27.Caption = "源单标识";


            this.gridColumn27.FieldName = "fHasLinkTxt";


            this.gridColumn27.MinWidth = 25;


            this.gridColumn27.MinWidth = 31;


            this.gridColumn27.Name = "gridColumn27";


            this.gridColumn27.Visible = true;


            this.gridColumn27.VisibleIndex = 2;


            this.gridColumn27.Width = 94;


            this.gridColumn27.Width = 117;


            // 


            // gv_billType


            // 


            this.gv_billType.AppearanceCell.Options.UseFont = true;


            this.gv_billType.Caption = "单据类型 ";


            this.gv_billType.FieldName = "billType";


            this.gv_billType.MinWidth = 50;


            this.gv_billType.MinWidth = 62;


            this.gv_billType.Name = "gv_billType";


            this.gv_billType.OptionsColumn.AllowEdit = false;


            this.gv_billType.Tag = "query_a.BILL_TYPE";


            this.gv_billType.Visible = true;


            this.gv_billType.VisibleIndex = 14;


            this.gv_billType.Width = 94;


            this.gv_billType.Width = 117;


            // 


            // gv_billNo


            // 


            this.gv_billNo.AppearanceCell.Options.UseFont = true;


            this.gv_billNo.Caption = "单据编号 ";


            this.gv_billNo.FieldName = "billNo";


            this.gv_billNo.MinWidth = 50;


            this.gv_billNo.MinWidth = 62;


            this.gv_billNo.Name = "gv_billNo";


            this.gv_billNo.OptionsColumn.AllowEdit = false;


            this.gv_billNo.Tag = "query_a.BILL_NO";


            this.gv_billNo.Visible = true;


            this.gv_billNo.VisibleIndex = 3;


            this.gv_billNo.Width = 94;


            this.gv_billNo.Width = 117;


            // 


            // gv_salesOrg


            // 


            this.gv_salesOrg.AppearanceCell.Options.UseFont = true;


            this.gv_salesOrg.Caption = "销售组织 ";


            this.gv_salesOrg.FieldName = "xsOrgName";


            this.gv_salesOrg.MinWidth = 50;


            this.gv_salesOrg.MinWidth = 62;


            this.gv_salesOrg.Name = "gv_salesOrg";


            this.gv_salesOrg.OptionsColumn.AllowEdit = false;


            this.gv_salesOrg.Tag = "query_a.SALES_ORG";


            this.gv_salesOrg.Visible = true;


            this.gv_salesOrg.VisibleIndex = 13;


            this.gv_salesOrg.Width = 94;


            this.gv_salesOrg.Width = 117;


            // 


            // gv_salesDept


            // 


            this.gv_salesDept.AppearanceCell.Options.UseFont = true;


            this.gv_salesDept.Caption = "销售部门 ";


            this.gv_salesDept.FieldName = "saleDeptName";


            this.gv_salesDept.MinWidth = 50;


            this.gv_salesDept.MinWidth = 62;


            this.gv_salesDept.Name = "gv_salesDept";


            this.gv_salesDept.OptionsColumn.AllowEdit = false;


            this.gv_salesDept.Tag = "query_a.SALES_DEPT";


            this.gv_salesDept.Visible = true;


            this.gv_salesDept.VisibleIndex = 5;


            this.gv_salesDept.Width = 94;


            this.gv_salesDept.Width = 117;


            // 


            // gv_salesPerson


            // 


            this.gv_salesPerson.AppearanceCell.Options.UseFont = true;


            this.gv_salesPerson.Caption = "销售员 ";


            this.gv_salesPerson.FieldName = "salerName";


            this.gv_salesPerson.MinWidth = 50;


            this.gv_salesPerson.MinWidth = 62;


            this.gv_salesPerson.Name = "gv_salesPerson";


            this.gv_salesPerson.OptionsColumn.AllowEdit = false;


            this.gv_salesPerson.Tag = "query_a.SALES_PERSON";


            this.gv_salesPerson.Width = 94;


            this.gv_salesPerson.Width = 117;


            // 


            // gv_returnReason


            // 


            this.gv_returnReason.AppearanceCell.Options.UseFont = true;


            this.gv_returnReason.Caption = "退货原因 ";


            this.gv_returnReason.FieldName = "thyy";


            this.gv_returnReason.MinWidth = 50;


            this.gv_returnReason.MinWidth = 62;


            this.gv_returnReason.Name = "gv_returnReason";


            this.gv_returnReason.OptionsColumn.AllowEdit = false;


            this.gv_returnReason.Tag = "query_a.RETURN_REASON";


            this.gv_returnReason.Visible = true;


            this.gv_returnReason.VisibleIndex = 6;


            this.gv_returnReason.Width = 94;


            this.gv_returnReason.Width = 117;


            // 


            // gv_createdBy


            // 


            this.gv_createdBy.AppearanceCell.Options.UseFont = true;


            this.gv_createdBy.Caption = "创建人 ";


            this.gv_createdBy.FieldName = "cjPeople";


            this.gv_createdBy.MinWidth = 50;


            this.gv_createdBy.MinWidth = 62;


            this.gv_createdBy.Name = "gv_createdBy";


            this.gv_createdBy.OptionsColumn.AllowEdit = false;


            this.gv_createdBy.Tag = "query_a.CREATED_BY";


            this.gv_createdBy.Visible = true;


            this.gv_createdBy.VisibleIndex = 7;


            this.gv_createdBy.Width = 94;


            this.gv_createdBy.Width = 117;


            // 


            // gv_createdDate


            // 


            this.gv_createdDate.AppearanceCell.Options.UseFont = true;


            this.gv_createdDate.Caption = "创建时间 ";


            this.gv_createdDate.FieldName = "createdDate";


            this.gv_createdDate.MinWidth = 50;


            this.gv_createdDate.MinWidth = 62;


            this.gv_createdDate.Name = "gv_createdDate";


            this.gv_createdDate.OptionsColumn.AllowEdit = false;


            this.gv_createdDate.Tag = "query_a.CREATED_DATE";


            this.gv_createdDate.Visible = true;


            this.gv_createdDate.VisibleIndex = 8;


            this.gv_createdDate.Width = 94;


            this.gv_createdDate.Width = 117;


            // 


            // gv_modifiedBy


            // 


            this.gv_modifiedBy.AppearanceCell.Options.UseFont = true;


            this.gv_modifiedBy.Caption = "修改人 ";


            this.gv_modifiedBy.FieldName = "modifiedBy";


            this.gv_modifiedBy.MinWidth = 50;


            this.gv_modifiedBy.MinWidth = 62;


            this.gv_modifiedBy.Name = "gv_modifiedBy";


            this.gv_modifiedBy.OptionsColumn.AllowEdit = false;


            this.gv_modifiedBy.Tag = "query_a.MODIFIED_BY";


            this.gv_modifiedBy.Width = 94;


            this.gv_modifiedBy.Width = 117;


            // 


            // gv_modifiedDate


            // 


            this.gv_modifiedDate.AppearanceCell.Options.UseFont = true;


            this.gv_modifiedDate.Caption = "修改时间 ";


            this.gv_modifiedDate.FieldName = "modifiedDate";


            this.gv_modifiedDate.MinWidth = 50;


            this.gv_modifiedDate.MinWidth = 62;


            this.gv_modifiedDate.Name = "gv_modifiedDate";


            this.gv_modifiedDate.OptionsColumn.AllowEdit = false;


            this.gv_modifiedDate.Tag = "query_a.MODIFIED_DATE";


            this.gv_modifiedDate.Width = 94;


            this.gv_modifiedDate.Width = 117;


            // 


            // gv_approvedBy


            // 


            this.gv_approvedBy.AppearanceCell.Options.UseFont = true;


            this.gv_approvedBy.Caption = "审核人 ";


            this.gv_approvedBy.FieldName = "shPeople";


            this.gv_approvedBy.MinWidth = 50;


            this.gv_approvedBy.MinWidth = 62;


            this.gv_approvedBy.Name = "gv_approvedBy";


            this.gv_approvedBy.OptionsColumn.AllowEdit = false;


            this.gv_approvedBy.Tag = "query_a.APPROVED_BY";


            this.gv_approvedBy.Visible = true;


            this.gv_approvedBy.VisibleIndex = 9;


            this.gv_approvedBy.Width = 94;


            this.gv_approvedBy.Width = 117;


            // 


            // gv_approvedDate


            // 


            this.gv_approvedDate.AppearanceCell.Options.UseFont = true;


            this.gv_approvedDate.Caption = "审核日期 ";


            this.gv_approvedDate.FieldName = "approvedDate";


            this.gv_approvedDate.MinWidth = 50;


            this.gv_approvedDate.MinWidth = 62;


            this.gv_approvedDate.Name = "gv_approvedDate";


            this.gv_approvedDate.OptionsColumn.AllowEdit = false;


            this.gv_approvedDate.Tag = "query_a.APPROVED_DATE";


            this.gv_approvedDate.Visible = true;


            this.gv_approvedDate.VisibleIndex = 10;


            this.gv_approvedDate.Width = 94;


            this.gv_approvedDate.Width = 117;


            // 


            // gridColumn18


            // 


            this.gridColumn18.Caption = "客户";


            this.gridColumn18.FieldName = "custName";


            this.gridColumn18.MinWidth = 25;


            this.gridColumn18.MinWidth = 31;


            this.gridColumn18.Name = "gridColumn18";


            this.gridColumn18.Visible = true;


            this.gridColumn18.VisibleIndex = 4;


            this.gridColumn18.Width = 94;


            this.gridColumn18.Width = 117;


            // 


            // 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.MinWidth = 62;


            this.gv_customerOrderNo.Name = "gv_customerOrderNo";


            this.gv_customerOrderNo.OptionsColumn.AllowEdit = false;


            this.gv_customerOrderNo.Tag = "query_a.CUSTOMER_ORDER_NO";


            this.gv_customerOrderNo.Width = 94;


            this.gv_customerOrderNo.Width = 117;


            // 


            // gridColumn24


            // 


            this.gridColumn24.Caption = "仓库ID";


            this.gridColumn24.FieldName = "ckId";


            this.gridColumn24.MinWidth = 25;


            this.gridColumn24.MinWidth = 31;


            this.gridColumn24.Name = "gridColumn24";


            this.gridColumn24.Width = 94;


            this.gridColumn24.Width = 117;


            // 


            // gridColumn25


            // 


            this.gridColumn25.Caption = "仓库名称";


            this.gridColumn25.FieldName = "ckName";


            this.gridColumn25.MinWidth = 25;


            this.gridColumn25.MinWidth = 31;


            this.gridColumn25.Name = "gridColumn25";


            this.gridColumn25.Visible = true;


            this.gridColumn25.VisibleIndex = 11;


            this.gridColumn25.Width = 94;


            this.gridColumn25.Width = 117;


            // 


            // gridColumn26


            // 


            this.gridColumn26.Caption = "仓库编号";


            this.gridColumn26.FieldName = "ckNo";


            this.gridColumn26.MinWidth = 25;


            this.gridColumn26.MinWidth = 31;


            this.gridColumn26.Name = "gridColumn26";


            this.gridColumn26.Visible = true;


            this.gridColumn26.VisibleIndex = 12;


            this.gridColumn26.Width = 94;


            this.gridColumn26.Width = 117;


            // 


            // gridColumn2


            // 


            this.gridColumn2.Caption = "数据来源";


            this.gridColumn2.FieldName = "fHasLinkSource";


            this.gridColumn2.MinWidth = 25;


            this.gridColumn2.MinWidth = 31;


            this.gridColumn2.Name = "gridColumn2";


            this.gridColumn2.Visible = true;


            this.gridColumn2.VisibleIndex = 15;


            this.gridColumn2.Width = 94;


            this.gridColumn2.Width = 117;


            // 


            // pageBar1


            // 


            this.pageBar1.CurrentPage = 1;


            this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;


            this.pageBar1.Location = new System.Drawing.Point(0, 519);


            this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);


            this.pageBar1.Location = new System.Drawing.Point(0, 635);


            this.pageBar1.Margin = new System.Windows.Forms.Padding(4, 6, 4, 6);


            this.pageBar1.Name = "pageBar1";


            this.pageBar1.RecordCount = 0;


            this.pageBar1.Size = new System.Drawing.Size(1437, 39);


            this.pageBar1.Size = new System.Drawing.Size(1797, 48);


            this.pageBar1.TabIndex = 4;


            this.pageBar1.TotalPages = 0;


            // 


            // xtraTabPage2


            // 


            this.xtraTabPage2.Controls.Add(this.splitMx1);


            this.xtraTabPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.xtraTabPage2.Name = "xtraTabPage2";


            this.xtraTabPage2.Size = new System.Drawing.Size(1437, 570);


            this.xtraTabPage2.Size = new System.Drawing.Size(1797, 698);


            this.xtraTabPage2.Text = "数据详细";


            // 


            // splitMx1


@@ -696,6 +704,7 @@


            this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;


            this.splitMx1.Horizontal = false;


            this.splitMx1.Location = new System.Drawing.Point(0, 0);


            this.splitMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.splitMx1.Name = "splitMx1";


            // 


            // splitMx1.Panel1


@@ -708,8 +717,13 @@


            this.splitMx1.Panel2.Controls.Add(this.tabMx);


            this.splitMx1.Panel2.Text = "Panel2";


            this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;


<<<<<<< HEAD


            this.splitMx1.Size = new System.Drawing.Size(1437, 570);


            this.splitMx1.SplitterPosition = 182;


=======


            this.splitMx1.Size = new System.Drawing.Size(1797, 698);


            this.splitMx1.SplitterPosition = 213;


>>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6


            this.splitMx1.TabIndex = 0;


            // 


            // layoutMx1


@@ -728,11 +742,11 @@


            this.layoutMx1.Controls.Add(this.txt_billType);


            this.layoutMx1.Controls.Add(this.txt_approvedDate);


            this.layoutMx1.Controls.Add(this.txt_id);


            this.layoutMx1.Controls.Add(this.txt_approvedBy);


            this.layoutMx1.Controls.Add(this.txt_shUserName2);


            this.layoutMx1.Controls.Add(this.txt_modifiedDate);


            this.layoutMx1.Controls.Add(this.txt_billNo);


            this.layoutMx1.Controls.Add(this.txt_salerName);


            this.layoutMx1.Controls.Add(this.txt_modifiedBy);


            this.layoutMx1.Controls.Add(this.txt_xgUserName1);


            this.layoutMx1.Controls.Add(this.txt_saleDeptName);


            this.layoutMx1.Controls.Add(this.txt_createdDate);


            this.layoutMx1.Controls.Add(this.txt_returnReason);


@@ -748,10 +762,15 @@


            this.layoutControlItem18,


            this.layoutControlItem6});


            this.layoutMx1.Location = new System.Drawing.Point(0, 0);


            this.layoutMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.layoutMx1.Name = "layoutMx1";


            this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(575, 496, 812, 534);


            this.layoutMx1.Root = this.Root;


<<<<<<< HEAD


            this.layoutMx1.Size = new System.Drawing.Size(1437, 182);


=======


            this.layoutMx1.Size = new System.Drawing.Size(1797, 213);


>>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6


            this.layoutMx1.TabIndex = 0;


            this.layoutMx1.Text = "layoutControl1";


            // 


@@ -767,9 +786,10 @@


            // btnSelect


            // 


            this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;


            this.btnSelect.Location = new System.Drawing.Point(12, 108);


            this.btnSelect.Location = new System.Drawing.Point(14, 128);


            this.btnSelect.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.btnSelect.Name = "btnSelect";


            this.btnSelect.Size = new System.Drawing.Size(126, 27);


            this.btnSelect.Size = new System.Drawing.Size(158, 34);


            this.btnSelect.StyleController = this.layoutMx1;


            this.btnSelect.TabIndex = 541;


            this.btnSelect.Text = "选择退货明细";


@@ -777,82 +797,89 @@


            // txt_returnCustomer


            // 


            this.txt_returnCustomer.IsReadly = false;


            this.txt_returnCustomer.Location = new System.Drawing.Point(438, 44);


            this.txt_returnCustomer.Location = new System.Drawing.Point(537, 52);


            this.txt_returnCustomer.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);


            this.txt_returnCustomer.Name = "txt_returnCustomer";


            this.txt_returnCustomer.Size = new System.Drawing.Size(278, 24);


            this.txt_returnCustomer.Size = new System.Drawing.Size(346, 28);


            this.txt_returnCustomer.TabIndex = 539;


            // 


            // txt_salesDept


            // 


            this.txt_salesDept.IsReadly = false;


            this.txt_salesDept.Location = new System.Drawing.Point(1146, 108);


            this.txt_salesDept.Location = new System.Drawing.Point(1411, 128);


            this.txt_salesDept.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);


            this.txt_salesDept.Name = "txt_salesDept";


            this.txt_salesDept.Size = new System.Drawing.Size(279, 24);


            this.txt_salesDept.Size = new System.Drawing.Size(346, 28);


            this.txt_salesDept.TabIndex = 538;


            // 


            // txt_inventoryOrg


            // 


            this.txt_inventoryOrg.IsReadly = false;


            this.txt_inventoryOrg.Location = new System.Drawing.Point(792, 108);


            this.txt_inventoryOrg.Location = new System.Drawing.Point(974, 128);


            this.txt_inventoryOrg.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);


            this.txt_inventoryOrg.Name = "txt_inventoryOrg";


            this.txt_inventoryOrg.Size = new System.Drawing.Size(278, 24);


            this.txt_inventoryOrg.Size = new System.Drawing.Size(346, 28);


            this.txt_inventoryOrg.TabIndex = 537;


            // 


            // txt_salesOrg


            // 


            this.txt_salesOrg.IsReadly = false;


            this.txt_salesOrg.Location = new System.Drawing.Point(84, 44);


            this.txt_salesOrg.Location = new System.Drawing.Point(101, 52);


            this.txt_salesOrg.Margin = new System.Windows.Forms.Padding(5, 5, 5, 5);


            this.txt_salesOrg.Name = "txt_salesOrg";


            this.txt_salesOrg.Size = new System.Drawing.Size(278, 24);


            this.txt_salesOrg.Size = new System.Drawing.Size(345, 28);


            this.txt_salesOrg.TabIndex = 535;


            // 


            // txt_fHasLinkRad


            // 


            this.txt_fHasLinkRad.EditValue = "1";


            this.txt_fHasLinkRad.Location = new System.Drawing.Point(438, 106);


            this.txt_fHasLinkRad.Location = new System.Drawing.Point(537, 126);


            this.txt_fHasLinkRad.Margin = new System.Windows.Forms.Padding(0);


            this.txt_fHasLinkRad.Name = "txt_fHasLinkRad";


            this.txt_fHasLinkRad.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {


            new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "有源单"),


            new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "无源单")});


            this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);


            this.txt_fHasLinkRad.Size = new System.Drawing.Size(278, 32);


            this.txt_fHasLinkRad.Size = new System.Drawing.Size(346, 38);


            this.txt_fHasLinkRad.StyleController = this.layoutMx1;


            this.txt_fHasLinkRad.TabIndex = 534;


            // 


            // txt_fstockid


            // 


            this.txt_fstockid.IsReadly = false;


            this.txt_fstockid.Location = new System.Drawing.Point(84, 76);


            this.txt_fstockid.Location = new System.Drawing.Point(101, 90);


            this.txt_fstockid.Margin = new System.Windows.Forms.Padding(0);


            this.txt_fstockid.Name = "txt_fstockid";


            this.txt_fstockid.Size = new System.Drawing.Size(278, 24);


            this.txt_fstockid.Size = new System.Drawing.Size(345, 28);


            this.txt_fstockid.TabIndex = 454;


            // 


            // lbGuid


            // 


            this.lbGuid.Location = new System.Drawing.Point(825, 131);


            this.lbGuid.Location = new System.Drawing.Point(1031, 160);


            this.lbGuid.Margin = new System.Windows.Forms.Padding(4, 0, 4, 0);


            this.lbGuid.Name = "lbGuid";


            this.lbGuid.Size = new System.Drawing.Size(268, 28);


            this.lbGuid.Size = new System.Drawing.Size(335, 34);


            this.lbGuid.TabIndex = 1;


            this.lbGuid.Text = "lbGuid";


            // 


            // txt_wjStatus


            // 


            this.txt_wjStatus.Location = new System.Drawing.Point(638, 143);


            this.txt_wjStatus.Location = new System.Drawing.Point(798, 175);


            this.txt_wjStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_wjStatus.Name = "txt_wjStatus";


            this.txt_wjStatus.Properties.Caption = "完结标识";


            this.txt_wjStatus.Size = new System.Drawing.Size(309, 24);


            this.txt_wjStatus.Size = new System.Drawing.Size(386, 27);


            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(1074, 76);


            this.txt_chkStatus.Location = new System.Drawing.Point(1324, 90);


            this.txt_chkStatus.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_chkStatus.Name = "txt_chkStatus";


            this.txt_chkStatus.Properties.Caption = "审核标识";


            this.txt_chkStatus.Size = new System.Drawing.Size(351, 24);


            this.txt_chkStatus.Size = new System.Drawing.Size(433, 27);


            this.txt_chkStatus.StyleController = this.layoutMx1;


            this.txt_chkStatus.TabIndex = 452;


            this.txt_chkStatus.Tag = "readonly";


@@ -860,122 +887,134 @@


            // txt_billType


            // 


            this.txt_billType.EditValue = "标准销售退货单(XSTHD01_SYS)";


            this.txt_billType.Location = new System.Drawing.Point(438, 12);


            this.txt_billType.Location = new System.Drawing.Point(537, 14);


            this.txt_billType.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            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(278, 24);


            this.txt_billType.Size = new System.Drawing.Size(346, 28);


            this.txt_billType.StyleController = this.layoutMx1;


            this.txt_billType.TabIndex = 451;


            // 


            // txt_approvedDate


            // 


            this.txt_approvedDate.Location = new System.Drawing.Point(1146, 44);


            this.txt_approvedDate.Location = new System.Drawing.Point(1411, 52);


            this.txt_approvedDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_approvedDate.Name = "txt_approvedDate";


            this.txt_approvedDate.Properties.Appearance.Options.UseFont = true;


            this.txt_approvedDate.Size = new System.Drawing.Size(279, 24);


            this.txt_approvedDate.Size = new System.Drawing.Size(346, 28);


            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, 3);


            this.txt_id.Location = new System.Drawing.Point(112, 4);


            this.txt_id.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_id.Name = "txt_id";


            this.txt_id.Properties.Appearance.Options.UseFont = true;


            this.txt_id.Size = new System.Drawing.Size(189, 24);


            this.txt_id.Size = new System.Drawing.Size(236, 28);


            this.txt_id.StyleController = this.layoutMx1;


            this.txt_id.TabIndex = 210;


            this.txt_id.Tag = "readonly";


            // 


            // txt_approvedBy


            // txt_shUserName2


            // 


            this.txt_approvedBy.Location = new System.Drawing.Point(1146, 12);


            this.txt_approvedBy.Name = "txt_approvedBy";


            this.txt_approvedBy.Properties.Appearance.Options.UseFont = true;


            this.txt_approvedBy.Size = new System.Drawing.Size(279, 24);


            this.txt_approvedBy.StyleController = this.layoutMx1;


            this.txt_approvedBy.TabIndex = 370;


            this.txt_approvedBy.Tag = "readonly";


            this.txt_shUserName2.Location = new System.Drawing.Point(1411, 14);


            this.txt_shUserName2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_shUserName2.Name = "txt_shUserName2";


            this.txt_shUserName2.Properties.Appearance.Options.UseFont = true;


            this.txt_shUserName2.Size = new System.Drawing.Size(346, 28);


            this.txt_shUserName2.StyleController = this.layoutMx1;


            this.txt_shUserName2.TabIndex = 370;


            this.txt_shUserName2.Tag = "readonly";


            // 


            // txt_modifiedDate


            // 


            this.txt_modifiedDate.Location = new System.Drawing.Point(792, 44);


            this.txt_modifiedDate.Location = new System.Drawing.Point(974, 52);


            this.txt_modifiedDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_modifiedDate.Name = "txt_modifiedDate";


            this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true;


            this.txt_modifiedDate.Size = new System.Drawing.Size(278, 24);


            this.txt_modifiedDate.Size = new System.Drawing.Size(346, 28);


            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(84, 12);


            this.txt_billNo.Location = new System.Drawing.Point(101, 14);


            this.txt_billNo.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_billNo.Name = "txt_billNo";


            this.txt_billNo.Properties.Appearance.Options.UseFont = true;


            this.txt_billNo.Size = new System.Drawing.Size(278, 24);


            this.txt_billNo.Size = new System.Drawing.Size(345, 28);


            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(700, 44);


            this.txt_salerName.Location = new System.Drawing.Point(875, 54);


            this.txt_salerName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_salerName.Name = "txt_salerName";


            this.txt_salerName.Properties.Appearance.Options.UseFont = true;


            this.txt_salerName.Size = new System.Drawing.Size(232, 24);


            this.txt_salerName.Size = new System.Drawing.Size(290, 28);


            this.txt_salerName.StyleController = this.layoutMx1;


            this.txt_salerName.TabIndex = 267;


            this.txt_salerName.Tag = "readonly";


            // 


            // txt_modifiedBy


            // txt_xgUserName1


            // 


            this.txt_modifiedBy.Location = new System.Drawing.Point(792, 12);


            this.txt_modifiedBy.Name = "txt_modifiedBy";


            this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true;


            this.txt_modifiedBy.Size = new System.Drawing.Size(278, 24);


            this.txt_modifiedBy.StyleController = this.layoutMx1;


            this.txt_modifiedBy.TabIndex = 327;


            this.txt_modifiedBy.Tag = "readonly";


            this.txt_xgUserName1.Location = new System.Drawing.Point(974, 14);


            this.txt_xgUserName1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_xgUserName1.Name = "txt_xgUserName1";


            this.txt_xgUserName1.Properties.Appearance.Options.UseFont = true;


            this.txt_xgUserName1.Size = new System.Drawing.Size(346, 28);


            this.txt_xgUserName1.StyleController = this.layoutMx1;


            this.txt_xgUserName1.TabIndex = 327;


            this.txt_xgUserName1.Tag = "readonly";


            // 


            // txt_saleDeptName


            // 


            this.txt_saleDeptName.Location = new System.Drawing.Point(792, 76);


            this.txt_saleDeptName.Location = new System.Drawing.Point(974, 90);


            this.txt_saleDeptName.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_saleDeptName.Name = "txt_saleDeptName";


            this.txt_saleDeptName.Properties.Appearance.Options.UseFont = true;


            this.txt_saleDeptName.Size = new System.Drawing.Size(278, 24);


            this.txt_saleDeptName.Size = new System.Drawing.Size(346, 28);


            this.txt_saleDeptName.StyleController = this.layoutMx1;


            this.txt_saleDeptName.TabIndex = 222;


            this.txt_saleDeptName.Tag = "readonly";


            // 


            // txt_createdDate


            // 


            this.txt_createdDate.Location = new System.Drawing.Point(710, 110);


            this.txt_createdDate.Location = new System.Drawing.Point(888, 134);


            this.txt_createdDate.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_createdDate.Name = "txt_createdDate";


            this.txt_createdDate.Properties.Appearance.Options.UseFont = true;


            this.txt_createdDate.Size = new System.Drawing.Size(237, 24);


            this.txt_createdDate.Size = new System.Drawing.Size(296, 28);


            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(438, 76);


            this.txt_returnReason.Location = new System.Drawing.Point(537, 90);


            this.txt_returnReason.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_returnReason.Name = "txt_returnReason";


            this.txt_returnReason.Properties.Appearance.Options.UseFont = true;


            this.txt_returnReason.Size = new System.Drawing.Size(278, 24);


            this.txt_returnReason.Size = new System.Drawing.Size(346, 28);


            this.txt_returnReason.StyleController = this.layoutMx1;


            this.txt_returnReason.TabIndex = 235;


            // 


            // txt_createdBy


            // 


            this.txt_createdBy.Location = new System.Drawing.Point(710, 77);


            this.txt_createdBy.Location = new System.Drawing.Point(888, 94);


            this.txt_createdBy.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_createdBy.Name = "txt_createdBy";


            this.txt_createdBy.Properties.Appearance.Options.UseFont = true;


            this.txt_createdBy.Size = new System.Drawing.Size(237, 24);


            this.txt_createdBy.Size = new System.Drawing.Size(296, 28);


            this.txt_createdBy.StyleController = this.layoutMx1;


            this.txt_createdBy.TabIndex = 312;


            this.txt_createdBy.Tag = "readonly";


@@ -983,7 +1022,8 @@


            // txt_fHasLinkSource


            // 


            this.txt_fHasLinkSource.EditValue = "销售出库单(SAL OUTSTOCK)";


            this.txt_fHasLinkSource.Location = new System.Drawing.Point(438, 140);


            this.txt_fHasLinkSource.Location = new System.Drawing.Point(537, 166);


            this.txt_fHasLinkSource.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_fHasLinkSource.Name = "txt_fHasLinkSource";


            this.txt_fHasLinkSource.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});


@@ -991,14 +1031,15 @@


            "销售出库单(SAL_OUTSTOCK)",


            "销售订单(SAL_SaleOrder)"});


            this.txt_fHasLinkSource.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;


            this.txt_fHasLinkSource.Size = new System.Drawing.Size(278, 24);


            this.txt_fHasLinkSource.Size = new System.Drawing.Size(346, 28);


            this.txt_fHasLinkSource.StyleController = this.layoutMx1;


            this.txt_fHasLinkSource.TabIndex = 544;


            // 


            // txt_xsms


            // 


            this.txt_xsms.EditValue = "-请选择-";


            this.txt_xsms.Location = new System.Drawing.Point(792, 140);


            this.txt_xsms.Location = new System.Drawing.Point(974, 166);


            this.txt_xsms.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_xsms.Name = "txt_xsms";


            this.txt_xsms.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {


            new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});


@@ -1009,7 +1050,7 @@


            "3:OBM",


            "4:供应商买料"});


            this.txt_xsms.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;


            this.txt_xsms.Size = new System.Drawing.Size(278, 24);


            this.txt_xsms.Size = new System.Drawing.Size(346, 28);


            this.txt_xsms.StyleController = this.layoutMx1;


            this.txt_xsms.TabIndex = 545;


            // 


@@ -1032,7 +1073,7 @@


            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);


            this.layoutControlItem1.TextSize = new System.Drawing.Size(82, 22);


            // 


            // layoutControlItem12


            // 


@@ -1043,7 +1084,7 @@


            this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;


            this.layoutControlItem12.Size = new System.Drawing.Size(313, 33);


            this.layoutControlItem12.Text = "创建时间";


            this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);


            this.layoutControlItem12.TextSize = new System.Drawing.Size(75, 22);


            // 


            // layoutControlItem11


            // 


@@ -1054,7 +1095,7 @@


            this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem11.Size = new System.Drawing.Size(313, 33);


            this.layoutControlItem11.Text = "创建人员";


            this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);


            this.layoutControlItem11.TextSize = new System.Drawing.Size(75, 22);


            // 


            // layoutControlItem18


            // 


@@ -1077,7 +1118,7 @@


            this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem6.Size = new System.Drawing.Size(308, 32);


            this.layoutControlItem6.Text = "销售员名";


            this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);


            this.layoutControlItem6.TextSize = new System.Drawing.Size(75, 22);


            // 


            // Root


            // 


@@ -1134,7 +1175,11 @@


            rowDefinition3,


            rowDefinition4,


            rowDefinition5});


<<<<<<< HEAD


            this.Root.Size = new System.Drawing.Size(1437, 182);


=======


            this.Root.Size = new System.Drawing.Size(1771, 214);


>>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6


            this.Root.TextVisible = false;


            // 


            // layoutControlItem4


@@ -1142,39 +1187,39 @@


            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(354, 32);


            this.layoutControlItem4.Size = new System.Drawing.Size(436, 38);


            this.layoutControlItem4.Text = "申请单号";


            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);


            this.layoutControlItem4.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layoutControlItem15


            // 


            this.layoutControlItem15.Control = this.txt_approvedBy;


            this.layoutControlItem15.Location = new System.Drawing.Point(1062, 0);


            this.layoutControlItem15.Control = this.txt_shUserName2;


            this.layoutControlItem15.Location = new System.Drawing.Point(1310, 0);


            this.layoutControlItem15.Name = "layoutControlItem15";


            this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem15.Size = new System.Drawing.Size(355, 32);


            this.layoutControlItem15.Size = new System.Drawing.Size(437, 38);


            this.layoutControlItem15.Text = "审核人员";


            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);


            this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layoutControlItem16


            // 


            this.layoutControlItem16.Control = this.txt_approvedDate;


            this.layoutControlItem16.Location = new System.Drawing.Point(1062, 32);


            this.layoutControlItem16.Location = new System.Drawing.Point(1310, 38);


            this.layoutControlItem16.Name = "layoutControlItem16";


            this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem16.Size = new System.Drawing.Size(355, 32);


            this.layoutControlItem16.Size = new System.Drawing.Size(437, 38);


            this.layoutControlItem16.Text = "审核时间";


            this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);


            this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layoutControlItem17


            // 


            this.layoutControlItem17.Control = this.txt_chkStatus;


            this.layoutControlItem17.Location = new System.Drawing.Point(1062, 64);


            this.layoutControlItem17.Location = new System.Drawing.Point(1310, 76);


            this.layoutControlItem17.Name = "layoutControlItem17";


            this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem17.Size = new System.Drawing.Size(355, 32);


            this.layoutControlItem17.Size = new System.Drawing.Size(437, 38);


            this.layoutControlItem17.Text = "审核标识";


            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem17.TextVisible = false;


@@ -1182,94 +1227,94 @@


            // layoutControlItem20


            // 


            this.layoutControlItem20.Control = this.txt_fstockid;


            this.layoutControlItem20.Location = new System.Drawing.Point(0, 64);


            this.layoutControlItem20.Location = new System.Drawing.Point(0, 76);


            this.layoutControlItem20.Name = "layoutControlItem20";


            this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem20.Size = new System.Drawing.Size(354, 32);


            this.layoutControlItem20.Size = new System.Drawing.Size(436, 38);


            this.layoutControlItem20.Text = "选择仓库";


            this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);


            this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layItem1


            // 


            this.layItem1.Control = this.txt_salesOrg;


            this.layItem1.Location = new System.Drawing.Point(0, 32);


            this.layItem1.Location = new System.Drawing.Point(0, 38);


            this.layItem1.Name = "layItem1";


            this.layItem1.OptionsTableLayoutItem.RowIndex = 1;


            this.layItem1.Size = new System.Drawing.Size(354, 32);


            this.layItem1.Size = new System.Drawing.Size(436, 38);


            this.layItem1.Text = "销售组织";


            this.layItem1.TextSize = new System.Drawing.Size(60, 18);


            this.layItem1.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layoutControlItem21


            // 


            this.layoutControlItem21.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;


            this.layoutControlItem21.AppearanceItemCaption.Options.UseBackColor = true;


            this.layoutControlItem21.Control = this.txt_fHasLinkRad;


            this.layoutControlItem21.Location = new System.Drawing.Point(354, 96);


            this.layoutControlItem21.Location = new System.Drawing.Point(436, 114);


            this.layoutControlItem21.Name = "layoutControlItem21";


            this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 3;


            this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);


            this.layoutControlItem21.Size = new System.Drawing.Size(354, 32);


            this.layoutControlItem21.Size = new System.Drawing.Size(437, 38);


            this.layoutControlItem21.Text = "源单类型";


            this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);


            this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layoutControlItem7


            // 


            this.layoutControlItem7.Control = this.txt_saleDeptName;


            this.layoutControlItem7.Location = new System.Drawing.Point(708, 64);


            this.layoutControlItem7.Location = new System.Drawing.Point(873, 76);


            this.layoutControlItem7.Name = "layoutControlItem7";


            this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem7.Size = new System.Drawing.Size(354, 32);


            this.layoutControlItem7.Size = new System.Drawing.Size(437, 38);


            this.layoutControlItem7.Text = "销售部门";


            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);


            this.layoutControlItem7.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layoutControlItem10


            // 


            this.layoutControlItem10.Control = this.txt_billType;


            this.layoutControlItem10.Location = new System.Drawing.Point(354, 0);


            this.layoutControlItem10.Location = new System.Drawing.Point(436, 0);


            this.layoutControlItem10.Name = "layoutControlItem10";


            this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem10.Size = new System.Drawing.Size(354, 32);


            this.layoutControlItem10.Size = new System.Drawing.Size(437, 38);


            this.layoutControlItem10.Text = "单据类型";


            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);


            this.layoutControlItem10.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layItem2


            // 


            this.layItem2.Control = this.txt_returnCustomer;


            this.layItem2.Location = new System.Drawing.Point(354, 32);


            this.layItem2.Location = new System.Drawing.Point(436, 38);


            this.layItem2.Name = "layItem2";


            this.layItem2.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layItem2.OptionsTableLayoutItem.RowIndex = 1;


            this.layItem2.Size = new System.Drawing.Size(354, 32);


            this.layItem2.Size = new System.Drawing.Size(437, 38);


            this.layItem2.Text = "退货客户";


            this.layItem2.TextSize = new System.Drawing.Size(60, 18);


            this.layItem2.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layItem3


            // 


            this.layItem3.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;


            this.layItem3.AppearanceItemCaption.Options.UseBackColor = true;


            this.layItem3.Control = this.txt_inventoryOrg;


            this.layItem3.Location = new System.Drawing.Point(708, 96);


            this.layItem3.Location = new System.Drawing.Point(873, 114);


            this.layItem3.Name = "layItem3";


            this.layItem3.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layItem3.OptionsTableLayoutItem.RowIndex = 3;


            this.layItem3.Size = new System.Drawing.Size(354, 32);


            this.layItem3.Size = new System.Drawing.Size(437, 38);


            this.layItem3.Text = "库存组织";


            this.layItem3.TextSize = new System.Drawing.Size(60, 18);


            this.layItem3.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layItem4


            // 


            this.layItem4.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;


            this.layItem4.AppearanceItemCaption.Options.UseBackColor = true;


            this.layItem4.Control = this.txt_salesDept;


            this.layItem4.Location = new System.Drawing.Point(1062, 96);


            this.layItem4.Location = new System.Drawing.Point(1310, 114);


            this.layItem4.Name = "layItem4";


            this.layItem4.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layItem4.OptionsTableLayoutItem.RowIndex = 3;


            this.layItem4.Size = new System.Drawing.Size(355, 32);


            this.layItem4.Size = new System.Drawing.Size(437, 38);


            this.layItem4.Text = "销售部门";


            this.layItem4.TextSize = new System.Drawing.Size(60, 18);


            this.layItem4.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layItem100


            // 


@@ -1277,56 +1322,60 @@


            this.layItem100.AppearanceItemCaption.Options.UseBackColor = true;


            this.layItem100.Control = this.txt_fHasLinkSource;


            this.layItem100.CustomizationFormText = "数据来源";


            this.layItem100.Location = new System.Drawing.Point(354, 128);


            this.layItem100.Location = new System.Drawing.Point(436, 152);


            this.layItem100.Name = "layItem100";


            this.layItem100.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layItem100.OptionsTableLayoutItem.RowIndex = 4;


<<<<<<< HEAD


            this.layItem100.Size = new System.Drawing.Size(354, 34);


=======


            this.layItem100.Size = new System.Drawing.Size(437, 38);


>>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6


            this.layItem100.Text = "数据来源";


            this.layItem100.TextSize = new System.Drawing.Size(60, 18);


            this.layItem100.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layoutControlItem13


            // 


            this.layoutControlItem13.Control = this.txt_modifiedBy;


            this.layoutControlItem13.Location = new System.Drawing.Point(708, 0);


            this.layoutControlItem13.Control = this.txt_xgUserName1;


            this.layoutControlItem13.Location = new System.Drawing.Point(873, 0);


            this.layoutControlItem13.Name = "layoutControlItem13";


            this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem13.Size = new System.Drawing.Size(354, 32);


            this.layoutControlItem13.Size = new System.Drawing.Size(437, 38);


            this.layoutControlItem13.Text = "修改人员";


            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);


            this.layoutControlItem13.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layoutControlItem14


            // 


            this.layoutControlItem14.Control = this.txt_modifiedDate;


            this.layoutControlItem14.Location = new System.Drawing.Point(708, 32);


            this.layoutControlItem14.Location = new System.Drawing.Point(873, 38);


            this.layoutControlItem14.Name = "layoutControlItem14";


            this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem14.Size = new System.Drawing.Size(354, 32);


            this.layoutControlItem14.Size = new System.Drawing.Size(437, 38);


            this.layoutControlItem14.Text = "修改时间";


            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);


            this.layoutControlItem14.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layoutControlItem9


            // 


            this.layoutControlItem9.Control = this.txt_returnReason;


            this.layoutControlItem9.CustomizationFormText = "申请原因";


            this.layoutControlItem9.Location = new System.Drawing.Point(354, 64);


            this.layoutControlItem9.Location = new System.Drawing.Point(436, 76);


            this.layoutControlItem9.Name = "layoutControlItem9";


            this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem9.Size = new System.Drawing.Size(354, 32);


            this.layoutControlItem9.Size = new System.Drawing.Size(437, 38);


            this.layoutControlItem9.Text = "申请原因";


            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);


            this.layoutControlItem9.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layoutControlItem3


            // 


            this.layoutControlItem3.Control = this.btnSelect;


            this.layoutControlItem3.Location = new System.Drawing.Point(0, 96);


            this.layoutControlItem3.MaxSize = new System.Drawing.Size(130, 31);


            this.layoutControlItem3.MinSize = new System.Drawing.Size(20, 31);


            this.layoutControlItem3.Location = new System.Drawing.Point(0, 114);


            this.layoutControlItem3.MaxSize = new System.Drawing.Size(162, 38);


            this.layoutControlItem3.MinSize = new System.Drawing.Size(25, 38);


            this.layoutControlItem3.Name = "layoutControlItem3";


            this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;


            this.layoutControlItem3.Size = new System.Drawing.Size(354, 32);


            this.layoutControlItem3.Size = new System.Drawing.Size(436, 38);


            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;


            this.layoutControlItem3.Text = "选择明细";


            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);


@@ -1337,13 +1386,17 @@


            this.layItem101.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;


            this.layItem101.AppearanceItemCaption.Options.UseBackColor = true;


            this.layItem101.Control = this.txt_xsms;


            this.layItem101.Location = new System.Drawing.Point(708, 128);


            this.layItem101.Location = new System.Drawing.Point(873, 152);


            this.layItem101.Name = "layItem101";


            this.layItem101.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layItem101.OptionsTableLayoutItem.RowIndex = 4;


<<<<<<< HEAD


            this.layItem101.Size = new System.Drawing.Size(354, 34);


=======


            this.layItem101.Size = new System.Drawing.Size(437, 38);


>>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6


            this.layItem101.Text = "销售模式";


            this.layItem101.TextSize = new System.Drawing.Size(60, 18);


            this.layItem101.TextSize = new System.Drawing.Size(72, 22);


            // 


            // layoutControlItem2


            // 


@@ -1364,9 +1417,14 @@


            // 


            this.tabMx.Dock = System.Windows.Forms.DockStyle.Fill;


            this.tabMx.Location = new System.Drawing.Point(0, 0);


            this.tabMx.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.tabMx.Name = "tabMx";


            this.tabMx.SelectedTabPage = this.tabMxPage1;


<<<<<<< HEAD


            this.tabMx.Size = new System.Drawing.Size(1437, 376);


=======


            this.tabMx.Size = new System.Drawing.Size(1797, 470);


>>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6


            this.tabMx.TabIndex = 3;


            this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {


            this.tabMxPage1,


@@ -1375,8 +1433,13 @@


            // tabMxPage1


            // 


            this.tabMxPage1.Controls.Add(this.split99);


            this.tabMxPage1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.tabMxPage1.Name = "tabMxPage1";


<<<<<<< HEAD


            this.tabMxPage1.Size = new System.Drawing.Size(1435, 344);


=======


            this.tabMxPage1.Size = new System.Drawing.Size(1795, 432);


>>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6


            this.tabMxPage1.Text = "申请明细";


            // 


            // split99


@@ -1384,6 +1447,7 @@


            this.split99.Dock = System.Windows.Forms.DockStyle.Fill;


            this.split99.Horizontal = false;


            this.split99.Location = new System.Drawing.Point(0, 0);


            this.split99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.split99.Name = "split99";


            // 


            // split99.Panel1


@@ -1396,8 +1460,13 @@


            this.split99.Panel2.Controls.Add(this.gcMx1);


            this.split99.Panel2.Text = "Panel2";


            this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;


<<<<<<< HEAD


            this.split99.Size = new System.Drawing.Size(1435, 344);


            this.split99.SplitterPosition = 132;


=======


            this.split99.Size = new System.Drawing.Size(1795, 432);


            this.split99.SplitterPosition = 161;


>>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6


            this.split99.TabIndex = 4;


            // 


            // layout99


@@ -1417,10 +1486,11 @@


            this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {


            this.layoutControlItem29});


            this.layout99.Location = new System.Drawing.Point(0, 0);


            this.layout99.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.layout99.Name = "layout99";


            this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(46, 297, 812, 500);


            this.layout99.Root = this.layoutControlGroup1;


            this.layout99.Size = new System.Drawing.Size(1435, 132);


            this.layout99.Size = new System.Drawing.Size(1795, 161);


            this.layout99.TabIndex = 0;


            this.layout99.Text = "layoutControl1";


            // 


@@ -1428,29 +1498,32 @@


            // 


            this.layoutControl1.Controls.Add(this.txt_iCount_1);


            this.layoutControl1.Controls.Add(this.txt_yuliang_1);


            this.layoutControl1.Location = new System.Drawing.Point(719, 86);


            this.layoutControl1.Location = new System.Drawing.Point(899, 105);


            this.layoutControl1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.layoutControl1.Name = "layoutControl1";


            this.layoutControl1.Root = this.layoutControlGroup2;


            this.layoutControl1.Size = new System.Drawing.Size(350, 34);


            this.layoutControl1.Size = new System.Drawing.Size(439, 42);


            this.layoutControl1.TabIndex = 477;


            this.layoutControl1.Text = "layoutControl1";


            // 


            // txt_iCount_1


            // 


            this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);


            this.txt_iCount_1.Location = new System.Drawing.Point(125, 2);


            this.txt_iCount_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_iCount_1.Name = "txt_iCount_1";


            this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;


            this.txt_iCount_1.Properties.ReadOnly = true;


            this.txt_iCount_1.Size = new System.Drawing.Size(69, 24);


            this.txt_iCount_1.Size = new System.Drawing.Size(92, 28);


            this.txt_iCount_1.StyleController = this.layoutControl1;


            this.txt_iCount_1.TabIndex = 228;


            // 


            // txt_yuliang_1


            // 


            this.txt_yuliang_1.Location = new System.Drawing.Point(279, 2);


            this.txt_yuliang_1.Location = new System.Drawing.Point(344, 2);


            this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_yuliang_1.Name = "txt_yuliang_1";


            this.txt_yuliang_1.Properties.ReadOnly = true;


            this.txt_yuliang_1.Size = new System.Drawing.Size(69, 24);


            this.txt_yuliang_1.Size = new System.Drawing.Size(93, 28);


            this.txt_yuliang_1.StyleController = this.layoutControl1;


            this.txt_yuliang_1.TabIndex = 229;


            // 


@@ -1475,7 +1548,7 @@


            this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {


            rowDefinition6});


            this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);


            this.layoutControlGroup2.Size = new System.Drawing.Size(350, 34);


            this.layoutControlGroup2.Size = new System.Drawing.Size(439, 42);


            this.layoutControlGroup2.TextVisible = false;


            // 


            // layoutControlItem33


@@ -1483,34 +1556,34 @@


            this.layoutControlItem33.Control = this.txt_iCount_1;


            this.layoutControlItem33.Location = new System.Drawing.Point(0, 0);


            this.layoutControlItem33.Name = "layoutControlItem33";


            this.layoutControlItem33.Size = new System.Drawing.Size(175, 34);


            this.layoutControlItem33.Size = new System.Drawing.Size(219, 42);


            this.layoutControlItem33.Text = "打印整张数值";


            this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);


            this.layoutControlItem33.TextSize = new System.Drawing.Size(108, 22);


            // 


            // layoutControlItem34


            // 


            this.layoutControlItem34.Control = this.txt_yuliang_1;


            this.layoutControlItem34.Location = new System.Drawing.Point(175, 0);


            this.layoutControlItem34.Location = new System.Drawing.Point(219, 0);


            this.layoutControlItem34.Name = "layoutControlItem34";


            this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem34.Size = new System.Drawing.Size(175, 34);


            this.layoutControlItem34.Size = new System.Drawing.Size(220, 42);


            this.layoutControlItem34.Text = "打印余数";


            this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);


            this.layoutControlItem34.TextSize = new System.Drawing.Size(108, 22);


            // 


            // ucBtnPrint1


            // 


            this.ucBtnPrint1.allClickKey = null;


            this.ucBtnPrint1.guidKey = null;


            this.ucBtnPrint1.Location = new System.Drawing.Point(1072, 47);


            this.ucBtnPrint1.Location = new System.Drawing.Point(1341, 57);


            this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);


            this.ucBtnPrint1.Name = "ucBtnPrint1";


            this.ucBtnPrint1.rptParameter = null;


            this.ucBtnPrint1.Size = new System.Drawing.Size(352, 37);


            this.ucBtnPrint1.Size = new System.Drawing.Size(441, 46);


            this.ucBtnPrint1.TabIndex = 230;


            // 


            // radOut


            // 


            this.radOut.Location = new System.Drawing.Point(1074, 10);


            this.radOut.Location = new System.Drawing.Point(1344, 12);


            this.radOut.Margin = new System.Windows.Forms.Padding(0);


            this.radOut.Name = "radOut";


            this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;


@@ -1519,15 +1592,16 @@


            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "只打整张"),


            new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "手动打")});


            this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);


            this.radOut.Size = new System.Drawing.Size(351, 37);


            this.radOut.Size = new System.Drawing.Size(439, 45);


            this.radOut.StyleController = this.layout99;


            this.radOut.TabIndex = 476;


            // 


            // lbMxGuid


            // 


            this.lbMxGuid.Location = new System.Drawing.Point(755, 76);


            this.lbMxGuid.Location = new System.Drawing.Point(944, 93);


            this.lbMxGuid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.lbMxGuid.Name = "lbMxGuid";


            this.lbMxGuid.Size = new System.Drawing.Size(58, 18);


            this.lbMxGuid.Size = new System.Drawing.Size(72, 22);


            this.lbMxGuid.StyleController = this.layout99;


            this.lbMxGuid.TabIndex = 229;


            this.lbMxGuid.Text = "lbMxGuid";


@@ -1535,72 +1609,79 @@


            // 


            // txtWlid


            // 


            this.txtWlid.Location = new System.Drawing.Point(114, 12);


            this.txtWlid.Location = new System.Drawing.Point(137, 14);


            this.txtWlid.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txtWlid.Name = "txtWlid";


            this.txtWlid.Properties.Appearance.Options.UseFont = true;


            this.txtWlid.Properties.ReadOnly = true;


            this.txtWlid.Size = new System.Drawing.Size(247, 24);


            this.txtWlid.Size = new System.Drawing.Size(315, 28);


            this.txtWlid.StyleController = this.layout99;


            this.txtWlid.TabIndex = 214;


            // 


            // txt_psnQty_1


            // 


            this.txt_psnQty_1.Location = new System.Drawing.Point(821, 49);


            this.txt_psnQty_1.Location = new System.Drawing.Point(1022, 59);


            this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_psnQty_1.Name = "txt_psnQty_1";


            this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;


            this.txt_psnQty_1.Size = new System.Drawing.Size(248, 24);


            this.txt_psnQty_1.Size = new System.Drawing.Size(316, 28);


            this.txt_psnQty_1.StyleController = this.layout99;


            this.txt_psnQty_1.TabIndex = 226;


            // 


            // txtWlmc


            // 


            this.txtWlmc.Location = new System.Drawing.Point(114, 49);


            this.txtWlmc.Location = new System.Drawing.Point(137, 59);


            this.txtWlmc.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txtWlmc.Name = "txtWlmc";


            this.txtWlmc.Properties.Appearance.Options.UseFont = true;


            this.txtWlmc.Properties.ReadOnly = true;


            this.txtWlmc.Size = new System.Drawing.Size(247, 24);


            this.txtWlmc.Size = new System.Drawing.Size(315, 28);


            this.txtWlmc.StyleController = this.layout99;


            this.txtWlmc.TabIndex = 216;


            // 


            // txtWlgg


            // 


            this.txtWlgg.Location = new System.Drawing.Point(114, 86);


            this.txtWlgg.Location = new System.Drawing.Point(137, 105);


            this.txtWlgg.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txtWlgg.Name = "txtWlgg";


            this.txtWlgg.Properties.Appearance.Options.UseFont = true;


            this.txtWlgg.Properties.ReadOnly = true;


            this.txtWlgg.Size = new System.Drawing.Size(601, 24);


            this.txtWlgg.Size = new System.Drawing.Size(758, 28);


            this.txtWlgg.StyleController = this.layout99;


            this.txtWlgg.TabIndex = 218;


            // 


            // txt_kQty


            // 


            this.txt_kQty.Location = new System.Drawing.Point(821, 12);


            this.txt_kQty.Location = new System.Drawing.Point(1022, 14);


            this.txt_kQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_kQty.Name = "txt_kQty";


            this.txt_kQty.Properties.Appearance.ForeColor = System.Drawing.Color.Blue;


            this.txt_kQty.Properties.Appearance.Options.UseFont = true;


            this.txt_kQty.Properties.Appearance.Options.UseForeColor = true;


            this.txt_kQty.Properties.ReadOnly = true;


            this.txt_kQty.Size = new System.Drawing.Size(248, 24);


            this.txt_kQty.Size = new System.Drawing.Size(316, 28);


            this.txt_kQty.StyleController = this.layout99;


            this.txt_kQty.TabIndex = 224;


            // 


            // txtQuantity


            // 


            this.txtQuantity.Location = new System.Drawing.Point(467, 12);


            this.txtQuantity.Location = new System.Drawing.Point(579, 14);


            this.txtQuantity.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txtQuantity.Name = "txtQuantity";


            this.txtQuantity.Properties.Appearance.Options.UseFont = true;


            this.txtQuantity.Properties.ReadOnly = true;


            this.txtQuantity.Size = new System.Drawing.Size(248, 24);


            this.txtQuantity.Size = new System.Drawing.Size(316, 28);


            this.txtQuantity.StyleController = this.layout99;


            this.txtQuantity.TabIndex = 220;


            // 


            // txt_yQty


            // 


            this.txt_yQty.Location = new System.Drawing.Point(467, 49);


            this.txt_yQty.Location = new System.Drawing.Point(579, 59);


            this.txt_yQty.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.txt_yQty.Name = "txt_yQty";


            this.txt_yQty.Properties.Appearance.Options.UseFont = true;


            this.txt_yQty.Properties.ReadOnly = true;


            this.txt_yQty.Size = new System.Drawing.Size(248, 24);


            this.txt_yQty.Size = new System.Drawing.Size(316, 28);


            this.txt_yQty.StyleController = this.layout99;


            this.txt_yQty.TabIndex = 222;


            // 


@@ -1656,7 +1737,7 @@


            rowDefinition7,


            rowDefinition8,


            rowDefinition9});


            this.layoutControlGroup1.Size = new System.Drawing.Size(1435, 132);


            this.layoutControlGroup1.Size = new System.Drawing.Size(1795, 161);


            this.layoutControlGroup1.TextVisible = false;


            // 


            // layoutControlItem22


@@ -1664,81 +1745,81 @@


            this.layoutControlItem22.Control = this.txtWlid;


            this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);


            this.layoutControlItem22.Name = "layoutControlItem22";


            this.layoutControlItem22.Size = new System.Drawing.Size(353, 37);


            this.layoutControlItem22.Size = new System.Drawing.Size(442, 45);


            this.layoutControlItem22.Text = "物料编码";


            this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);


            this.layoutControlItem22.TextSize = new System.Drawing.Size(108, 22);


            // 


            // layoutControlItem23


            // 


            this.layoutControlItem23.Control = this.txtWlmc;


            this.layoutControlItem23.Location = new System.Drawing.Point(0, 37);


            this.layoutControlItem23.Location = new System.Drawing.Point(0, 45);


            this.layoutControlItem23.Name = "layoutControlItem23";


            this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem23.Size = new System.Drawing.Size(353, 37);


            this.layoutControlItem23.Size = new System.Drawing.Size(442, 46);


            this.layoutControlItem23.Text = "物料名称";


            this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);


            this.layoutControlItem23.TextSize = new System.Drawing.Size(108, 22);


            // 


            // layoutControlItem24


            // 


            this.layoutControlItem24.Control = this.txtWlgg;


            this.layoutControlItem24.Location = new System.Drawing.Point(0, 74);


            this.layoutControlItem24.Location = new System.Drawing.Point(0, 91);


            this.layoutControlItem24.Name = "layoutControlItem24";


            this.layoutControlItem24.OptionsTableLayoutItem.ColumnSpan = 2;


            this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem24.Size = new System.Drawing.Size(707, 38);


            this.layoutControlItem24.Size = new System.Drawing.Size(885, 46);


            this.layoutControlItem24.Text = "物料规格";


            this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);


            this.layoutControlItem24.TextSize = new System.Drawing.Size(108, 22);


            // 


            // layoutControlItem25


            // 


            this.layoutControlItem25.Control = this.txtQuantity;


            this.layoutControlItem25.Location = new System.Drawing.Point(353, 0);


            this.layoutControlItem25.Location = new System.Drawing.Point(442, 0);


            this.layoutControlItem25.Name = "layoutControlItem25";


            this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem25.Size = new System.Drawing.Size(354, 37);


            this.layoutControlItem25.Size = new System.Drawing.Size(443, 45);


            this.layoutControlItem25.Text = "本次申请总量";


            this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);


            this.layoutControlItem25.TextSize = new System.Drawing.Size(108, 22);


            // 


            // layoutControlItem26


            // 


            this.layoutControlItem26.Control = this.txt_yQty;


            this.layoutControlItem26.Location = new System.Drawing.Point(353, 37);


            this.layoutControlItem26.Location = new System.Drawing.Point(442, 45);


            this.layoutControlItem26.Name = "layoutControlItem26";


            this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;


            this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem26.Size = new System.Drawing.Size(354, 37);


            this.layoutControlItem26.Size = new System.Drawing.Size(443, 46);


            this.layoutControlItem26.Text = "已打印总量";


            this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);


            this.layoutControlItem26.TextSize = new System.Drawing.Size(108, 22);


            // 


            // layoutControlItem27


            // 


            this.layoutControlItem27.Control = this.txt_kQty;


            this.layoutControlItem27.Location = new System.Drawing.Point(707, 0);


            this.layoutControlItem27.Location = new System.Drawing.Point(885, 0);


            this.layoutControlItem27.Name = "layoutControlItem27";


            this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem27.Size = new System.Drawing.Size(354, 37);


            this.layoutControlItem27.Size = new System.Drawing.Size(443, 45);


            this.layoutControlItem27.Text = "可打印总数";


            this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);


            this.layoutControlItem27.TextSize = new System.Drawing.Size(108, 22);


            // 


            // layoutControlItem28


            // 


            this.layoutControlItem28.Control = this.txt_psnQty_1;


            this.layoutControlItem28.Location = new System.Drawing.Point(707, 37);


            this.layoutControlItem28.Location = new System.Drawing.Point(885, 45);


            this.layoutControlItem28.Name = "layoutControlItem28";


            this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem28.Size = new System.Drawing.Size(354, 37);


            this.layoutControlItem28.Size = new System.Drawing.Size(443, 46);


            this.layoutControlItem28.Text = "每张条码数量";


            this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);


            this.layoutControlItem28.TextSize = new System.Drawing.Size(108, 22);


            // 


            // layoutControlItem30


            // 


            this.layoutControlItem30.Control = this.radOut;


            this.layoutControlItem30.Location = new System.Drawing.Point(1061, 0);


            this.layoutControlItem30.Location = new System.Drawing.Point(1328, 0);


            this.layoutControlItem30.Name = "layoutControlItem30";


            this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);


            this.layoutControlItem30.Size = new System.Drawing.Size(354, 37);


            this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(4, 0, 0, 0);


            this.layoutControlItem30.Size = new System.Drawing.Size(443, 45);


            this.layoutControlItem30.Text = "自动计算";


            this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem30.TextVisible = false;


@@ -1746,12 +1827,12 @@


            // layoutControlItem31


            // 


            this.layoutControlItem31.Control = this.ucBtnPrint1;


            this.layoutControlItem31.Location = new System.Drawing.Point(1061, 37);


            this.layoutControlItem31.Location = new System.Drawing.Point(1328, 45);


            this.layoutControlItem31.Name = "layoutControlItem31";


            this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;


            this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1;


            this.layoutControlItem31.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);


            this.layoutControlItem31.Size = new System.Drawing.Size(354, 37);


            this.layoutControlItem31.Size = new System.Drawing.Size(443, 46);


            this.layoutControlItem31.Text = "打印按钮";


            this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem31.TextVisible = false;


@@ -1759,11 +1840,11 @@


            // layoutControlItem32


            // 


            this.layoutControlItem32.Control = this.layoutControl1;


            this.layoutControlItem32.Location = new System.Drawing.Point(707, 74);


            this.layoutControlItem32.Location = new System.Drawing.Point(885, 91);


            this.layoutControlItem32.Name = "layoutControlItem32";


            this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;


            this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 2;


            this.layoutControlItem32.Size = new System.Drawing.Size(354, 38);


            this.layoutControlItem32.Size = new System.Drawing.Size(443, 46);


            this.layoutControlItem32.Text = "打印数量";


            this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);


            this.layoutControlItem32.TextVisible = false;


@@ -1771,14 +1852,20 @@


            // gcMx1


            // 


            this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;


            this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.gcMx1.Location = new System.Drawing.Point(0, 0);


            this.gcMx1.MainView = this.gvMx1;


            this.gcMx1.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.gcMx1.Name = "gcMx1";


            this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {


            this.repositoryItemButtonEdit1,


            this.repositoryItemComboBox1,


            this.repositoryItemDateEdit1});


<<<<<<< HEAD


            this.gcMx1.Size = new System.Drawing.Size(1435, 200);


=======


            this.gcMx1.Size = new System.Drawing.Size(1795, 256);


>>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6


            this.gcMx1.TabIndex = 0;


            this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {


            this.gvMx1});


@@ -1804,6 +1891,7 @@


            this.gridColumn21,


            this.gridColumn22,


            this.gvMxDel});


            this.gvMx1.DetailHeight = 428;


            this.gvMx1.GridControl = this.gcMx1;


            this.gvMx1.Name = "gvMx1";


            this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;


@@ -1815,88 +1903,88 @@


            this.gvMx1id.AppearanceCell.Options.UseFont = true;


            this.gvMx1id.Caption = "主键GUID";


            this.gvMx1id.FieldName = "guid";


            this.gvMx1id.MinWidth = 50;


            this.gvMx1id.MinWidth = 62;


            this.gvMx1id.Name = "gvMx1id";


            this.gvMx1id.Tag = "query_a.ID";


            this.gvMx1id.Width = 94;


            this.gvMx1id.Width = 117;


            // 


            // gvMx1materialId


            // 


            this.gvMx1materialId.AppearanceCell.Options.UseFont = true;


            this.gvMx1materialId.Caption = "物料ID ";


            this.gvMx1materialId.FieldName = "itemId";


            this.gvMx1materialId.MinWidth = 50;


            this.gvMx1materialId.MinWidth = 62;


            this.gvMx1materialId.Name = "gvMx1materialId";


            this.gvMx1materialId.Tag = "query_a.MATERIAL_ID";


            this.gvMx1materialId.Width = 94;


            this.gvMx1materialId.Width = 117;


            // 


            // gvMx1materialName


            // 


            this.gvMx1materialName.AppearanceCell.Options.UseFont = true;


            this.gvMx1materialName.Caption = "物料名称 ";


            this.gvMx1materialName.FieldName = "itemName";


            this.gvMx1materialName.MinWidth = 50;


            this.gvMx1materialName.MinWidth = 62;


            this.gvMx1materialName.Name = "gvMx1materialName";


            this.gvMx1materialName.Tag = "query_a.MATERIAL_NAME";


            this.gvMx1materialName.Visible = true;


            this.gvMx1materialName.VisibleIndex = 0;


            this.gvMx1materialName.Width = 94;


            this.gvMx1materialName.Width = 117;


            // 


            // gvMx1materialSpecification


            // 


            this.gvMx1materialSpecification.AppearanceCell.Options.UseFont = true;


            this.gvMx1materialSpecification.Caption = "物料规格 ";


            this.gvMx1materialSpecification.FieldName = "itemModel";


            this.gvMx1materialSpecification.MinWidth = 50;


            this.gvMx1materialSpecification.MinWidth = 62;


            this.gvMx1materialSpecification.Name = "gvMx1materialSpecification";


            this.gvMx1materialSpecification.Tag = "query_a.MATERIAL_SPECIFICATION";


            this.gvMx1materialSpecification.Visible = true;


            this.gvMx1materialSpecification.VisibleIndex = 8;


            this.gvMx1materialSpecification.Width = 94;


            this.gvMx1materialSpecification.Width = 117;


            // 


            // gridColumn20


            // 


            this.gridColumn20.Caption = "物料编码";


            this.gridColumn20.FieldName = "itemNo";


            this.gridColumn20.MinWidth = 25;


            this.gridColumn20.MinWidth = 31;


            this.gridColumn20.Name = "gridColumn20";


            this.gridColumn20.Visible = true;


            this.gridColumn20.VisibleIndex = 1;


            this.gridColumn20.Width = 94;


            this.gridColumn20.Width = 117;


            // 


            // gvMx1salesUnitId


            // 


            this.gvMx1salesUnitId.AppearanceCell.Options.UseFont = true;


            this.gvMx1salesUnitId.Caption = "销售单位 ";


            this.gvMx1salesUnitId.FieldName = "xxDw";


            this.gvMx1salesUnitId.MinWidth = 50;


            this.gvMx1salesUnitId.MinWidth = 62;


            this.gvMx1salesUnitId.Name = "gvMx1salesUnitId";


            this.gvMx1salesUnitId.Tag = "query_a.SALES_UNIT_ID";


            this.gvMx1salesUnitId.Visible = true;


            this.gvMx1salesUnitId.VisibleIndex = 2;


            this.gvMx1salesUnitId.Width = 94;


            this.gvMx1salesUnitId.Width = 117;


            // 


            // gvMx1salesQuantity


            // 


            this.gvMx1salesQuantity.AppearanceCell.Options.UseFont = true;


            this.gvMx1salesQuantity.Caption = "销售数量 ";


            this.gvMx1salesQuantity.FieldName = "salesQuantity";


            this.gvMx1salesQuantity.MinWidth = 50;


            this.gvMx1salesQuantity.MinWidth = 62;


            this.gvMx1salesQuantity.Name = "gvMx1salesQuantity";


            this.gvMx1salesQuantity.Tag = "query_a.SALES_QUANTITY";


            this.gvMx1salesQuantity.Visible = true;


            this.gvMx1salesQuantity.VisibleIndex = 3;


            this.gvMx1salesQuantity.Width = 94;


            this.gvMx1salesQuantity.Width = 117;


            // 


            // gridColumn32


            // 


            this.gridColumn32.Caption = "发货总量";


            this.gridColumn32.FieldName = "fhQuantity";


            this.gridColumn32.MinWidth = 25;


            this.gridColumn32.MinWidth = 31;


            this.gridColumn32.Name = "gridColumn32";


            this.gridColumn32.Visible = true;


            this.gridColumn32.VisibleIndex = 12;


            this.gridColumn32.Width = 94;


            this.gridColumn32.Width = 117;


            // 


            // gvMx1note


            // 


@@ -1907,12 +1995,12 @@


            this.gvMx1note.AppearanceHeader.Options.UseForeColor = true;


            this.gvMx1note.Caption = "申请备注 ";


            this.gvMx1note.FieldName = "note";


            this.gvMx1note.MinWidth = 50;


            this.gvMx1note.MinWidth = 62;


            this.gvMx1note.Name = "gvMx1note";


            this.gvMx1note.Tag = "edit";


            this.gvMx1note.Visible = true;


            this.gvMx1note.VisibleIndex = 5;


            this.gvMx1note.Width = 94;


            this.gvMx1note.Width = 117;


            // 


            // gridColumn13


            // 


@@ -1922,12 +2010,12 @@


            this.gridColumn13.AppearanceHeader.Options.UseForeColor = true;


            this.gridColumn13.Caption = "申请数量";


            this.gridColumn13.FieldName = "sqQty";


            this.gridColumn13.MinWidth = 25;


            this.gridColumn13.MinWidth = 31;


            this.gridColumn13.Name = "gridColumn13";


            this.gridColumn13.Tag = "yz_quantity_0_edit";


            this.gridColumn13.Visible = true;


            this.gridColumn13.VisibleIndex = 4;


            this.gridColumn13.Width = 94;


            this.gridColumn13.Width = 117;


            // 


            // gvMx1returnDate


            // 


@@ -1939,12 +2027,12 @@


            this.gvMx1returnDate.Caption = "退货日期 ";


            this.gvMx1returnDate.ColumnEdit = this.repositoryItemDateEdit1;


            this.gvMx1returnDate.FieldName = "returnDate";


            this.gvMx1returnDate.MinWidth = 50;


            this.gvMx1returnDate.MinWidth = 62;


            this.gvMx1returnDate.Name = "gvMx1returnDate";


            this.gvMx1returnDate.Tag = "edit";


            this.gvMx1returnDate.Visible = true;


            this.gvMx1returnDate.VisibleIndex = 6;


            this.gvMx1returnDate.Width = 94;


            this.gvMx1returnDate.Width = 117;


            // 


            // repositoryItemDateEdit1


            // 


@@ -1960,12 +2048,12 @@


            this.gvMx1isFree.AppearanceCell.Options.UseFont = true;


            this.gvMx1isFree.Caption = "是否赠品 ";


            this.gvMx1isFree.FieldName = "isFreeChk";


            this.gvMx1isFree.MinWidth = 50;


            this.gvMx1isFree.MinWidth = 62;


            this.gvMx1isFree.Name = "gvMx1isFree";


            this.gvMx1isFree.Tag = "query_a.IS_FREE";


            this.gvMx1isFree.Visible = true;


            this.gvMx1isFree.VisibleIndex = 9;


            this.gvMx1isFree.Width = 94;


            this.gvMx1isFree.Width = 117;


            // 


            // gvMx1returnType


            // 


@@ -1977,12 +2065,12 @@


            this.gvMx1returnType.Caption = "退货类型 ";


            this.gvMx1returnType.ColumnEdit = this.repositoryItemComboBox1;


            this.gvMx1returnType.FieldName = "returnType";


            this.gvMx1returnType.MinWidth = 50;


            this.gvMx1returnType.MinWidth = 62;


            this.gvMx1returnType.Name = "gvMx1returnType";


            this.gvMx1returnType.Tag = "edit";


            this.gvMx1returnType.Visible = true;


            this.gvMx1returnType.VisibleIndex = 7;


            this.gvMx1returnType.Width = 94;


            this.gvMx1returnType.Width = 117;


            // 


            // repositoryItemComboBox1


            // 


@@ -2001,39 +2089,39 @@


            // 


            this.gridColumn12.Caption = "送货明细guid";


            this.gridColumn12.FieldName = "deliveDetailGuid";


            this.gridColumn12.MinWidth = 25;


            this.gridColumn12.MinWidth = 31;


            this.gridColumn12.Name = "gridColumn12";


            this.gridColumn12.Width = 94;


            this.gridColumn12.Width = 117;


            // 


            // gridColumn21


            // 


            this.gridColumn21.Caption = "可打印数量";


            this.gridColumn21.FieldName = "kdy";


            this.gridColumn21.MinWidth = 25;


            this.gridColumn21.MinWidth = 31;


            this.gridColumn21.Name = "gridColumn21";


            this.gridColumn21.Visible = true;


            this.gridColumn21.VisibleIndex = 10;


            this.gridColumn21.Width = 94;


            this.gridColumn21.Width = 117;


            // 


            // gridColumn22


            // 


            this.gridColumn22.Caption = "已打印数量";


            this.gridColumn22.FieldName = "ydy";


            this.gridColumn22.MinWidth = 25;


            this.gridColumn22.MinWidth = 31;


            this.gridColumn22.Name = "gridColumn22";


            this.gridColumn22.Visible = true;


            this.gridColumn22.VisibleIndex = 11;


            this.gridColumn22.Width = 94;


            this.gridColumn22.Width = 117;


            // 


            // gvMxDel


            // 


            this.gvMxDel.Caption = "移出";


            this.gvMxDel.ColumnEdit = this.repositoryItemButtonEdit1;


            this.gvMxDel.MinWidth = 25;


            this.gvMxDel.MinWidth = 31;


            this.gvMxDel.Name = "gvMxDel";


            this.gvMxDel.Visible = true;


            this.gvMxDel.VisibleIndex = 13;


            this.gvMxDel.Width = 94;


            this.gvMxDel.Width = 117;


            // 


            // repositoryItemButtonEdit1


            // 


@@ -2049,17 +2137,28 @@


            // tabMxPage2


            // 


            this.tabMxPage2.Controls.Add(this.gcMx2);


            this.tabMxPage2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.tabMxPage2.Name = "tabMxPage2";


<<<<<<< HEAD


            this.tabMxPage2.Size = new System.Drawing.Size(1435, 344);


=======


            this.tabMxPage2.Size = new System.Drawing.Size(1794, 428);


>>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6


            this.tabMxPage2.Text = "已打印条码明细";


            // 


            // gcMx2


            // 


            this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;


            this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.gcMx2.Location = new System.Drawing.Point(0, 0);


            this.gcMx2.MainView = this.gvMx2;


            this.gcMx2.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.gcMx2.Name = "gcMx2";


<<<<<<< HEAD


            this.gcMx2.Size = new System.Drawing.Size(1435, 344);


=======


            this.gcMx2.Size = new System.Drawing.Size(1794, 428);


>>>>>>> e58327f873e6aee426b1d0b8ec9914efae708cd6


            this.gcMx2.TabIndex = 3;


            this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {


            this.gvMx2});


@@ -2081,6 +2180,7 @@


            this.gridColumn29,


            this.gridColumn30,


            this.gridColumn31});


            this.gvMx2.DetailHeight = 428;


            this.gvMx2.GridControl = this.gcMx2;


            this.gvMx2.Name = "gvMx2";


            this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;


@@ -2092,145 +2192,146 @@


            this.gridColumn3.AppearanceCell.Options.UseFont = true;


            this.gridColumn3.Caption = "guid";


            this.gridColumn3.FieldName = "guid";


            this.gridColumn3.MinWidth = 50;


            this.gridColumn3.MinWidth = 62;


            this.gridColumn3.Name = "gridColumn3";


            this.gridColumn3.Tag = "query_a.guid";


            this.gridColumn3.Width = 94;


            this.gridColumn3.Width = 117;


            // 


            // gvMx1itemBarcode


            // 


            this.gvMx1itemBarcode.AppearanceCell.Options.UseFont = true;


            this.gvMx1itemBarcode.Caption = "物料条码";


            this.gvMx1itemBarcode.FieldName = "itemBarcode";


            this.gvMx1itemBarcode.MinWidth = 25;


            this.gvMx1itemBarcode.MinWidth = 31;


            this.gvMx1itemBarcode.Name = "gvMx1itemBarcode";


            this.gvMx1itemBarcode.Tag = "query_a.ITEM_BARCODE";


            this.gvMx1itemBarcode.Visible = true;


            this.gvMx1itemBarcode.VisibleIndex = 0;


            this.gvMx1itemBarcode.Width = 300;


            this.gvMx1itemBarcode.Width = 375;


            // 


            // gridColumn14


            // 


            this.gridColumn14.Caption = "物料编码";


            this.gridColumn14.FieldName = "itemNo";


            this.gridColumn14.MinWidth = 25;


            this.gridColumn14.MinWidth = 31;


            this.gridColumn14.Name = "gridColumn14";


            this.gridColumn14.Visible = true;


            this.gridColumn14.VisibleIndex = 1;


            this.gridColumn14.Width = 94;


            this.gridColumn14.Width = 117;


            // 


            // gridColumn15


            // 


            this.gridColumn15.Caption = "物料名称";


            this.gridColumn15.FieldName = "itemName";


            this.gridColumn15.MinWidth = 25;


            this.gridColumn15.MinWidth = 31;


            this.gridColumn15.Name = "gridColumn15";


            this.gridColumn15.Visible = true;


            this.gridColumn15.VisibleIndex = 2;


            this.gridColumn15.Width = 94;


            this.gridColumn15.Width = 117;


            // 


            // gridColumn16


            // 


            this.gridColumn16.Caption = "规格型号";


            this.gridColumn16.FieldName = "itemModel";


            this.gridColumn16.MinWidth = 25;


            this.gridColumn16.MinWidth = 31;


            this.gridColumn16.Name = "gridColumn16";


            this.gridColumn16.Visible = true;


            this.gridColumn16.VisibleIndex = 3;


            this.gridColumn16.Width = 94;


            this.gridColumn16.Width = 117;


            // 


            // gvMx1quantity


            // 


            this.gvMx1quantity.AppearanceCell.Options.UseFont = true;


            this.gvMx1quantity.Caption = "数量";


            this.gvMx1quantity.FieldName = "quantity";


            this.gvMx1quantity.MinWidth = 50;


            this.gvMx1quantity.MinWidth = 62;


            this.gvMx1quantity.Name = "gvMx1quantity";


            this.gvMx1quantity.Tag = "query_a.QUANTITY";


            this.gvMx1quantity.Visible = true;


            this.gvMx1quantity.VisibleIndex = 4;


            this.gvMx1quantity.Width = 94;


            this.gvMx1quantity.Width = 117;


            // 


            // gridColumn17


            // 


            this.gridColumn17.Caption = "单位";


            this.gridColumn17.FieldName = "dwName";


            this.gridColumn17.MinWidth = 25;


            this.gridColumn17.MinWidth = 31;


            this.gridColumn17.Name = "gridColumn17";


            this.gridColumn17.Visible = true;


            this.gridColumn17.VisibleIndex = 5;


            this.gridColumn17.Width = 94;


            this.gridColumn17.Width = 117;


            // 


            // gvMx1createBy


            // 


            this.gvMx1createBy.AppearanceCell.Options.UseFont = true;


            this.gvMx1createBy.Caption = "创建人";


            this.gvMx1createBy.FieldName = "createBy";


            this.gvMx1createBy.MinWidth = 25;


            this.gvMx1createBy.MinWidth = 31;


            this.gvMx1createBy.Name = "gvMx1createBy";


            this.gvMx1createBy.Tag = "query_a.CREATE_BY";


            this.gvMx1createBy.Visible = true;


            this.gvMx1createBy.VisibleIndex = 6;


            this.gvMx1createBy.Width = 94;


            this.gvMx1createBy.Width = 117;


            // 


            // gvMx1lotDate


            // 


            this.gvMx1lotDate.AppearanceCell.Options.UseFont = true;


            this.gvMx1lotDate.Caption = "创建日期";


            this.gvMx1lotDate.FieldName = "createDate";


            this.gvMx1lotDate.MinWidth = 25;


            this.gvMx1lotDate.MinWidth = 31;


            this.gvMx1lotDate.Name = "gvMx1lotDate";


            this.gvMx1lotDate.Tag = "query_a.LOT_DATE";


            this.gvMx1lotDate.Visible = true;


            this.gvMx1lotDate.VisibleIndex = 7;


            this.gvMx1lotDate.Width = 94;


            this.gvMx1lotDate.Width = 117;


            // 


            // gridColumn28


            // 


            this.gridColumn28.Caption = "是否入库";


            this.gridColumn28.FieldName = "isRk";


            this.gridColumn28.MinWidth = 25;


            this.gridColumn28.MinWidth = 31;


            this.gridColumn28.Name = "gridColumn28";


            this.gridColumn28.Visible = true;


            this.gridColumn28.VisibleIndex = 8;


            this.gridColumn28.Width = 94;


            this.gridColumn28.Width = 117;


            // 


            // gridColumn29


            // 


            this.gridColumn29.Caption = "入库人";


            this.gridColumn29.FieldName = "rkUser";


            this.gridColumn29.MinWidth = 25;


            this.gridColumn29.MinWidth = 31;


            this.gridColumn29.Name = "gridColumn29";


            this.gridColumn29.Visible = true;


            this.gridColumn29.VisibleIndex = 9;


            this.gridColumn29.Width = 94;


            this.gridColumn29.Width = 117;


            // 


            // gridColumn30


            // 


            this.gridColumn30.Caption = "入库日期";


            this.gridColumn30.FieldName = "rkDate";


            this.gridColumn30.MinWidth = 25;


            this.gridColumn30.MinWidth = 31;


            this.gridColumn30.Name = "gridColumn30";


            this.gridColumn30.Visible = true;


            this.gridColumn30.VisibleIndex = 10;


            this.gridColumn30.Width = 94;


            this.gridColumn30.Width = 117;


            // 


            // gridColumn31


            // 


            this.gridColumn31.Caption = "入库位";


            this.gridColumn31.FieldName = "rkPositon";


            this.gridColumn31.MinWidth = 25;


            this.gridColumn31.MinWidth = 31;


            this.gridColumn31.Name = "gridColumn31";


            this.gridColumn31.Visible = true;


            this.gridColumn31.VisibleIndex = 11;


            this.gridColumn31.Width = 94;


            this.gridColumn31.Width = 117;


            // 


            // picCheckBox


            // 


            this.picCheckBox.Image = global::Gs.DevApp.Properties.Resources.ico_noCheck;


            this.picCheckBox.Location = new System.Drawing.Point(962, 40);


            this.picCheckBox.Location = new System.Drawing.Point(1202, 49);


            this.picCheckBox.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.picCheckBox.Name = "picCheckBox";


            this.picCheckBox.Size = new System.Drawing.Size(100, 50);


            this.picCheckBox.Size = new System.Drawing.Size(125, 61);


            this.picCheckBox.SizeMode = System.Windows.Forms.PictureBoxSizeMode.StretchImage;


            this.picCheckBox.TabIndex = 451;


            this.picCheckBox.TabStop = false;


@@ -2238,12 +2339,13 @@


            // 


            // Frm_SalesReturnNotice


            // 


            this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);


            this.AutoScaleDimensions = new System.Drawing.SizeF(10F, 22F);


            this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;


            this.ClientSize = new System.Drawing.Size(1439, 682);


            this.ClientSize = new System.Drawing.Size(1799, 834);


            this.Controls.Add(this.picCheckBox);


            this.Controls.Add(this.xtraTabControl1);


            this.Controls.Add(this.toolBarMenu1);


            this.Margin = new System.Windows.Forms.Padding(4, 4, 4, 4);


            this.Name = "Frm_SalesReturnNotice";


            this.Text = "销售退货申请单";


            ((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();


@@ -2271,11 +2373,11 @@


            ((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_approvedDate.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_id.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_approvedBy.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_shUserName2.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedDate.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_billNo.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_salerName.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_modifiedBy.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_xgUserName1.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_saleDeptName.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit();


            ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit();


@@ -2392,9 +2494,9 @@


        private DevExpress.XtraEditors.ComboBoxEdit txt_billType;


        private System.Windows.Forms.Label lbGuid;


        private DevExpress.XtraEditors.TextEdit txt_approvedDate;


        private DevExpress.XtraEditors.TextEdit txt_approvedBy;


        private DevExpress.XtraEditors.TextEdit txt_shUserName2;


        private DevExpress.XtraEditors.TextEdit txt_modifiedDate;


        private DevExpress.XtraEditors.TextEdit txt_modifiedBy;


        private DevExpress.XtraEditors.TextEdit txt_xgUserName1;


        private DevExpress.XtraEditors.TextEdit txt_createdDate;


        private DevExpress.XtraEditors.TextEdit txt_createdBy;


        private DevExpress.XtraEditors.TextEdit txt_salerName;