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 | 654 +++++++++++++++++++++++++++++++----------------------------
1 files changed, 344 insertions(+), 310 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 54521a8..8ee2e51 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -38,16 +38,17 @@
DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -80,6 +81,7 @@
this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn26 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -106,16 +108,14 @@
this.txt_createdDate = new DevExpress.XtraEditors.TextEdit();
this.txt_returnReason = new DevExpress.XtraEditors.TextEdit();
this.txt_createdBy = new DevExpress.XtraEditors.TextEdit();
- this.textEdit1 = new DevExpress.XtraEditors.TextEdit();
- this.textEdit2 = 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();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -123,16 +123,18 @@
this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem1 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem3 = new DevExpress.XtraLayout.LayoutControlItem();
this.layItem4 = new DevExpress.XtraLayout.LayoutControlItem();
+ 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();
@@ -239,16 +241,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit2.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();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
@@ -256,16 +256,18 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layItem4)).BeginInit();
+ ((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();
@@ -327,7 +329,7 @@
this.toolBarMenu1.Location = new System.Drawing.Point(0, 0);
this.toolBarMenu1.Name = "toolBarMenu1";
this.toolBarMenu1.rptParameter = null;
- this.toolBarMenu1.Size = new System.Drawing.Size(1276, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1439, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -338,7 +340,7 @@
this.xtraTabControl1.Location = new System.Drawing.Point(0, 80);
this.xtraTabControl1.Name = "xtraTabControl1";
this.xtraTabControl1.SelectedTabPage = this.xtraTabPage1;
- this.xtraTabControl1.Size = new System.Drawing.Size(1276, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1439, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -348,7 +350,7 @@
//
this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1274, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1437, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -369,7 +371,7 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1274, 570);
+ this.split1.Size = new System.Drawing.Size(1437, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
@@ -379,7 +381,7 @@
this.gcMain1.Location = new System.Drawing.Point(0, 0);
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1274, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1437, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -408,7 +410,8 @@
this.gv_customerOrderNo,
this.gridColumn24,
this.gridColumn25,
- this.gridColumn26});
+ this.gridColumn26,
+ this.gridColumn2});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -454,7 +457,7 @@
this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Visible = true;
- this.gridColumn27.VisibleIndex = 3;
+ this.gridColumn27.VisibleIndex = 2;
this.gridColumn27.Width = 94;
//
// gv_billType
@@ -467,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 = 2;
+ this.gv_billType.VisibleIndex = 16;
this.gv_billType.Width = 94;
//
// gv_billNo
@@ -480,7 +483,7 @@
this.gv_billNo.OptionsColumn.AllowEdit = false;
this.gv_billNo.Tag = "query_a.BILL_NO";
this.gv_billNo.Visible = true;
- this.gv_billNo.VisibleIndex = 4;
+ this.gv_billNo.VisibleIndex = 3;
this.gv_billNo.Width = 94;
//
// gv_salesOrg
@@ -493,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 = 5;
+ this.gv_salesOrg.VisibleIndex = 15;
this.gv_salesOrg.Width = 94;
//
// gv_salesDept
@@ -506,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
@@ -518,8 +521,6 @@
this.gv_salesPerson.Name = "gv_salesPerson";
this.gv_salesPerson.OptionsColumn.AllowEdit = false;
this.gv_salesPerson.Tag = "query_a.SALES_PERSON";
- this.gv_salesPerson.Visible = true;
- this.gv_salesPerson.VisibleIndex = 8;
this.gv_salesPerson.Width = 94;
//
// gv_returnReason
@@ -532,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 = 9;
+ this.gv_returnReason.VisibleIndex = 6;
this.gv_returnReason.Width = 94;
//
// gv_createdBy
@@ -545,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 = 10;
+ this.gv_createdBy.VisibleIndex = 7;
this.gv_createdBy.Width = 94;
//
// gv_createdDate
@@ -558,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 = 11;
+ this.gv_createdDate.VisibleIndex = 8;
this.gv_createdDate.Width = 94;
//
// gv_modifiedBy
@@ -571,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 = 12;
+ this.gv_modifiedBy.VisibleIndex = 9;
this.gv_modifiedBy.Width = 94;
//
// gv_modifiedDate
@@ -584,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 = 13;
+ this.gv_modifiedDate.VisibleIndex = 10;
this.gv_modifiedDate.Width = 94;
//
// gv_approvedBy
@@ -597,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 = 14;
+ this.gv_approvedBy.VisibleIndex = 11;
this.gv_approvedBy.Width = 94;
//
// gv_approvedDate
@@ -610,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 = 15;
+ this.gv_approvedDate.VisibleIndex = 12;
this.gv_approvedDate.Width = 94;
//
// gridColumn18
@@ -620,7 +621,7 @@
this.gridColumn18.MinWidth = 25;
this.gridColumn18.Name = "gridColumn18";
this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 16;
+ this.gridColumn18.VisibleIndex = 4;
this.gridColumn18.Width = 94;
//
// gv_customerOrderNo
@@ -632,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 = 7;
this.gv_customerOrderNo.Width = 94;
//
// gridColumn24
@@ -651,7 +650,7 @@
this.gridColumn25.MinWidth = 25;
this.gridColumn25.Name = "gridColumn25";
this.gridColumn25.Visible = true;
- this.gridColumn25.VisibleIndex = 17;
+ this.gridColumn25.VisibleIndex = 13;
this.gridColumn25.Width = 94;
//
// gridColumn26
@@ -661,8 +660,18 @@
this.gridColumn26.MinWidth = 25;
this.gridColumn26.Name = "gridColumn26";
this.gridColumn26.Visible = true;
- this.gridColumn26.VisibleIndex = 18;
+ this.gridColumn26.VisibleIndex = 14;
this.gridColumn26.Width = 94;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鏁版嵁鏉ユ簮";
+ this.gridColumn2.FieldName = "fHasLinkSource";
+ this.gridColumn2.MinWidth = 25;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 17;
+ this.gridColumn2.Width = 94;
//
// pageBar1
//
@@ -672,7 +681,7 @@
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 5, 3, 5);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1274, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1437, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -680,7 +689,7 @@
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1274, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1437, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -700,8 +709,8 @@
this.splitMx1.Panel2.Controls.Add(this.tabMx);
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.splitMx1.Size = new System.Drawing.Size(1274, 570);
- this.splitMx1.SplitterPosition = 149;
+ this.splitMx1.Size = new System.Drawing.Size(1437, 570);
+ this.splitMx1.SplitterPosition = 174;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -728,8 +737,8 @@
this.layoutMx1.Controls.Add(this.txt_createdDate);
this.layoutMx1.Controls.Add(this.txt_returnReason);
this.layoutMx1.Controls.Add(this.txt_createdBy);
- this.layoutMx1.Controls.Add(this.textEdit1);
- this.layoutMx1.Controls.Add(this.textEdit2);
+ 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,
@@ -737,14 +746,12 @@
this.layoutControlItem12,
this.layoutControlItem11,
this.layoutControlItem18,
- this.layoutControlItem6,
- this.layoutControlItem13,
- this.layoutControlItem14});
+ this.layoutControlItem6});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(637, 414, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1274, 149);
+ this.layoutMx1.Size = new System.Drawing.Size(1437, 174);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -761,25 +768,25 @@
// txt_returnCustomer
//
this.txt_returnCustomer.IsReadly = false;
- this.txt_returnCustomer.Location = new System.Drawing.Point(397, 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(237, 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(1023, 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(239, 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(710, 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(237, 24);
+ this.txt_inventoryOrg.Size = new System.Drawing.Size(273, 24);
this.txt_inventoryOrg.TabIndex = 537;
//
// txt_salesOrg
@@ -787,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(237, 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(397, 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(237, 33);
+ this.txt_fHasLinkRad.Size = new System.Drawing.Size(273, 32);
this.txt_fHasLinkRad.StyleController = this.layoutMx1;
this.txt_fHasLinkRad.TabIndex = 534;
//
@@ -810,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(237, 24);
+ this.txt_fstockid.Size = new System.Drawing.Size(273, 24);
this.txt_fstockid.TabIndex = 454;
//
// lbGuid
@@ -833,10 +840,10 @@
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(951, 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(311, 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";
@@ -844,23 +851,23 @@
// txt_billType
//
this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
- this.txt_billType.Location = new System.Drawing.Point(397, 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(237, 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(1023, 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(239, 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";
@@ -877,20 +884,20 @@
//
// txt_approvedBy
//
- this.txt_approvedBy.Location = new System.Drawing.Point(1023, 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(239, 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(1008, 42);
+ 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(233, 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";
@@ -900,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(237, 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";
@@ -917,20 +924,20 @@
//
// txt_modifiedBy
//
- this.txt_modifiedBy.Location = new System.Drawing.Point(1008, 10);
+ 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(233, 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(710, 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(237, 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";
@@ -947,10 +954,10 @@
//
// txt_returnReason
//
- this.txt_returnReason.Location = new System.Drawing.Point(397, 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(237, 24);
+ this.txt_returnReason.Size = new System.Drawing.Size(273, 24);
this.txt_returnReason.StyleController = this.layoutMx1;
this.txt_returnReason.TabIndex = 235;
//
@@ -964,23 +971,38 @@
this.txt_createdBy.TabIndex = 312;
this.txt_createdBy.Tag = "readonly";
//
- // textEdit1
+ // txt_fHasLinkSource
//
- this.textEdit1.Location = new System.Drawing.Point(710, 12);
- this.textEdit1.Name = "textEdit1";
- this.textEdit1.Size = new System.Drawing.Size(237, 24);
- this.textEdit1.StyleController = this.layoutMx1;
- this.textEdit1.TabIndex = 542;
- this.textEdit1.Tag = "readonly";
+ this.txt_fHasLinkSource.EditValue = "閿�鍞嚭搴撳崟(SAL OUTSTOCK)";
+ 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)});
+ this.txt_fHasLinkSource.Properties.Items.AddRange(new object[] {
+ "閿�鍞嚭搴撳崟(SAL_OUTSTOCK)",
+ "閿�鍞鍗�(SAL_SaleOrder)"});
+ this.txt_fHasLinkSource.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
+ this.txt_fHasLinkSource.Size = new System.Drawing.Size(273, 24);
+ this.txt_fHasLinkSource.StyleController = this.layoutMx1;
+ this.txt_fHasLinkSource.TabIndex = 544;
//
- // textEdit2
+ // txt_xsms
//
- this.textEdit2.Location = new System.Drawing.Point(710, 44);
- this.textEdit2.Name = "textEdit2";
- this.textEdit2.Size = new System.Drawing.Size(237, 24);
- this.textEdit2.StyleController = this.layoutMx1;
- this.textEdit2.TabIndex = 543;
- this.textEdit2.Tag = "readonly";
+ 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
//
@@ -1048,27 +1070,6 @@
this.layoutControlItem6.Text = "閿�鍞憳鍚�";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
- // layoutControlItem13
- //
- this.layoutControlItem13.Control = this.txt_modifiedBy;
- this.layoutControlItem13.Location = new System.Drawing.Point(924, 0);
- this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(309, 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(924, 32);
- this.layoutControlItem14.Name = "layoutControlItem14";
- this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(309, 32);
- this.layoutControlItem14.Text = "淇敼鏃堕棿";
- this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
- //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
@@ -1080,16 +1081,18 @@
this.layoutControlItem17,
this.layoutControlItem20,
this.layItem1,
- this.layoutControlItem3,
this.layoutControlItem21,
- this.layoutControlItem9,
this.layoutControlItem7,
- this.layoutControlItem2,
- this.layoutControlItem5,
this.layoutControlItem10,
this.layItem2,
this.layItem3,
- this.layItem4});
+ this.layItem4,
+ this.layItem100,
+ this.layoutControlItem13,
+ this.layoutControlItem14,
+ this.layoutControlItem9,
+ this.layoutControlItem3,
+ this.layItem101});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1113,12 +1116,15 @@
rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition4.Height = 100D;
rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
rowDefinition3,
- rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1274, 149);
+ rowDefinition4,
+ rowDefinition5});
+ this.Root.Size = new System.Drawing.Size(1416, 180);
this.Root.TextVisible = false;
//
// layoutControlItem4
@@ -1126,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(313, 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(939, 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(315, 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(939, 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(315, 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(939, 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(315, 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;
@@ -1169,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(313, 32);
+ this.layoutControlItem20.Size = new System.Drawing.Size(349, 32);
this.layoutControlItem20.Text = "閫夋嫨浠撳簱";
this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1179,9 +1185,128 @@
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(313, 32);
+ this.layItem1.Size = new System.Drawing.Size(349, 32);
this.layItem1.Text = "閿�鍞粍缁�";
this.layItem1.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // 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(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(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(698, 64);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+ 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(349, 0);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ 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(349, 32);
+ this.layItem2.Name = "layItem2";
+ this.layItem2.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layItem2.OptionsTableLayoutItem.RowIndex = 1;
+ this.layItem2.Size = new System.Drawing.Size(349, 32);
+ this.layItem2.Text = "閫�璐у鎴�";
+ this.layItem2.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // 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(698, 96);
+ this.layItem3.Name = "layItem3";
+ this.layItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layItem3.OptionsTableLayoutItem.RowIndex = 3;
+ this.layItem3.Size = new System.Drawing.Size(349, 32);
+ this.layItem3.Text = "搴撳瓨缁勭粐";
+ this.layItem3.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // 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(1047, 96);
+ this.layItem4.Name = "layItem4";
+ this.layItem4.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layItem4.OptionsTableLayoutItem.RowIndex = 3;
+ this.layItem4.Size = new System.Drawing.Size(349, 32);
+ this.layItem4.Text = "閿�鍞儴闂�";
+ this.layItem4.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layItem100
+ //
+ this.layItem100.AppearanceItemCaption.BackColor = System.Drawing.Color.SkyBlue;
+ this.layItem100.AppearanceItemCaption.Options.UseBackColor = true;
+ this.layItem100.Control = this.txt_fHasLinkSource;
+ this.layItem100.CustomizationFormText = "鏁版嵁鏉ユ簮";
+ 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(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(698, 0);
+ this.layoutControlItem13.Name = "layoutControlItem13";
+ this.layoutControlItem13.OptionsTableLayoutItem.ColumnIndex = 2;
+ 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(698, 32);
+ this.layoutControlItem14.Name = "layoutControlItem14";
+ this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
+ 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
//
@@ -1191,116 +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(313, 33);
+ 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;
//
- // layoutControlItem21
+ // layItem101
//
- 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(313, 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(313, 33);
- this.layoutControlItem21.Text = "婧愬崟绫诲瀷";
- this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_returnReason;
- this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
- this.layoutControlItem9.Location = new System.Drawing.Point(313, 64);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(313, 32);
- this.layoutControlItem9.Text = "鐢宠鍘熷洜";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_saleDeptName;
- this.layoutControlItem7.Location = new System.Drawing.Point(626, 64);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(313, 32);
- this.layoutControlItem7.Text = "閿�鍞儴闂�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem2
- //
- this.layoutControlItem2.Control = this.textEdit1;
- this.layoutControlItem2.Location = new System.Drawing.Point(626, 0);
- this.layoutControlItem2.Name = "layoutControlItem2";
- this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(313, 32);
- this.layoutControlItem2.Text = "淇敼浜哄憳";
- this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem5
- //
- this.layoutControlItem5.Control = this.textEdit2;
- this.layoutControlItem5.Location = new System.Drawing.Point(626, 32);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(313, 32);
- this.layoutControlItem5.Text = "淇敼鏃堕棿";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_billType;
- this.layoutControlItem10.Location = new System.Drawing.Point(313, 0);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(313, 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(313, 32);
- this.layItem2.Name = "layItem2";
- this.layItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layItem2.Size = new System.Drawing.Size(313, 32);
- this.layItem2.Text = "閫�璐у鎴�";
- this.layItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // 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(626, 96);
- this.layItem3.Name = "layItem3";
- this.layItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layItem3.OptionsTableLayoutItem.RowIndex = 3;
- this.layItem3.Size = new System.Drawing.Size(313, 33);
- this.layItem3.Text = "搴撳瓨缁勭粐";
- this.layItem3.TextSize = new System.Drawing.Size(60, 18);
- //
- // 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(939, 96);
- this.layItem4.Name = "layItem4";
- this.layItem4.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layItem4.OptionsTableLayoutItem.RowIndex = 3;
- this.layItem4.Size = new System.Drawing.Size(315, 33);
- this.layItem4.Text = "閿�鍞儴闂�";
- this.layItem4.TextSize = new System.Drawing.Size(60, 18);
+ 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
//
@@ -1308,7 +1341,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1274, 409);
+ this.tabMx.Size = new System.Drawing.Size(1437, 384);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1318,7 +1351,7 @@
//
this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1272, 377);
+ this.tabMxPage1.Size = new System.Drawing.Size(1435, 352);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// split99
@@ -1338,7 +1371,7 @@
this.split99.Panel2.Controls.Add(this.gcMx1);
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split99.Size = new System.Drawing.Size(1272, 377);
+ this.split99.Size = new System.Drawing.Size(1435, 352);
this.split99.SplitterPosition = 132;
this.split99.TabIndex = 4;
//
@@ -1362,7 +1395,7 @@
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(1272, 132);
+ this.layout99.Size = new System.Drawing.Size(1435, 132);
this.layout99.TabIndex = 0;
this.layout99.Text = "layoutControl1";
//
@@ -1370,10 +1403,10 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 76);
+ this.layoutControl1.Location = new System.Drawing.Point(719, 86);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 28);
+ this.layoutControl1.Size = new System.Drawing.Size(350, 34);
this.layoutControl1.TabIndex = 477;
this.layoutControl1.Text = "layoutControl1";
//
@@ -1383,16 +1416,16 @@
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(62, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(69, 24);
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(272, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(279, 2);
this.txt_yuliang_1.Name = "txt_yuliang_1";
this.txt_yuliang_1.Properties.ReadOnly = true;
- this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(69, 24);
this.txt_yuliang_1.StyleController = this.layoutControl1;
this.txt_yuliang_1.TabIndex = 229;
//
@@ -1412,12 +1445,12 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition5,
columnDefinition6});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5});
+ rowDefinition6});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(350, 34);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem33
@@ -1425,17 +1458,17 @@
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(168, 28);
+ this.layoutControlItem33.Size = new System.Drawing.Size(175, 34);
this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem34
//
this.layoutControlItem34.Control = this.txt_yuliang_1;
- this.layoutControlItem34.Location = new System.Drawing.Point(168, 0);
+ this.layoutControlItem34.Location = new System.Drawing.Point(175, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem34.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem34.Size = new System.Drawing.Size(175, 34);
this.layoutControlItem34.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1443,7 +1476,7 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1072, 47);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
@@ -1452,7 +1485,7 @@
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(1033, 10);
+ this.radOut.Location = new System.Drawing.Point(1074, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1480,68 +1513,68 @@
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(234, 24);
+ this.txtWlid.Size = new System.Drawing.Size(247, 24);
this.txtWlid.StyleController = this.layout99;
this.txtWlid.TabIndex = 214;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 44);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(821, 49);
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(234, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(248, 24);
this.txt_psnQty_1.StyleController = this.layout99;
this.txt_psnQty_1.TabIndex = 226;
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 44);
+ this.txtWlmc.Location = new System.Drawing.Point(114, 49);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(234, 24);
+ this.txtWlmc.Size = new System.Drawing.Size(247, 24);
this.txtWlmc.StyleController = this.layout99;
this.txtWlmc.TabIndex = 216;
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 76);
+ this.txtWlgg.Location = new System.Drawing.Point(114, 86);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(574, 24);
+ this.txtWlgg.Size = new System.Drawing.Size(601, 24);
this.txtWlgg.StyleController = this.layout99;
this.txtWlgg.TabIndex = 218;
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(794, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(821, 12);
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(234, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(248, 24);
this.txt_kQty.StyleController = this.layout99;
this.txt_kQty.TabIndex = 224;
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(454, 12);
+ this.txtQuantity.Location = new System.Drawing.Point(467, 12);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(234, 24);
+ this.txtQuantity.Size = new System.Drawing.Size(248, 24);
this.txtQuantity.StyleController = this.layout99;
this.txtQuantity.TabIndex = 220;
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 44);
+ this.txt_yQty.Location = new System.Drawing.Point(467, 49);
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(234, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(248, 24);
this.txt_yQty.StyleController = this.layout99;
this.txt_yQty.TabIndex = 222;
//
@@ -1587,17 +1620,17 @@
columnDefinition8,
columnDefinition9,
columnDefinition10});
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition7.Height = 100D;
rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition8.Height = 100D;
rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition6,
rowDefinition7,
- rowDefinition8});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
+ rowDefinition8,
+ rowDefinition9});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1435, 132);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem22
@@ -1605,83 +1638,83 @@
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(340, 32);
+ this.layoutControlItem22.Size = new System.Drawing.Size(353, 37);
this.layoutControlItem22.Text = "鐗╂枡缂栫爜";
this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txtWlmc;
- this.layoutControlItem23.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem23.Location = new System.Drawing.Point(0, 37);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem23.Size = new System.Drawing.Size(353, 37);
this.layoutControlItem23.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txtWlgg;
- this.layoutControlItem24.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem24.Location = new System.Drawing.Point(0, 74);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(680, 32);
+ this.layoutControlItem24.Size = new System.Drawing.Size(707, 38);
this.layoutControlItem24.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem25
//
this.layoutControlItem25.Control = this.txtQuantity;
- this.layoutControlItem25.Location = new System.Drawing.Point(340, 0);
+ this.layoutControlItem25.Location = new System.Drawing.Point(353, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem25.Size = new System.Drawing.Size(354, 37);
this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem26
//
this.layoutControlItem26.Control = this.txt_yQty;
- this.layoutControlItem26.Location = new System.Drawing.Point(340, 32);
+ this.layoutControlItem26.Location = new System.Drawing.Point(353, 37);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem26.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem26.Size = new System.Drawing.Size(354, 37);
this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_kQty;
- this.layoutControlItem27.Location = new System.Drawing.Point(680, 0);
+ this.layoutControlItem27.Location = new System.Drawing.Point(707, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem27.Size = new System.Drawing.Size(354, 37);
this.layoutControlItem27.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem28
//
this.layoutControlItem28.Control = this.txt_psnQty_1;
- this.layoutControlItem28.Location = new System.Drawing.Point(680, 32);
+ this.layoutControlItem28.Location = new System.Drawing.Point(707, 37);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem28.Size = new System.Drawing.Size(354, 37);
this.layoutControlItem28.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem30
//
this.layoutControlItem30.Control = this.radOut;
- this.layoutControlItem30.Location = new System.Drawing.Point(1020, 0);
+ this.layoutControlItem30.Location = new System.Drawing.Point(1061, 0);
this.layoutControlItem30.MaxSize = new System.Drawing.Size(230, 28);
this.layoutControlItem30.MinSize = new System.Drawing.Size(230, 28);
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(340, 32);
+ this.layoutControlItem30.Size = new System.Drawing.Size(354, 37);
this.layoutControlItem30.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem30.Text = "鑷姩璁＄畻";
this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
@@ -1690,14 +1723,14 @@
// layoutControlItem31
//
this.layoutControlItem31.Control = this.ucBtnPrint1;
- this.layoutControlItem31.Location = new System.Drawing.Point(1020, 32);
+ this.layoutControlItem31.Location = new System.Drawing.Point(1061, 37);
this.layoutControlItem31.MaxSize = new System.Drawing.Size(338, 32);
this.layoutControlItem31.MinSize = new System.Drawing.Size(338, 32);
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(340, 32);
+ this.layoutControlItem31.Size = new System.Drawing.Size(354, 37);
this.layoutControlItem31.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
@@ -1706,11 +1739,11 @@
// layoutControlItem32
//
this.layoutControlItem32.Control = this.layoutControl1;
- this.layoutControlItem32.Location = new System.Drawing.Point(680, 64);
+ this.layoutControlItem32.Location = new System.Drawing.Point(707, 74);
this.layoutControlItem32.Name = "layoutControlItem32";
this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem32.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem32.Size = new System.Drawing.Size(354, 38);
this.layoutControlItem32.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem32.TextVisible = false;
@@ -1725,7 +1758,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemComboBox1,
this.repositoryItemDateEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1272, 233);
+ this.gcMx1.Size = new System.Drawing.Size(1435, 208);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1997,7 +2030,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1272, 377);
+ this.tabMxPage2.Size = new System.Drawing.Size(1435, 352);
this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�";
//
// gcMx2
@@ -2006,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(1272, 377);
+ 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});
@@ -2187,7 +2220,7 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1276, 682);
+ this.ClientSize = new System.Drawing.Size(1439, 682);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
@@ -2227,16 +2260,14 @@
((System.ComponentModel.ISupportInitialize)(this.txt_createdDate.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_returnReason.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.textEdit2.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();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
@@ -2244,16 +2275,18 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layItem4)).EndInit();
+ ((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);
@@ -2353,8 +2386,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
@@ -2446,17 +2477,20 @@
private DevExpress.XtraEditors.SimpleButton btnSelect;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraLayout.LayoutControlItem layItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraEditors.TextEdit textEdit1;
- private DevExpress.XtraEditors.TextEdit textEdit2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layItem2;
private DevExpress.XtraLayout.LayoutControlItem layItem3;
private DevExpress.XtraLayout.LayoutControlItem layItem4;
+ private DevExpress.XtraEditors.ComboBoxEdit txt_fHasLinkSource;
+ private DevExpress.XtraLayout.LayoutControlItem layItem100;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ 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