From 72394a31b491cb19fc67b479dde1eaed68bc0288 Mon Sep 17 00:00:00 2001
From: lu <99954486@qq.com>
Date: 星期四, 08 五月 2025 07:42:54 +0800
Subject: [PATCH] 打印
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 21
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs | 6
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 6
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 558 +++++++--
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs | 768 ++++++++----
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs | 6
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs | 652 ++++++++---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs | 553 +++++++--
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs | 6
DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs | 863 +++++++++-----
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs | 6
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 14
12 files changed, 2,398 insertions(+), 1,061 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index d0e6d50..d4510f7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -1268,7 +1268,7 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(682, 40);
+ this.layoutControl1.Location = new System.Drawing.Point(462, 72);
this.layoutControl1.Margin = new System.Windows.Forms.Padding(0);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 222, 812, 500);
@@ -1352,7 +1352,7 @@
// ucBtnPrint1
//
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1019, 9);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(799, 41);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
@@ -1361,7 +1361,7 @@
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(1021, -22);
+ this.radOut.Location = new System.Drawing.Point(801, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1375,7 +1375,7 @@
//
// txtWlid
//
- this.txtWlid.Location = new System.Drawing.Point(114, -20);
+ this.txtWlid.Location = new System.Drawing.Point(-106, 12);
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
@@ -1385,7 +1385,7 @@
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(786, 11);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(566, 43);
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(230, 24);
@@ -1394,7 +1394,7 @@
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 11);
+ this.txtWlmc.Location = new System.Drawing.Point(-106, 43);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
@@ -1404,7 +1404,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 42);
+ this.txtWlgg.Location = new System.Drawing.Point(-106, 74);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
@@ -1414,7 +1414,7 @@
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(786, -20);
+ this.txt_kQty.Location = new System.Drawing.Point(566, 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;
@@ -1426,7 +1426,7 @@
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(450, -20);
+ this.txtQuantity.Location = new System.Drawing.Point(230, 12);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
@@ -1436,7 +1436,7 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(450, 11);
+ this.txt_yQty.Location = new System.Drawing.Point(230, 43);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
@@ -2205,6 +2205,7 @@
this.split99.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit();
this.layout99.ResumeLayout(false);
+ this.layout99.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
this.layoutControl1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
index ea25404..78c4769 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.Designer.cs
@@ -39,6 +39,16 @@
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.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 rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -117,6 +127,36 @@
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layout99 = new DevExpress.XtraLayout.LayoutControl();
+ this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.radOut = new DevExpress.XtraEditors.RadioGroup();
+ this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
+ 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.txtYdy = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ 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.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1tlid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -134,26 +174,6 @@
this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
- this.radOut = new DevExpress.XtraEditors.RadioGroup();
- this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
- this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
- this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
- this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
- this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
- this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
- this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
- this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
- this.txtYdy = new DevExpress.XtraEditors.TextEdit();
- this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
- this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
- this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
- this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
- this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
- this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
- this.txtWlid = new DevExpress.XtraEditors.TextEdit();
- this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -231,20 +251,44 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit();
+ this.split99.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit();
+ this.split99.Panel2.SuspendLayout();
+ this.split99.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit();
+ this.layout99.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
+ this.layoutControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).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.txtYdy.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).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.layoutControlItem29)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
- this.panelMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -1095,21 +1139,404 @@
//
// tabMxPage1
//
- this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Controls.Add(this.panelMx1);
+ this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1124, 378);
this.tabMxPage1.Text = "閫�鏂欐槑缁�";
//
+ // split99
+ //
+ this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split99.Horizontal = false;
+ this.split99.Location = new System.Drawing.Point(0, 0);
+ this.split99.Name = "split99";
+ //
+ // split99.Panel1
+ //
+ this.split99.Panel1.Controls.Add(this.layout99);
+ this.split99.Panel1.Text = "Panel1";
+ //
+ // split99.Panel2
+ //
+ this.split99.Panel2.Controls.Add(this.gcMx1);
+ this.split99.Panel2.Text = "Panel2";
+ this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split99.Size = new System.Drawing.Size(1124, 378);
+ this.split99.SplitterPosition = 114;
+ this.split99.TabIndex = 2;
+ //
+ // layout99
+ //
+ this.layout99.Controls.Add(this.layoutControl1);
+ this.layout99.Controls.Add(this.radOut);
+ this.layout99.Controls.Add(this.ucBtnPrint1);
+ 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.txtYdy);
+ this.layout99.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layout99.Location = new System.Drawing.Point(0, 0);
+ this.layout99.Name = "layout99";
+ this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(505, 378, 812, 500);
+ this.layout99.Root = this.layoutControlGroup1;
+ this.layout99.Size = new System.Drawing.Size(1124, 114);
+ this.layout99.TabIndex = 0;
+ this.layout99.Text = "layoutControl1";
+ //
+ // layoutControl1
+ //
+ this.layoutControl1.Controls.Add(this.txt_iCount_1);
+ this.layoutControl1.Controls.Add(this.txt_yuliang_1);
+ this.layoutControl1.Location = new System.Drawing.Point(692, 50);
+ this.layoutControl1.Name = "layoutControl1";
+ this.layoutControl1.Root = this.layoutControlGroup2;
+ this.layoutControl1.Size = new System.Drawing.Size(336, 31);
+ this.layoutControl1.TabIndex = 475;
+ this.layoutControl1.Text = "layoutControl1";
+ //
+ // txt_iCount_1
+ //
+ this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
+ this.txt_iCount_1.Name = "txt_iCount_1";
+ this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
+ this.txt_iCount_1.Properties.ReadOnly = true;
+ this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_iCount_1.StyleController = this.layoutControl1;
+ this.txt_iCount_1.TabIndex = 228;
+ //
+ // txt_yuliang_1
+ //
+ this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
+ this.txt_yuliang_1.Name = "txt_yuliang_1";
+ this.txt_yuliang_1.Properties.ReadOnly = true;
+ this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_yuliang_1.StyleController = this.layoutControl1;
+ this.txt_yuliang_1.TabIndex = 229;
+ //
+ // layoutControlGroup2
+ //
+ this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup2.GroupBordersVisible = false;
+ this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem30,
+ this.layoutControlItem31});
+ this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup2.Name = "layoutControlGroup2";
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition5,
+ columnDefinition6});
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition6});
+ this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 31);
+ this.layoutControlGroup2.TextVisible = false;
+ //
+ // layoutControlItem30
+ //
+ 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, 31);
+ this.layoutControlItem30.Text = "鎵撳嵃鏁村紶鏁板��";
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem31
+ //
+ 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, 31);
+ this.layoutControlItem31.Text = "鎵撳嵃浣欐暟";
+ this.layoutControlItem31.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // radOut
+ //
+ this.radOut.Location = new System.Drawing.Point(1033, -22);
+ this.radOut.Margin = new System.Windows.Forms.Padding(0);
+ this.radOut.Name = "radOut";
+ this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
+ this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
+ this.radOut.Size = new System.Drawing.Size(227, 28);
+ this.radOut.StyleController = this.layout99;
+ this.radOut.TabIndex = 474;
+ //
+ // ucBtnPrint1
+ //
+ this.ucBtnPrint1.guidKey = null;
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 15);
+ 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, 31);
+ this.ucBtnPrint1.TabIndex = 231;
+ //
+ // lbMxGuid
+ //
+ this.lbMxGuid.Location = new System.Drawing.Point(1032, 50);
+ 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, -20);
+ this.txtWlid.Name = "txtWlid";
+ this.txtWlid.Properties.Appearance.Options.UseFont = true;
+ this.txtWlid.Properties.ReadOnly = true;
+ this.txtWlid.Size = new System.Drawing.Size(234, 24);
+ this.txtWlid.StyleController = this.layout99;
+ this.txtWlid.TabIndex = 214;
+ //
+ // txt_psnQty_1
+ //
+ this.txt_psnQty_1.Location = new System.Drawing.Point(794, 15);
+ 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, 15);
+ this.txtWlmc.Name = "txtWlmc";
+ this.txtWlmc.Properties.Appearance.Options.UseFont = true;
+ this.txtWlmc.Properties.ReadOnly = true;
+ this.txtWlmc.Size = new System.Drawing.Size(234, 24);
+ this.txtWlmc.StyleController = this.layout99;
+ this.txtWlmc.TabIndex = 216;
+ //
+ // txtWlgg
+ //
+ this.txtWlgg.Location = new System.Drawing.Point(114, 50);
+ this.txtWlgg.Name = "txtWlgg";
+ this.txtWlgg.Properties.Appearance.Options.UseFont = true;
+ this.txtWlgg.Properties.ReadOnly = true;
+ this.txtWlgg.Size = new System.Drawing.Size(234, 24);
+ this.txtWlgg.StyleController = this.layout99;
+ this.txtWlgg.TabIndex = 218;
+ //
+ // txt_kQty
+ //
+ this.txt_kQty.Location = new System.Drawing.Point(794, -20);
+ 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, -20);
+ 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;
+ //
+ // txtYdy
+ //
+ this.txtYdy.Location = new System.Drawing.Point(454, 15);
+ this.txtYdy.Name = "txtYdy";
+ this.txtYdy.Properties.Appearance.Options.UseFont = true;
+ this.txtYdy.Properties.ReadOnly = true;
+ this.txtYdy.Size = new System.Drawing.Size(234, 24);
+ this.txtYdy.StyleController = this.layout99;
+ this.txtYdy.TabIndex = 222;
+ //
+ // layoutControlGroup1
+ //
+ this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup1.GroupBordersVisible = false;
+ this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem19,
+ this.layoutControlItem20,
+ this.layoutControlItem21,
+ this.layoutControlItem22,
+ this.layoutControlItem23,
+ this.layoutControlItem24,
+ this.layoutControlItem25,
+ this.layoutControlItem26,
+ this.layoutControlItem27,
+ this.layoutControlItem28,
+ this.layoutControlItem29});
+ this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup1.Name = "Root";
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition7,
+ columnDefinition8,
+ columnDefinition9,
+ columnDefinition10});
+ 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[] {
+ rowDefinition7,
+ rowDefinition8,
+ rowDefinition9});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 125);
+ this.layoutControlGroup1.TextVisible = false;
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txtWlid;
+ this.layoutControlItem19.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem19.Text = "鐗╂枡缂栧彿";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txtWlmc;
+ this.layoutControlItem20.Location = new System.Drawing.Point(0, 35);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem20.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem20.Text = "鐗╂枡鍚嶇О";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.txtWlgg;
+ this.layoutControlItem21.Location = new System.Drawing.Point(0, 70);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem21.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem21.Text = "鐗╂枡瑙勬牸";
+ this.layoutControlItem21.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, 35);
+ this.layoutControlItem22.Text = "鐢宠鎬婚噺";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.txtYdy;
+ this.layoutControlItem23.Location = new System.Drawing.Point(340, 35);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem23.Size = new System.Drawing.Size(340, 35);
+ 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.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem24.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem24.Text = "鍙墦鍗版�绘暟";
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem25
+ //
+ this.layoutControlItem25.Control = this.txt_psnQty_1;
+ this.layoutControlItem25.Location = new System.Drawing.Point(680, 35);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem25.Text = "姣忓紶鏉＄爜鏁伴噺";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem26
+ //
+ this.layoutControlItem26.Control = this.lbMxGuid;
+ this.layoutControlItem26.Location = new System.Drawing.Point(1020, 70);
+ this.layoutControlItem26.Name = "layoutControlItem26";
+ this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem26.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem26.TextVisible = false;
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.ucBtnPrint1;
+ this.layoutControlItem27.Location = new System.Drawing.Point(1020, 35);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem27.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem27.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem27.TextVisible = false;
+ //
+ // layoutControlItem28
+ //
+ this.layoutControlItem28.Control = this.radOut;
+ this.layoutControlItem28.Location = new System.Drawing.Point(1020, 0);
+ this.layoutControlItem28.MaxSize = new System.Drawing.Size(230, 28);
+ this.layoutControlItem28.MinSize = new System.Drawing.Size(230, 28);
+ this.layoutControlItem28.Name = "layoutControlItem28";
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem28.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
+ this.layoutControlItem28.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem28.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem28.Text = "鑷姩璁＄畻";
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem28.TextVisible = false;
+ //
+ // layoutControlItem29
+ //
+ this.layoutControlItem29.Control = this.layoutControl1;
+ this.layoutControlItem29.Location = new System.Drawing.Point(680, 70);
+ this.layoutControlItem29.Name = "layoutControlItem29";
+ this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem29.Size = new System.Drawing.Size(340, 35);
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem29.TextVisible = false;
+ //
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.Location = new System.Drawing.Point(0, 101);
+ this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 277);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 252);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1304,202 +1731,6 @@
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
- //
- // panelMx1
- //
- this.panelMx1.Controls.Add(this.radOut);
- this.panelMx1.Controls.Add(this.ucBtnPrint1);
- this.panelMx1.Controls.Add(this.lbMxGuid);
- this.panelMx1.Controls.Add(this.txt_iCount_1);
- this.panelMx1.Controls.Add(this.labelControl14);
- this.panelMx1.Controls.Add(this.txt_psnQty_1);
- this.panelMx1.Controls.Add(this.labelControl12);
- this.panelMx1.Controls.Add(this.txt_kQty);
- this.panelMx1.Controls.Add(this.labelControl13);
- this.panelMx1.Controls.Add(this.txtYdy);
- this.panelMx1.Controls.Add(this.labelControl1);
- this.panelMx1.Controls.Add(this.txtQuantity);
- this.panelMx1.Controls.Add(this.labelControl10);
- this.panelMx1.Controls.Add(this.txtWlgg);
- this.panelMx1.Controls.Add(this.labelControl9);
- this.panelMx1.Controls.Add(this.txtWlmc);
- this.panelMx1.Controls.Add(this.labelControl8);
- this.panelMx1.Controls.Add(this.txtWlid);
- this.panelMx1.Controls.Add(this.labelControl7);
- this.panelMx1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panelMx1.Location = new System.Drawing.Point(0, 0);
- this.panelMx1.Name = "panelMx1";
- this.panelMx1.Size = new System.Drawing.Size(1124, 101);
- this.panelMx1.TabIndex = 1;
- //
- // radOut
- //
- this.radOut.Location = new System.Drawing.Point(749, 26);
- this.radOut.Margin = new System.Windows.Forms.Padding(0);
- this.radOut.Name = "radOut";
- this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
- this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
- new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄨ嚜鍔�"),
- new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍗婅嚜鍔�"),
- new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩")});
- this.radOut.Size = new System.Drawing.Size(248, 31);
- this.radOut.TabIndex = 474;
- //
- // ucBtnPrint1
- //
- this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(748, 63);
- this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
- this.ucBtnPrint1.Name = "ucBtnPrint1";
- this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(207, 32);
- this.ucBtnPrint1.TabIndex = 231;
- //
- // lbMxGuid
- //
- this.lbMxGuid.Location = new System.Drawing.Point(762, 5);
- this.lbMxGuid.Name = "lbMxGuid";
- this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
- this.lbMxGuid.TabIndex = 229;
- this.lbMxGuid.Text = "lbMxGuid";
- this.lbMxGuid.Visible = false;
- //
- // txt_iCount_1
- //
- this.txt_iCount_1.Location = new System.Drawing.Point(649, 67);
- this.txt_iCount_1.Name = "txt_iCount_1";
- this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
- this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(96, 24);
- this.txt_iCount_1.TabIndex = 228;
- //
- // labelControl14
- //
- this.labelControl14.Location = new System.Drawing.Point(538, 70);
- this.labelControl14.Name = "labelControl14";
- this.labelControl14.Size = new System.Drawing.Size(105, 18);
- this.labelControl14.TabIndex = 227;
- this.labelControl14.Text = "鎵撳嵃鏉＄爜寮犳暟锛�";
- //
- // txt_psnQty_1
- //
- this.txt_psnQty_1.Location = new System.Drawing.Point(649, 33);
- 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(96, 24);
- this.txt_psnQty_1.TabIndex = 226;
- //
- // labelControl12
- //
- this.labelControl12.Location = new System.Drawing.Point(538, 39);
- this.labelControl12.Name = "labelControl12";
- this.labelControl12.Size = new System.Drawing.Size(105, 18);
- this.labelControl12.TabIndex = 225;
- this.labelControl12.Text = "姣忓紶鏉＄爜鏁伴噺锛�";
- //
- // txt_kQty
- //
- this.txt_kQty.Location = new System.Drawing.Point(649, 6);
- 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(96, 24);
- this.txt_kQty.TabIndex = 224;
- //
- // labelControl13
- //
- this.labelControl13.Location = new System.Drawing.Point(553, 9);
- this.labelControl13.Name = "labelControl13";
- this.labelControl13.Size = new System.Drawing.Size(90, 18);
- this.labelControl13.TabIndex = 223;
- this.labelControl13.Text = "鍙墦鍗版�绘暟锛�";
- //
- // txtYdy
- //
- this.txtYdy.Location = new System.Drawing.Point(430, 36);
- this.txtYdy.Name = "txtYdy";
- this.txtYdy.Properties.Appearance.Options.UseFont = true;
- this.txtYdy.Properties.ReadOnly = true;
- this.txtYdy.Size = new System.Drawing.Size(96, 24);
- this.txtYdy.TabIndex = 222;
- //
- // labelControl1
- //
- this.labelControl1.Location = new System.Drawing.Point(345, 39);
- this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(80, 18);
- this.labelControl1.TabIndex = 221;
- this.labelControl1.Text = "宸叉墦鍗版�婚噺:";
- //
- // txtQuantity
- //
- this.txtQuantity.Location = new System.Drawing.Point(430, 6);
- this.txtQuantity.Name = "txtQuantity";
- this.txtQuantity.Properties.Appearance.Options.UseFont = true;
- this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(96, 24);
- this.txtQuantity.TabIndex = 220;
- //
- // labelControl10
- //
- this.labelControl10.Location = new System.Drawing.Point(330, 9);
- this.labelControl10.Name = "labelControl10";
- this.labelControl10.Size = new System.Drawing.Size(95, 18);
- this.labelControl10.TabIndex = 219;
- this.labelControl10.Text = "鏈鐢宠鎬婚噺:";
- //
- // txtWlgg
- //
- this.txtWlgg.Location = new System.Drawing.Point(90, 67);
- this.txtWlgg.Name = "txtWlgg";
- this.txtWlgg.Properties.Appearance.Options.UseFont = true;
- this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(436, 24);
- this.txtWlgg.TabIndex = 218;
- //
- // labelControl9
- //
- this.labelControl9.Location = new System.Drawing.Point(21, 70);
- this.labelControl9.Name = "labelControl9";
- this.labelControl9.Size = new System.Drawing.Size(65, 18);
- this.labelControl9.TabIndex = 217;
- this.labelControl9.Text = "鐗╂枡瑙勬牸:";
- //
- // txtWlmc
- //
- this.txtWlmc.Location = new System.Drawing.Point(90, 34);
- this.txtWlmc.Name = "txtWlmc";
- this.txtWlmc.Properties.Appearance.Options.UseFont = true;
- this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(232, 24);
- this.txtWlmc.TabIndex = 216;
- //
- // labelControl8
- //
- this.labelControl8.Location = new System.Drawing.Point(21, 39);
- this.labelControl8.Name = "labelControl8";
- this.labelControl8.Size = new System.Drawing.Size(65, 18);
- this.labelControl8.TabIndex = 215;
- this.labelControl8.Text = "鐗╂枡鍚嶇О:";
- //
- // txtWlid
- //
- this.txtWlid.Location = new System.Drawing.Point(90, 4);
- this.txtWlid.Name = "txtWlid";
- this.txtWlid.Properties.Appearance.Options.UseFont = true;
- this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(232, 24);
- this.txtWlid.TabIndex = 214;
- //
- // labelControl7
- //
- this.labelControl7.Location = new System.Drawing.Point(21, 9);
- this.labelControl7.Name = "labelControl7";
- this.labelControl7.Size = new System.Drawing.Size(65, 18);
- this.labelControl7.TabIndex = 213;
- this.labelControl7.Text = "鐗╂枡缂栧彿:";
//
// xtraTabPage3
//
@@ -1782,21 +2013,44 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit();
+ this.split99.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit();
+ this.split99.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit();
+ this.split99.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit();
+ this.layout99.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
+ this.layoutControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).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.txtYdy.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).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.layoutControlItem29)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
- this.panelMx1.ResumeLayout(false);
- this.panelMx1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtYdy.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
@@ -1880,25 +2134,16 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraEditors.PanelControl panelMx1;
private UserControl.UcBtnPrint ucBtnPrint1;
private DevExpress.XtraEditors.LabelControl lbMxGuid;
private DevExpress.XtraEditors.TextEdit txt_iCount_1;
- private DevExpress.XtraEditors.LabelControl labelControl14;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
- private DevExpress.XtraEditors.LabelControl labelControl12;
private DevExpress.XtraEditors.TextEdit txt_kQty;
- private DevExpress.XtraEditors.LabelControl labelControl13;
private DevExpress.XtraEditors.TextEdit txtYdy;
- private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraEditors.TextEdit txtQuantity;
- private DevExpress.XtraEditors.LabelControl labelControl10;
private DevExpress.XtraEditors.TextEdit txtWlgg;
- private DevExpress.XtraEditors.LabelControl labelControl9;
private DevExpress.XtraEditors.TextEdit txtWlmc;
- private DevExpress.XtraEditors.LabelControl labelControl8;
private DevExpress.XtraEditors.TextEdit txtWlid;
- private DevExpress.XtraEditors.LabelControl labelControl7;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
@@ -1931,5 +2176,24 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn16;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraEditors.RadioGroup radOut;
+ private DevExpress.XtraEditors.SplitContainerControl split99;
+ private DevExpress.XtraLayout.LayoutControl layout99;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+ private DevExpress.XtraLayout.LayoutControl layoutControl1;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+ private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
index debfe51..4761c0e 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemTbl.cs
@@ -134,7 +134,7 @@
}
this.ucBtnPrint1.rptParameter = "rpt_SCTL{" + lbMxGuid.Text.Trim()
+ "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
+ "," + txt_iCount_1.Text.Trim()
+ "," + txt_psnQty_1.Text.Trim()
+ "}";
@@ -143,11 +143,11 @@
//鑷姩璁＄畻鎵撳嵃閲�
txt_psnQty_1.TextChanged += (s, e) =>
{
- Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
+ Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
};
radOut.SelectedIndexChanged += (s, e) =>
{
- Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
+ Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
}
private async void GridView1_ColumnFilterChanged(object sender, EventArgs e)
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
index 40a8456..55848c3 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.Designer.cs
@@ -30,25 +30,35 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ 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.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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions2 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject5 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -160,26 +170,17 @@
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
this.radOut = new DevExpress.XtraEditors.RadioGroup();
this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
- this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
- this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
- this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
- this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
- this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
- this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
- this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
this.txtWlid = new DevExpress.XtraEditors.TextEdit();
- this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -200,6 +201,25 @@
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layout99 = new DevExpress.XtraLayout.LayoutControl();
+ 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.layoutControlItem29 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem30 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem31 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ this.layoutControlItem32 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem33 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem34 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -270,8 +290,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1.CalendarTimeProperties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
- this.panelMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
@@ -286,6 +304,32 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit();
+ this.split99.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit();
+ this.split99.Panel2.SuspendLayout();
+ this.split99.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit();
+ this.layout99.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.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.layoutControlItem29)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
+ this.layoutControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -326,6 +370,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -338,7 +383,8 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split1.Panel2.Text = "Panel2";
+ this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1126, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
@@ -658,7 +704,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -669,6 +715,7 @@
//
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(1126, 570);
this.splitMx1.SplitterPosition = 188;
this.splitMx1.TabIndex = 0;
@@ -967,35 +1014,35 @@
this.layoutControlItem21});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- 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;
- rowDefinition10.Height = 100D;
- rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ 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[] {
- rowDefinition6,
- rowDefinition7,
- rowDefinition8,
- rowDefinition9,
- rowDefinition10});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5});
this.Root.Size = new System.Drawing.Size(1105, 200);
this.Root.TextVisible = false;
//
@@ -1217,8 +1264,7 @@
//
// tabMxPage1
//
- this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Controls.Add(this.panelMx1);
+ this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1124, 338);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
@@ -1226,7 +1272,7 @@
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.Location = new System.Drawing.Point(0, 102);
+ this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
@@ -1234,7 +1280,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemComboBox1,
this.repositoryItemDateEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 236);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 220);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1619,44 +1665,17 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ 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, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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);
//
- // panelMx1
- //
- this.panelMx1.Controls.Add(this.radOut);
- this.panelMx1.Controls.Add(this.ucBtnPrint1);
- this.panelMx1.Controls.Add(this.lbMxGuid);
- this.panelMx1.Controls.Add(this.txt_iCount_1);
- this.panelMx1.Controls.Add(this.labelControl14);
- this.panelMx1.Controls.Add(this.txt_psnQty_1);
- this.panelMx1.Controls.Add(this.labelControl12);
- this.panelMx1.Controls.Add(this.txt_kQty);
- this.panelMx1.Controls.Add(this.labelControl13);
- this.panelMx1.Controls.Add(this.txt_yQty);
- this.panelMx1.Controls.Add(this.labelControl1);
- this.panelMx1.Controls.Add(this.txtQuantity);
- this.panelMx1.Controls.Add(this.labelControl10);
- this.panelMx1.Controls.Add(this.txtWlgg);
- this.panelMx1.Controls.Add(this.labelControl9);
- this.panelMx1.Controls.Add(this.txtWlmc);
- this.panelMx1.Controls.Add(this.labelControl8);
- this.panelMx1.Controls.Add(this.txtWlid);
- this.panelMx1.Controls.Add(this.labelControl7);
- this.panelMx1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panelMx1.Location = new System.Drawing.Point(0, 0);
- this.panelMx1.Name = "panelMx1";
- this.panelMx1.Size = new System.Drawing.Size(1124, 102);
- this.panelMx1.TabIndex = 3;
- //
// radOut
//
- this.radOut.Location = new System.Drawing.Point(763, 29);
+ this.radOut.Location = new System.Drawing.Point(756, -10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1664,164 +1683,110 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄨ嚜鍔�"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍗婅嚜鍔�"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩")});
- this.radOut.Size = new System.Drawing.Size(248, 31);
+ this.radOut.Size = new System.Drawing.Size(227, 28);
+ this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 476;
//
// ucBtnPrint1
//
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(762, 64);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(754, 22);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(207, 31);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(180, 31);
this.ucBtnPrint1.TabIndex = 230;
//
// lbMxGuid
//
- this.lbMxGuid.Location = new System.Drawing.Point(763, 8);
+ 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;
//
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(652, 67);
+ this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(96, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_iCount_1.StyleController = this.layoutControl1;
this.txt_iCount_1.TabIndex = 228;
- //
- // labelControl14
- //
- this.labelControl14.Location = new System.Drawing.Point(541, 70);
- this.labelControl14.Name = "labelControl14";
- this.labelControl14.Size = new System.Drawing.Size(105, 18);
- this.labelControl14.TabIndex = 227;
- this.labelControl14.Text = "鎵撳嵃鏉＄爜寮犳暟锛�";
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(652, 36);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(517, 24);
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(96, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
+ this.txt_psnQty_1.StyleController = this.layout99;
this.txt_psnQty_1.TabIndex = 226;
- //
- // labelControl12
- //
- this.labelControl12.Location = new System.Drawing.Point(541, 39);
- this.labelControl12.Name = "labelControl12";
- this.labelControl12.Size = new System.Drawing.Size(105, 18);
- this.labelControl12.TabIndex = 225;
- this.labelControl12.Text = "姣忓紶鏉＄爜鏁伴噺锛�";
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(652, 6);
+ this.txt_kQty.Location = new System.Drawing.Point(517, -8);
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(96, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_kQty.StyleController = this.layout99;
this.txt_kQty.TabIndex = 224;
- //
- // labelControl13
- //
- this.labelControl13.Location = new System.Drawing.Point(556, 9);
- this.labelControl13.Name = "labelControl13";
- this.labelControl13.Size = new System.Drawing.Size(90, 18);
- this.labelControl13.TabIndex = 223;
- this.labelControl13.Text = "鍙墦鍗版�绘暟锛�";
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(430, 36);
+ this.txt_yQty.Location = new System.Drawing.Point(177, 24);
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(96, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_yQty.StyleController = this.layout99;
this.txt_yQty.TabIndex = 222;
- //
- // labelControl1
- //
- this.labelControl1.Location = new System.Drawing.Point(346, 39);
- this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(80, 18);
- this.labelControl1.TabIndex = 221;
- this.labelControl1.Text = "宸叉墦鍗版�婚噺:";
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(430, 6);
+ this.txtQuantity.Location = new System.Drawing.Point(177, -8);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(96, 24);
+ this.txtQuantity.Size = new System.Drawing.Size(234, 24);
+ this.txtQuantity.StyleController = this.layout99;
this.txtQuantity.TabIndex = 220;
- //
- // labelControl10
- //
- this.labelControl10.Location = new System.Drawing.Point(331, 9);
- this.labelControl10.Name = "labelControl10";
- this.labelControl10.Size = new System.Drawing.Size(95, 18);
- this.labelControl10.TabIndex = 219;
- this.labelControl10.Text = "鏈鐢宠鎬婚噺:";
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(90, 67);
+ this.txtWlgg.Location = new System.Drawing.Point(-163, 56);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(436, 24);
+ this.txtWlgg.Size = new System.Drawing.Size(574, 24);
+ this.txtWlgg.StyleController = this.layout99;
this.txtWlgg.TabIndex = 218;
- //
- // labelControl9
- //
- this.labelControl9.Location = new System.Drawing.Point(20, 70);
- this.labelControl9.Name = "labelControl9";
- this.labelControl9.Size = new System.Drawing.Size(65, 18);
- this.labelControl9.TabIndex = 217;
- this.labelControl9.Text = "鐗╂枡瑙勬牸:";
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(90, 36);
+ this.txtWlmc.Location = new System.Drawing.Point(-163, 24);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(236, 24);
+ this.txtWlmc.Size = new System.Drawing.Size(234, 24);
+ this.txtWlmc.StyleController = this.layout99;
this.txtWlmc.TabIndex = 216;
- //
- // labelControl8
- //
- this.labelControl8.Location = new System.Drawing.Point(20, 39);
- this.labelControl8.Name = "labelControl8";
- this.labelControl8.Size = new System.Drawing.Size(65, 18);
- this.labelControl8.TabIndex = 215;
- this.labelControl8.Text = "鐗╂枡鍚嶇О:";
//
// txtWlid
//
- this.txtWlid.Location = new System.Drawing.Point(90, 6);
+ this.txtWlid.Location = new System.Drawing.Point(-163, -8);
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(236, 24);
+ this.txtWlid.Size = new System.Drawing.Size(234, 24);
+ this.txtWlid.StyleController = this.layout99;
this.txtWlid.TabIndex = 214;
- //
- // labelControl7
- //
- this.labelControl7.Location = new System.Drawing.Point(20, 9);
- this.labelControl7.Name = "labelControl7";
- this.labelControl7.Size = new System.Drawing.Size(65, 18);
- this.labelControl7.TabIndex = 213;
- this.labelControl7.Text = "鐗╂枡缂栫爜:";
//
// tabMxPage2
//
@@ -2018,10 +1983,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -2036,6 +2001,284 @@
this.picCheckBox.TabIndex = 451;
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
+ //
+ // split99
+ //
+ this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split99.Horizontal = false;
+ this.split99.Location = new System.Drawing.Point(0, 0);
+ this.split99.Name = "split99";
+ //
+ // split99.split99_Panel1
+ //
+ this.split99.Panel1.Controls.Add(this.layout99);
+ this.split99.Panel1.Text = "Panel1";
+ //
+ // split99.split99_Panel2
+ //
+ this.split99.Panel2.Controls.Add(this.gcMx1);
+ this.split99.Panel2.Text = "Panel2";
+ this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split99.Size = new System.Drawing.Size(1124, 338);
+ this.split99.SplitterPosition = 106;
+ this.split99.TabIndex = 4;
+ //
+ // layout99
+ //
+ this.layout99.Controls.Add(this.layoutControl1);
+ this.layout99.Controls.Add(this.ucBtnPrint1);
+ this.layout99.Controls.Add(this.radOut);
+ this.layout99.Controls.Add(this.lbMxGuid);
+ this.layout99.Controls.Add(this.txtWlid);
+ this.layout99.Controls.Add(this.txt_psnQty_1);
+ this.layout99.Controls.Add(this.txtWlmc);
+ this.layout99.Controls.Add(this.txtWlgg);
+ this.layout99.Controls.Add(this.txt_kQty);
+ this.layout99.Controls.Add(this.txtQuantity);
+ this.layout99.Controls.Add(this.txt_yQty);
+ this.layout99.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem29});
+ this.layout99.Location = new System.Drawing.Point(0, 0);
+ this.layout99.Name = "layout99";
+ this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(46, 297, 812, 500);
+ this.layout99.Root = this.layoutControlGroup1;
+ this.layout99.Size = new System.Drawing.Size(1124, 106);
+ this.layout99.TabIndex = 0;
+ this.layout99.Text = "layoutControl1";
+ //
+ // layoutControlGroup1
+ //
+ this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup1.GroupBordersVisible = false;
+ this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem22,
+ this.layoutControlItem23,
+ this.layoutControlItem24,
+ this.layoutControlItem25,
+ this.layoutControlItem26,
+ this.layoutControlItem27,
+ this.layoutControlItem28,
+ this.layoutControlItem30,
+ this.layoutControlItem31,
+ this.layoutControlItem32});
+ this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup1.Name = "Root";
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition7,
+ columnDefinition8,
+ columnDefinition9,
+ columnDefinition10});
+ 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[] {
+ rowDefinition7,
+ rowDefinition8,
+ rowDefinition9});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
+ this.layoutControlGroup1.TextVisible = false;
+ //
+ // layoutControlItem22
+ //
+ this.layoutControlItem22.Control = this.txtWlid;
+ this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem22.Name = "layoutControlItem22";
+ this.layoutControlItem22.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem22.Text = "鐗╂枡缂栫爜";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.txtWlmc;
+ this.layoutControlItem23.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem23.Text = "鐗╂枡鍚嶇О";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem24
+ //
+ this.layoutControlItem24.Control = this.txtWlgg;
+ this.layoutControlItem24.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem24.Size = new System.Drawing.Size(680, 32);
+ this.layoutControlItem24.Text = "鐗╂枡瑙勬牸";
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem25
+ //
+ this.layoutControlItem25.Control = this.txtQuantity;
+ this.layoutControlItem25.Location = new System.Drawing.Point(340, 0);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem26
+ //
+ this.layoutControlItem26.Control = this.txt_yQty;
+ this.layoutControlItem26.Location = new System.Drawing.Point(340, 32);
+ this.layoutControlItem26.Name = "layoutControlItem26";
+ this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem26.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺";
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.txt_kQty;
+ this.layoutControlItem27.Location = new System.Drawing.Point(680, 0);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem27.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem27.Text = "鍙墦鍗版�绘暟";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem28
+ //
+ this.layoutControlItem28.Control = this.txt_psnQty_1;
+ this.layoutControlItem28.Location = new System.Drawing.Point(680, 32);
+ this.layoutControlItem28.Name = "layoutControlItem28";
+ this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem28.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem28.Text = "姣忓紶鏉＄爜鏁伴噺";
+ this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem29
+ //
+ this.layoutControlItem29.Control = this.lbMxGuid;
+ this.layoutControlItem29.Location = new System.Drawing.Point(1020, 64);
+ this.layoutControlItem29.Name = "layoutControlItem29";
+ this.layoutControlItem29.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem29.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem29.Text = "lbMxGuid";
+ this.layoutControlItem29.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem29.TextVisible = false;
+ //
+ // layoutControlItem30
+ //
+ this.layoutControlItem30.Control = this.radOut;
+ this.layoutControlItem30.Location = new System.Drawing.Point(1020, 0);
+ this.layoutControlItem30.MaxSize = new System.Drawing.Size(230, 28);
+ this.layoutControlItem30.MinSize = new System.Drawing.Size(230, 28);
+ this.layoutControlItem30.Name = "layoutControlItem30";
+ this.layoutControlItem30.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem30.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
+ this.layoutControlItem30.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem30.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem30.Text = "鑷姩璁＄畻";
+ this.layoutControlItem30.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem30.TextVisible = false;
+ //
+ // layoutControlItem31
+ //
+ this.layoutControlItem31.Control = this.ucBtnPrint1;
+ this.layoutControlItem31.Location = new System.Drawing.Point(1020, 32);
+ this.layoutControlItem31.MaxSize = new System.Drawing.Size(182, 31);
+ this.layoutControlItem31.MinSize = new System.Drawing.Size(182, 31);
+ 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;
+ //
+ // layoutControl1
+ //
+ this.layoutControl1.Controls.Add(this.txt_iCount_1);
+ this.layoutControl1.Controls.Add(this.txt_yuliang_1);
+ this.layoutControl1.Location = new System.Drawing.Point(415, 56);
+ this.layoutControl1.Name = "layoutControl1";
+ this.layoutControl1.Root = this.layoutControlGroup2;
+ this.layoutControl1.Size = new System.Drawing.Size(336, 28);
+ this.layoutControl1.TabIndex = 477;
+ this.layoutControl1.Text = "layoutControl1";
+ //
+ // layoutControlItem32
+ //
+ this.layoutControlItem32.Control = this.layoutControl1;
+ this.layoutControlItem32.Location = new System.Drawing.Point(680, 64);
+ this.layoutControlItem32.Name = "layoutControlItem32";
+ this.layoutControlItem32.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem32.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem32.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem32.Text = "鎵撳嵃鏁伴噺";
+ this.layoutControlItem32.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem32.TextVisible = false;
+ //
+ // layoutControlGroup2
+ //
+ this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup2.GroupBordersVisible = false;
+ this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem33,
+ this.layoutControlItem34});
+ this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup2.Name = "layoutControlGroup2";
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition5,
+ columnDefinition6});
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition6});
+ this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlGroup2.TextVisible = false;
+ //
+ // layoutControlItem33
+ //
+ this.layoutControlItem33.Control = this.txt_iCount_1;
+ this.layoutControlItem33.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem33.Name = "layoutControlItem33";
+ this.layoutControlItem33.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��";
+ this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // txt_yuliang_1
+ //
+ this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
+ this.txt_yuliang_1.Name = "txt_yuliang_1";
+ this.txt_yuliang_1.Properties.ReadOnly = true;
+ this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_yuliang_1.StyleController = this.layoutControl1;
+ this.txt_yuliang_1.TabIndex = 229;
+ //
+ // layoutControlItem34
+ //
+ this.layoutControlItem34.Control = this.txt_yuliang_1;
+ this.layoutControlItem34.Location = new System.Drawing.Point(168, 0);
+ this.layoutControlItem34.Name = "layoutControlItem34";
+ this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem34.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem34.Text = "鎵撳嵃浣欐暟";
+ this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
//
// Frm_SalesReturnNotice
//
@@ -2117,9 +2360,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemDateEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
- this.panelMx1.ResumeLayout(false);
- this.panelMx1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
@@ -2134,6 +2374,32 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit();
+ this.split99.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit();
+ this.split99.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit();
+ this.split99.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit();
+ this.layout99.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.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.layoutControlItem29)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem30)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem31)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
+ this.layoutControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem32)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem33)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem34)).EndInit();
this.ResumeLayout(false);
}
@@ -2232,25 +2498,16 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraEditors.PanelControl panelMx1;
private UserControl.UcBtnPrint ucBtnPrint1;
private DevExpress.XtraEditors.LabelControl lbMxGuid;
private DevExpress.XtraEditors.TextEdit txt_iCount_1;
- private DevExpress.XtraEditors.LabelControl labelControl14;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
- private DevExpress.XtraEditors.LabelControl labelControl12;
private DevExpress.XtraEditors.TextEdit txt_kQty;
- private DevExpress.XtraEditors.LabelControl labelControl13;
private DevExpress.XtraEditors.TextEdit txt_yQty;
- private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraEditors.TextEdit txtQuantity;
- private DevExpress.XtraEditors.LabelControl labelControl10;
private DevExpress.XtraEditors.TextEdit txtWlgg;
- private DevExpress.XtraEditors.LabelControl labelControl9;
private DevExpress.XtraEditors.TextEdit txtWlmc;
- private DevExpress.XtraEditors.LabelControl labelControl8;
private DevExpress.XtraEditors.TextEdit txtWlid;
- private DevExpress.XtraEditors.LabelControl labelControl7;
private DevExpress.XtraTab.XtraTabPage tabMxPage2;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn20;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
@@ -2289,5 +2546,24 @@
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
private DevExpress.XtraEditors.RadioGroup radOut;
+ private DevExpress.XtraEditors.SplitContainerControl split99;
+ private DevExpress.XtraLayout.LayoutControl layout99;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem28;
+ private DevExpress.XtraLayout.LayoutControl layoutControl1;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem29;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem30;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem31;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
+ private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem33;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem34;
}
}
\ 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 10847d8..e9c0765 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesReturnNotice.cs
@@ -106,7 +106,7 @@
}
this.ucBtnPrint1.rptParameter = "rpt_Xsth{" + lbMxGuid.Text.Trim()
+ "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
+ "," + txt_iCount_1.Text.Trim()
+ "," + txt_psnQty_1.Text.Trim()
+ "}";
@@ -114,12 +114,12 @@
//鑷姩璁＄畻鎵撳嵃閲�
txt_psnQty_1.TextChanged += (s, e) =>
{
- Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
+ Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
};
radOut.SelectedIndexChanged += (s, e) =>
{
- Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
+ Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
index cfafaf5..643b1b4 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.Designer.cs
@@ -38,6 +38,16 @@
DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition9 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition10 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions1 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject1 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject2 = new DevExpress.Utils.SerializableAppearanceObject();
@@ -103,6 +113,36 @@
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
+ this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layout99 = new DevExpress.XtraLayout.LayoutControl();
+ this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
+ this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem27 = 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.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvMx1tlid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -120,26 +160,6 @@
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
- this.radOut = new DevExpress.XtraEditors.RadioGroup();
- this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
- this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
- this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
- this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
- this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
- this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
- this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
- this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
- this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
- this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
- this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
- this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
- this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
- this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
- this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
- this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
- this.txtWlid = new DevExpress.XtraEditors.TextEdit();
- this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -204,20 +224,44 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit();
+ this.split99.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit();
+ this.split99.Panel2.SuspendLayout();
+ this.split99.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit();
+ this.layout99.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
+ this.layoutControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).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.layoutControlItem22)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
- this.panelMx1.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).BeginInit();
this.xtraTabPage3.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
@@ -582,10 +626,10 @@
//
// txt_itemName
//
- this.txt_itemName.Location = new System.Drawing.Point(636, 43);
+ this.txt_itemName.Location = new System.Drawing.Point(626, 43);
this.txt_itemName.Name = "txt_itemName";
this.txt_itemName.Properties.Appearance.Options.UseFont = true;
- this.txt_itemName.Size = new System.Drawing.Size(200, 24);
+ this.txt_itemName.Size = new System.Drawing.Size(195, 24);
this.txt_itemName.StyleController = this.layoutMx1;
this.txt_itemName.TabIndex = 464;
this.txt_itemName.Tag = "readonly";
@@ -603,7 +647,7 @@
"鏉ユ枡涓嶈壇閫�鏂�",
"浣滀笟涓嶈壇閫�鏂�"});
this.txt_tbl005.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_tbl005.Size = new System.Drawing.Size(200, 24);
+ this.txt_tbl005.Size = new System.Drawing.Size(195, 24);
this.txt_tbl005.StyleController = this.layoutMx1;
this.txt_tbl005.TabIndex = 459;
//
@@ -612,7 +656,7 @@
this.txt_tbl002.IsReadly = false;
this.txt_tbl002.Location = new System.Drawing.Point(84, 43);
this.txt_tbl002.Name = "txt_tbl002";
- this.txt_tbl002.Size = new System.Drawing.Size(200, 24);
+ this.txt_tbl002.Size = new System.Drawing.Size(195, 24);
this.txt_tbl002.TabIndex = 462;
//
// txt_billNo
@@ -620,85 +664,85 @@
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(200, 24);
+ this.txt_billNo.Size = new System.Drawing.Size(195, 24);
this.txt_billNo.StyleController = this.layoutMx1;
this.txt_billNo.TabIndex = 211;
this.txt_billNo.Tag = "readonly";
//
// txt_tbl012
//
- this.txt_tbl012.Location = new System.Drawing.Point(912, 43);
+ this.txt_tbl012.Location = new System.Drawing.Point(897, 43);
this.txt_tbl012.Name = "txt_tbl012";
this.txt_tbl012.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl012.Size = new System.Drawing.Size(202, 24);
+ this.txt_tbl012.Size = new System.Drawing.Size(196, 24);
this.txt_tbl012.StyleController = this.layoutMx1;
this.txt_tbl012.TabIndex = 247;
this.txt_tbl012.Tag = "readonly";
//
// txt_daa014
//
- this.txt_daa014.Location = new System.Drawing.Point(360, 12);
+ this.txt_daa014.Location = new System.Drawing.Point(355, 12);
this.txt_daa014.Name = "txt_daa014";
this.txt_daa014.Properties.Appearance.Options.UseFont = true;
- this.txt_daa014.Size = new System.Drawing.Size(200, 24);
+ this.txt_daa014.Size = new System.Drawing.Size(195, 24);
this.txt_daa014.StyleController = this.layoutMx1;
this.txt_daa014.TabIndex = 217;
this.txt_daa014.Tag = "readonly";
//
// txt_itemNo
//
- this.txt_itemNo.Location = new System.Drawing.Point(636, 12);
+ this.txt_itemNo.Location = new System.Drawing.Point(626, 12);
this.txt_itemNo.Name = "txt_itemNo";
this.txt_itemNo.Properties.Appearance.Options.UseFont = true;
- this.txt_itemNo.Size = new System.Drawing.Size(200, 24);
+ this.txt_itemNo.Size = new System.Drawing.Size(195, 24);
this.txt_itemNo.StyleController = this.layoutMx1;
this.txt_itemNo.TabIndex = 298;
this.txt_itemNo.Tag = "readonly";
//
// txt_tbl011
//
- this.txt_tbl011.Location = new System.Drawing.Point(912, 12);
+ this.txt_tbl011.Location = new System.Drawing.Point(897, 12);
this.txt_tbl011.Name = "txt_tbl011";
this.txt_tbl011.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl011.Size = new System.Drawing.Size(202, 24);
+ this.txt_tbl011.Size = new System.Drawing.Size(196, 24);
this.txt_tbl011.StyleController = this.layoutMx1;
this.txt_tbl011.TabIndex = 243;
this.txt_tbl011.Tag = "readonly";
//
// txt_itemModel
//
- this.txt_itemModel.Location = new System.Drawing.Point(636, 74);
+ this.txt_itemModel.Location = new System.Drawing.Point(626, 74);
this.txt_itemModel.Name = "txt_itemModel";
this.txt_itemModel.Properties.Appearance.Options.UseFont = true;
- this.txt_itemModel.Size = new System.Drawing.Size(200, 24);
+ this.txt_itemModel.Size = new System.Drawing.Size(195, 24);
this.txt_itemModel.StyleController = this.layoutMx1;
this.txt_itemModel.TabIndex = 219;
this.txt_itemModel.Tag = "readonly";
//
// txt_tbl006
//
- this.txt_tbl006.Location = new System.Drawing.Point(360, 74);
+ this.txt_tbl006.Location = new System.Drawing.Point(355, 74);
this.txt_tbl006.Name = "txt_tbl006";
this.txt_tbl006.Properties.Appearance.Options.UseFont = true;
- this.txt_tbl006.Size = new System.Drawing.Size(200, 24);
+ this.txt_tbl006.Size = new System.Drawing.Size(195, 24);
this.txt_tbl006.StyleController = this.layoutMx1;
this.txt_tbl006.TabIndex = 226;
//
// txt_tbl013
//
- this.txt_tbl013.Location = new System.Drawing.Point(840, 74);
+ this.txt_tbl013.Location = new System.Drawing.Point(825, 74);
this.txt_tbl013.Name = "txt_tbl013";
this.txt_tbl013.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_tbl013.Size = new System.Drawing.Size(274, 24);
+ this.txt_tbl013.Size = new System.Drawing.Size(268, 24);
this.txt_tbl013.StyleController = this.layoutMx1;
this.txt_tbl013.TabIndex = 465;
this.txt_tbl013.Tag = "readonly";
//
// txt_erpProductionOrderNo
//
- this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(360, 43);
+ this.txt_erpProductionOrderNo.Location = new System.Drawing.Point(355, 43);
this.txt_erpProductionOrderNo.Name = "txt_erpProductionOrderNo";
- this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(200, 24);
+ this.txt_erpProductionOrderNo.Size = new System.Drawing.Size(195, 24);
this.txt_erpProductionOrderNo.StyleController = this.layoutMx1;
this.txt_erpProductionOrderNo.TabIndex = 467;
this.txt_erpProductionOrderNo.Tag = "readonly";
@@ -761,7 +805,7 @@
rowDefinition2,
rowDefinition3,
rowDefinition4});
- this.Root.Size = new System.Drawing.Size(1126, 144);
+ this.Root.Size = new System.Drawing.Size(1105, 144);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -769,27 +813,27 @@
this.layoutControlItem1.Control = this.txt_billNo;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_daa014;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem2.Text = "鎶曟枡鍗曞彿";
this.layoutControlItem2.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_itemNo;
- this.layoutControlItem3.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem3.Text = "浜у搧缂栫爜";
this.layoutControlItem3.TextSize = new System.Drawing.Size(60, 18);
//
@@ -799,29 +843,29 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem4.Text = "濮斿宸ュ崟";
this.layoutControlItem4.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_itemName;
- this.layoutControlItem5.Location = new System.Drawing.Point(552, 31);
+ this.layoutControlItem5.Location = new System.Drawing.Point(542, 31);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem5.Text = "浜у搧鍚嶇О";
this.layoutControlItem5.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_itemModel;
- this.layoutControlItem6.Location = new System.Drawing.Point(552, 62);
+ this.layoutControlItem6.Location = new System.Drawing.Point(542, 62);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem6.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem6.Text = "浜у搧鍨嬪彿";
this.layoutControlItem6.TextSize = new System.Drawing.Size(60, 18);
//
@@ -831,39 +875,39 @@
this.layoutControlItem7.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem7.Text = "閫�鏂欑被鍨�";
this.layoutControlItem7.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_tbl011;
- this.layoutControlItem9.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem9.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem9.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem9.Text = "瀹℃牳浜�";
this.layoutControlItem9.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_tbl012;
- this.layoutControlItem10.Location = new System.Drawing.Point(828, 31);
+ this.layoutControlItem10.Location = new System.Drawing.Point(813, 31);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem10.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem10.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem10.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_tbl013;
- this.layoutControlItem11.Location = new System.Drawing.Point(828, 62);
+ this.layoutControlItem11.Location = new System.Drawing.Point(813, 62);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem11.Size = new System.Drawing.Size(278, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem11.Text = "瀹℃牳鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -871,22 +915,22 @@
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_erpProductionOrderNo;
- this.layoutControlItem15.Location = new System.Drawing.Point(276, 31);
+ this.layoutControlItem15.Location = new System.Drawing.Point(271, 31);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem15.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem15.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem15.Text = "浠诲姟鍗曞彿";
this.layoutControlItem15.TextSize = new System.Drawing.Size(60, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_tbl006;
- this.layoutControlItem8.Location = new System.Drawing.Point(276, 62);
+ this.layoutControlItem8.Location = new System.Drawing.Point(271, 62);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem8.Text = "澶囨敞";
this.layoutControlItem8.TextSize = new System.Drawing.Size(60, 18);
//
@@ -898,7 +942,7 @@
this.layoutControlItem13.MinSize = new System.Drawing.Size(90, 31);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem13.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem13.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem13.Text = "閫夋嫨鎸夐挳";
this.layoutControlItem13.TextSize = new System.Drawing.Size(0, 0);
@@ -918,21 +962,411 @@
//
// tabMxPage1
//
- this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Controls.Add(this.panelMx1);
+ this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1124, 412);
this.tabMxPage1.Text = "閫�鏂欐槑缁�";
//
+ // split99
+ //
+ this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split99.Horizontal = false;
+ this.split99.Location = new System.Drawing.Point(0, 0);
+ this.split99.Name = "split99";
+ //
+ // split99.Panel1
+ //
+ this.split99.Panel1.Controls.Add(this.layout99);
+ this.split99.Panel1.Text = "Panel1";
+ //
+ // split99.Panel2
+ //
+ this.split99.Panel2.Controls.Add(this.gcMx1);
+ this.split99.Panel2.Text = "Panel2";
+ this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split99.Size = new System.Drawing.Size(1124, 412);
+ this.split99.SplitterPosition = 124;
+ this.split99.TabIndex = 2;
+ //
+ // layout99
+ //
+ this.layout99.Controls.Add(this.layoutControl1);
+ this.layout99.Controls.Add(this.ucBtnPrint1);
+ this.layout99.Controls.Add(this.radOut);
+ this.layout99.Controls.Add(this.lbMxGuid);
+ this.layout99.Controls.Add(this.txtWlid);
+ this.layout99.Controls.Add(this.txt_psnQty_1);
+ this.layout99.Controls.Add(this.txtWlmc);
+ this.layout99.Controls.Add(this.txtWlgg);
+ this.layout99.Controls.Add(this.txt_kQty);
+ this.layout99.Controls.Add(this.txtQuantity);
+ this.layout99.Controls.Add(this.txt_yQty);
+ this.layout99.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem22});
+ this.layout99.Location = new System.Drawing.Point(0, 0);
+ this.layout99.Name = "layout99";
+ this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(131, 424, 812, 500);
+ this.layout99.Root = this.layoutControlGroup1;
+ this.layout99.Size = new System.Drawing.Size(1124, 124);
+ this.layout99.TabIndex = 0;
+ this.layout99.Text = "layoutControl1";
+ //
+ // layoutControl1
+ //
+ this.layoutControl1.Controls.Add(this.txt_iCount_1);
+ this.layoutControl1.Controls.Add(this.txt_yuliang_1);
+ this.layoutControl1.Location = new System.Drawing.Point(415, 76);
+ this.layoutControl1.Name = "layoutControl1";
+ this.layoutControl1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1081, 196, 812, 500);
+ this.layoutControl1.Root = this.layoutControlGroup2;
+ this.layoutControl1.Size = new System.Drawing.Size(336, 28);
+ this.layoutControl1.TabIndex = 477;
+ this.layoutControl1.Text = "layoutControl1";
+ //
+ // txt_iCount_1
+ //
+ this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
+ this.txt_iCount_1.Name = "txt_iCount_1";
+ this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
+ this.txt_iCount_1.Properties.ReadOnly = true;
+ this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_iCount_1.StyleController = this.layoutControl1;
+ this.txt_iCount_1.TabIndex = 228;
+ //
+ // txt_yuliang_1
+ //
+ this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
+ this.txt_yuliang_1.Name = "txt_yuliang_1";
+ this.txt_yuliang_1.Properties.ReadOnly = true;
+ this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_yuliang_1.StyleController = this.layoutControl1;
+ this.txt_yuliang_1.TabIndex = 229;
+ //
+ // layoutControlGroup2
+ //
+ this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup2.GroupBordersVisible = false;
+ this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem26,
+ this.layoutControlItem27});
+ this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup2.Name = "Root";
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition5,
+ columnDefinition6});
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition5});
+ this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlGroup2.TextVisible = false;
+ //
+ // layoutControlItem26
+ //
+ this.layoutControlItem26.Control = this.txt_iCount_1;
+ this.layoutControlItem26.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem26.Name = "layoutControlItem26";
+ this.layoutControlItem26.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.txt_yuliang_1;
+ this.layoutControlItem27.Location = new System.Drawing.Point(168, 0);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem27.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // ucBtnPrint1
+ //
+ this.ucBtnPrint1.guidKey = null;
+ this.ucBtnPrint1.Location = new System.Drawing.Point(754, 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(338, 32);
+ this.ucBtnPrint1.TabIndex = 231;
+ //
+ // radOut
+ //
+ this.radOut.Location = new System.Drawing.Point(756, 10);
+ this.radOut.Margin = new System.Windows.Forms.Padding(0);
+ this.radOut.Name = "radOut";
+ this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
+ this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
+ this.radOut.Size = new System.Drawing.Size(227, 28);
+ this.radOut.StyleController = this.layout99;
+ this.radOut.TabIndex = 476;
+ //
+ // lbMxGuid
+ //
+ this.lbMxGuid.Location = new System.Drawing.Point(771, 63);
+ 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(-163, 12);
+ this.txtWlid.Name = "txtWlid";
+ this.txtWlid.Properties.Appearance.Options.UseFont = true;
+ this.txtWlid.Properties.ReadOnly = true;
+ this.txtWlid.Size = new System.Drawing.Size(234, 24);
+ this.txtWlid.StyleController = this.layout99;
+ this.txtWlid.TabIndex = 214;
+ //
+ // txt_psnQty_1
+ //
+ this.txt_psnQty_1.Location = new System.Drawing.Point(517, 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(-163, 44);
+ this.txtWlmc.Name = "txtWlmc";
+ this.txtWlmc.Properties.Appearance.Options.UseFont = true;
+ this.txtWlmc.Properties.ReadOnly = true;
+ this.txtWlmc.Size = new System.Drawing.Size(234, 24);
+ this.txtWlmc.StyleController = this.layout99;
+ this.txtWlmc.TabIndex = 216;
+ //
+ // txtWlgg
+ //
+ this.txtWlgg.Location = new System.Drawing.Point(-163, 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 = 218;
+ //
+ // txt_kQty
+ //
+ this.txt_kQty.Location = new System.Drawing.Point(517, 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(177, 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(177, 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;
+ //
+ // layoutControlItem22
+ //
+ this.layoutControlItem22.Control = this.lbMxGuid;
+ this.layoutControlItem22.Location = new System.Drawing.Point(1020, 64);
+ this.layoutControlItem22.Name = "layoutControlItem22";
+ this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem22.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem22.Text = "lbMxGuid";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem22.TextVisible = false;
+ //
+ // layoutControlGroup1
+ //
+ this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup1.GroupBordersVisible = false;
+ this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem12,
+ this.layoutControlItem16,
+ this.layoutControlItem17,
+ this.layoutControlItem18,
+ this.layoutControlItem19,
+ this.layoutControlItem20,
+ this.layoutControlItem21,
+ this.layoutControlItem23,
+ this.layoutControlItem24,
+ this.layoutControlItem25});
+ this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup1.Name = "Root";
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition7,
+ columnDefinition8,
+ columnDefinition9,
+ columnDefinition10});
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
+ this.layoutControlGroup1.TextVisible = false;
+ //
+ // layoutControlItem12
+ //
+ this.layoutControlItem12.Control = this.txtWlid;
+ this.layoutControlItem12.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem12.Name = "layoutControlItem12";
+ this.layoutControlItem12.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem12.Text = "鐗╂枡缂栫爜";
+ this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txtWlmc;
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem16.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem16.Text = "鐗╂枡鍚嶇О";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txtWlgg;
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem17.Size = new System.Drawing.Size(680, 32);
+ this.layoutControlItem17.Text = "鐗╂枡瑙勬牸";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txtQuantity;
+ this.layoutControlItem18.Location = new System.Drawing.Point(340, 0);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem18.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem18.Text = "鏈鐢宠鎬婚噺";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_yQty;
+ this.layoutControlItem19.Location = new System.Drawing.Point(340, 32);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem19.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_kQty;
+ this.layoutControlItem20.Location = new System.Drawing.Point(680, 0);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem20.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem20.Text = "鍙墦鍗版�绘暟";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.txt_psnQty_1;
+ this.layoutControlItem21.Location = new System.Drawing.Point(680, 32);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem21.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem21.Text = "姣忓紶鏉＄爜鏁伴噺";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.radOut;
+ this.layoutControlItem23.Location = new System.Drawing.Point(1020, 0);
+ this.layoutControlItem23.MaxSize = new System.Drawing.Size(230, 28);
+ this.layoutControlItem23.MinSize = new System.Drawing.Size(230, 28);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
+ this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem23.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem23.Text = "鎵撳嵃璁＄畻";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem23.TextVisible = false;
+ //
+ // layoutControlItem24
+ //
+ this.layoutControlItem24.Control = this.ucBtnPrint1;
+ this.layoutControlItem24.Location = new System.Drawing.Point(1020, 32);
+ this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem24.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
+ this.layoutControlItem24.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem24.Text = "鎵撳嵃鎸夐挳";
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem24.TextVisible = false;
+ //
+ // layoutControlItem25
+ //
+ this.layoutControlItem25.Control = this.layoutControl1;
+ this.layoutControlItem25.Location = new System.Drawing.Point(680, 64);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem25.TextVisible = false;
+ //
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.Location = new System.Drawing.Point(0, 98);
+ this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1124, 314);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 276);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1133,202 +1567,6 @@
this.gridColumn5.Visible = true;
this.gridColumn5.VisibleIndex = 5;
this.gridColumn5.Width = 94;
- //
- // panelMx1
- //
- this.panelMx1.Controls.Add(this.radOut);
- this.panelMx1.Controls.Add(this.ucBtnPrint1);
- this.panelMx1.Controls.Add(this.lbMxGuid);
- this.panelMx1.Controls.Add(this.txt_iCount_1);
- this.panelMx1.Controls.Add(this.labelControl14);
- this.panelMx1.Controls.Add(this.txt_psnQty_1);
- this.panelMx1.Controls.Add(this.labelControl12);
- this.panelMx1.Controls.Add(this.txt_kQty);
- this.panelMx1.Controls.Add(this.labelControl13);
- this.panelMx1.Controls.Add(this.txt_yQty);
- this.panelMx1.Controls.Add(this.labelControl1);
- this.panelMx1.Controls.Add(this.txtQuantity);
- this.panelMx1.Controls.Add(this.labelControl10);
- this.panelMx1.Controls.Add(this.txtWlgg);
- this.panelMx1.Controls.Add(this.labelControl9);
- this.panelMx1.Controls.Add(this.txtWlmc);
- this.panelMx1.Controls.Add(this.labelControl8);
- this.panelMx1.Controls.Add(this.txtWlid);
- this.panelMx1.Controls.Add(this.labelControl7);
- this.panelMx1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panelMx1.Location = new System.Drawing.Point(0, 0);
- this.panelMx1.Name = "panelMx1";
- this.panelMx1.Size = new System.Drawing.Size(1124, 98);
- this.panelMx1.TabIndex = 1;
- //
- // radOut
- //
- this.radOut.Location = new System.Drawing.Point(772, 26);
- this.radOut.Margin = new System.Windows.Forms.Padding(0);
- this.radOut.Name = "radOut";
- this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
- this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
- new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄨ嚜鍔�"),
- new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍗婅嚜鍔�"),
- new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩")});
- this.radOut.Size = new System.Drawing.Size(248, 31);
- this.radOut.TabIndex = 476;
- //
- // ucBtnPrint1
- //
- this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(770, 60);
- this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
- this.ucBtnPrint1.Name = "ucBtnPrint1";
- this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(207, 32);
- this.ucBtnPrint1.TabIndex = 231;
- //
- // lbMxGuid
- //
- this.lbMxGuid.Location = new System.Drawing.Point(770, 0);
- this.lbMxGuid.Name = "lbMxGuid";
- this.lbMxGuid.Size = new System.Drawing.Size(58, 18);
- this.lbMxGuid.TabIndex = 229;
- this.lbMxGuid.Text = "lbMxGuid";
- this.lbMxGuid.Visible = false;
- //
- // txt_iCount_1
- //
- this.txt_iCount_1.Location = new System.Drawing.Point(653, 64);
- this.txt_iCount_1.Name = "txt_iCount_1";
- this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
- this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(96, 24);
- this.txt_iCount_1.TabIndex = 228;
- //
- // labelControl14
- //
- this.labelControl14.Location = new System.Drawing.Point(542, 67);
- this.labelControl14.Name = "labelControl14";
- this.labelControl14.Size = new System.Drawing.Size(105, 18);
- this.labelControl14.TabIndex = 227;
- this.labelControl14.Text = "鎵撳嵃鏉＄爜寮犳暟锛�";
- //
- // txt_psnQty_1
- //
- this.txt_psnQty_1.Location = new System.Drawing.Point(653, 34);
- 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(96, 24);
- this.txt_psnQty_1.TabIndex = 226;
- //
- // labelControl12
- //
- this.labelControl12.Location = new System.Drawing.Point(542, 37);
- this.labelControl12.Name = "labelControl12";
- this.labelControl12.Size = new System.Drawing.Size(105, 18);
- this.labelControl12.TabIndex = 225;
- this.labelControl12.Text = "姣忓紶鏉＄爜鏁伴噺锛�";
- //
- // txt_kQty
- //
- this.txt_kQty.Location = new System.Drawing.Point(653, 6);
- 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(96, 24);
- this.txt_kQty.TabIndex = 224;
- //
- // labelControl13
- //
- this.labelControl13.Location = new System.Drawing.Point(557, 9);
- this.labelControl13.Name = "labelControl13";
- this.labelControl13.Size = new System.Drawing.Size(90, 18);
- this.labelControl13.TabIndex = 223;
- this.labelControl13.Text = "鍙墦鍗版�绘暟锛�";
- //
- // txt_yQty
- //
- this.txt_yQty.Location = new System.Drawing.Point(430, 34);
- 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(96, 24);
- this.txt_yQty.TabIndex = 222;
- //
- // labelControl1
- //
- this.labelControl1.Location = new System.Drawing.Point(332, 37);
- this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(90, 18);
- this.labelControl1.TabIndex = 221;
- this.labelControl1.Text = "宸叉墦鍗版�婚噺锛�";
- //
- // txtQuantity
- //
- this.txtQuantity.Location = new System.Drawing.Point(430, 6);
- this.txtQuantity.Name = "txtQuantity";
- this.txtQuantity.Properties.Appearance.Options.UseFont = true;
- this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(96, 24);
- this.txtQuantity.TabIndex = 220;
- //
- // labelControl10
- //
- this.labelControl10.Location = new System.Drawing.Point(317, 9);
- this.labelControl10.Name = "labelControl10";
- this.labelControl10.Size = new System.Drawing.Size(105, 18);
- this.labelControl10.TabIndex = 219;
- this.labelControl10.Text = "鏈鐢宠鎬婚噺锛�";
- //
- // txtWlgg
- //
- this.txtWlgg.Location = new System.Drawing.Point(90, 64);
- this.txtWlgg.Name = "txtWlgg";
- this.txtWlgg.Properties.Appearance.Options.UseFont = true;
- this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(436, 24);
- this.txtWlgg.TabIndex = 218;
- //
- // labelControl9
- //
- this.labelControl9.Location = new System.Drawing.Point(11, 67);
- this.labelControl9.Name = "labelControl9";
- this.labelControl9.Size = new System.Drawing.Size(75, 18);
- this.labelControl9.TabIndex = 217;
- this.labelControl9.Text = "鐗╂枡瑙勬牸锛�";
- //
- // txtWlmc
- //
- this.txtWlmc.Location = new System.Drawing.Point(90, 34);
- this.txtWlmc.Name = "txtWlmc";
- this.txtWlmc.Properties.Appearance.Options.UseFont = true;
- this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(215, 24);
- this.txtWlmc.TabIndex = 216;
- //
- // labelControl8
- //
- this.labelControl8.Location = new System.Drawing.Point(11, 39);
- this.labelControl8.Name = "labelControl8";
- this.labelControl8.Size = new System.Drawing.Size(75, 18);
- this.labelControl8.TabIndex = 215;
- this.labelControl8.Text = "鐗╂枡鍚嶇О锛�";
- //
- // txtWlid
- //
- this.txtWlid.Location = new System.Drawing.Point(90, 4);
- this.txtWlid.Name = "txtWlid";
- this.txtWlid.Properties.Appearance.Options.UseFont = true;
- this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(215, 24);
- this.txtWlid.TabIndex = 214;
- //
- // labelControl7
- //
- this.labelControl7.Location = new System.Drawing.Point(11, 9);
- this.labelControl7.Name = "labelControl7";
- this.labelControl7.Size = new System.Drawing.Size(75, 18);
- this.labelControl7.TabIndex = 213;
- this.labelControl7.Text = "鐗╂枡缂栫爜锛�";
//
// xtraTabPage3
//
@@ -1557,21 +1795,44 @@
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit();
+ this.split99.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit();
+ this.split99.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit();
+ this.split99.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit();
+ this.layout99.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
+ this.layoutControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).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.layoutControlItem22)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
- this.panelMx1.ResumeLayout(false);
- this.panelMx1.PerformLayout();
- ((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_kQty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txt_yQty.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtQuantity.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlgg.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlmc.Properties)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.txtWlid.Properties)).EndInit();
this.xtraTabPage3.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
@@ -1648,25 +1909,16 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraEditors.PanelControl panelMx1;
private UserControl.UcBtnPrint ucBtnPrint1;
private DevExpress.XtraEditors.LabelControl lbMxGuid;
private DevExpress.XtraEditors.TextEdit txt_iCount_1;
- private DevExpress.XtraEditors.LabelControl labelControl14;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
- private DevExpress.XtraEditors.LabelControl labelControl12;
private DevExpress.XtraEditors.TextEdit txt_kQty;
- private DevExpress.XtraEditors.LabelControl labelControl13;
private DevExpress.XtraEditors.TextEdit txt_yQty;
- private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraEditors.TextEdit txtQuantity;
- private DevExpress.XtraEditors.LabelControl labelControl10;
private DevExpress.XtraEditors.TextEdit txtWlgg;
- private DevExpress.XtraEditors.LabelControl labelControl9;
private DevExpress.XtraEditors.TextEdit txtWlmc;
- private DevExpress.XtraEditors.LabelControl labelControl8;
private DevExpress.XtraEditors.TextEdit txtWlid;
- private DevExpress.XtraEditors.LabelControl labelControl7;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
@@ -1689,5 +1941,24 @@
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
private DevExpress.XtraEditors.RadioGroup radOut;
+ private DevExpress.XtraEditors.SplitContainerControl split99;
+ private DevExpress.XtraLayout.LayoutControl layout99;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
+ private DevExpress.XtraLayout.LayoutControl layoutControl1;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
index 7771cf5..00c5b09 100644
--- a/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WW/Frm_WwTbl.cs
@@ -119,7 +119,7 @@
}
this.ucBtnPrint1.rptParameter = "rpt_wwtl{" + lbMxGuid.Text.Trim()
+ "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
+ "," + txt_iCount_1.Text.Trim()
+ "," + txt_psnQty_1.Text.Trim()
+ "}";
@@ -127,12 +127,12 @@
//鑷姩璁＄畻鎵撳嵃閲�
txt_psnQty_1.TextChanged += (s, e) =>
{
- Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
+ Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
};
radOut.SelectedIndexChanged += (s, e) =>
{
- Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
+ Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 13e3062..45a08b8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -43,6 +43,16 @@
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 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.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -119,26 +129,17 @@
this.gridColumn15 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
this.radOut = new DevExpress.XtraEditors.RadioGroup();
this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
- this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
- this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
- this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
this.txt_yQty = new DevExpress.XtraEditors.TextEdit();
- this.labelControl11 = new DevExpress.XtraEditors.LabelControl();
this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
- this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
- this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
- this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
this.txtWlid = new DevExpress.XtraEditors.TextEdit();
- this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -158,6 +159,25 @@
this.gvBtnAlawys = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layout99 = new DevExpress.XtraLayout.LayoutControl();
+ this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+ 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.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem27 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -210,8 +230,6 @@
this.tabMxPage1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
- this.panelMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
@@ -225,6 +243,32 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit();
+ this.split99.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit();
+ this.split99.Panel2.SuspendLayout();
+ this.split99.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit();
+ this.layout99.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).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.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
+ this.layoutControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -265,6 +309,7 @@
// split1
//
this.split1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
this.split1.Horizontal = false;
this.split1.Location = new System.Drawing.Point(0, 0);
this.split1.Name = "split1";
@@ -277,13 +322,11 @@
//
// split1.Panel2
//
- this.split1.Panel2.Text = "Panel2";
- this.split1.FixedPanel = DevExpress.XtraEditors.SplitFixedPanel.Panel2;
+ this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1344, 570);
this.split1.SplitterPosition = 0;
this.split1.TabIndex = 0;
-
//
// gcMain1
//
@@ -545,9 +588,7 @@
this.splitMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.splitMx1.Horizontal = false;
this.splitMx1.Location = new System.Drawing.Point(0, 0);
- this.splitMx1.Name = "splitMx1";
- this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
-
+ this.splitMx1.Name = "splitMx1";
//
// splitMx1.Panel1
//
@@ -558,6 +599,7 @@
//
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(1344, 570);
this.splitMx1.SplitterPosition = 140;
this.splitMx1.TabIndex = 0;
@@ -927,8 +969,7 @@
//
// tabMxPage1
//
- this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Controls.Add(this.panelMx1);
+ this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1342, 386);
this.tabMxPage1.Text = "鏉ユ枡淇℃伅鏄庣粏";
@@ -936,10 +977,10 @@
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.Location = new System.Drawing.Point(0, 98);
+ 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(1342, 288);
+ this.gcMx1.Size = new System.Drawing.Size(1342, 258);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1165,36 +1206,9 @@
this.gridColumn12.VisibleIndex = 14;
this.gridColumn12.Width = 94;
//
- // panelMx1
- //
- this.panelMx1.Controls.Add(this.radOut);
- this.panelMx1.Controls.Add(this.txt_iCount_1);
- this.panelMx1.Controls.Add(this.txt_psnQty_1);
- this.panelMx1.Controls.Add(this.ucBtnPrint1);
- this.panelMx1.Controls.Add(this.lbMxGuid);
- this.panelMx1.Controls.Add(this.labelControl14);
- this.panelMx1.Controls.Add(this.labelControl12);
- this.panelMx1.Controls.Add(this.txt_kQty);
- this.panelMx1.Controls.Add(this.labelControl13);
- this.panelMx1.Controls.Add(this.txt_yQty);
- this.panelMx1.Controls.Add(this.labelControl11);
- this.panelMx1.Controls.Add(this.txtQuantity);
- this.panelMx1.Controls.Add(this.labelControl10);
- this.panelMx1.Controls.Add(this.txtWlgg);
- this.panelMx1.Controls.Add(this.labelControl9);
- this.panelMx1.Controls.Add(this.txtWlmc);
- this.panelMx1.Controls.Add(this.labelControl8);
- this.panelMx1.Controls.Add(this.txtWlid);
- this.panelMx1.Controls.Add(this.labelControl7);
- this.panelMx1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panelMx1.Location = new System.Drawing.Point(0, 0);
- this.panelMx1.Name = "panelMx1";
- this.panelMx1.Size = new System.Drawing.Size(1342, 98);
- this.panelMx1.TabIndex = 0;
- //
// radOut
//
- this.radOut.Location = new System.Drawing.Point(775, 26);
+ 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;
@@ -1202,28 +1216,31 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄨ嚜鍔�"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍗婅嚜鍔�"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩")});
- this.radOut.Size = new System.Drawing.Size(248, 31);
+ this.radOut.Size = new System.Drawing.Size(227, 28);
+ this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 476;
//
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(656, 67);
+ this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
this.txt_iCount_1.Properties.ReadOnly = true;
this.txt_iCount_1.Properties.UseMaskAsDisplayFormat = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(94, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_iCount_1.StyleController = this.layoutControl1;
this.txt_iCount_1.TabIndex = 264;
this.txt_iCount_1.Tag = "ReadOnly";
this.txt_iCount_1.ToolTip = "璇疯緭鍏ユ潯鐮佸紶鏁�";
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(656, 36);
+ 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.Properties.UseMaskAsDisplayFormat = true;
- this.txt_psnQty_1.Size = new System.Drawing.Size(94, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
+ this.txt_psnQty_1.StyleController = this.layout99;
this.txt_psnQty_1.TabIndex = 263;
this.txt_psnQty_1.Tag = "ReadOnly";
this.txt_psnQty_1.ToolTip = "璇疯緭鍏ユ瘡寮犳潯鐮佺殑鏁伴噺";
@@ -1231,141 +1248,84 @@
// ucBtnPrint1
//
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(774, 63);
+ 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 = "rpt_daa";
- this.ucBtnPrint1.Size = new System.Drawing.Size(203, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(338, 32);
this.ucBtnPrint1.TabIndex = 232;
//
// lbMxGuid
//
- this.lbMxGuid.Location = new System.Drawing.Point(1036, 10);
+ this.lbMxGuid.Location = new System.Drawing.Point(1032, 119);
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;
//
- // labelControl14
- //
- this.labelControl14.Location = new System.Drawing.Point(545, 70);
- this.labelControl14.Name = "labelControl14";
- this.labelControl14.Size = new System.Drawing.Size(105, 18);
- this.labelControl14.TabIndex = 227;
- this.labelControl14.Text = "鎵撳嵃鏉＄爜寮犳暟锛�";
- //
- // labelControl12
- //
- this.labelControl12.Location = new System.Drawing.Point(545, 39);
- this.labelControl12.Name = "labelControl12";
- this.labelControl12.Size = new System.Drawing.Size(105, 18);
- this.labelControl12.TabIndex = 225;
- this.labelControl12.Text = "姣忓紶鏉＄爜鏁伴噺锛�";
- //
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(656, 6);
+ 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(96, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_kQty.StyleController = this.layout99;
this.txt_kQty.TabIndex = 224;
- //
- // labelControl13
- //
- this.labelControl13.Location = new System.Drawing.Point(560, 9);
- this.labelControl13.Name = "labelControl13";
- this.labelControl13.Size = new System.Drawing.Size(90, 18);
- this.labelControl13.TabIndex = 223;
- this.labelControl13.Text = "鍙墦鍗版�绘暟锛�";
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(430, 36);
+ 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(96, 24);
+ this.txt_yQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_yQty.StyleController = this.layout99;
this.txt_yQty.TabIndex = 222;
- //
- // labelControl11
- //
- this.labelControl11.Location = new System.Drawing.Point(332, 39);
- this.labelControl11.Name = "labelControl11";
- this.labelControl11.Size = new System.Drawing.Size(90, 18);
- this.labelControl11.TabIndex = 221;
- this.labelControl11.Text = "宸叉墦鍗版�婚噺锛�";
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(430, 6);
+ 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(96, 24);
+ this.txtQuantity.Size = new System.Drawing.Size(234, 24);
+ this.txtQuantity.StyleController = this.layout99;
this.txtQuantity.TabIndex = 220;
- //
- // labelControl10
- //
- this.labelControl10.Location = new System.Drawing.Point(317, 9);
- this.labelControl10.Name = "labelControl10";
- this.labelControl10.Size = new System.Drawing.Size(105, 18);
- this.labelControl10.TabIndex = 219;
- this.labelControl10.Text = "鏈鏀惰揣鎬婚噺锛�";
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(90, 67);
+ 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(436, 24);
+ this.txtWlgg.Size = new System.Drawing.Size(574, 24);
+ this.txtWlgg.StyleController = this.layout99;
this.txtWlgg.TabIndex = 218;
- //
- // labelControl9
- //
- this.labelControl9.Location = new System.Drawing.Point(11, 70);
- this.labelControl9.Name = "labelControl9";
- this.labelControl9.Size = new System.Drawing.Size(75, 18);
- this.labelControl9.TabIndex = 217;
- this.labelControl9.Text = "鐗╂枡瑙勬牸锛�";
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(90, 36);
+ 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(215, 24);
+ this.txtWlmc.Size = new System.Drawing.Size(234, 24);
+ this.txtWlmc.StyleController = this.layout99;
this.txtWlmc.TabIndex = 216;
- //
- // labelControl8
- //
- this.labelControl8.Location = new System.Drawing.Point(11, 39);
- this.labelControl8.Name = "labelControl8";
- this.labelControl8.Size = new System.Drawing.Size(75, 18);
- this.labelControl8.TabIndex = 215;
- this.labelControl8.Text = "鐗╂枡鍚嶇О锛�";
//
// txtWlid
//
- this.txtWlid.Location = new System.Drawing.Point(90, 6);
+ 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(215, 24);
+ this.txtWlid.Size = new System.Drawing.Size(234, 24);
+ this.txtWlid.StyleController = this.layout99;
this.txtWlid.TabIndex = 214;
- //
- // labelControl7
- //
- this.labelControl7.Location = new System.Drawing.Point(11, 9);
- this.labelControl7.Name = "labelControl7";
- this.labelControl7.Size = new System.Drawing.Size(75, 18);
- this.labelControl7.TabIndex = 213;
- this.labelControl7.Text = "鐗╂枡缂栧彿锛�";
//
// tabMxPage2
//
@@ -1572,6 +1532,281 @@
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
+ // split99
+ //
+ this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split99.Horizontal = false;
+ this.split99.Location = new System.Drawing.Point(0, 0);
+ this.split99.Name = "split99";
+ //
+ // split99.split99_Panel1
+ //
+ this.split99.Panel1.Controls.Add(this.layout99);
+ this.split99.Panel1.Text = "Panel1";
+ //
+ // split99.split99_Panel2
+ //
+ this.split99.Panel2.Controls.Add(this.gcMx1);
+ this.split99.Panel2.Text = "Panel2";
+ this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split99.Size = new System.Drawing.Size(1342, 386);
+ this.split99.SplitterPosition = 116;
+ this.split99.TabIndex = 2;
+ //
+ // layout99
+ //
+ this.layout99.Controls.Add(this.layoutControl1);
+ this.layout99.Controls.Add(this.lbMxGuid);
+ this.layout99.Controls.Add(this.ucBtnPrint1);
+ this.layout99.Controls.Add(this.radOut);
+ this.layout99.Controls.Add(this.txt_psnQty_1);
+ this.layout99.Controls.Add(this.txtWlid);
+ 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.layoutControlItem24});
+ this.layout99.Location = new System.Drawing.Point(0, 0);
+ this.layout99.Name = "layout99";
+ this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(31, 355, 812, 500);
+ this.layout99.Root = this.layoutControlGroup1;
+ this.layout99.Size = new System.Drawing.Size(1342, 116);
+ this.layout99.TabIndex = 0;
+ this.layout99.Text = "layoutControl1";
+ //
+ // layoutControlGroup1
+ //
+ this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup1.GroupBordersVisible = false;
+ this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem15,
+ this.layoutControlItem16,
+ this.layoutControlItem17,
+ this.layoutControlItem18,
+ this.layoutControlItem19,
+ this.layoutControlItem20,
+ this.layoutControlItem21,
+ this.layoutControlItem22,
+ this.layoutControlItem23,
+ this.layoutControlItem25});
+ this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup1.Name = "Root";
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition7,
+ columnDefinition8,
+ columnDefinition9,
+ columnDefinition10});
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
+ this.layoutControlGroup1.TextVisible = false;
+ //
+ // layoutControlItem15
+ //
+ this.layoutControlItem15.Control = this.txtWlid;
+ this.layoutControlItem15.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem15.Name = "layoutControlItem15";
+ this.layoutControlItem15.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem15.Text = "鐗╂枡缂栧彿";
+ this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txtWlmc;
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem16.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem16.Text = "鐗╂枡鍚嶇О";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txtWlgg;
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem17.Size = new System.Drawing.Size(680, 32);
+ this.layoutControlItem17.Text = "鐗╂枡瑙勬牸";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txtQuantity;
+ this.layoutControlItem18.Location = new System.Drawing.Point(340, 0);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem18.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_yQty;
+ this.layoutControlItem19.Location = new System.Drawing.Point(340, 32);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem19.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_kQty;
+ this.layoutControlItem20.Location = new System.Drawing.Point(680, 0);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem20.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem20.Text = "鍙墦鍗版�绘暟";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.txt_psnQty_1;
+ this.layoutControlItem21.Location = new System.Drawing.Point(680, 32);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem21.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem21.Text = "姣忓紶鏉＄爜鏁伴噺";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem22
+ //
+ this.layoutControlItem22.Control = this.radOut;
+ this.layoutControlItem22.Location = new System.Drawing.Point(1020, 0);
+ this.layoutControlItem22.MaxSize = new System.Drawing.Size(230, 28);
+ this.layoutControlItem22.MinSize = new System.Drawing.Size(230, 28);
+ this.layoutControlItem22.Name = "layoutControlItem22";
+ this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem22.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
+ this.layoutControlItem22.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem22.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem22.Text = "鑷姩璁＄畻";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem22.TextVisible = false;
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.ucBtnPrint1;
+ this.layoutControlItem23.Location = new System.Drawing.Point(1020, 32);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem23.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
+ this.layoutControlItem23.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem23.TextVisible = false;
+ //
+ // layoutControlItem24
+ //
+ this.layoutControlItem24.Control = this.lbMxGuid;
+ this.layoutControlItem24.Location = new System.Drawing.Point(1020, 107);
+ this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem24.Size = new System.Drawing.Size(340, 54);
+ this.layoutControlItem24.Text = "lbMxGuid";
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem24.TextVisible = false;
+ //
+ // layoutControl1
+ //
+ this.layoutControl1.Controls.Add(this.txt_iCount_1);
+ this.layoutControl1.Controls.Add(this.txt_yuliang_1);
+ this.layoutControl1.Location = new System.Drawing.Point(692, 76);
+ this.layoutControl1.Name = "layoutControl1";
+ this.layoutControl1.Root = this.layoutControlGroup2;
+ this.layoutControl1.Size = new System.Drawing.Size(336, 28);
+ this.layoutControl1.TabIndex = 477;
+ this.layoutControl1.Text = "layoutControl1";
+ //
+ // layoutControlItem25
+ //
+ this.layoutControlItem25.Control = this.layoutControl1;
+ this.layoutControlItem25.Location = new System.Drawing.Point(680, 64);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem25.TextVisible = false;
+ //
+ // layoutControlGroup2
+ //
+ this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup2.GroupBordersVisible = false;
+ this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem26,
+ this.layoutControlItem27});
+ this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup2.Name = "layoutControlGroup2";
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition5,
+ columnDefinition6});
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition5});
+ this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlGroup2.TextVisible = false;
+ //
+ // layoutControlItem26
+ //
+ this.layoutControlItem26.Control = this.txt_iCount_1;
+ this.layoutControlItem26.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem26.Name = "layoutControlItem26";
+ this.layoutControlItem26.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // txt_yuliang_1
+ //
+ this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
+ this.txt_yuliang_1.Name = "txt_yuliang_1";
+ this.txt_yuliang_1.Properties.ReadOnly = true;
+ this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_yuliang_1.StyleController = this.layoutControl1;
+ this.txt_yuliang_1.TabIndex = 265;
+ //
+ // layoutControlItem27
+ //
+ this.layoutControlItem27.Control = this.txt_yuliang_1;
+ this.layoutControlItem27.Location = new System.Drawing.Point(168, 0);
+ this.layoutControlItem27.Name = "layoutControlItem27";
+ this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem27.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
+ this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
+ //
// Frm_ArrivalBarcode
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1633,9 +1868,6 @@
this.tabMxPage1.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
- this.panelMx1.ResumeLayout(false);
- this.panelMx1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
@@ -1649,6 +1881,32 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit();
+ this.split99.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit();
+ this.split99.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit();
+ this.split99.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit();
+ this.layout99.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).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.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
+ this.layoutControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem27)).EndInit();
this.ResumeLayout(false);
}
@@ -1719,25 +1977,16 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
- private DevExpress.XtraEditors.PanelControl panelMx1;
private DevExpress.XtraEditors.TextEdit txt_iCount_1;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
private UserControl.UcBtnPrint ucBtnPrint1;
private DevExpress.XtraEditors.LabelControl lbMxGuid;
- private DevExpress.XtraEditors.LabelControl labelControl14;
- private DevExpress.XtraEditors.LabelControl labelControl12;
private DevExpress.XtraEditors.TextEdit txt_kQty;
- private DevExpress.XtraEditors.LabelControl labelControl13;
private DevExpress.XtraEditors.TextEdit txt_yQty;
- private DevExpress.XtraEditors.LabelControl labelControl11;
private DevExpress.XtraEditors.TextEdit txtQuantity;
- private DevExpress.XtraEditors.LabelControl labelControl10;
private DevExpress.XtraEditors.TextEdit txtWlgg;
- private DevExpress.XtraEditors.LabelControl labelControl9;
private DevExpress.XtraEditors.TextEdit txtWlmc;
- private DevExpress.XtraEditors.LabelControl labelControl8;
private DevExpress.XtraEditors.TextEdit txtWlid;
- private DevExpress.XtraEditors.LabelControl labelControl7;
private DevExpress.XtraTab.XtraTabPage tabMxPage2;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
@@ -1768,5 +2017,24 @@
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraEditors.RadioGroup radOut;
+ private DevExpress.XtraEditors.SplitContainerControl split99;
+ private DevExpress.XtraLayout.LayoutControl layout99;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraLayout.LayoutControl layoutControl1;
+ private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem27;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index 097574c..78a82cd 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -66,7 +66,7 @@
}
this.ucBtnPrint1.rptParameter = "rpt_Arrival{" + lbMxGuid.Text.Trim()
+ "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
+ "," + txt_iCount_1.Text.Trim()
+ "," + txt_psnQty_1.Text.Trim()
+ "}";
@@ -77,11 +77,11 @@
//鑷姩璁＄畻鎵撳嵃閲�
txt_psnQty_1.TextChanged += (s, e) =>
{
- Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
+ Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
};
radOut.SelectedIndexChanged += (s, e) =>
{
- Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
+ Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
index fc34c98..8916162 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.Designer.cs
@@ -47,6 +47,16 @@
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject6 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject7 = new DevExpress.Utils.SerializableAppearanceObject();
DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject8 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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 rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -123,26 +133,17 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMxDel = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.panelMx1 = new DevExpress.XtraEditors.PanelControl();
this.radOut = new DevExpress.XtraEditors.RadioGroup();
this.ucBtnPrint1 = new Gs.DevApp.UserControl.UcBtnPrint();
this.lbMxGuid = new DevExpress.XtraEditors.LabelControl();
this.txt_iCount_1 = new DevExpress.XtraEditors.TextEdit();
- this.labelControl14 = new DevExpress.XtraEditors.LabelControl();
this.txt_psnQty_1 = new DevExpress.XtraEditors.TextEdit();
- this.labelControl12 = new DevExpress.XtraEditors.LabelControl();
this.txt_kQty = new DevExpress.XtraEditors.TextEdit();
- this.labelControl13 = new DevExpress.XtraEditors.LabelControl();
this.txtYdy = new DevExpress.XtraEditors.TextEdit();
- this.labelControl1 = new DevExpress.XtraEditors.LabelControl();
this.txtQuantity = new DevExpress.XtraEditors.TextEdit();
- this.labelControl10 = new DevExpress.XtraEditors.LabelControl();
this.txtWlgg = new DevExpress.XtraEditors.TextEdit();
- this.labelControl9 = new DevExpress.XtraEditors.LabelControl();
this.txtWlmc = new DevExpress.XtraEditors.TextEdit();
- this.labelControl8 = new DevExpress.XtraEditors.LabelControl();
this.txtWlid = new DevExpress.XtraEditors.TextEdit();
- this.labelControl7 = new DevExpress.XtraEditors.LabelControl();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx2 = new DevExpress.XtraGrid.GridControl();
this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -159,6 +160,25 @@
this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.split99 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.layout99 = new DevExpress.XtraLayout.LayoutControl();
+ this.layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControl1 = new DevExpress.XtraLayout.LayoutControl();
+ this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlGroup2 = new DevExpress.XtraLayout.LayoutControlGroup();
+ this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_yuliang_1 = new DevExpress.XtraEditors.TextEdit();
+ this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem26 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -209,8 +229,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).BeginInit();
- this.panelMx1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).BeginInit();
@@ -225,6 +243,32 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split99)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).BeginInit();
+ this.split99.Panel1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).BeginInit();
+ this.split99.Panel2.SuspendLayout();
+ this.split99.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layout99)).BeginInit();
+ this.layout99.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).BeginInit();
+ this.layoutControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -857,8 +901,7 @@
//
// tabMxPage1
//
- this.tabMxPage1.Controls.Add(this.gcMx1);
- this.tabMxPage1.Controls.Add(this.panelMx1);
+ this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
this.tabMxPage1.Size = new System.Drawing.Size(1165, 422);
this.tabMxPage1.Text = "鐗╂枡鏄庣粏";
@@ -866,13 +909,13 @@
// gcMx1
//
this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.Location = new System.Drawing.Point(0, 102);
+ this.gcMx1.Location = new System.Drawing.Point(0, 0);
this.gcMx1.MainView = this.gvMx1;
this.gcMx1.Name = "gcMx1";
this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
this.repositoryItemButtonEdit1,
this.repositoryItemSearchLookUpEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1165, 320);
+ this.gcMx1.Size = new System.Drawing.Size(1165, 284);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1151,201 +1194,120 @@
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
//
- // panelMx1
- //
- this.panelMx1.Controls.Add(this.radOut);
- this.panelMx1.Controls.Add(this.ucBtnPrint1);
- this.panelMx1.Controls.Add(this.lbMxGuid);
- this.panelMx1.Controls.Add(this.txt_iCount_1);
- this.panelMx1.Controls.Add(this.labelControl14);
- this.panelMx1.Controls.Add(this.txt_psnQty_1);
- this.panelMx1.Controls.Add(this.labelControl12);
- this.panelMx1.Controls.Add(this.txt_kQty);
- this.panelMx1.Controls.Add(this.labelControl13);
- this.panelMx1.Controls.Add(this.txtYdy);
- this.panelMx1.Controls.Add(this.labelControl1);
- this.panelMx1.Controls.Add(this.txtQuantity);
- this.panelMx1.Controls.Add(this.labelControl10);
- this.panelMx1.Controls.Add(this.txtWlgg);
- this.panelMx1.Controls.Add(this.labelControl9);
- this.panelMx1.Controls.Add(this.txtWlmc);
- this.panelMx1.Controls.Add(this.labelControl8);
- this.panelMx1.Controls.Add(this.txtWlid);
- this.panelMx1.Controls.Add(this.labelControl7);
- this.panelMx1.Dock = System.Windows.Forms.DockStyle.Top;
- this.panelMx1.Location = new System.Drawing.Point(0, 0);
- this.panelMx1.Name = "panelMx1";
- this.panelMx1.Size = new System.Drawing.Size(1165, 102);
- this.panelMx1.TabIndex = 2;
- //
// radOut
//
- this.radOut.Location = new System.Drawing.Point(779, 26);
+ this.radOut.Location = new System.Drawing.Point(797, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
this.radOut.Properties.Items.AddRange(new DevExpress.XtraEditors.Controls.RadioGroupItem[] {
- new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄨ嚜鍔�"),
- new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍗婅嚜鍔�"),
- new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩")});
- this.radOut.Size = new System.Drawing.Size(248, 31);
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍏ㄦ墦"),
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
+ new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
+ this.radOut.Size = new System.Drawing.Size(227, 28);
+ this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 476;
//
// ucBtnPrint1
//
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(779, 63);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(795, 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(207, 32);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(338, 32);
this.ucBtnPrint1.TabIndex = 230;
//
// lbMxGuid
//
- this.lbMxGuid.Location = new System.Drawing.Point(1046, 70);
+ this.lbMxGuid.Location = new System.Drawing.Point(1032, 104);
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;
//
// txt_iCount_1
//
- this.txt_iCount_1.Location = new System.Drawing.Point(658, 67);
+ this.txt_iCount_1.Location = new System.Drawing.Point(104, 2);
this.txt_iCount_1.Name = "txt_iCount_1";
this.txt_iCount_1.Properties.Appearance.Options.UseFont = true;
this.txt_iCount_1.Properties.ReadOnly = true;
- this.txt_iCount_1.Size = new System.Drawing.Size(96, 24);
+ this.txt_iCount_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_iCount_1.StyleController = this.layoutControl1;
this.txt_iCount_1.TabIndex = 228;
- //
- // labelControl14
- //
- this.labelControl14.Location = new System.Drawing.Point(547, 70);
- this.labelControl14.Name = "labelControl14";
- this.labelControl14.Size = new System.Drawing.Size(105, 18);
- this.labelControl14.TabIndex = 227;
- this.labelControl14.Text = "鎵撳嵃鏉＄爜寮犳暟锛�";
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(658, 33);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(558, 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(96, 24);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
+ this.txt_psnQty_1.StyleController = this.layout99;
this.txt_psnQty_1.TabIndex = 226;
- //
- // labelControl12
- //
- this.labelControl12.Location = new System.Drawing.Point(547, 39);
- this.labelControl12.Name = "labelControl12";
- this.labelControl12.Size = new System.Drawing.Size(105, 18);
- this.labelControl12.TabIndex = 225;
- this.labelControl12.Text = "姣忓紶鏉＄爜鏁伴噺锛�";
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(658, 3);
+ this.txt_kQty.Location = new System.Drawing.Point(558, 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(96, 24);
+ this.txt_kQty.Size = new System.Drawing.Size(234, 24);
+ this.txt_kQty.StyleController = this.layout99;
this.txt_kQty.TabIndex = 224;
- //
- // labelControl13
- //
- this.labelControl13.Location = new System.Drawing.Point(562, 9);
- this.labelControl13.Name = "labelControl13";
- this.labelControl13.Size = new System.Drawing.Size(90, 18);
- this.labelControl13.TabIndex = 223;
- this.labelControl13.Text = "鍙墦鍗版�绘暟锛�";
//
// txtYdy
//
- this.txtYdy.Location = new System.Drawing.Point(430, 36);
+ this.txtYdy.Location = new System.Drawing.Point(218, 44);
this.txtYdy.Name = "txtYdy";
this.txtYdy.Properties.Appearance.Options.UseFont = true;
this.txtYdy.Properties.ReadOnly = true;
- this.txtYdy.Size = new System.Drawing.Size(96, 24);
+ this.txtYdy.Size = new System.Drawing.Size(234, 24);
+ this.txtYdy.StyleController = this.layout99;
this.txtYdy.TabIndex = 222;
- //
- // labelControl1
- //
- this.labelControl1.Location = new System.Drawing.Point(346, 39);
- this.labelControl1.Name = "labelControl1";
- this.labelControl1.Size = new System.Drawing.Size(80, 18);
- this.labelControl1.TabIndex = 221;
- this.labelControl1.Text = "宸叉墦鍗版�婚噺:";
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(430, 6);
+ this.txtQuantity.Location = new System.Drawing.Point(218, 12);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(96, 24);
+ this.txtQuantity.Size = new System.Drawing.Size(234, 24);
+ this.txtQuantity.StyleController = this.layout99;
this.txtQuantity.TabIndex = 220;
- //
- // labelControl10
- //
- this.labelControl10.Location = new System.Drawing.Point(331, 9);
- this.labelControl10.Name = "labelControl10";
- this.labelControl10.Size = new System.Drawing.Size(95, 18);
- this.labelControl10.TabIndex = 219;
- this.labelControl10.Text = "鏈鐢宠鎬婚噺:";
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(90, 67);
+ this.txtWlgg.Location = new System.Drawing.Point(-122, 76);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(436, 24);
+ this.txtWlgg.Size = new System.Drawing.Size(574, 24);
+ this.txtWlgg.StyleController = this.layout99;
this.txtWlgg.TabIndex = 218;
- //
- // labelControl9
- //
- this.labelControl9.Location = new System.Drawing.Point(20, 70);
- this.labelControl9.Name = "labelControl9";
- this.labelControl9.Size = new System.Drawing.Size(65, 18);
- this.labelControl9.TabIndex = 217;
- this.labelControl9.Text = "鐗╂枡瑙勬牸:";
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(90, 36);
+ this.txtWlmc.Location = new System.Drawing.Point(-122, 44);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(236, 24);
+ this.txtWlmc.Size = new System.Drawing.Size(234, 24);
+ this.txtWlmc.StyleController = this.layout99;
this.txtWlmc.TabIndex = 216;
- //
- // labelControl8
- //
- this.labelControl8.Location = new System.Drawing.Point(20, 39);
- this.labelControl8.Name = "labelControl8";
- this.labelControl8.Size = new System.Drawing.Size(65, 18);
- this.labelControl8.TabIndex = 215;
- this.labelControl8.Text = "鐗╂枡鍚嶇О:";
//
// txtWlid
//
- this.txtWlid.Location = new System.Drawing.Point(90, 6);
+ this.txtWlid.Location = new System.Drawing.Point(-122, 12);
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(236, 24);
+ this.txtWlid.Size = new System.Drawing.Size(234, 24);
+ this.txtWlid.StyleController = this.layout99;
this.txtWlid.TabIndex = 214;
- //
- // labelControl7
- //
- this.labelControl7.Location = new System.Drawing.Point(20, 9);
- this.labelControl7.Name = "labelControl7";
- this.labelControl7.Size = new System.Drawing.Size(65, 18);
- this.labelControl7.TabIndex = 213;
- this.labelControl7.Text = "鐗╂枡缂栫爜:";
//
// xtraTabPage3
//
@@ -1516,6 +1478,280 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // split99
+ //
+ this.split99.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.split99.Horizontal = false;
+ this.split99.Location = new System.Drawing.Point(0, 0);
+ this.split99.Name = "split99";
+ //
+ // split99.split99_Panel1
+ //
+ this.split99.Panel1.Controls.Add(this.layout99);
+ this.split99.Panel1.Text = "Panel1";
+ //
+ // split99.split99_Panel2
+ //
+ this.split99.Panel2.Controls.Add(this.gcMx1);
+ this.split99.Panel2.Text = "Panel2";
+ this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
+ this.split99.Size = new System.Drawing.Size(1165, 422);
+ this.split99.SplitterPosition = 126;
+ this.split99.TabIndex = 3;
+ //
+ // layout99
+ //
+ this.layout99.Controls.Add(this.lbMxGuid);
+ this.layout99.Controls.Add(this.ucBtnPrint1);
+ this.layout99.Controls.Add(this.radOut);
+ this.layout99.Controls.Add(this.layoutControl1);
+ 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.txtYdy);
+ this.layout99.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.layout99.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem26});
+ this.layout99.Location = new System.Drawing.Point(0, 0);
+ this.layout99.Name = "layout99";
+ this.layout99.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(121, 456, 812, 500);
+ this.layout99.Root = this.layoutControlGroup1;
+ this.layout99.Size = new System.Drawing.Size(1165, 126);
+ this.layout99.TabIndex = 0;
+ this.layout99.Text = "layoutControl1";
+ //
+ // layoutControlGroup1
+ //
+ this.layoutControlGroup1.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup1.GroupBordersVisible = false;
+ this.layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem5,
+ this.layoutControlItem7,
+ this.layoutControlItem16,
+ this.layoutControlItem17,
+ this.layoutControlItem18,
+ this.layoutControlItem19,
+ this.layoutControlItem20,
+ this.layoutControlItem21,
+ this.layoutControlItem25,
+ this.layoutControlItem24});
+ this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup1.Name = "Root";
+ columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7.Width = 100D;
+ columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition8.Width = 100D;
+ columnDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition9.Width = 100D;
+ columnDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition10.Width = 100D;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition7,
+ columnDefinition8,
+ columnDefinition9,
+ columnDefinition10});
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 116);
+ this.layoutControlGroup1.TextVisible = false;
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txtWlid;
+ this.layoutControlItem5.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem5.Name = "layoutControlItem5";
+ this.layoutControlItem5.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem5.Text = "鐗╂枡缂栫爜";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem7
+ //
+ this.layoutControlItem7.Control = this.txtWlmc;
+ this.layoutControlItem7.Location = new System.Drawing.Point(0, 32);
+ this.layoutControlItem7.Name = "layoutControlItem7";
+ this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem7.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem7.Text = "鐗╂枡鍚嶇О";
+ this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem16
+ //
+ this.layoutControlItem16.Control = this.txtWlgg;
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 64);
+ this.layoutControlItem16.Name = "layoutControlItem16";
+ this.layoutControlItem16.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem16.Size = new System.Drawing.Size(680, 32);
+ this.layoutControlItem16.Text = "鐗╂枡瑙勬牸";
+ this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem17
+ //
+ this.layoutControlItem17.Control = this.txtQuantity;
+ this.layoutControlItem17.Location = new System.Drawing.Point(340, 0);
+ this.layoutControlItem17.Name = "layoutControlItem17";
+ this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem17.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem17.Text = "鏈鐢宠鎬婚噺";
+ this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem18
+ //
+ this.layoutControlItem18.Control = this.txtYdy;
+ this.layoutControlItem18.Location = new System.Drawing.Point(340, 32);
+ this.layoutControlItem18.Name = "layoutControlItem18";
+ this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem18.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem18.Text = "宸叉墦鍗版�婚噺";
+ this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem19
+ //
+ this.layoutControlItem19.Control = this.txt_kQty;
+ this.layoutControlItem19.Location = new System.Drawing.Point(680, 0);
+ this.layoutControlItem19.Name = "layoutControlItem19";
+ this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem19.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem19.Text = "鍙墦鍗版�绘暟";
+ this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem20
+ //
+ this.layoutControlItem20.Control = this.txt_psnQty_1;
+ this.layoutControlItem20.Location = new System.Drawing.Point(680, 32);
+ this.layoutControlItem20.Name = "layoutControlItem20";
+ this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem20.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem20.Text = "姣忓紶鏉＄爜鏁伴噺";
+ this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControl1
+ //
+ this.layoutControl1.Controls.Add(this.txt_iCount_1);
+ this.layoutControl1.Controls.Add(this.txt_yuliang_1);
+ this.layoutControl1.Location = new System.Drawing.Point(456, 76);
+ this.layoutControl1.Name = "layoutControl1";
+ this.layoutControl1.Root = this.layoutControlGroup2;
+ this.layoutControl1.Size = new System.Drawing.Size(336, 28);
+ this.layoutControl1.TabIndex = 227;
+ this.layoutControl1.Text = "layoutControl1";
+ //
+ // layoutControlItem21
+ //
+ this.layoutControlItem21.Control = this.layoutControl1;
+ this.layoutControlItem21.Location = new System.Drawing.Point(680, 64);
+ this.layoutControlItem21.Name = "layoutControlItem21";
+ this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem21.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem21.Text = "鎵撳嵃鏁伴噺";
+ this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem21.TextVisible = false;
+ //
+ // layoutControlGroup2
+ //
+ this.layoutControlGroup2.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
+ this.layoutControlGroup2.GroupBordersVisible = false;
+ this.layoutControlGroup2.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
+ this.layoutControlItem22,
+ this.layoutControlItem23});
+ this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
+ this.layoutControlGroup2.Name = "layoutControlGroup2";
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
+ columnDefinition5,
+ columnDefinition6});
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
+ rowDefinition4});
+ this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 28);
+ this.layoutControlGroup2.TextVisible = false;
+ //
+ // layoutControlItem22
+ //
+ this.layoutControlItem22.Control = this.txt_iCount_1;
+ this.layoutControlItem22.Location = new System.Drawing.Point(0, 0);
+ this.layoutControlItem22.Name = "layoutControlItem22";
+ this.layoutControlItem22.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem22.Text = "鎵撳嵃鏁村紶鏁板��";
+ this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // txt_yuliang_1
+ //
+ this.txt_yuliang_1.Location = new System.Drawing.Point(272, 2);
+ this.txt_yuliang_1.Name = "txt_yuliang_1";
+ this.txt_yuliang_1.Size = new System.Drawing.Size(62, 24);
+ this.txt_yuliang_1.StyleController = this.layoutControl1;
+ this.txt_yuliang_1.TabIndex = 229;
+ //
+ // layoutControlItem23
+ //
+ this.layoutControlItem23.Control = this.txt_yuliang_1;
+ this.layoutControlItem23.Location = new System.Drawing.Point(168, 0);
+ this.layoutControlItem23.Name = "layoutControlItem23";
+ this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem23.Size = new System.Drawing.Size(168, 28);
+ this.layoutControlItem23.Text = "鎵撳嵃浣欐暟";
+ this.layoutControlItem23.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem25
+ //
+ this.layoutControlItem25.Control = this.ucBtnPrint1;
+ this.layoutControlItem25.Location = new System.Drawing.Point(1020, 32);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 1;
+ this.layoutControlItem25.Padding = new DevExpress.XtraLayout.Utils.Padding(1, 1, 0, 0);
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem25.Text = "鎵撳嵃鎸夐挳";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem25.TextVisible = false;
+ //
+ // layoutControlItem26
+ //
+ this.layoutControlItem26.Control = this.lbMxGuid;
+ this.layoutControlItem26.Location = new System.Drawing.Point(1020, 92);
+ this.layoutControlItem26.Name = "layoutControlItem26";
+ this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 2;
+ this.layoutControlItem26.Size = new System.Drawing.Size(340, 46);
+ this.layoutControlItem26.Text = "lbMxGuid";
+ this.layoutControlItem26.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem26.TextVisible = false;
+ //
+ // layoutControlItem24
+ //
+ this.layoutControlItem24.Control = this.radOut;
+ this.layoutControlItem24.Location = new System.Drawing.Point(1020, 0);
+ this.layoutControlItem24.MaxSize = new System.Drawing.Size(230, 28);
+ this.layoutControlItem24.MinSize = new System.Drawing.Size(230, 28);
+ this.layoutControlItem24.Name = "layoutControlItem24";
+ this.layoutControlItem24.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem24.Padding = new DevExpress.XtraLayout.Utils.Padding(3, 0, 0, 0);
+ this.layoutControlItem24.Size = new System.Drawing.Size(340, 32);
+ this.layoutControlItem24.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem24.Text = "璁＄畻鏂瑰紡";
+ this.layoutControlItem24.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem24.TextVisible = false;
+ //
// Frm_MesShouTuo
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1576,9 +1812,6 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemSearchLookUpEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gridView2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.panelMx1)).EndInit();
- this.panelMx1.ResumeLayout(false);
- this.panelMx1.PerformLayout();
((System.ComponentModel.ISupportInitialize)(this.radOut.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_iCount_1.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_psnQty_1.Properties)).EndInit();
@@ -1593,6 +1826,32 @@
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel1)).EndInit();
+ this.split99.Panel1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split99.Panel2)).EndInit();
+ this.split99.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.split99)).EndInit();
+ this.split99.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layout99)).EndInit();
+ this.layout99.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem7)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem16)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem17)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem18)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem19)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem20)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControl1)).EndInit();
+ this.layoutControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlGroup2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_yuliang_1.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem26)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
this.ResumeLayout(false);
}
@@ -1654,25 +1913,16 @@
private DevExpress.XtraGrid.Columns.GridColumn gvMxDel;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
- private DevExpress.XtraEditors.PanelControl panelMx1;
private UserControl.UcBtnPrint ucBtnPrint1;
private DevExpress.XtraEditors.LabelControl lbMxGuid;
private DevExpress.XtraEditors.TextEdit txt_iCount_1;
- private DevExpress.XtraEditors.LabelControl labelControl14;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
- private DevExpress.XtraEditors.LabelControl labelControl12;
private DevExpress.XtraEditors.TextEdit txt_kQty;
- private DevExpress.XtraEditors.LabelControl labelControl13;
private DevExpress.XtraEditors.TextEdit txtYdy;
- private DevExpress.XtraEditors.LabelControl labelControl1;
private DevExpress.XtraEditors.TextEdit txtQuantity;
- private DevExpress.XtraEditors.LabelControl labelControl10;
private DevExpress.XtraEditors.TextEdit txtWlgg;
- private DevExpress.XtraEditors.LabelControl labelControl9;
private DevExpress.XtraEditors.TextEdit txtWlmc;
- private DevExpress.XtraEditors.LabelControl labelControl8;
private DevExpress.XtraEditors.TextEdit txtWlid;
- private DevExpress.XtraEditors.LabelControl labelControl7;
private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
private DevExpress.XtraGrid.GridControl gcMx2;
private DevExpress.XtraGrid.Views.Grid.GridView gvMx2;
@@ -1709,5 +1959,24 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.Utils.ToolTipController tips;
private DevExpress.XtraEditors.RadioGroup radOut;
+ private DevExpress.XtraEditors.SplitContainerControl split99;
+ private DevExpress.XtraLayout.LayoutControl layout99;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem7;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
+ private DevExpress.XtraLayout.LayoutControl layoutControl1;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup2;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
+ private DevExpress.XtraEditors.TextEdit txt_yuliang_1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem26;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
index 123ccf1..05c63ff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_MesShouTuo.cs
@@ -104,7 +104,7 @@
}
this.ucBtnPrint1.rptParameter = "rpt_Strk{" + lbMxGuid.Text.Trim()
+ "," + ""
- + "," + Gs.DevApp.ToolBox.UtilityHelper.PrintYuLiang(radOut).ToString()
+ + "," + Gs.DevApp.ToolBox.UtilityHelper.ToDecimal(txt_yuliang_1.Text.Trim())
+ "," + txt_iCount_1.Text.Trim()
+ "," + txt_psnQty_1.Text.Trim()
+ "}";
@@ -112,12 +112,12 @@
//鑷姩璁＄畻鎵撳嵃閲�
txt_psnQty_1.TextChanged += (s, e) =>
{
- Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut);
+ Gs.DevApp.ToolBox.UtilityHelper.PrintJiSuan(txt_psnQty_1, txt_iCount_1, txt_kQty.Text.Trim(), radOut, txt_yuliang_1);
};
radOut.SelectedIndexChanged += (s, e) =>
{
- Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut);
+ Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 5eafab2..4102f34 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -2153,19 +2153,7 @@
else
txt_iCount_1.ReadOnly = true;
}
- public static decimal PrintYuLiang(DevExpress.XtraEditors.RadioGroup rd)
- {
- decimal dc = 0;
- if (rd.SelectedIndex != 0)
- return 0;
- string txt = rd.Properties.Items[0].Description;// = "鍏ㄨ嚜鍔ㄣ��" + remainder.ToString() + "銆�";
- txt = txt.Trim().Replace("鍏ㄨ嚜鍔ㄣ��", "");
- txt = txt.Replace("銆�", "");
- if (string.IsNullOrEmpty(txt))
- return 0;
- return decimal.Parse(txt);
- }
-
+
#region 缁樺埗琛ㄥご鍏ㄩ�夊嬀閫夋
/// <summary>
/// 缁樺埗琛ㄥご鍏ㄩ�夊嬀閫夋
--
Gitblit v1.9.3