From c2e1de823e648ca7e62bc868d8aaf9ad5c65a287 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 14 九月 2025 09:17:28 +0800
Subject: [PATCH] 到货单版本冲突
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 173 +++++++++++++++++++++++++++++++++++----------------------
1 files changed, 106 insertions(+), 67 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 031ead2..8ee2e51 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/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();
@@ -131,6 +132,9 @@
this.layItem100 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
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();
@@ -203,8 +207,6 @@
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -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();
@@ -262,6 +265,9 @@
((System.ComponentModel.ISupportInitialize)(this.layItem100)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((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();
@@ -310,8 +316,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -466,7 +470,7 @@
this.gv_billType.OptionsColumn.AllowEdit = false;
this.gv_billType.Tag = "query_a.BILL_TYPE";
this.gv_billType.Visible = true;
- this.gv_billType.VisibleIndex = 17;
+ this.gv_billType.VisibleIndex = 16;
this.gv_billType.Width = 94;
//
// gv_billNo
@@ -492,7 +496,7 @@
this.gv_salesOrg.OptionsColumn.AllowEdit = false;
this.gv_salesOrg.Tag = "query_a.SALES_ORG";
this.gv_salesOrg.Visible = true;
- this.gv_salesOrg.VisibleIndex = 16;
+ this.gv_salesOrg.VisibleIndex = 15;
this.gv_salesOrg.Width = 94;
//
// gv_salesDept
@@ -505,7 +509,7 @@
this.gv_salesDept.OptionsColumn.AllowEdit = false;
this.gv_salesDept.Tag = "query_a.SALES_DEPT";
this.gv_salesDept.Visible = true;
- this.gv_salesDept.VisibleIndex = 6;
+ this.gv_salesDept.VisibleIndex = 5;
this.gv_salesDept.Width = 94;
//
// gv_salesPerson
@@ -529,7 +533,7 @@
this.gv_returnReason.OptionsColumn.AllowEdit = false;
this.gv_returnReason.Tag = "query_a.RETURN_REASON";
this.gv_returnReason.Visible = true;
- this.gv_returnReason.VisibleIndex = 7;
+ this.gv_returnReason.VisibleIndex = 6;
this.gv_returnReason.Width = 94;
//
// gv_createdBy
@@ -542,7 +546,7 @@
this.gv_createdBy.OptionsColumn.AllowEdit = false;
this.gv_createdBy.Tag = "query_a.CREATED_BY";
this.gv_createdBy.Visible = true;
- this.gv_createdBy.VisibleIndex = 8;
+ this.gv_createdBy.VisibleIndex = 7;
this.gv_createdBy.Width = 94;
//
// gv_createdDate
@@ -555,7 +559,7 @@
this.gv_createdDate.OptionsColumn.AllowEdit = false;
this.gv_createdDate.Tag = "query_a.CREATED_DATE";
this.gv_createdDate.Visible = true;
- this.gv_createdDate.VisibleIndex = 9;
+ this.gv_createdDate.VisibleIndex = 8;
this.gv_createdDate.Width = 94;
//
// gv_modifiedBy
@@ -568,7 +572,7 @@
this.gv_modifiedBy.OptionsColumn.AllowEdit = false;
this.gv_modifiedBy.Tag = "query_a.MODIFIED_BY";
this.gv_modifiedBy.Visible = true;
- this.gv_modifiedBy.VisibleIndex = 10;
+ this.gv_modifiedBy.VisibleIndex = 9;
this.gv_modifiedBy.Width = 94;
//
// gv_modifiedDate
@@ -581,7 +585,7 @@
this.gv_modifiedDate.OptionsColumn.AllowEdit = false;
this.gv_modifiedDate.Tag = "query_a.MODIFIED_DATE";
this.gv_modifiedDate.Visible = true;
- this.gv_modifiedDate.VisibleIndex = 11;
+ this.gv_modifiedDate.VisibleIndex = 10;
this.gv_modifiedDate.Width = 94;
//
// gv_approvedBy
@@ -594,7 +598,7 @@
this.gv_approvedBy.OptionsColumn.AllowEdit = false;
this.gv_approvedBy.Tag = "query_a.APPROVED_BY";
this.gv_approvedBy.Visible = true;
- this.gv_approvedBy.VisibleIndex = 12;
+ this.gv_approvedBy.VisibleIndex = 11;
this.gv_approvedBy.Width = 94;
//
// gv_approvedDate
@@ -607,7 +611,7 @@
this.gv_approvedDate.OptionsColumn.AllowEdit = false;
this.gv_approvedDate.Tag = "query_a.APPROVED_DATE";
this.gv_approvedDate.Visible = true;
- this.gv_approvedDate.VisibleIndex = 13;
+ this.gv_approvedDate.VisibleIndex = 12;
this.gv_approvedDate.Width = 94;
//
// gridColumn18
@@ -629,8 +633,6 @@
this.gv_customerOrderNo.Name = "gv_customerOrderNo";
this.gv_customerOrderNo.OptionsColumn.AllowEdit = false;
this.gv_customerOrderNo.Tag = "query_a.CUSTOMER_ORDER_NO";
- this.gv_customerOrderNo.Visible = true;
- this.gv_customerOrderNo.VisibleIndex = 5;
this.gv_customerOrderNo.Width = 94;
//
// gridColumn24
@@ -648,7 +650,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 14;
+ this.gridColumn25.VisibleIndex = 13;
this.gridColumn25.Width = 94;
//
// gridColumn26
@@ -658,7 +660,7 @@
this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 15;
+ this.gridColumn26.VisibleIndex = 14;
this.gridColumn26.Width = 94;
//
// gridColumn2
@@ -668,7 +670,7 @@
this.gridColumn2.MinWidth = 25;
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 18;
+ this.gridColumn2.VisibleIndex = 17;
this.gridColumn2.Width = 94;
//
// pageBar1
@@ -736,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,
@@ -755,7 +758,7 @@
// btnSelect
//
this.btnSelect.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- this.btnSelect.Location = new System.Drawing.Point(12, 102);
+ this.btnSelect.Location = new System.Drawing.Point(12, 108);
this.btnSelect.Name = "btnSelect";
this.btnSelect.Size = new System.Drawing.Size(126, 27);
this.btnSelect.StyleController = this.layoutMx1;
@@ -765,7 +768,7 @@
// txt_returnCustomer
//
this.txt_returnCustomer.IsReadly = false;
- this.txt_returnCustomer.Location = new System.Drawing.Point(433, 38);
+ this.txt_returnCustomer.Location = new System.Drawing.Point(433, 44);
this.txt_returnCustomer.Name = "txt_returnCustomer";
this.txt_returnCustomer.Size = new System.Drawing.Size(273, 24);
this.txt_returnCustomer.TabIndex = 539;
@@ -773,7 +776,7 @@
// txt_salesDept
//
this.txt_salesDept.IsReadly = false;
- this.txt_salesDept.Location = new System.Drawing.Point(1131, 102);
+ this.txt_salesDept.Location = new System.Drawing.Point(1131, 108);
this.txt_salesDept.Name = "txt_salesDept";
this.txt_salesDept.Size = new System.Drawing.Size(273, 24);
this.txt_salesDept.TabIndex = 538;
@@ -781,7 +784,7 @@
// txt_inventoryOrg
//
this.txt_inventoryOrg.IsReadly = false;
- this.txt_inventoryOrg.Location = new System.Drawing.Point(782, 102);
+ this.txt_inventoryOrg.Location = new System.Drawing.Point(782, 108);
this.txt_inventoryOrg.Name = "txt_inventoryOrg";
this.txt_inventoryOrg.Size = new System.Drawing.Size(273, 24);
this.txt_inventoryOrg.TabIndex = 537;
@@ -789,7 +792,7 @@
// txt_salesOrg
//
this.txt_salesOrg.IsReadly = false;
- this.txt_salesOrg.Location = new System.Drawing.Point(84, 38);
+ this.txt_salesOrg.Location = new System.Drawing.Point(84, 44);
this.txt_salesOrg.Name = "txt_salesOrg";
this.txt_salesOrg.Size = new System.Drawing.Size(273, 24);
this.txt_salesOrg.TabIndex = 535;
@@ -797,7 +800,7 @@
// txt_fHasLinkRad
//
this.txt_fHasLinkRad.EditValue = "1";
- this.txt_fHasLinkRad.Location = new System.Drawing.Point(433, 100);
+ 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[] {
@@ -811,7 +814,7 @@
// txt_fstockid
//
this.txt_fstockid.IsReadly = false;
- this.txt_fstockid.Location = new System.Drawing.Point(84, 70);
+ 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(273, 24);
@@ -837,7 +840,7 @@
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(1059, 70);
+ 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(345, 24);
@@ -848,7 +851,7 @@
// txt_billType
//
this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
- this.txt_billType.Location = new System.Drawing.Point(433, 6);
+ 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)});
@@ -861,7 +864,7 @@
//
// txt_approvedDate
//
- this.txt_approvedDate.Location = new System.Drawing.Point(1131, 38);
+ 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(273, 24);
@@ -881,7 +884,7 @@
//
// txt_approvedBy
//
- this.txt_approvedBy.Location = new System.Drawing.Point(1131, 6);
+ 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(273, 24);
@@ -891,7 +894,7 @@
//
// txt_modifiedDate
//
- this.txt_modifiedDate.Location = new System.Drawing.Point(782, 38);
+ 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(273, 24);
@@ -901,7 +904,7 @@
//
// txt_billNo
//
- this.txt_billNo.Location = new System.Drawing.Point(84, 6);
+ 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(273, 24);
@@ -921,7 +924,7 @@
//
// txt_modifiedBy
//
- this.txt_modifiedBy.Location = new System.Drawing.Point(782, 6);
+ 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(273, 24);
@@ -931,7 +934,7 @@
//
// txt_saleDeptName
//
- this.txt_saleDeptName.Location = new System.Drawing.Point(782, 70);
+ 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(273, 24);
@@ -951,7 +954,7 @@
//
// txt_returnReason
//
- this.txt_returnReason.Location = new System.Drawing.Point(433, 70);
+ 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(273, 24);
@@ -971,7 +974,7 @@
// txt_fHasLinkSource
//
this.txt_fHasLinkSource.EditValue = "閿�鍞嚭搴撳崟(SAL OUTSTOCK)";
- this.txt_fHasLinkSource.Location = new System.Drawing.Point(433, 134);
+ 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)});
@@ -982,6 +985,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
//
@@ -1070,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;
@@ -1273,6 +1295,45 @@
this.layoutControlItem14.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem14.Text = "淇敼鏃堕棿";
this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_returnReason;
+ this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
+ 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(349, 32);
+ this.layoutControlItem9.Text = "鐢宠鍘熷洜";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // 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.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
+ 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
//
@@ -1969,7 +2030,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1435, 357);
+ this.tabMxPage2.Size = new System.Drawing.Size(1435, 352);
this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�";
//
// gcMx2
@@ -1978,7 +2039,7 @@
this.gcMx2.Location = new System.Drawing.Point(0, 0);
this.gcMx2.MainView = this.gvMx2;
this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1435, 357);
+ this.gcMx2.Size = new System.Drawing.Size(1435, 352);
this.gcMx2.TabIndex = 3;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -2155,32 +2216,6 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_returnReason;
- this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
- 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(349, 32);
- this.layoutControlItem9.Text = "鐢宠鍘熷洜";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
- //
- // 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.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 3;
- 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;
- //
// Frm_SalesReturnNotice
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2226,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 +2284,9 @@
((System.ComponentModel.ISupportInitialize)(this.layItem100)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((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);
@@ -2296,8 +2335,6 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
this.ResumeLayout(false);
}
@@ -2453,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;
}
}
\ No newline at end of file
--
Gitblit v1.9.3