From 0287489aff977927aae7a1e32e8969263b94da63 Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期日, 10 八月 2025 21:39:23 +0800
Subject: [PATCH] 销售
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 76 +-
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 1313 ++++++++++++++++++++++++++++++------------------------
2 files changed, 763 insertions(+), 626 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index a78227f..b0abb8f 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -30,11 +30,6 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -43,21 +38,21 @@
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 rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ 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.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
- this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
- this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
- this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ 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();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject3 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject4 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -112,61 +107,72 @@
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.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
- this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
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.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
- this.radOut = new DevExpress.XtraEditors.RadioGroup();
- this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
- this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
- this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
- this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
- this.txtWlid = new DevExpress.XtraEditors.TextEdit();
- this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
- this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
- this.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem28 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
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();
+ this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
+ this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn6 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1id = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1materialId = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1materialName = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -178,12 +184,15 @@
this.gvMx1note = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn13 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1returnDate = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemDateEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemDateEdit();
this.gvMx1isFree = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1returnType = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -202,11 +211,6 @@
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -246,26 +250,26 @@
((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();
@@ -282,75 +286,41 @@
((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.layoutControlItem30)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).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();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
this.SuspendLayout();
- //
- // repositoryItemSearchLookUpEdit1
- //
- this.repositoryItemSearchLookUpEdit1.AutoHeight = false;
- this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";
- this.repositoryItemSearchLookUpEdit1.NullText = "璇烽�夋嫨";
- //
- // repositoryItemDateEdit1
- //
- this.repositoryItemDateEdit1.AutoHeight = false;
- this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
- //
- // repositoryItemComboBox1
- //
- this.repositoryItemComboBox1.AutoHeight = false;
- this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemComboBox1.Items.AddRange(new object[] {
- "閫�璐�(THLX01_SYS)",
- "閫�璐цˉ璐�(THLX02_SYS)",
- "浠呴��娆句笉閫�璐�(THLX03_SYS)"});
- this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
- this.repositoryItemComboBox1.NullText = "璇烽�夋嫨";
- this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- //
- // repositoryItemButtonEdit1
- //
- this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
- this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
- this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
- this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
// toolBarMenu1
//
@@ -363,7 +333,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(1363, 80);
+ this.toolBarMenu1.Size = new System.Drawing.Size(1276, 80);
this.toolBarMenu1.TabIndex = 0;
this.toolBarMenu1.xlsInService = null;
this.toolBarMenu1.xlsOutParameter = null;
@@ -374,7 +344,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(1363, 602);
+ this.xtraTabControl1.Size = new System.Drawing.Size(1276, 602);
this.xtraTabControl1.TabIndex = 3;
this.xtraTabControl1.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage1,
@@ -384,7 +354,7 @@
//
this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1361, 570);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1274, 570);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -405,7 +375,7 @@
//
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1361, 570);
+ this.split1.Size = new System.Drawing.Size(1274, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
//
@@ -415,7 +385,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(1361, 519);
+ this.gcMain1.Size = new System.Drawing.Size(1274, 519);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -486,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;
@@ -708,7 +678,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(1361, 39);
+ this.pageBar1.Size = new System.Drawing.Size(1274, 39);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -716,7 +686,7 @@
//
this.xtraTabPage2.Controls.Add(this.splitMx1);
this.xtraTabPage2.Name = "xtraTabPage2";
- this.xtraTabPage2.Size = new System.Drawing.Size(1361, 570);
+ this.xtraTabPage2.Size = new System.Drawing.Size(1274, 570);
this.xtraTabPage2.Text = "鏁版嵁璇︾粏";
//
// splitMx1
@@ -736,8 +706,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(1361, 570);
- this.splitMx1.SplitterPosition = 184;
+ this.splitMx1.Size = new System.Drawing.Size(1274, 570);
+ this.splitMx1.SplitterPosition = 144;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -766,12 +736,16 @@
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(1361, 184);
+ this.layoutMx1.Size = new System.Drawing.Size(1274, 144);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -785,17 +759,17 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem("1", "鏈夋簮鍗�"),
new DevExpress.XtraEditors.Controls.RadioGroupItem("0", "鏃犳簮鍗�", false)});
this.txt_fHasLinkRad.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.txt_fHasLinkRad.Size = new System.Drawing.Size(259, 33);
+ 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(259, 24);
+ this.txt_fstockid.Size = new System.Drawing.Size(232, 24);
this.txt_fstockid.TabIndex = 454;
//
// lbGuid
@@ -808,20 +782,20 @@
//
// txt_wjStatus
//
- this.txt_wjStatus.Location = new System.Drawing.Point(682, 143);
+ this.txt_wjStatus.Location = new System.Drawing.Point(638, 143);
this.txt_wjStatus.Name = "txt_wjStatus";
this.txt_wjStatus.Properties.Caption = "瀹岀粨鏍囪瘑";
- this.txt_wjStatus.Size = new System.Drawing.Size(331, 24);
+ this.txt_wjStatus.Size = new System.Drawing.Size(309, 24);
this.txt_wjStatus.StyleController = this.layoutMx1;
this.txt_wjStatus.TabIndex = 453;
this.txt_wjStatus.Tag = "readonly";
//
// txt_chkStatus
//
- this.txt_chkStatus.Location = new System.Drawing.Point(1017, 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(332, 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";
@@ -829,31 +803,31 @@
// txt_billType
//
this.txt_billType.EditValue = "鏍囧噯閿�鍞��璐у崟(XSTHD01_SYS)";
- this.txt_billType.Location = new System.Drawing.Point(419, 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(259, 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(259, 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(1089, 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(260, 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";
@@ -870,40 +844,40 @@
//
// txt_approvedBy
//
- this.txt_approvedBy.Location = new System.Drawing.Point(1089, 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(260, 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(419, 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(259, 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";
//
// txt_inventoryOrg
//
- this.txt_inventoryOrg.Location = new System.Drawing.Point(754, 12);
+ this.txt_inventoryOrg.Location = new System.Drawing.Point(710, 12);
this.txt_inventoryOrg.Name = "txt_inventoryOrg";
this.txt_inventoryOrg.Properties.Appearance.Options.UseFont = true;
- this.txt_inventoryOrg.Size = new System.Drawing.Size(259, 24);
+ this.txt_inventoryOrg.Size = new System.Drawing.Size(237, 24);
this.txt_inventoryOrg.StyleController = this.layoutMx1;
this.txt_inventoryOrg.TabIndex = 243;
this.txt_inventoryOrg.Tag = "readonly";
//
// txt_modifiedDate
//
- this.txt_modifiedDate.Location = new System.Drawing.Point(1089, 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(260, 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";
@@ -913,76 +887,76 @@
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(259, 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(419, 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(259, 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(1089, 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(260, 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(419, 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(259, 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(754, 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(259, 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";
//
// txt_createdDate
//
- this.txt_createdDate.Location = new System.Drawing.Point(754, 110);
+ this.txt_createdDate.Location = new System.Drawing.Point(710, 110);
this.txt_createdDate.Name = "txt_createdDate";
this.txt_createdDate.Properties.Appearance.Options.UseFont = true;
- this.txt_createdDate.Size = new System.Drawing.Size(259, 24);
+ this.txt_createdDate.Size = new System.Drawing.Size(237, 24);
this.txt_createdDate.StyleController = this.layoutMx1;
this.txt_createdDate.TabIndex = 319;
this.txt_createdDate.Tag = "readonly";
//
// txt_returnReason
//
- this.txt_returnReason.Location = new System.Drawing.Point(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(594, 24);
+ this.txt_returnReason.Size = new System.Drawing.Size(540, 24);
this.txt_returnReason.StyleController = this.layoutMx1;
this.txt_returnReason.TabIndex = 235;
//
// txt_createdBy
//
- this.txt_createdBy.Location = new System.Drawing.Point(754, 77);
+ this.txt_createdBy.Location = new System.Drawing.Point(710, 77);
this.txt_createdBy.Name = "txt_createdBy";
this.txt_createdBy.Properties.Appearance.Options.UseFont = true;
- this.txt_createdBy.Size = new System.Drawing.Size(259, 24);
+ this.txt_createdBy.Size = new System.Drawing.Size(237, 24);
this.txt_createdBy.StyleController = this.layoutMx1;
this.txt_createdBy.TabIndex = 312;
this.txt_createdBy.Tag = "readonly";
@@ -1008,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;
@@ -1055,208 +1069,83 @@
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(1361, 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(335, 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(335, 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(670, 0);
- this.layoutControlItem3.Name = "layoutControlItem3";
- this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(335, 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(335, 32);
- this.layoutControlItem6.Name = "layoutControlItem6";
- this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem6.Size = new System.Drawing.Size(335, 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(335, 65);
- this.layoutControlItem7.Name = "layoutControlItem7";
- this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(335, 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(670, 32);
- this.layoutControlItem8.Name = "layoutControlItem8";
- this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem8.Size = new System.Drawing.Size(335, 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(335, 98);
- this.layoutControlItem10.Name = "layoutControlItem10";
- this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(335, 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(670, 65);
- this.layoutControlItem11.Name = "layoutControlItem11";
- this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(335, 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(670, 98);
- this.layoutControlItem12.Name = "layoutControlItem12";
- this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem12.Size = new System.Drawing.Size(335, 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(1005, 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(336, 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(1005, 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(336, 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(1005, 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(336, 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(1005, 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(336, 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(1005, 131);
- this.layoutControlItem17.Name = "layoutControlItem17";
- this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(336, 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(670, 131);
- this.layoutControlItem18.Name = "layoutControlItem18";
- this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem18.Size = new System.Drawing.Size(335, 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(335, 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(670, 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(335, 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(335, 33);
+ this.layoutControlItem5.Size = new System.Drawing.Size(308, 32);
this.layoutControlItem5.Text = "閿�鍞鍗�";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
@@ -1267,9 +1156,87 @@
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(335, 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
//
@@ -1277,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(1361, 374);
+ this.tabMx.Size = new System.Drawing.Size(1274, 414);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1287,7 +1254,7 @@
//
this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1359, 342);
+ this.tabMxPage1.Size = new System.Drawing.Size(1272, 382);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// split99
@@ -1307,63 +1274,43 @@
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(1359, 342);
- this.split99.SplitterPosition = 127;
- this.split99.TabIndex = 1;
+ this.split99.Size = new System.Drawing.Size(1272, 382);
+ this.split99.SplitterPosition = 137;
+ this.split99.TabIndex = 4;
//
// layout99
//
- this.layout99.Controls.Add(this.lbMxGuid);
- this.layout99.Controls.Add(this.ucBtnPrint1);
this.layout99.Controls.Add(this.layoutControl1);
+ this.layout99.Controls.Add(this.ucBtnPrint1);
this.layout99.Controls.Add(this.radOut);
- this.layout99.Controls.Add(this.txtQuantity);
- this.layout99.Controls.Add(this.txt_yQty);
- this.layout99.Controls.Add(this.txt_kQty);
- this.layout99.Controls.Add(this.txt_psnQty_1);
+ 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(408, 530, 812, 500);
+ this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(46, 297, 812, 500);
this.layout99.Root = this.layoutControlGroup1;
- this.layout99.Size = new System.Drawing.Size(1359, 127);
+ this.layout99.Size = new System.Drawing.Size(1272, 137);
this.layout99.TabIndex = 0;
this.layout99.Text = "layoutControl1";
- //
- // lbMxGuid
- //
- this.lbMxGuid.Location = new System.Drawing.Point(12, 60);
- this.lbMxGuid.Name = "lbMxGuid";
- this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
- this.lbMxGuid.StyleController = this.layout99;
- this.lbMxGuid.TabIndex = 479;
- this.lbMxGuid.Text = "lbMxGuid";
- //
- // ucBtnPrint1
- //
- this.ucBtnPrint1.allClickKey = null;
- this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 48);
- 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 = 478;
//
// 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, 84);
+ 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, 32);
- this.layoutControl1.TabIndex = 476;
+ this.layoutControl1.Size = new System.Drawing.Size(336, 28);
+ this.layoutControl1.TabIndex = 477;
this.layoutControl1.Text = "layoutControl1";
//
// txt_iCount_1
@@ -1390,8 +1337,8 @@
this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.layoutControlGroup2.GroupBordersVisible = false;
this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem30,
- this.layoutControlItem31});
+ this.layoutControlItem33,
+ this.layoutControlItem34});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "layoutControlGroup2";
columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -1401,36 +1348,47 @@
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
columnDefinition5,
columnDefinition6});
- rowDefinition6.Height = 100D;
- rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition6});
+ rowDefinition5});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 32);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
this.layoutControlGroup2.TextVisible = false;
//
- // layoutControlItem30
+ // layoutControlItem33
//
- this.layoutControlItem30.Control = this.txt_iCount_1;
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 0);
- this.layoutControlItem30.Name = "layoutControlItem30";
- this.layoutControlItem30.Size = new System.Drawing.Size(168, 32);
- this.layoutControlItem30.Text = "鎵撳嵃鏁村紶鏁板��";
- this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
+ 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);
//
- // layoutControlItem31
+ // layoutControlItem34
//
- this.layoutControlItem31.Control = this.txt_yuliang_1;
- this.layoutControlItem31.Location = new System.Drawing.Point(168, 0);
- this.layoutControlItem31.Name = "layoutControlItem31";
- this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem31.Size = new System.Drawing.Size(168, 32);
- this.layoutControlItem31.Text = "鎵撳嵃浣欐暟";
- this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
+ 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(1032, 12);
+ 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;
@@ -1438,80 +1396,99 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
- this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(336, 32);
+ this.radOut.Size = new System.Drawing.Size(227, 28);
this.radOut.StyleController = this.layout99;
- this.radOut.TabIndex = 475;
+ this.radOut.TabIndex = 476;
//
- // txtQuantity
+ // lbMxGuid
//
- this.txtQuantity.Location = new System.Drawing.Point(454, 12);
- this.txtQuantity.Name = "txtQuantity";
- this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(234, 24);
- this.txtQuantity.StyleController = this.layout99;
- this.txtQuantity.TabIndex = 4;
- //
- // txt_yQty
- //
- this.txt_yQty.Location = new System.Drawing.Point(454, 48);
- this.txt_yQty.Name = "txt_yQty";
- 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 = 5;
- //
- // txt_kQty
- //
- this.txt_kQty.Location = new System.Drawing.Point(794, 12);
- this.txt_kQty.Name = "txt_kQty";
- 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 = 6;
- //
- // txt_psnQty_1
- //
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 48);
- this.txt_psnQty_1.Name = "txt_psnQty_1";
- this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
- this.txt_psnQty_1.StyleController = this.layout99;
- this.txt_psnQty_1.TabIndex = 477;
+ 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 = 480;
+ 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, 48);
+ 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 = 481;
+ this.txtWlmc.TabIndex = 216;
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 84);
+ 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.StyleController = this.layout99;
- this.txtWlgg.TabIndex = 482;
+ 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(0, 48);
+ this.layoutControlItem29.Location = new System.Drawing.Point(1020, 64);
this.layoutControlItem29.Name = "layoutControlItem29";
- this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem29.Size = new System.Drawing.Size(340, 48);
+ 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;
@@ -1521,16 +1498,16 @@
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.layoutControlItem26,
- this.layoutControlItem23,
- this.layoutControlItem22,
- this.layoutControlItem32,
- this.layoutControlItem33,
- this.layoutControlItem34});
+ 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;
@@ -1546,125 +1523,133 @@
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,
- rowDefinition9});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 128);
+ 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.txt_kQty;
- this.layoutControlItem24.Location = new System.Drawing.Point(680, 0);
+ this.layoutControlItem24.Control = this.txtWlgg;
+ this.layoutControlItem24.Location = new System.Drawing.Point(0, 64);
this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem24.Size = new System.Drawing.Size(340, 36);
- this.layoutControlItem24.Text = "鍙墦鍗版�绘暟";
+ 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.radOut;
- this.layoutControlItem25.Location = new System.Drawing.Point(1020, 0);
+ this.layoutControlItem25.Control = this.txtQuantity;
+ this.layoutControlItem25.Location = new System.Drawing.Point(340, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
- this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 36);
- this.layoutControlItem25.Text = "鎵撳嵃鏂瑰紡";
- this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem25.TextVisible = false;
+ 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_psnQty_1;
- this.layoutControlItem27.Location = new System.Drawing.Point(680, 36);
+ 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.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem27.Size = new System.Drawing.Size(340, 36);
- this.layoutControlItem27.Text = "姣忓紶鏉＄爜鏁伴噺";
+ 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.ucBtnPrint1;
- this.layoutControlItem28.Location = new System.Drawing.Point(1020, 36);
+ this.layoutControlItem28.Control = this.txt_psnQty_1;
+ this.layoutControlItem28.Location = new System.Drawing.Point(680, 32);
this.layoutControlItem28.Name = "layoutControlItem28";
- this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(340, 36);
- this.layoutControlItem28.Text = "鎵撳嵃鎸夐挳";
- this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem28.TextVisible = false;
+ this.layoutControlItem28.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem28.Text = "姣忓紶鏉＄爜鏁伴噺";
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
- // layoutControlItem26
+ // layoutControlItem30
//
- this.layoutControlItem26.Control = this.layoutControl1;
- this.layoutControlItem26.Location = new System.Drawing.Point(680, 72);
- this.layoutControlItem26.Name = "layoutControlItem26";
- this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem26.Size = new System.Drawing.Size(340, 36);
- this.layoutControlItem26.Text = "鎵撳嵃寮犳暟";
- this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem26.TextVisible = false;
+ 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;
//
- // layoutControlItem23
+ // layoutControlItem31
//
- this.layoutControlItem23.Control = this.txt_yQty;
- this.layoutControlItem23.Location = new System.Drawing.Point(340, 36);
- this.layoutControlItem23.Name = "layoutControlItem23";
- this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 36);
- this.layoutControlItem23.Text = "宸叉墦鍗版�婚噺";
- this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem22
- //
- this.layoutControlItem22.Control = this.txtQuantity;
- this.layoutControlItem22.Location = new System.Drawing.Point(340, 0);
- this.layoutControlItem22.Name = "layoutControlItem22";
- this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 36);
- this.layoutControlItem22.Text = "鏈鐢宠鎬婚噺";
- this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+ 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.txtWlid;
- this.layoutControlItem32.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem32.Control = this.layoutControl1;
+ this.layoutControlItem32.Location = new System.Drawing.Point(680, 64);
this.layoutControlItem32.Name = "layoutControlItem32";
- this.layoutControlItem32.Size = new System.Drawing.Size(340, 36);
- this.layoutControlItem32.Text = "鐗╂枡缂栫爜";
- this.layoutControlItem32.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem33
- //
- this.layoutControlItem33.Control = this.txtWlmc;
- this.layoutControlItem33.Location = new System.Drawing.Point(0, 36);
- this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem33.Size = new System.Drawing.Size(340, 36);
- this.layoutControlItem33.Text = "鐗╂枡鍚嶇О";
- this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
- //
- // layoutControlItem34
- //
- this.layoutControlItem34.Control = this.txtWlgg;
- this.layoutControlItem34.Location = new System.Drawing.Point(0, 72);
- this.layoutControlItem34.Name = "layoutControlItem34";
- this.layoutControlItem34.OptionsTableLayoutItem.ColumnSpan = 2;
- this.layoutControlItem34.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem34.Size = new System.Drawing.Size(680, 36);
- this.layoutControlItem34.Text = "鐗╂枡瑙勬牸";
- this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
+ 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
//
@@ -1672,7 +1657,12 @@
this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
- this.gcMx1.Size = new System.Drawing.Size(1359, 203);
+ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemSearchLookUpEdit1,
+ this.repositoryItemButtonEdit1,
+ this.repositoryItemComboBox1,
+ this.repositoryItemDateEdit1});
+ 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});
@@ -1721,6 +1711,101 @@
this.gridColumn2.VisibleIndex = 0;
this.gridColumn2.Width = 94;
//
+ // repositoryItemSearchLookUpEdit1
+ //
+ this.repositoryItemSearchLookUpEdit1.AutoHeight = false;
+ this.repositoryItemSearchLookUpEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemSearchLookUpEdit1.Name = "repositoryItemSearchLookUpEdit1";
+ this.repositoryItemSearchLookUpEdit1.NullText = "璇烽�夋嫨";
+ this.repositoryItemSearchLookUpEdit1.PopupView = this.gridView2;
+ this.repositoryItemSearchLookUpEdit1.EditValueChanged += new System.EventHandler(this.repositoryItemSearchLookUpEdit1_EditValueChanged);
+ //
+ // gridView2
+ //
+ this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn4,
+ this.gridColumn5,
+ this.gridColumn6,
+ this.gridColumn7,
+ this.gridColumn8,
+ this.gridColumn9,
+ this.gridColumn10,
+ this.gridColumn11,
+ this.gridColumn23});
+ this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+ this.gridView2.Name = "gridView2";
+ this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
+ this.gridView2.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "閿�鍞崟鍙�";
+ this.gridColumn4.FieldName = "xsHno";
+ this.gridColumn4.Name = "gridColumn4";
+ this.gridColumn4.Visible = true;
+ this.gridColumn4.VisibleIndex = 0;
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "鍙戣揣鍗曞彿";
+ this.gridColumn5.FieldName = "fhNo";
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 1;
+ //
+ // gridColumn6
+ //
+ this.gridColumn6.Caption = "鐗╂枡缂栧彿";
+ this.gridColumn6.FieldName = "itemNo";
+ this.gridColumn6.Name = "gridColumn6";
+ this.gridColumn6.Visible = true;
+ this.gridColumn6.VisibleIndex = 2;
+ //
+ // gridColumn7
+ //
+ this.gridColumn7.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn7.FieldName = "itemName";
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 3;
+ //
+ // gridColumn8
+ //
+ this.gridColumn8.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn8.FieldName = "itemModel";
+ this.gridColumn8.Name = "gridColumn8";
+ this.gridColumn8.Visible = true;
+ this.gridColumn8.VisibleIndex = 4;
+ //
+ // gridColumn9
+ //
+ this.gridColumn9.Caption = "鍙戣揣鏁伴噺";
+ this.gridColumn9.FieldName = "fhSl";
+ this.gridColumn9.Name = "gridColumn9";
+ this.gridColumn9.Visible = true;
+ this.gridColumn9.VisibleIndex = 5;
+ //
+ // gridColumn10
+ //
+ this.gridColumn10.Caption = "宸查��鏁伴噺";
+ this.gridColumn10.FieldName = "ytSl";
+ this.gridColumn10.Name = "gridColumn10";
+ this.gridColumn10.Visible = true;
+ this.gridColumn10.VisibleIndex = 6;
+ //
+ // gridColumn11
+ //
+ this.gridColumn11.Caption = "鍑哄簱鏄庣粏Guid";
+ this.gridColumn11.FieldName = "ckmxGuid";
+ this.gridColumn11.Name = "gridColumn11";
+ //
+ // gridColumn23
+ //
+ this.gridColumn23.Caption = "鐗╂枡ID";
+ this.gridColumn23.FieldName = "itemId";
+ this.gridColumn23.Name = "gridColumn23";
+ //
// gvMx1id
//
this.gvMx1id.AppearanceCell.Options.UseFont = true;
@@ -1762,7 +1847,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
@@ -1772,7 +1857,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
@@ -1784,7 +1869,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
@@ -1796,7 +1881,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
@@ -1822,7 +1907,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
@@ -1837,7 +1922,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
@@ -1854,8 +1939,17 @@
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
+ //
+ this.repositoryItemDateEdit1.AutoHeight = false;
+ this.repositoryItemDateEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemDateEdit1.CalendarTimeProperties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemDateEdit1.Name = "repositoryItemDateEdit1";
//
// gvMx1isFree
//
@@ -1883,8 +1977,21 @@
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
+ //
+ this.repositoryItemComboBox1.AutoHeight = false;
+ this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox1.Items.AddRange(new object[] {
+ "閫�璐�(THLX01_SYS)",
+ "閫�璐цˉ璐�(THLX02_SYS)",
+ "浠呴��娆句笉閫�璐�(THLX03_SYS)"});
+ this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
+ this.repositoryItemComboBox1.NullText = "璇烽�夋嫨";
+ this.repositoryItemComboBox1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
//
// gridColumn12
//
@@ -1924,11 +2031,22 @@
this.gvMxDel.VisibleIndex = 14;
this.gvMxDel.Width = 94;
//
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
+ this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
+ //
// tabMxPage2
//
this.tabMxPage2.Controls.Add(this.gcMx2);
this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1359, 342);
+ this.tabMxPage2.Size = new System.Drawing.Size(1272, 382);
this.tabMxPage2.Text = "宸叉墦鍗版潯鐮佹槑缁�";
//
// gcMx2
@@ -1937,7 +2055,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(1359, 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});
@@ -2118,17 +2236,12 @@
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
- this.ClientSize = new System.Drawing.Size(1363, 682);
+ this.ClientSize = new System.Drawing.Size(1276, 682);
this.Controls.Add(this.picCheckBox);
this.Controls.Add(this.xtraTabControl1);
this.Controls.Add(this.toolBarMenu1);
this.Name = "Frm_SalesReturnNotice";
this.Text = "閿�鍞��璐х敵璇峰崟";
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).EndInit();
this.xtraTabControl1.ResumeLayout(false);
this.xtraTabPage1.ResumeLayout(false);
@@ -2168,26 +2281,26 @@
((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);
@@ -2204,30 +2317,36 @@
((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.layoutControlItem30)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem29)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem28)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).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();
+ ((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
@@ -2287,10 +2406,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;
@@ -2303,6 +2418,16 @@
private DevExpress.XtraGrid.GridControl gcMx1;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gridView2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1id;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialId;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1materialName;
@@ -2312,25 +2437,36 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMx1note;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn13;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnDate;
+ private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1isFree;
private DevExpress.XtraGrid.Columns.GridColumn gvMx1returnType;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
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;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
private UserControl.UcLookCk txt_fstockid;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
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_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;
@@ -2350,39 +2486,32 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
- private DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit repositoryItemSearchLookUpEdit1;
- private DevExpress.XtraEditors.Repository.RepositoryItemDateEdit repositoryItemDateEdit1;
- private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraEditors.RadioGroup radOut;
private DevExpress.XtraEditors.SplitContainerControl split99;
private DevExpress.XtraLayout.LayoutControl layout99;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
- private DevExpress.XtraEditors.TextEdit txtQuantity;
- private DevExpress.XtraEditors.TextEdit txt_yQty;
- private DevExpress.XtraEditors.TextEdit txt_kQty;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
- private DevExpress.XtraEditors.RadioGroup radOut;
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.XtraEditors.TextEdit txt_iCount_1;
- private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
- private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
- private UserControl.UcBtnPrint ucBtnPrint1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
- private DevExpress.XtraEditors.LabelControl lbMxGuid;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
- private DevExpress.XtraEditors.TextEdit txtWlid;
- private DevExpress.XtraEditors.TextEdit txtWlmc;
- private DevExpress.XtraEditors.TextEdit txtWlgg;
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
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
index d7122f1..bee37e3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -73,13 +73,12 @@
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
};
//鎵撳嵃浜嬩欢
this.ucBtnPrint1.btnPrintClick += (s, e) =>
{
- ucBtnPrint1.guidKey = "";
string rowGuid = lbMxGuid.Text.Trim();
ucBtnPrint1.guidKey = rowGuid;
if (!Gs.DevApp.ToolBox.UtilityHelper.IsNumeric3(txt_iCount_1.Text.Trim(), txt_yuliang_1.Text.Trim()))
@@ -96,19 +95,21 @@
this.ucBtnPrint1.rptParameter = "return false";
return;
}
- if (rowGuid.Length < 10)
+ if (lbMxGuid.Text.Trim().Length < 10)
{
Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鎵撳嵃鐨勮锛�");
this.ucBtnPrint1.rptParameter = "return false";
return;
}
-
- this.ucBtnPrint1.rptParameter = "rpt_Xsth{" + rowGuid.Trim()
+ this.ucBtnPrint1.rptParameter = "rpt_Xsth{"
+ + lbMxGuid.Text.Trim()//鍏宠仈涓婚敭
+ "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
- + "," + txt_iCount_1.Text.Trim()
- + "," + txt_psnQty_1.Text.Trim()
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())//浣欐暟
+ + "," + txt_iCount_1.Text.Trim()//寮犳暟
+ + "," + txt_psnQty_1.Text.Trim()//姣忓紶鏉＄爜鏁伴噺
+ "}";
+ txt_iCount_1.Text = "";
+ txt_psnQty_1.Text = "";
};
//鎵撳嵃鎵归噺鎿嶄綔浜嬩欢
this.ucBtnPrint1.btnAllClick += (s, e) =>
@@ -129,8 +130,8 @@
{
try
{
- string rptParameter = "rpt_Xsth{"
- + "100"
+ string rptParameter = "rpt_Xsth{"
+ + "100"//閲嶆墦閮芥槸浼�100锛�
+ "," + ""
+ "," + ""
+ "," + ""
@@ -150,10 +151,10 @@
}
};
gvMx1.FocusedRowChanged += GvMx1_FocusedRowChanged;
- //鑷姩璁＄畻鎵撳嵃閲�
+ //鎵撳嵃鑷姩璁＄畻
txt_psnQty_1.TextChanged += (s, e) =>
{
- Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
+ Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
};
radOut.SelectedIndexChanged += (s, e) =>
{
@@ -163,7 +164,7 @@
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
- Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
+ _filterList = Gs.DevApp.ToolBox.UtilityHelper.GetDilter(gridView1.Columns, gridView1);
Task.Delay(100);
getPageList(1);
}
@@ -223,7 +224,7 @@
lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾鍒犻櫎鍚楋紵"))
@@ -241,18 +242,19 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
if (xtraTabControl1.SelectedTabPageIndex == 0)
{ }
else
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 2);
getPageList(this.pageBar1.CurrentPage);
}
-
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -290,7 +292,7 @@
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billno");
if (string.IsNullOrEmpty(rowGuid))
{
- ToolBox.MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
Gs.DevApp.ToolBox.UtilityHelper.JumpTab(xtraTabControl1, 3);
@@ -305,6 +307,10 @@
gvList.Add(gvMx2);
UtilityHelper.ChangeEnableByControl(this.layoutMx1.Controls, true, gvList);
}
+ //2025/07/12鍔犱笂淇敼鐘舵�佷笅涓嶈兘淇敼
+
+ txt_fHasLinkRad.ReadOnly = true;
+ txt_salesOrderId.IsReadly = true;
}
/// <summary>
/// 鏂板浜嬩欢
@@ -335,22 +341,21 @@
string FNote = txt_returnReason.Text.ToString();
string _sqGuid = txt_salesOrderId.GetId();
string ckId = txt_fstockid.GetId();
- int _fIsLink = txt_fHasLinkRad.SelectedIndex;
if (string.IsNullOrEmpty(_sqGuid))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨閿�鍞鍗曪紒");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨閿�鍞鍗曪紒");
txt_salesOrderId.Focus();
return;
}
if (txt_billType.SelectedIndex < 0)
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨鍗曟嵁绫诲瀷锛�");
txt_billType.Focus();
return;
}
if (string.IsNullOrEmpty(ckId))
{
- Gs.DevApp.ToolBox.MsgHelper.Warning("璇烽�夋嫨浠撳簱锛�");
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇烽�夋嫨浠撳簱锛�");
txt_fstockid.Focus();
return;
}
@@ -361,7 +366,7 @@
salesId = _sqGuid,//閿�鍞崟鍙�
inRemark = FNote.Trim(),//澶囨敞
ckId = ckId,
- FIsLink = _fIsLink,//鏈夋棤婧愬崟
+ FIsLink = txt_fHasLinkRad.SelectedIndex,
list = new List<dynamic>(),
};
gvMx1.CloseEditor();
@@ -560,11 +565,11 @@
}
}
else
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- ToolBox.MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
@@ -605,13 +610,14 @@
case 0:
strMsg = "鍙嶅鏍�";
break;
- };
+ }
+ ;
toolBarMenu1.guidKey = "";
string rowGuid, rowName;
(rowGuid, rowName) = UtilityHelper.GetCurrentRow(xtraTabControl1, lbGuid, txt_billNo, gridView1, "billNo");
if (string.IsNullOrEmpty(rowGuid))
{
- MsgHelper.Warning("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
+ MsgHelper.ShowError("璇峰厛閫夋嫨浣犺鎿嶄綔鐨勮锛�");
return;
}
if (!MsgHelper.AskQuestion("浣犻�夋嫨浜嗐��" + rowName + "銆戯紝纭畾" + strMsg + "鍚楋紵"))
@@ -627,9 +633,9 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
- MsgHelper.Warning(_rtn.rtnData.outMsg.ToString());
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
+ MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
if (xtraTabControl1.SelectedTabPageIndex == 1)
{
getModel(lbGuid.Text.Trim());
@@ -638,10 +644,12 @@
gridView1.FocusedRowHandle = rowHandle;
UtilityHelper.SetCheckIco(gridView1, "chkStatus", "approvedBy", "approvedDate", picCheckBox, this, _inFieldValue.ToString());
}
+ else
+ MsgHelper.ShowError(_rtn.rtnData.outMsg.ToString());
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
private void repositoryItemSearchLookUpEdit1_EditValueChanged(object sender, EventArgs e)
@@ -693,13 +701,15 @@
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
if (_rtn.rtnCode > 0)
{
- if (_rtn.rtnCode > 0) getModel(lbGuid.Text);
+ MsgHelper.ShowInformation("鎻愮ず锛�" + _rtn.rtnMsg);
+ getModel(lbGuid.Text);
}
- MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
+ else
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
- MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
}
}
}
@@ -710,8 +720,6 @@
{
DataRow row = gvMx1.GetDataRow(e.FocusedRowHandle);
lbMxGuid.Text = row["guid"].ToString();
- if (string.IsNullOrEmpty(lbMxGuid.Text))
- return;
ucBtnPrint1.guidKey = row["guid"].ToString();
txtWlid.Text = row["itemNo"].ToString();
txtWlgg.Text = row["itemModel"].ToString();
--
Gitblit v1.9.3