From b7d9f2e23cbda587d814c7d07c1664c053c83dcb Mon Sep 17 00:00:00 2001
From: cdk <2441919651@qq.com>
Date: 星期二, 12 八月 2025 13:58:07 +0800
Subject: [PATCH] Merge branch 'master' of http://git.gs-mes.com:8080/r/~tjx/GsMesClient
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 1039 +++++++++++++++++++++++++++++++++++++++++++--------------
1 files changed, 784 insertions(+), 255 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 3d52a0e..1d79e6b 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -38,7 +38,16 @@
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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition5 = 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.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();
@@ -75,7 +84,7 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
- this.txt_fIsLink = new DevExpress.XtraEditors.RadioGroup();
+ this.txt_fHasLinkRad = new DevExpress.XtraEditors.RadioGroup();
this.txt_fstockid = new Gs.DevApp.UserControl.UcLookCk();
this.lbGuid = new System.Windows.Forms.Label();
this.txt_wjStatus = new DevExpress.XtraEditors.CheckEdit();
@@ -98,28 +107,58 @@
this.txt_createdBy = new DevExpress.XtraEditors.TextEdit();
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.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layout99 = new DevExpress.XtraLayout.LayoutControl();
+ this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
+ this.radOut = new DevExpress.XtraEditors.RadioGroup();
+ this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
+ this.txtWlid = new DevExpress.XtraEditors.TextEdit();
+ this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
+ this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
+ this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
+ this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
+ this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
+ this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -191,7 +230,7 @@
this.splitMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).BeginInit();
this.layoutMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkRad.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).BeginInit();
@@ -211,29 +250,64 @@
((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.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.layoutControlItem3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit();
+ this.split99.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit();
+ this.split99.Panel2.SuspendLayout();
+ this.split99.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit();
+ this.layout99.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
+ this.layoutControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
@@ -382,7 +456,7 @@
// gridColumn27
//
this.gridColumn27.Caption = "婧愬崟鏍囪瘑";
- this.gridColumn27.FieldName = "fIsLink";
+ this.gridColumn27.FieldName = "fHasLinkTxt";
this.gridColumn27.MinWidth = 25;
this.gridColumn27.Name = "gridColumn27";
this.gridColumn27.Visible = true;
@@ -633,12 +707,12 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1274, 570);
- this.splitMx1.SplitterPosition = 184;
+ this.splitMx1.SplitterPosition = 144;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
- this.layoutMx1.Controls.Add(this.txt_fIsLink);
+ this.layoutMx1.Controls.Add(this.txt_fHasLinkRad);
this.layoutMx1.Controls.Add(this.txt_fstockid);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_wjStatus);
@@ -662,36 +736,40 @@
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem19,
- this.layoutControlItem1});
+ this.layoutControlItem1,
+ this.layoutControlItem12,
+ this.layoutControlItem11,
+ this.layoutControlItem3,
+ this.layoutControlItem18});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(703, 289, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(620, 530, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1274, 184);
+ this.layoutMx1.Size = new System.Drawing.Size(1274, 144);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
- // txt_fIsLink
+ // txt_fHasLinkRad
//
- this.txt_fIsLink.EditValue = "1";
- this.txt_fIsLink.Location = new System.Drawing.Point(84, 42);
- this.txt_fIsLink.Margin = new System.Windows.Forms.Padding(0);
- this.txt_fIsLink.Name = "txt_fIsLink";
- this.txt_fIsLink.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+ this.txt_fHasLinkRad.EditValue = "1";
+ this.txt_fHasLinkRad.Location = new System.Drawing.Point(84, 42);
+ 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", "鏃犳簮鍗�", false)});
- this.txt_fIsLink.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.txt_fIsLink.Size = new System.Drawing.Size(237, 33);
- this.txt_fIsLink.StyleController = this.layoutMx1;
- this.txt_fIsLink.TabIndex = 534;
+ this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);
+ this.txt_fHasLinkRad.Size = new System.Drawing.Size(232, 32);
+ this.txt_fHasLinkRad.StyleController = this.layoutMx1;
+ this.txt_fHasLinkRad.TabIndex = 534;
//
// txt_fstockid
//
this.txt_fstockid.IsReadly = false;
- this.txt_fstockid.Location = new System.Drawing.Point(84, 110);
+ this.txt_fstockid.Location = new System.Drawing.Point(392, 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(232, 24);
this.txt_fstockid.TabIndex = 454;
//
// lbGuid
@@ -714,10 +792,10 @@
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(951, 143);
+ this.txt_chkStatus.Location = new System.Drawing.Point(628, 108);
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(304, 24);
this.txt_chkStatus.StyleController = this.layoutMx1;
this.txt_chkStatus.TabIndex = 452;
this.txt_chkStatus.Tag = "readonly";
@@ -725,31 +803,31 @@
// txt_billType
//
this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
- this.txt_billType.Location = new System.Drawing.Point(397, 110);
+ this.txt_billType.Location = new System.Drawing.Point(392, 44);
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(232, 24);
this.txt_billType.StyleController = this.layoutMx1;
this.txt_billType.TabIndex = 451;
//
// txt_salesOrderId
//
this.txt_salesOrderId.IsReadly = false;
- this.txt_salesOrderId.Location = new System.Drawing.Point(84, 77);
+ this.txt_salesOrderId.Location = new System.Drawing.Point(84, 76);
this.txt_salesOrderId.Name = "txt_salesOrderId";
- this.txt_salesOrderId.Size = new System.Drawing.Size(237, 24);
+ this.txt_salesOrderId.Size = new System.Drawing.Size(232, 24);
this.txt_salesOrderId.TabIndex = 0;
//
// txt_approvedDate
//
- this.txt_approvedDate.Location = new System.Drawing.Point(1023, 110);
+ this.txt_approvedDate.Location = new System.Drawing.Point(1008, 108);
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(233, 24);
this.txt_approvedDate.StyleController = this.layoutMx1;
this.txt_approvedDate.TabIndex = 378;
this.txt_approvedDate.Tag = "readonly";
@@ -766,20 +844,20 @@
//
// txt_approvedBy
//
- this.txt_approvedBy.Location = new System.Drawing.Point(1023, 77);
+ this.txt_approvedBy.Location = new System.Drawing.Point(1008, 76);
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(233, 24);
this.txt_approvedBy.StyleController = this.layoutMx1;
this.txt_approvedBy.TabIndex = 370;
this.txt_approvedBy.Tag = "readonly";
//
// txt_xsOrgName
//
- this.txt_xsOrgName.Location = new System.Drawing.Point(397, 12);
+ this.txt_xsOrgName.Location = new System.Drawing.Point(392, 12);
this.txt_xsOrgName.Name = "txt_xsOrgName";
this.txt_xsOrgName.Properties.Appearance.Options.UseFont = true;
- this.txt_xsOrgName.Size = new System.Drawing.Size(237, 24);
+ this.txt_xsOrgName.Size = new System.Drawing.Size(232, 24);
this.txt_xsOrgName.StyleController = this.layoutMx1;
this.txt_xsOrgName.TabIndex = 219;
this.txt_xsOrgName.Tag = "readonly";
@@ -796,10 +874,10 @@
//
// txt_modifiedDate
//
- this.txt_modifiedDate.Location = new System.Drawing.Point(1023, 44);
+ this.txt_modifiedDate.Location = new System.Drawing.Point(1008, 44);
this.txt_modifiedDate.Name = "txt_modifiedDate";
this.txt_modifiedDate.Properties.Appearance.Options.UseFont = true;
- this.txt_modifiedDate.Size = new System.Drawing.Size(239, 24);
+ this.txt_modifiedDate.Size = new System.Drawing.Size(233, 24);
this.txt_modifiedDate.StyleController = this.layoutMx1;
this.txt_modifiedDate.TabIndex = 336;
this.txt_modifiedDate.Tag = "readonly";
@@ -809,47 +887,47 @@
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(232, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 213;
this.txt_billNo.Tag = "readonly";
//
// txt_salerName
//
- this.txt_salerName.Location = new System.Drawing.Point(397, 44);
+ this.txt_salerName.Location = new System.Drawing.Point(700, 44);
this.txt_salerName.Name = "txt_salerName";
this.txt_salerName.Properties.Appearance.Options.UseFont = true;
- this.txt_salerName.Size = new System.Drawing.Size(237, 24);
+ this.txt_salerName.Size = new System.Drawing.Size(232, 24);
this.txt_salerName.StyleController = this.layoutMx1;
this.txt_salerName.TabIndex = 267;
this.txt_salerName.Tag = "readonly";
//
// txt_modifiedBy
//
- this.txt_modifiedBy.Location = new System.Drawing.Point(1023, 12);
+ this.txt_modifiedBy.Location = new System.Drawing.Point(1008, 12);
this.txt_modifiedBy.Name = "txt_modifiedBy";
this.txt_modifiedBy.Properties.Appearance.Options.UseFont = true;
- this.txt_modifiedBy.Size = new System.Drawing.Size(239, 24);
+ this.txt_modifiedBy.Size = new System.Drawing.Size(233, 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(397, 77);
+ this.txt_saleDeptName.Location = new System.Drawing.Point(700, 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(232, 24);
this.txt_saleDeptName.StyleController = this.layoutMx1;
this.txt_saleDeptName.TabIndex = 222;
this.txt_saleDeptName.Tag = "readonly";
//
// txt_custName
//
- this.txt_custName.Location = new System.Drawing.Point(710, 44);
+ this.txt_custName.Location = new System.Drawing.Point(700, 12);
this.txt_custName.Name = "txt_custName";
this.txt_custName.Properties.Appearance.Options.UseFont = true;
- this.txt_custName.Size = new System.Drawing.Size(237, 24);
+ this.txt_custName.Size = new System.Drawing.Size(232, 24);
this.txt_custName.StyleController = this.layoutMx1;
this.txt_custName.TabIndex = 252;
this.txt_custName.Tag = "readonly";
@@ -866,10 +944,10 @@
//
// txt_returnReason
//
- this.txt_returnReason.Location = new System.Drawing.Point(84, 143);
+ this.txt_returnReason.Location = new System.Drawing.Point(84, 108);
this.txt_returnReason.Name = "txt_returnReason";
this.txt_returnReason.Properties.Appearance.Options.UseFont = true;
- this.txt_returnReason.Size = new System.Drawing.Size(550, 24);
+ this.txt_returnReason.Size = new System.Drawing.Size(540, 24);
this.txt_returnReason.StyleController = this.layoutMx1;
this.txt_returnReason.TabIndex = 235;
//
@@ -904,30 +982,70 @@
this.layoutControlItem1.Text = "涓婚敭GUID";
this.layoutControlItem1.TextSize = new System.Drawing.Size(66, 18);
//
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txt_createdDate;
+ this.layoutControlItem12.Location = new System.Drawing.Point(626, 98);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem12.Size = new System.Drawing.Size(313, 33);
+ this.layoutControlItem12.Text = "鍒涘缓鏃堕棿";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem11
+ //
+ this.layoutControlItem11.Control = this.txt_createdBy;
+ this.layoutControlItem11.Location = new System.Drawing.Point(626, 65);
+ this.layoutControlItem11.Name = "layoutControlItem11";
+ this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem11.Size = new System.Drawing.Size(313, 33);
+ this.layoutControlItem11.Text = "鍒涘缓浜哄憳";
+ this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem3
+ //
+ this.layoutControlItem3.Control = this.txt_inventoryOrg;
+ this.layoutControlItem3.Location = new System.Drawing.Point(626, 0);
+ this.layoutControlItem3.Name = "layoutControlItem3";
+ this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem3.Size = new System.Drawing.Size(313, 32);
+ this.layoutControlItem3.Text = "搴撳瓨缁勭粐";
+ this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txt_wjStatus;
+ this.layoutControlItem18.Location = new System.Drawing.Point(626, 131);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem18.Size = new System.Drawing.Size(313, 33);
+ this.layoutControlItem18.Text = "瀹岀粨鏍囪瘑";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem18.TextVisible = false;
+ //
// Root
//
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem2,
- this.layoutControlItem3,
- this.layoutControlItem6,
- this.layoutControlItem7,
- this.layoutControlItem8,
- this.layoutControlItem10,
- this.layoutControlItem11,
- this.layoutControlItem12,
this.layoutControlItem13,
this.layoutControlItem14,
this.layoutControlItem15,
this.layoutControlItem16,
- this.layoutControlItem17,
- this.layoutControlItem18,
this.layoutControlItem4,
- this.layoutControlItem9,
- this.layoutControlItem20,
this.layoutControlItem5,
- this.layoutControlItem21});
+ this.layoutControlItem21,
+ this.layoutControlItem8,
+ this.layoutControlItem6,
+ this.layoutControlItem7,
+ this.layoutControlItem10,
+ this.layoutControlItem20,
+ this.layoutControlItem9,
+ this.layoutControlItem17});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -951,221 +1069,174 @@
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,
- rowDefinition5});
- this.Root.Size = new System.Drawing.Size(1274, 184);
+ rowDefinition4});
+ this.Root.Size = new System.Drawing.Size(1253, 148);
this.Root.TextVisible = false;
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_xsOrgName;
- this.layoutControlItem2.Location = new System.Drawing.Point(313, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(308, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(313, 32);
+ this.layoutControlItem2.Size = new System.Drawing.Size(308, 32);
this.layoutControlItem2.Text = "閿�鍞粍缁�";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem3
- //
- this.layoutControlItem3.Control = this.txt_inventoryOrg;
- this.layoutControlItem3.Location = new System.Drawing.Point(626, 0);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(313, 32);
- this.layoutControlItem3.Text = "搴撳瓨缁勭粐";
- this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem6
- //
- this.layoutControlItem6.Control = this.txt_salerName;
- this.layoutControlItem6.Location = new System.Drawing.Point(313, 32);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(313, 33);
- this.layoutControlItem6.Text = "閿�鍞憳鍚�";
- this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem7
- //
- this.layoutControlItem7.Control = this.txt_saleDeptName;
- this.layoutControlItem7.Location = new System.Drawing.Point(313, 65);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(313, 33);
- this.layoutControlItem7.Text = "閿�鍞儴闂�";
- this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem8
- //
- this.layoutControlItem8.Control = this.txt_custName;
- this.layoutControlItem8.Location = new System.Drawing.Point(626, 32);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(313, 33);
- this.layoutControlItem8.Text = "瀹㈡埛鍚嶇О";
- this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem10
- //
- this.layoutControlItem10.Control = this.txt_billType;
- this.layoutControlItem10.Location = new System.Drawing.Point(313, 98);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(313, 33);
- this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷";
- this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem11
- //
- this.layoutControlItem11.Control = this.txt_createdBy;
- this.layoutControlItem11.Location = new System.Drawing.Point(626, 65);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(313, 33);
- this.layoutControlItem11.Text = "鍒涘缓浜哄憳";
- this.layoutControlItem11.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem12
- //
- this.layoutControlItem12.Control = this.txt_createdDate;
- this.layoutControlItem12.Location = new System.Drawing.Point(626, 98);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(313, 33);
- this.layoutControlItem12.Text = "鍒涘缓鏃堕棿";
- this.layoutControlItem12.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_modifiedBy;
- this.layoutControlItem13.Location = new System.Drawing.Point(939, 0);
+ 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(315, 32);
+ 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(939, 32);
+ 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(315, 33);
+ this.layoutControlItem14.Size = new System.Drawing.Size(309, 32);
this.layoutControlItem14.Text = "淇敼鏃堕棿";
this.layoutControlItem14.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_approvedBy;
- this.layoutControlItem15.Location = new System.Drawing.Point(939, 65);
+ this.layoutControlItem15.Location = new System.Drawing.Point(924, 64);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(315, 33);
+ this.layoutControlItem15.Size = new System.Drawing.Size(309, 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, 98);
+ this.layoutControlItem16.Location = new System.Drawing.Point(924, 96);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(315, 33);
+ this.layoutControlItem16.Size = new System.Drawing.Size(309, 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, 131);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(315, 33);
- this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
- this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem17.TextVisible = false;
- //
- // layoutControlItem18
- //
- this.layoutControlItem18.Control = this.txt_wjStatus;
- this.layoutControlItem18.Location = new System.Drawing.Point(626, 131);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(313, 33);
- this.layoutControlItem18.Text = "瀹岀粨鏍囪瘑";
- this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem18.TextVisible = false;
//
// layoutControlItem4
//
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(308, 32);
this.layoutControlItem4.Text = "鐢宠鍗曞彿";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem9
- //
- this.layoutControlItem9.Control = this.txt_returnReason;
- this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 131);
- this.layoutControlItem9.Name = "layoutControlItem9";
- this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem9.Size = new System.Drawing.Size(626, 33);
- this.layoutControlItem9.Text = "鐢宠鍘熷洜";
- this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
- //
- // layoutControlItem20
- //
- this.layoutControlItem20.Control = this.txt_fstockid;
- this.layoutControlItem20.Location = new System.Drawing.Point(0, 98);
- this.layoutControlItem20.Name = "layoutControlItem20";
- this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem20.Size = new System.Drawing.Size(313, 33);
- this.layoutControlItem20.Text = "閫夋嫨浠撳簱";
- this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_salesOrderId;
- this.layoutControlItem5.Location = new System.Drawing.Point(0, 65);
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem5.Size = new System.Drawing.Size(313, 33);
+ this.layoutControlItem5.Size = new System.Drawing.Size(308, 32);
this.layoutControlItem5.Text = "閿�鍞鍗�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem21
//
- this.layoutControlItem21.Control = this.txt_fIsLink;
+ this.layoutControlItem21.Control = this.txt_fHasLinkRad;
this.layoutControlItem21.Location = new System.Drawing.Point(0, 32);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
this.layoutControlItem21.Padding = new DevExpress.XtraLayout.Utils.Padding(2, 2, 0, 0);
- this.layoutControlItem21.Size = new System.Drawing.Size(313, 33);
+ this.layoutControlItem21.Size = new System.Drawing.Size(308, 32);
this.layoutControlItem21.Text = "鏈夋棤婧愬崟";
this.layoutControlItem21.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem8
+ //
+ this.layoutControlItem8.Control = this.txt_custName;
+ this.layoutControlItem8.Location = new System.Drawing.Point(616, 0);
+ this.layoutControlItem8.Name = "layoutControlItem8";
+ this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem8.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem8.Text = "瀹㈡埛鍚嶇О";
+ this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem6
+ //
+ this.layoutControlItem6.Control = this.txt_salerName;
+ this.layoutControlItem6.Location = new System.Drawing.Point(616, 32);
+ this.layoutControlItem6.Name = "layoutControlItem6";
+ this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem6.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem6.Text = "閿�鍞憳鍚�";
+ this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txt_saleDeptName;
+ this.layoutControlItem7.Location = new System.Drawing.Point(616, 64);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem7.Size = new System.Drawing.Size(308, 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(308, 32);
+ this.layoutControlItem10.Name = "layoutControlItem10";
+ this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem10.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem10.Text = "鍗曟嵁绫诲瀷";
+ this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_fstockid;
+ this.layoutControlItem20.Location = new System.Drawing.Point(308, 64);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem20.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem20.Text = "閫夋嫨浠撳簱";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem9
+ //
+ this.layoutControlItem9.Control = this.txt_returnReason;
+ this.layoutControlItem9.CustomizationFormText = "鐢宠鍘熷洜";
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 96);
+ this.layoutControlItem9.Name = "layoutControlItem9";
+ this.layoutControlItem9.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem9.Size = new System.Drawing.Size(616, 32);
+ this.layoutControlItem9.Text = "鐢宠鍘熷洜";
+ this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txt_chkStatus;
+ this.layoutControlItem17.Location = new System.Drawing.Point(616, 96);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 3;
+ this.layoutControlItem17.Size = new System.Drawing.Size(308, 32);
+ this.layoutControlItem17.Text = "瀹℃牳鏍囪瘑";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem17.TextVisible = false;
//
// tabMx
//
@@ -1173,7 +1244,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, 374);
+ this.tabMx.Size = new System.Drawing.Size(1274, 414);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1181,10 +1252,403 @@
//
// tabMxPage1
//
- this.tabMxPage1.Controls.Add(this.gcMx1);
+ this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1272, 342);
+ this.tabMxPage1.Size = new System.Drawing.Size(1272, 382);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
+ //
+ // split99
+ //
+ this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split99.Horizontal = false;
+ this.split99.Location = new System.Drawing.Point(0, 0);
+ this.split99.Name = "split99";
+ //
+ // split99.Panel1
+ //
+ this.split99.Panel1.Controls.Add(this.layout99);
+ this.split99.Panel1.Text = "Panel1";
+ //
+ // split99.Panel2
+ //
+ 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, 382);
+ this.split99.SplitterPosition = 137;
+ this.split99.TabIndex = 4;
+ //
+ // layout99
+ //
+ this.layout99.Controls.Add(this.layoutControl1);
+ this.layout99.Controls.Add(this.ucBtnPrint1);
+ this.layout99.Controls.Add(this.radOut);
+ this.layout99.Controls.Add(this.lbMxGuid);
+ this.layout99.Controls.Add(this.txtWlid);
+ this.layout99.Controls.Add(this.txt_psnQty_1);
+ this.layout99.Controls.Add(this.txtWlmc);
+ this.layout99.Controls.Add(this.txtWlgg);
+ this.layout99.Controls.Add(this.txt_kQty);
+ this.layout99.Controls.Add(this.txtQuantity);
+ this.layout99.Controls.Add(this.txt_yQty);
+ this.layout99.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem29});
+ this.layout99.Location = new System.Drawing.Point(0, 0);
+ 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, 137);
+ this.layout99.TabIndex = 0;
+ this.layout99.Text = "layoutControl1";
+ //
+ // layoutControl1
+ //
+ 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.Name = "layoutControl1";
+ this.layoutControl1.Root = this.layoutControlGroup2;
+ this.layoutControl1.Size = new System.Drawing.Size(336, 28);
+ this.layoutControl1.TabIndex = 477;
+ this.layoutControl1.Text = "layoutControl1";
+ //
+ // txt_iCount_1
+ //
+ this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
+ this.txt_iCount_1.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.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.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.StyleController = this.layoutControl1;
+ this.txt_yuliang_1.TabIndex = 229;
+ //
+ // layoutControlGroup2
+ //
+ this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup2.GroupBordersVisible = false;
+ this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem33,
+ this.layoutControlItem34});
+ this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup2.Name = "layoutControlGroup2";
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition5,
+ columnDefinition6});
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition5});
+ this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlGroup2.TextVisible = false;
+ //
+ // layoutControlItem33
+ //
+ 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.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.Name = "layoutControlItem34";
+ this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem34.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem34.Text = "鎵撳嵃浣欐暟";
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // ucBtnPrint1
+ //
+ this.ucBtnPrint1.allClickKey = null;
+ this.ucBtnPrint1.guidKey = null;
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1031, 42);
+ this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
+ this.ucBtnPrint1.Name = "ucBtnPrint1";
+ this.ucBtnPrint1.rptParameter = null;
+ this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
+ this.ucBtnPrint1.TabIndex = 230;
+ //
+ // radOut
+ //
+ this.radOut.Location = new System.Drawing.Point(1033, 10);
+ this.radOut.Margin = new System.Windows.Forms.Padding(0);
+ this.radOut.Name = "radOut";
+ this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
+ this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
+ this.radOut.Size = new System.Drawing.Size(227, 28);
+ this.radOut.StyleController = this.layout99;
+ this.radOut.TabIndex = 476;
+ //
+ // lbMxGuid
+ //
+ this.lbMxGuid.Location = new System.Drawing.Point(755, 76);
+ this.lbMxGuid.Name = "lbMxGuid";
+ this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
+ this.lbMxGuid.StyleController = this.layout99;
+ this.lbMxGuid.TabIndex = 229;
+ this.lbMxGuid.Text = "lbMxGuid";
+ this.lbMxGuid.Visible = false;
+ //
+ // txtWlid
+ //
+ this.txtWlid.Location = new System.Drawing.Point(114, 12);
+ 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.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.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.StyleController = this.layout99;
+ this.txt_psnQty_1.TabIndex = 226;
+ //
+ // txtWlmc
+ //
+ this.txtWlmc.Location = new System.Drawing.Point(114, 44);
+ 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.StyleController = this.layout99;
+ this.txtWlmc.TabIndex = 216;
+ //
+ // txtWlgg
+ //
+ this.txtWlgg.Location = new System.Drawing.Point(114, 76);
+ 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.TabIndex = 218;
+ //
+ // txt_kQty
+ //
+ this.txt_kQty.Location = new System.Drawing.Point(794, 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.StyleController = this.layout99;
+ this.txt_kQty.TabIndex = 224;
+ //
+ // txtQuantity
+ //
+ this.txtQuantity.Location = new System.Drawing.Point(454, 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.StyleController = this.layout99;
+ this.txtQuantity.TabIndex = 220;
+ //
+ // txt_yQty
+ //
+ this.txt_yQty.Location = new System.Drawing.Point(454, 44);
+ 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.StyleController = this.layout99;
+ this.txt_yQty.TabIndex = 222;
+ //
+ // layoutControlItem29
+ //
+ this.layoutControlItem29.Control = this.lbMxGuid;
+ this.layoutControlItem29.Location = new System.Drawing.Point(1020, 64);
+ this.layoutControlItem29.Name = "layoutControlItem29";
+ this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem29.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem29.Text = "lbMxGuid";
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem29.TextVisible = false;
+ //
+ // layoutControlGroup1
+ //
+ this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup1.GroupBordersVisible = false;
+ this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem22,
+ this.layoutControlItem23,
+ this.layoutControlItem24,
+ this.layoutControlItem25,
+ this.layoutControlItem26,
+ this.layoutControlItem27,
+ this.layoutControlItem28,
+ this.layoutControlItem30,
+ this.layoutControlItem31,
+ this.layoutControlItem32});
+ this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup1.Name = "Root";
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition7,
+ 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;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
+ this.layoutControlGroup1.TextVisible = false;
+ //
+ // layoutControlItem22
+ //
+ 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.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.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
+ 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.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem24.Size = new System.Drawing.Size(680, 32);
+ 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.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
+ 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.Name = "layoutControlItem26";
+ this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem26.Size = new System.Drawing.Size(340, 32);
+ 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.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem27.Size = new System.Drawing.Size(340, 32);
+ 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.Name = "layoutControlItem28";
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem28.Size = new System.Drawing.Size(340, 32);
+ 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.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.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem30.Text = "鑷姩璁＄畻";
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem30.TextVisible = false;
+ //
+ // layoutControlItem31
+ //
+ this.layoutControlItem31.Control = this.ucBtnPrint1;
+ this.layoutControlItem31.Location = new System.Drawing.Point(1020, 32);
+ 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.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳";
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem31.TextVisible = false;
+ //
+ // layoutControlItem32
+ //
+ this.layoutControlItem32.Control = this.layoutControl1;
+ this.layoutControlItem32.Location = new System.Drawing.Point(680, 64);
+ 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.Text = "鎵撳嵃鏁伴噺";
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem32.TextVisible = false;
//
// gcMx1
//
@@ -1197,7 +1661,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemComboBox1,
this.repositoryItemDateEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1272, 342);
+ this.gcMx1.Size = new System.Drawing.Size(1272, 233);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1382,7 +1846,7 @@
this.gvMx1materialSpecification.Name = "gvMx1materialSpecification";
this.gvMx1materialSpecification.Tag = "query_a.MATERIAL_SPECIFICATION";
this.gvMx1materialSpecification.Visible = true;
- this.gvMx1materialSpecification.VisibleIndex = 2;
+ this.gvMx1materialSpecification.VisibleIndex = 9;
this.gvMx1materialSpecification.Width = 94;
//
// gridColumn20
@@ -1392,7 +1856,7 @@
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 3;
+ this.gridColumn20.VisibleIndex = 2;
this.gridColumn20.Width = 94;
//
// gvMx1salesUnitId
@@ -1404,7 +1868,7 @@
this.gvMx1salesUnitId.Name = "gvMx1salesUnitId";
this.gvMx1salesUnitId.Tag = "query_a.SALES_UNIT_ID";
this.gvMx1salesUnitId.Visible = true;
- this.gvMx1salesUnitId.VisibleIndex = 4;
+ this.gvMx1salesUnitId.VisibleIndex = 3;
this.gvMx1salesUnitId.Width = 94;
//
// gvMx1salesQuantity
@@ -1416,7 +1880,7 @@
this.gvMx1salesQuantity.Name = "gvMx1salesQuantity";
this.gvMx1salesQuantity.Tag = "query_a.SALES_QUANTITY";
this.gvMx1salesQuantity.Visible = true;
- this.gvMx1salesQuantity.VisibleIndex = 5;
+ this.gvMx1salesQuantity.VisibleIndex = 4;
this.gvMx1salesQuantity.Width = 94;
//
// gridColumn32
@@ -1442,7 +1906,7 @@
this.gvMx1note.Name = "gvMx1note";
this.gvMx1note.Tag = "edit";
this.gvMx1note.Visible = true;
- this.gvMx1note.VisibleIndex = 7;
+ this.gvMx1note.VisibleIndex = 6;
this.gvMx1note.Width = 94;
//
// gridColumn13
@@ -1457,7 +1921,7 @@
this.gridColumn13.Name = "gridColumn13";
this.gridColumn13.Tag = "yz_quantity_0_edit";
this.gridColumn13.Visible = true;
- this.gridColumn13.VisibleIndex = 6;
+ this.gridColumn13.VisibleIndex = 5;
this.gridColumn13.Width = 94;
//
// gvMx1returnDate
@@ -1474,7 +1938,7 @@
this.gvMx1returnDate.Name = "gvMx1returnDate";
this.gvMx1returnDate.Tag = "edit";
this.gvMx1returnDate.Visible = true;
- this.gvMx1returnDate.VisibleIndex = 8;
+ this.gvMx1returnDate.VisibleIndex = 7;
this.gvMx1returnDate.Width = 94;
//
// repositoryItemDateEdit1
@@ -1512,7 +1976,7 @@
this.gvMx1returnType.Name = "gvMx1returnType";
this.gvMx1returnType.Tag = "edit";
this.gvMx1returnType.Visible = true;
- this.gvMx1returnType.VisibleIndex = 9;
+ this.gvMx1returnType.VisibleIndex = 8;
this.gvMx1returnType.Width = 94;
//
// repositoryItemComboBox1
@@ -1581,7 +2045,7 @@
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1272, 342);
+ this.tabMxPage2.Size = new System.Drawing.Size(1272, 382);
this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�";
//
// gcMx2
@@ -1590,7 +2054,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, 342);
+ this.gcMx2.Size = new System.Drawing.Size(1272, 382);
this.gcMx2.TabIndex = 3;
this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx2});
@@ -1796,7 +2260,7 @@
this.splitMx1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layoutMx1)).EndInit();
this.layoutMx1.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.txt_fIsLink.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_fHasLinkRad.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_wjStatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_chkStatus.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_billType.Properties)).EndInit();
@@ -1816,29 +2280,64 @@
((System.ComponentModel.ISupportInitialize)(this.txt_createdBy.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.layoutControlItem3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem8)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit();
+ this.split99.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit();
+ this.split99.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit();
+ this.split99.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit();
+ this.layout99.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
+ this.layoutControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
@@ -1906,10 +2405,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem3;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
@@ -1948,6 +2443,16 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private UserControl.UcBtnPrint ucBtnPrint1;
+ private DevExpress.XtraEditors.LabelControl lbMxGuid;
+ private DevExpress.XtraEditors.TextEdit txt_iCount_1;
+ private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
+ private DevExpress.XtraEditors.TextEdit txt_kQty;
+ private DevExpress.XtraEditors.TextEdit txt_yQty;
+ private DevExpress.XtraEditors.TextEdit txtQuantity;
+ private DevExpress.XtraEditors.TextEdit txtWlgg;
+ private DevExpress.XtraEditors.TextEdit txtWlmc;
+ private DevExpress.XtraEditors.TextEdit txtWlid;
private DevExpress.XtraTab.XtraTabPage tabMxPage2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
@@ -1958,12 +2463,9 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraEditors.RadioGroup txt_fIsLink;
+ private DevExpress.XtraEditors.RadioGroup txt_fHasLinkRad;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
private DevExpress.XtraGrid.GridControl gcMx2;
@@ -1983,5 +2485,32 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
+ private DevExpress.XtraEditors.RadioGroup radOut;
+ private DevExpress.XtraEditors.SplitContainerControl split99;
+ private DevExpress.XtraLayout.LayoutControl layout99;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+ private DevExpress.XtraLayout.LayoutControl layoutControl1;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+ private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem8;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem9;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
}
}
\ No newline at end of file
--
Gitblit v1.9.3