到货单版本冲突

lu

5 天以前 c2e1de823e648ca7e62bc868d8aaf9ad5c65a287

 DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs

@@ -109,6 +109,7 @@
            this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
            this.txt_createdBy = new DevExpress.XtraEditors.TextEdit();
            this.txt_fHasLinkSource = new DevExpress.XtraEditors.ComboBoxEdit();
            this.txt_xsms = new DevExpress.XtraEditors.ComboBoxEdit();
            this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -133,6 +134,7 @@
            this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
            this.layItem101 = new DevExpress.XtraLayout.LayoutControlItem();
            this.tabMx = new DevExpress.XtraTab.XtraTabControl();
            this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
            this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -240,6 +242,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_xsms.Properties)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
@@ -264,6 +267,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem101)).BeginInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
            this.tabMx.SuspendLayout();
            this.tabMxPage1.SuspendLayout();
@@ -734,6 +738,7 @@
            this.layoutMx1.Controls.Add(this.txt_returnReason);
            this.layoutMx1.Controls.Add(this.txt_createdBy);
            this.layoutMx1.Controls.Add(this.txt_fHasLinkSource);
            this.layoutMx1.Controls.Add(this.txt_xsms);
            this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
            this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
            this.layoutControlItem19,
@@ -763,25 +768,25 @@
            // 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(433, 44);
            this.txt_returnCustomer.Name = "txt_returnCustomer";
            this.txt_returnCustomer.Size = new System.Drawing.Size(278, 24);
            this.txt_returnCustomer.Size = new System.Drawing.Size(273, 24);
            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(1131, 108);
            this.txt_salesDept.Name = "txt_salesDept";
            this.txt_salesDept.Size = new System.Drawing.Size(279, 24);
            this.txt_salesDept.Size = new System.Drawing.Size(273, 24);
            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(782, 108);
            this.txt_inventoryOrg.Name = "txt_inventoryOrg";
            this.txt_inventoryOrg.Size = new System.Drawing.Size(278, 24);
            this.txt_inventoryOrg.Size = new System.Drawing.Size(273, 24);
            this.txt_inventoryOrg.TabIndex = 537;
            // 
            // txt_salesOrg
@@ -789,20 +794,20 @@
            this.txt_salesOrg.IsReadly = false;
            this.txt_salesOrg.Location = new System.Drawing.Point(84, 44);
            this.txt_salesOrg.Name = "txt_salesOrg";
            this.txt_salesOrg.Size = new System.Drawing.Size(278, 24);
            this.txt_salesOrg.Size = new System.Drawing.Size(273, 24);
            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(433, 106);
            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(273, 32);
            this.txt_fHasLinkRad.StyleController = this.layoutMx1;
            this.txt_fHasLinkRad.TabIndex = 534;
            // 
@@ -812,7 +817,7 @@
            this.txt_fstockid.Location = new System.Drawing.Point(84, 76);
            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(273, 24);
            this.txt_fstockid.TabIndex = 454;
            // 
            // lbGuid
@@ -835,10 +840,10 @@
            // 
            // txt_chkStatus
            // 
            this.txt_chkStatus.Location = new System.Drawing.Point(1074, 76);
            this.txt_chkStatus.Location = new System.Drawing.Point(1059, 76);
            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(345, 24);
            this.txt_chkStatus.StyleController = this.layoutMx1;
            this.txt_chkStatus.TabIndex = 452;
            this.txt_chkStatus.Tag = "readonly";
@@ -846,23 +851,23 @@
            // 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(433, 12);
            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(273, 24);
            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(1131, 44);
            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(273, 24);
            this.txt_approvedDate.StyleController = this.layoutMx1;
            this.txt_approvedDate.TabIndex = 378;
            this.txt_approvedDate.Tag = "readonly";
@@ -879,20 +884,20 @@
            // 
            // txt_approvedBy
            // 
            this.txt_approvedBy.Location = new System.Drawing.Point(1146, 12);
            this.txt_approvedBy.Location = new System.Drawing.Point(1131, 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.Size = new System.Drawing.Size(273, 24);
            this.txt_approvedBy.StyleController = this.layoutMx1;
            this.txt_approvedBy.TabIndex = 370;
            this.txt_approvedBy.Tag = "readonly";
            // 
            // txt_modifiedDate
            // 
            this.txt_modifiedDate.Location = new System.Drawing.Point(792, 44);
            this.txt_modifiedDate.Location = new System.Drawing.Point(782, 44);
            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(273, 24);
            this.txt_modifiedDate.StyleController = this.layoutMx1;
            this.txt_modifiedDate.TabIndex = 336;
            this.txt_modifiedDate.Tag = "readonly";
@@ -902,7 +907,7 @@
            this.txt_billNo.Location = new System.Drawing.Point(84, 12);
            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(273, 24);
            this.txt_billNo.StyleController = this.layoutMx1;
            this.txt_billNo.TabIndex = 213;
            this.txt_billNo.Tag = "readonly";
@@ -919,20 +924,20 @@
            // 
            // txt_modifiedBy
            // 
            this.txt_modifiedBy.Location = new System.Drawing.Point(792, 12);
            this.txt_modifiedBy.Location = new System.Drawing.Point(782, 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.Size = new System.Drawing.Size(273, 24);
            this.txt_modifiedBy.StyleController = this.layoutMx1;
            this.txt_modifiedBy.TabIndex = 327;
            this.txt_modifiedBy.Tag = "readonly";
            // 
            // txt_saleDeptName
            // 
            this.txt_saleDeptName.Location = new System.Drawing.Point(792, 76);
            this.txt_saleDeptName.Location = new System.Drawing.Point(782, 76);
            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(273, 24);
            this.txt_saleDeptName.StyleController = this.layoutMx1;
            this.txt_saleDeptName.TabIndex = 222;
            this.txt_saleDeptName.Tag = "readonly";
@@ -949,10 +954,10 @@
            // 
            // txt_returnReason
            // 
            this.txt_returnReason.Location = new System.Drawing.Point(438, 76);
            this.txt_returnReason.Location = new System.Drawing.Point(433, 76);
            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(273, 24);
            this.txt_returnReason.StyleController = this.layoutMx1;
            this.txt_returnReason.TabIndex = 235;
            // 
@@ -969,7 +974,7 @@
            // 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(433, 140);
            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)});
@@ -977,9 +982,27 @@
            "销售出库单(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(273, 24);
            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(782, 140);
            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)});
            this.txt_xsms.Properties.Items.AddRange(new object[] {
            "-请选择-",
            "1:ODM",
            "2:OEM",
            "3:OBM",
            "4:供应商买料"});
            this.txt_xsms.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
            this.txt_xsms.Size = new System.Drawing.Size(273, 24);
            this.txt_xsms.StyleController = this.layoutMx1;
            this.txt_xsms.TabIndex = 545;
            // 
            // layoutControlItem19
            // 
@@ -1068,7 +1091,8 @@
            this.layoutControlItem13,
            this.layoutControlItem14,
            this.layoutControlItem9,
            this.layoutControlItem3});
            this.layoutControlItem3,
            this.layItem101});
            this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
            this.Root.Name = "Root";
            columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1100,7 +1124,7 @@
            rowDefinition3,
            rowDefinition4,
            rowDefinition5});
            this.Root.Size = new System.Drawing.Size(1437, 180);
            this.Root.Size = new System.Drawing.Size(1416, 180);
            this.Root.TextVisible = false;
            // 
            // layoutControlItem4
@@ -1108,39 +1132,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(349, 32);
            this.layoutControlItem4.Text = "申请单号";
            this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem15
            // 
            this.layoutControlItem15.Control = this.txt_approvedBy;
            this.layoutControlItem15.Location = new System.Drawing.Point(1062, 0);
            this.layoutControlItem15.Location = new System.Drawing.Point(1047, 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(349, 32);
            this.layoutControlItem15.Text = "审核人员";
            this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem16
            // 
            this.layoutControlItem16.Control = this.txt_approvedDate;
            this.layoutControlItem16.Location = new System.Drawing.Point(1062, 32);
            this.layoutControlItem16.Location = new System.Drawing.Point(1047, 32);
            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(349, 32);
            this.layoutControlItem16.Text = "审核时间";
            this.layoutControlItem16.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem17
            // 
            this.layoutControlItem17.Control = this.txt_chkStatus;
            this.layoutControlItem17.Location = new System.Drawing.Point(1062, 64);
            this.layoutControlItem17.Location = new System.Drawing.Point(1047, 64);
            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(349, 32);
            this.layoutControlItem17.Text = "审核标识";
            this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem17.TextVisible = false;
@@ -1151,7 +1175,7 @@
            this.layoutControlItem20.Location = new System.Drawing.Point(0, 64);
            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(349, 32);
            this.layoutControlItem20.Text = "选择仓库";
            this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1161,7 +1185,7 @@
            this.layItem1.Location = new System.Drawing.Point(0, 32);
            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(349, 32);
            this.layItem1.Text = "销售组织";
            this.layItem1.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1170,44 +1194,44 @@
            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(349, 96);
            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(349, 32);
            this.layoutControlItem21.Text = "源单类型";
            this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem7
            // 
            this.layoutControlItem7.Control = this.txt_saleDeptName;
            this.layoutControlItem7.Location = new System.Drawing.Point(708, 64);
            this.layoutControlItem7.Location = new System.Drawing.Point(698, 64);
            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(349, 32);
            this.layoutControlItem7.Text = "销售部门";
            this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem10
            // 
            this.layoutControlItem10.Control = this.txt_billType;
            this.layoutControlItem10.Location = new System.Drawing.Point(354, 0);
            this.layoutControlItem10.Location = new System.Drawing.Point(349, 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(349, 32);
            this.layoutControlItem10.Text = "单据类型";
            this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layItem2
            // 
            this.layItem2.Control = this.txt_returnCustomer;
            this.layItem2.Location = new System.Drawing.Point(354, 32);
            this.layItem2.Location = new System.Drawing.Point(349, 32);
            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(349, 32);
            this.layItem2.Text = "退货客户";
            this.layItem2.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1216,11 +1240,11 @@
            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(698, 96);
            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(349, 32);
            this.layItem3.Text = "库存组织";
            this.layItem3.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1229,11 +1253,11 @@
            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(1047, 96);
            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(349, 32);
            this.layItem4.Text = "销售部门";
            this.layItem4.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1243,32 +1267,32 @@
            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(349, 128);
            this.layItem100.Name = "layItem100";
            this.layItem100.OptionsTableLayoutItem.ColumnIndex = 1;
            this.layItem100.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem100.Size = new System.Drawing.Size(354, 32);
            this.layItem100.Size = new System.Drawing.Size(349, 32);
            this.layItem100.Text = "数据来源";
            this.layItem100.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem13
            // 
            this.layoutControlItem13.Control = this.txt_modifiedBy;
            this.layoutControlItem13.Location = new System.Drawing.Point(708, 0);
            this.layoutControlItem13.Location = new System.Drawing.Point(698, 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(349, 32);
            this.layoutControlItem13.Text = "修改人员";
            this.layoutControlItem13.TextSize = new System.Drawing.Size(60, 18);
            // 
            // layoutControlItem14
            // 
            this.layoutControlItem14.Control = this.txt_modifiedDate;
            this.layoutControlItem14.Location = new System.Drawing.Point(708, 32);
            this.layoutControlItem14.Location = new System.Drawing.Point(698, 32);
            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(349, 32);
            this.layoutControlItem14.Text = "修改时间";
            this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1276,11 +1300,11 @@
            // 
            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(349, 64);
            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(349, 32);
            this.layoutControlItem9.Text = "申请原因";
            this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
            // 
@@ -1292,11 +1316,24 @@
            this.layoutControlItem3.MinSize = new System.Drawing.Size(20, 31);
            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(349, 32);
            this.layoutControlItem3.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
            this.layoutControlItem3.Text = "选择明细";
            this.layoutControlItem3.TextSize = new System.Drawing.Size(0, 0);
            this.layoutControlItem3.TextVisible = false;
            // 
            // layItem101
            // 
            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(698, 128);
            this.layItem101.Name = "layItem101";
            this.layItem101.OptionsTableLayoutItem.ColumnIndex = 2;
            this.layItem101.OptionsTableLayoutItem.RowIndex = 4;
            this.layItem101.Size = new System.Drawing.Size(349, 32);
            this.layItem101.Text = "销售模式";
            this.layItem101.TextSize = new System.Drawing.Size(60, 18);
            // 
            // tabMx
            // 
@@ -2224,6 +2261,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkSource.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.txt_xsms.Properties)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
@@ -2248,6 +2286,7 @@
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.layItem101)).EndInit();
            ((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
            this.tabMx.ResumeLayout(false);
            this.tabMxPage1.ResumeLayout(false);
@@ -2451,5 +2490,7 @@
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
        private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
        private DevExpress.XtraEditors.ComboBoxEdit txt_xsms;
        private DevExpress.XtraLayout.LayoutControlItem layItem101;
    }
}