From cf758a0cd625345be2176bd19ac0d94c8fe609d6 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期三, 06 八月 2025 18:52:25 +0800
Subject: [PATCH] 1、采购到货新增合并提交 2、顶部按钮合并按钮启用
---
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs | 50 +
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs | 16
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 6
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 1211 +++++++++++++++++++++++++++++++++----------------
DevApp/Gs.DevApp/Gs.DevApp.csproj | 3
DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx | 117 ++++
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx | 3
7 files changed, 994 insertions(+), 412 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index b5a05a4..3f20f85 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -34,6 +34,7 @@
toolBarMenu1.btnChkClick += ToolBarMenu1_btnChkClick;
toolBarMenu1.btnFChkClick += ToolBarMenu1_btnFChkClick;
toolBarMenu1.btnLogClick += ToolBarMenu1_btnLogClick;
+ toolBarMenu1.btnHbClick += ToolBarMenu1_btnHbClick;
this.toolBarMenu1.getXmlConfig();
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameterMx(gvMx1);
Gs.DevApp.ToolBox.UtilityHelper.SetGridViewParameter(gridView1, picCheckBox, this, "fstatus", "", (value) =>
@@ -175,6 +176,11 @@
{
_toolCk("EditModelSubmitF");
}
+
+ private void ToolBarMenu1_btnHbClick(object sender, EventArgs e)
+ {
+ _toolCk("EditModelSubmitHb");
+ }
/// <summary>
/// 鍙栨秷浜嬩欢
/// </summary>
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx
index a4826a3..57d12a7 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.resx
@@ -117,6 +117,9 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <metadata name="gv_remainingReceivedQty.GenerateMember" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
+ <value>False</value>
+ </metadata>
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 285eb82..6333fff 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -30,24 +30,24 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- 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.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.XtraLayout.ColumnDefinition columnDefinition11 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition12 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition13 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition14 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition15 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition16 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition17 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition18 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition19 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition20 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition15 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition16 = new DevExpress.XtraLayout.RowDefinition();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -133,7 +133,28 @@
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
- this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+ this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMx2 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
+ this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gvMx1 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gvAbtGuid = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1guid = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -154,30 +175,38 @@
this.gridColumn12 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn27 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn28 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemComboBox1 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.gridColumn29 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn30 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn31 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.repositoryItemButtonEdit2 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.tabMxPage2 = new DevExpress.XtraTab.XtraTabPage();
- this.gcMx2 = new DevExpress.XtraGrid.GridControl();
- this.gvMx2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gvMx2guid = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2itemBarcode = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2itemNo = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn14 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gvMx2oldqty = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gcMx1 = new DevExpress.XtraGrid.GridControl();
+ this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
+ this.gcMx3 = new DevExpress.XtraGrid.GridControl();
+ this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn34 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn35 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn36 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn37 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn38 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn39 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn40 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn41 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn42 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn43 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn44 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn45 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn46 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn47 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn48 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn49 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn50 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn51 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ this.gridColumn52 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn53 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn54 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -261,14 +290,25 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
+ this.xtraTabPage3.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).BeginInit();
+ this.splitContainerControl1.Panel2.SuspendLayout();
+ this.splitContainerControl1.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -799,32 +839,32 @@
this.layoutControlItem13});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- 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;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
+ columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition13.Width = 100D;
+ columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition14.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- 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;
+ columnDefinition11,
+ columnDefinition12,
+ columnDefinition13,
+ columnDefinition14});
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition11.Height = 100D;
+ rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition12.Height = 100D;
+ rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition1,
- rowDefinition2,
- rowDefinition3,
- rowDefinition4});
+ rowDefinition9,
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12});
this.Root.Size = new System.Drawing.Size(1159, 116);
this.Root.TextVisible = false;
//
@@ -967,7 +1007,8 @@
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
- this.tabMxPage2});
+ this.tabMxPage2,
+ this.xtraTabPage3});
//
// tabMxPage1
//
@@ -996,7 +1037,7 @@
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split99.Size = new System.Drawing.Size(1174, 297);
- this.split99.SplitterPosition = 90;
+ this.split99.SplitterPosition = 115;
this.split99.TabIndex = 2;
//
// layout99
@@ -1020,7 +1061,7 @@
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(1174, 90);
+ this.layout99.Size = new System.Drawing.Size(1174, 115);
this.layout99.TabIndex = 0;
this.layout99.Text = "layoutControl1";
//
@@ -1028,11 +1069,11 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(580, 68);
+ this.layoutControl1.Location = new System.Drawing.Point(588, 75);
this.layoutControl1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(280, 24);
+ this.layoutControl1.Size = new System.Drawing.Size(284, 28);
this.layoutControl1.TabIndex = 477;
this.layoutControl1.Text = "layoutControl1";
//
@@ -1044,7 +1085,7 @@
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(52, 20);
+ this.txt_iCount_1.Size = new System.Drawing.Size(54, 20);
this.txt_iCount_1.StyleController = this.layoutControl1;
this.txt_iCount_1.TabIndex = 264;
this.txt_iCount_1.Tag = "ReadOnly";
@@ -1052,11 +1093,11 @@
//
// txt_yuliang_1
//
- this.txt_yuliang_1.Location = new System.Drawing.Point(226, 2);
+ this.txt_yuliang_1.Location = new System.Drawing.Point(228, 2);
this.txt_yuliang_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 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(52, 20);
+ this.txt_yuliang_1.Size = new System.Drawing.Size(54, 20);
this.txt_yuliang_1.StyleController = this.layoutControl1;
this.txt_yuliang_1.TabIndex = 265;
//
@@ -1068,20 +1109,20 @@
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.Name = "Root";
+ columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15.Width = 100D;
+ columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition16.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15,
+ columnDefinition16});
+ rowDefinition13.Height = 100D;
+ rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5});
+ rowDefinition13});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(280, 24);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(284, 28);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem26
@@ -1089,17 +1130,17 @@
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(140, 24);
+ this.layoutControlItem26.Size = new System.Drawing.Size(142, 28);
this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem26.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem27
//
this.layoutControlItem27.Control = this.txt_yuliang_1;
- this.layoutControlItem27.Location = new System.Drawing.Point(140, 0);
+ this.layoutControlItem27.Location = new System.Drawing.Point(142, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem27.Size = new System.Drawing.Size(140, 24);
+ this.layoutControlItem27.Size = new System.Drawing.Size(142, 28);
this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem27.TextSize = new System.Drawing.Size(72, 14);
//
@@ -1118,16 +1159,16 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(863, 38);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(875, 41);
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(283, 28);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(288, 32);
this.ucBtnPrint1.TabIndex = 232;
//
// radOut
//
- this.radOut.Location = new System.Drawing.Point(865, 10);
+ this.radOut.Location = new System.Drawing.Point(877, 10);
this.radOut.Margin = new System.Windows.Forms.Padding(0);
this.radOut.Name = "radOut";
this.radOut.Properties.ItemHorzAlignment = DevExpress.XtraEditors.RadioItemHorzAlignment.Near;
@@ -1136,18 +1177,18 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(282, 28);
+ this.radOut.Size = new System.Drawing.Size(287, 31);
this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 476;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(664, 40);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(672, 43);
this.txt_psnQty_1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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(196, 20);
+ this.txt_psnQty_1.Size = new System.Drawing.Size(200, 20);
this.txt_psnQty_1.StyleController = this.layout99;
this.txt_psnQty_1.TabIndex = 263;
this.txt_psnQty_1.Tag = "ReadOnly";
@@ -1160,64 +1201,64 @@
this.txtWlid.Name = "txtWlid";
this.txtWlid.Properties.Appearance.Options.UseFont = true;
this.txtWlid.Properties.ReadOnly = true;
- this.txtWlid.Size = new System.Drawing.Size(196, 20);
+ this.txtWlid.Size = new System.Drawing.Size(200, 20);
this.txtWlid.StyleController = this.layout99;
this.txtWlid.TabIndex = 214;
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(96, 40);
+ this.txtWlmc.Location = new System.Drawing.Point(96, 43);
this.txtWlmc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
- this.txtWlmc.Size = new System.Drawing.Size(196, 20);
+ this.txtWlmc.Size = new System.Drawing.Size(200, 20);
this.txtWlmc.StyleController = this.layout99;
this.txtWlmc.TabIndex = 216;
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(96, 68);
+ this.txtWlgg.Location = new System.Drawing.Point(96, 75);
this.txtWlgg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
- this.txtWlgg.Size = new System.Drawing.Size(480, 20);
+ this.txtWlgg.Size = new System.Drawing.Size(488, 20);
this.txtWlgg.StyleController = this.layout99;
this.txtWlgg.TabIndex = 218;
//
// txt_kQty
//
- this.txt_kQty.Location = new System.Drawing.Point(664, 12);
+ this.txt_kQty.Location = new System.Drawing.Point(672, 12);
this.txt_kQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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(196, 20);
+ this.txt_kQty.Size = new System.Drawing.Size(200, 20);
this.txt_kQty.StyleController = this.layout99;
this.txt_kQty.TabIndex = 224;
//
// txtQuantity
//
- this.txtQuantity.Location = new System.Drawing.Point(380, 12);
+ this.txtQuantity.Location = new System.Drawing.Point(384, 12);
this.txtQuantity.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txtQuantity.Name = "txtQuantity";
this.txtQuantity.Properties.Appearance.Options.UseFont = true;
this.txtQuantity.Properties.ReadOnly = true;
- this.txtQuantity.Size = new System.Drawing.Size(196, 20);
+ this.txtQuantity.Size = new System.Drawing.Size(200, 20);
this.txtQuantity.StyleController = this.layout99;
this.txtQuantity.TabIndex = 220;
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(380, 40);
+ this.txt_yQty.Location = new System.Drawing.Point(384, 43);
this.txt_yQty.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
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(196, 20);
+ this.txt_yQty.Size = new System.Drawing.Size(200, 20);
this.txt_yQty.StyleController = this.layout99;
this.txt_yQty.TabIndex = 222;
//
@@ -1250,30 +1291,30 @@
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;
+ columnDefinition17.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition17.Width = 100D;
+ columnDefinition18.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition18.Width = 100D;
+ columnDefinition19.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition19.Width = 100D;
+ columnDefinition20.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition20.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;
+ columnDefinition17,
+ columnDefinition18,
+ columnDefinition19,
+ columnDefinition20});
+ rowDefinition14.Height = 100D;
+ rowDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition15.Height = 100D;
+ rowDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition16.Height = 100D;
+ rowDefinition16.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(1157, 104);
+ rowDefinition14,
+ rowDefinition15,
+ rowDefinition16});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1174, 115);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem15
@@ -1281,81 +1322,81 @@
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(284, 28);
+ this.layoutControlItem15.Size = new System.Drawing.Size(288, 31);
this.layoutControlItem15.Text = "鐗╂枡缂栧彿";
this.layoutControlItem15.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txtWlmc;
- this.layoutControlItem16.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(284, 28);
+ this.layoutControlItem16.Size = new System.Drawing.Size(288, 32);
this.layoutControlItem16.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem16.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txtWlgg;
- this.layoutControlItem17.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 63);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(568, 28);
+ this.layoutControlItem17.Size = new System.Drawing.Size(576, 32);
this.layoutControlItem17.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txtQuantity;
- this.layoutControlItem18.Location = new System.Drawing.Point(284, 0);
+ this.layoutControlItem18.Location = new System.Drawing.Point(288, 0);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem18.Size = new System.Drawing.Size(284, 28);
+ this.layoutControlItem18.Size = new System.Drawing.Size(288, 31);
this.layoutControlItem18.Text = "鏈鏀惰揣鎬婚噺";
this.layoutControlItem18.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_yQty;
- this.layoutControlItem19.Location = new System.Drawing.Point(284, 28);
+ this.layoutControlItem19.Location = new System.Drawing.Point(288, 31);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(284, 28);
+ this.layoutControlItem19.Size = new System.Drawing.Size(288, 32);
this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_kQty;
- this.layoutControlItem20.Location = new System.Drawing.Point(568, 0);
+ this.layoutControlItem20.Location = new System.Drawing.Point(576, 0);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(284, 28);
+ this.layoutControlItem20.Size = new System.Drawing.Size(288, 31);
this.layoutControlItem20.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem20.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_psnQty_1;
- this.layoutControlItem21.Location = new System.Drawing.Point(568, 28);
+ this.layoutControlItem21.Location = new System.Drawing.Point(576, 31);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(284, 28);
+ this.layoutControlItem21.Size = new System.Drawing.Size(288, 32);
this.layoutControlItem21.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 14);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.radOut;
- this.layoutControlItem22.Location = new System.Drawing.Point(852, 0);
+ this.layoutControlItem22.Location = new System.Drawing.Point(864, 0);
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(285, 28);
+ this.layoutControlItem22.Size = new System.Drawing.Size(290, 31);
this.layoutControlItem22.Text = "鑷姩璁＄畻";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -1363,12 +1404,12 @@
// layoutControlItem23
//
this.layoutControlItem23.Control = this.ucBtnPrint1;
- this.layoutControlItem23.Location = new System.Drawing.Point(852, 28);
+ this.layoutControlItem23.Location = new System.Drawing.Point(864, 31);
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(285, 28);
+ this.layoutControlItem23.Size = new System.Drawing.Size(290, 32);
this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1376,31 +1417,236 @@
// layoutControlItem25
//
this.layoutControlItem25.Control = this.layoutControl1;
- this.layoutControlItem25.Location = new System.Drawing.Point(568, 56);
+ this.layoutControlItem25.Location = new System.Drawing.Point(576, 63);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem25.Size = new System.Drawing.Size(284, 28);
+ this.layoutControlItem25.Size = new System.Drawing.Size(288, 32);
this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
//
- // gcMx1
+ // tabMxPage2
//
- this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.gcMx1.Location = new System.Drawing.Point(0, 0);
- this.gcMx1.MainView = this.gvMx1;
- this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.gcMx1.Name = "gcMx1";
- this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit1,
- this.repositoryItemButtonEdit2,
- this.repositoryItemComboBox1});
- this.gcMx1.Size = new System.Drawing.Size(1174, 197);
- this.gcMx1.TabIndex = 1;
- this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx1});
+ this.tabMxPage2.Controls.Add(this.gcMx2);
+ this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.tabMxPage2.Name = "tabMxPage2";
+ this.tabMxPage2.Size = new System.Drawing.Size(1174, 297);
+ this.tabMxPage2.Text = "宸叉墦鏉＄爜鏄庣粏";
+ //
+ // gcMx2
+ //
+ this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMx2.Location = new System.Drawing.Point(0, 0);
+ this.gcMx2.MainView = this.gvMx2;
+ this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMx2.Name = "gcMx2";
+ this.gcMx2.Size = new System.Drawing.Size(1174, 297);
+ this.gcMx2.TabIndex = 0;
+ this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx2});
+ //
+ // gvMx2
+ //
+ this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
+ this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
+ this.gvMx2.Appearance.Row.Options.UseFont = true;
+ this.gvMx2.ColumnPanelRowHeight = 39;
+ this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gvMx2guid,
+ this.gridColumn16,
+ this.gvMx2itemBarcode,
+ this.gvMx2itemNo,
+ this.gridColumn18,
+ this.gridColumn14,
+ this.gvMx2oldqty,
+ this.gridColumn21,
+ this.gridColumn20,
+ this.gridColumn17,
+ this.gridColumn22,
+ this.gridColumn23,
+ this.gridColumn24,
+ this.gridColumn32});
+ this.gvMx2.DetailHeight = 272;
+ this.gvMx2.GridControl = this.gcMx2;
+ this.gvMx2.Name = "gvMx2";
+ this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx2.OptionsView.ShowGroupPanel = false;
+ //
+ // gvMx2guid
+ //
+ this.gvMx2guid.AppearanceCell.Options.UseFont = true;
+ this.gvMx2guid.Caption = "guid ";
+ this.gvMx2guid.FieldName = "guid";
+ this.gvMx2guid.MinWidth = 44;
+ this.gvMx2guid.Name = "gvMx2guid";
+ this.gvMx2guid.Tag = "query_a.guid";
+ this.gvMx2guid.Width = 82;
+ //
+ // gridColumn16
+ //
+ this.gridColumn16.Caption = "鏄惁鍏ュ簱";
+ this.gridColumn16.FieldName = "isRk";
+ this.gridColumn16.MaxWidth = 44;
+ this.gridColumn16.MinWidth = 44;
+ this.gridColumn16.Name = "gridColumn16";
+ this.gridColumn16.Visible = true;
+ this.gridColumn16.VisibleIndex = 0;
+ this.gridColumn16.Width = 44;
+ //
+ // gvMx2itemBarcode
+ //
+ this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
+ this.gvMx2itemBarcode.Caption = "鐗╂枡鏉＄爜";
+ this.gvMx2itemBarcode.FieldName = "itemBarcode";
+ this.gvMx2itemBarcode.MinWidth = 44;
+ this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
+ this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
+ this.gvMx2itemBarcode.Visible = true;
+ this.gvMx2itemBarcode.VisibleIndex = 1;
+ this.gvMx2itemBarcode.Width = 262;
+ //
+ // gvMx2itemNo
+ //
+ this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
+ this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
+ this.gvMx2itemNo.FieldName = "itemNo";
+ this.gvMx2itemNo.MinWidth = 44;
+ this.gvMx2itemNo.Name = "gvMx2itemNo";
+ this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
+ this.gvMx2itemNo.Visible = true;
+ this.gvMx2itemNo.VisibleIndex = 2;
+ this.gvMx2itemNo.Width = 87;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn18.FieldName = "itemName";
+ this.gridColumn18.MinWidth = 44;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 3;
+ this.gridColumn18.Width = 131;
+ //
+ // gridColumn14
+ //
+ this.gridColumn14.Caption = "瑙勬牸鍨嬪彿";
+ this.gridColumn14.FieldName = "itemModel";
+ this.gridColumn14.MinWidth = 44;
+ this.gridColumn14.Name = "gridColumn14";
+ this.gridColumn14.Visible = true;
+ this.gridColumn14.VisibleIndex = 4;
+ this.gridColumn14.Width = 131;
+ //
+ // gvMx2oldqty
+ //
+ this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
+ this.gvMx2oldqty.Caption = "鏁伴噺";
+ this.gvMx2oldqty.FieldName = "quantity";
+ this.gvMx2oldqty.MinWidth = 44;
+ this.gvMx2oldqty.Name = "gvMx2oldqty";
+ this.gvMx2oldqty.Tag = "query_a.OLDQTY";
+ this.gvMx2oldqty.Visible = true;
+ this.gvMx2oldqty.VisibleIndex = 5;
+ this.gvMx2oldqty.Width = 82;
+ //
+ // gridColumn21
+ //
+ this.gridColumn21.Caption = "鍗曚綅";
+ this.gridColumn21.FieldName = "dwName";
+ this.gridColumn21.MinWidth = 22;
+ this.gridColumn21.Name = "gridColumn21";
+ this.gridColumn21.Visible = true;
+ this.gridColumn21.VisibleIndex = 6;
+ this.gridColumn21.Width = 82;
+ //
+ // gridColumn20
+ //
+ this.gridColumn20.Caption = "鎵撶爜浜�";
+ this.gridColumn20.FieldName = "createBy";
+ this.gridColumn20.MinWidth = 22;
+ this.gridColumn20.Name = "gridColumn20";
+ this.gridColumn20.Visible = true;
+ this.gridColumn20.VisibleIndex = 7;
+ this.gridColumn20.Width = 82;
+ //
+ // gridColumn17
+ //
+ this.gridColumn17.Caption = "鎵撶爜鏃ユ湡";
+ this.gridColumn17.FieldName = "createDate";
+ this.gridColumn17.MinWidth = 10;
+ this.gridColumn17.Name = "gridColumn17";
+ this.gridColumn17.Visible = true;
+ this.gridColumn17.VisibleIndex = 8;
+ this.gridColumn17.Width = 157;
+ //
+ // gridColumn22
+ //
+ this.gridColumn22.Caption = "鍏ュ簱浜�";
+ this.gridColumn22.FieldName = "rkUser";
+ this.gridColumn22.MinWidth = 22;
+ this.gridColumn22.Name = "gridColumn22";
+ this.gridColumn22.Visible = true;
+ this.gridColumn22.VisibleIndex = 9;
+ this.gridColumn22.Width = 82;
+ //
+ // gridColumn23
+ //
+ this.gridColumn23.Caption = "鍏ュ簱鏃ユ湡";
+ this.gridColumn23.FieldName = "rkDate";
+ this.gridColumn23.MinWidth = 22;
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 10;
+ this.gridColumn23.Width = 82;
+ //
+ // gridColumn24
+ //
+ this.gridColumn24.Caption = "鍏ュ簱浣�";
+ this.gridColumn24.FieldName = "rkPositon";
+ this.gridColumn24.MinWidth = 22;
+ this.gridColumn24.Name = "gridColumn24";
+ this.gridColumn24.Visible = true;
+ this.gridColumn24.VisibleIndex = 11;
+ this.gridColumn24.Width = 82;
+ //
+ // gridColumn32
+ //
+ this.gridColumn32.Caption = "鍏ュ簱绫诲瀷";
+ this.gridColumn32.FieldName = "cgrkType";
+ this.gridColumn32.Name = "gridColumn32";
+ this.gridColumn32.Visible = true;
+ this.gridColumn32.VisibleIndex = 12;
+ //
+ // xtraTabPage3
+ //
+ this.xtraTabPage3.Controls.Add(this.splitContainerControl1);
+ this.xtraTabPage3.Name = "xtraTabPage3";
+ this.xtraTabPage3.Size = new System.Drawing.Size(1174, 297);
+ this.xtraTabPage3.Text = "鍚堝苟鏄庣粏";
+ //
+ // repositoryItemButtonEdit1
+ //
+ this.repositoryItemButtonEdit1.AutoHeight = false;
+ this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ //
+ // repositoryItemButtonEdit2
+ //
+ this.repositoryItemButtonEdit2.AutoHeight = false;
+ this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
+ //
+ // repositoryItemComboBox1
+ //
+ this.repositoryItemComboBox1.AutoHeight = false;
+ this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
//
// gvMx1
//
@@ -1645,13 +1891,6 @@
this.gridColumn28.VisibleIndex = 16;
this.gridColumn28.Width = 66;
//
- // repositoryItemComboBox1
- //
- this.repositoryItemComboBox1.AutoHeight = false;
- this.repositoryItemComboBox1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemComboBox1.Name = "repositoryItemComboBox1";
- //
// gridColumn29
//
this.gridColumn29.Caption = "浠撳簱缂栫爜";
@@ -1676,213 +1915,345 @@
this.gridColumn31.Visible = true;
this.gridColumn31.VisibleIndex = 15;
//
- // repositoryItemButtonEdit1
+ // gcMx1
//
- this.repositoryItemButtonEdit1.AutoHeight = false;
- this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ this.gcMx1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx1.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMx1.Location = new System.Drawing.Point(0, 0);
+ this.gcMx1.MainView = this.gvMx1;
+ this.gcMx1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMx1.Name = "gcMx1";
+ this.gcMx1.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit1,
+ this.repositoryItemButtonEdit2,
+ this.repositoryItemComboBox1});
+ this.gcMx1.Size = new System.Drawing.Size(1174, 172);
+ this.gcMx1.TabIndex = 1;
+ this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx1});
+ //
+ // splitContainerControl1
+ //
+ this.splitContainerControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.splitContainerControl1.Horizontal = false;
+ this.splitContainerControl1.Location = new System.Drawing.Point(0, 0);
+ this.splitContainerControl1.Name = "splitContainerControl1";
+ //
+ // splitContainerControl1.Panel1
+ //
+ this.splitContainerControl1.Panel1.Text = "Panel1";
+ //
+ // splitContainerControl1.Panel2
+ //
+ this.splitContainerControl1.Panel2.Controls.Add(this.gcMx3);
+ this.splitContainerControl1.Panel2.Text = "Panel2";
+ this.splitContainerControl1.Size = new System.Drawing.Size(1174, 297);
+ this.splitContainerControl1.TabIndex = 0;
+ //
+ // gcMx3
+ //
+ this.gcMx3.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMx3.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMx3.Location = new System.Drawing.Point(0, 0);
+ this.gcMx3.MainView = this.gvMx3;
+ this.gcMx3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMx3.Name = "gcMx3";
+ this.gcMx3.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit3,
+ this.repositoryItemButtonEdit4,
+ this.repositoryItemComboBox2});
+ this.gcMx3.Size = new System.Drawing.Size(1174, 187);
+ this.gcMx3.TabIndex = 2;
+ this.gcMx3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMx3});
+ //
+ // gvMx3
+ //
+ this.gvMx3.Appearance.Row.Options.UseFont = true;
+ this.gvMx3.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn33,
+ this.gridColumn34,
+ this.gridColumn35,
+ this.gridColumn36,
+ this.gridColumn37,
+ this.gridColumn38,
+ this.gridColumn39,
+ this.gridColumn40,
+ this.gridColumn41,
+ this.gridColumn42,
+ this.gridColumn43,
+ this.gridColumn44,
+ this.gridColumn45,
+ this.gridColumn46,
+ this.gridColumn47,
+ this.gridColumn48,
+ this.gridColumn49,
+ this.gridColumn50,
+ this.gridColumn51,
+ this.gridColumn52,
+ this.gridColumn53,
+ this.gridColumn54});
+ this.gvMx3.DetailHeight = 272;
+ this.gvMx3.GridControl = this.gcMx3;
+ this.gvMx3.Name = "gvMx3";
+ this.gvMx3.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+ this.gvMx3.OptionsFilter.AllowFilterEditor = false;
+ this.gvMx3.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMx3.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMx3.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn33
+ //
+ this.gridColumn33.Caption = "abtGuid涓嶈兘鍒犻櫎";
+ this.gridColumn33.FieldName = "aboutGuid";
+ this.gridColumn33.MinWidth = 44;
+ this.gridColumn33.Name = "gridColumn33";
+ this.gridColumn33.OptionsColumn.ReadOnly = true;
+ this.gridColumn33.Width = 82;
+ //
+ // gridColumn34
+ //
+ this.gridColumn34.AppearanceCell.Options.UseFont = true;
+ this.gridColumn34.Caption = "guid涓嶈兘鍒犻櫎";
+ this.gridColumn34.FieldName = "guid";
+ this.gridColumn34.MinWidth = 61;
+ this.gridColumn34.Name = "gridColumn34";
+ this.gridColumn34.OptionsColumn.ReadOnly = true;
+ this.gridColumn34.Tag = "query_a.guid";
+ this.gridColumn34.Width = 87;
+ //
+ // gridColumn35
+ //
+ this.gridColumn35.AppearanceCell.Options.UseFont = true;
+ this.gridColumn35.Caption = "鎬ユ枡鏍囪瘑";
+ this.gridColumn35.FieldName = "urgentFlag";
+ this.gridColumn35.MinWidth = 10;
+ this.gridColumn35.Name = "gridColumn35";
+ this.gridColumn35.Tag = "query_a.urgent_flag";
+ this.gridColumn35.Visible = true;
+ this.gridColumn35.VisibleIndex = 0;
+ this.gridColumn35.Width = 10;
+ //
+ // gridColumn36
+ //
+ this.gridColumn36.AppearanceCell.Options.UseFont = true;
+ this.gridColumn36.Caption = "ERP閲囪喘鍗曞彿";
+ this.gridColumn36.FieldName = "ebeln";
+ this.gridColumn36.MinWidth = 44;
+ this.gridColumn36.Name = "gridColumn36";
+ this.gridColumn36.OptionsColumn.ReadOnly = true;
+ this.gridColumn36.Tag = "query_a.ebeln";
+ this.gridColumn36.Visible = true;
+ this.gridColumn36.VisibleIndex = 1;
+ this.gridColumn36.Width = 92;
+ //
+ // gridColumn37
+ //
+ this.gridColumn37.Caption = "鐗╂枡缂栧彿";
+ this.gridColumn37.FieldName = "itemNo";
+ this.gridColumn37.MinWidth = 44;
+ this.gridColumn37.Name = "gridColumn37";
+ this.gridColumn37.OptionsColumn.ReadOnly = true;
+ this.gridColumn37.Visible = true;
+ this.gridColumn37.VisibleIndex = 2;
+ this.gridColumn37.Width = 77;
+ //
+ // gridColumn38
+ //
+ this.gridColumn38.AppearanceCell.Options.UseFont = true;
+ this.gridColumn38.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn38.FieldName = "itemName";
+ this.gridColumn38.MinWidth = 44;
+ this.gridColumn38.Name = "gridColumn38";
+ this.gridColumn38.OptionsColumn.ReadOnly = true;
+ this.gridColumn38.Tag = "query_a.board_style";
+ this.gridColumn38.Visible = true;
+ this.gridColumn38.VisibleIndex = 3;
+ this.gridColumn38.Width = 139;
+ //
+ // gridColumn39
+ //
+ this.gridColumn39.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn39.FieldName = "itemModel";
+ this.gridColumn39.MinWidth = 44;
+ this.gridColumn39.Name = "gridColumn39";
+ this.gridColumn39.Visible = true;
+ this.gridColumn39.VisibleIndex = 4;
+ this.gridColumn39.Width = 95;
+ //
+ // gridColumn40
+ //
+ this.gridColumn40.Caption = "鏈鏀惰揣鏁伴噺";
+ this.gridColumn40.FieldName = "quantity";
+ this.gridColumn40.MinWidth = 44;
+ this.gridColumn40.Name = "gridColumn40";
+ this.gridColumn40.Visible = true;
+ this.gridColumn40.VisibleIndex = 5;
+ this.gridColumn40.Width = 73;
+ //
+ // gridColumn41
+ //
+ this.gridColumn41.AppearanceCell.Options.UseFont = true;
+ this.gridColumn41.Caption = "宸插叆搴撴暟閲�";
+ this.gridColumn41.FieldName = "okRkqty";
+ this.gridColumn41.MinWidth = 44;
+ this.gridColumn41.Name = "gridColumn41";
+ this.gridColumn41.OptionsColumn.ReadOnly = true;
+ this.gridColumn41.Tag = "query_a.ok_rkqty";
+ this.gridColumn41.Visible = true;
+ this.gridColumn41.VisibleIndex = 6;
+ this.gridColumn41.Width = 77;
+ //
+ // gridColumn42
+ //
+ this.gridColumn42.AppearanceCell.Options.UseFont = true;
+ this.gridColumn42.Caption = "宸叉墦鍗版暟閲�";
+ this.gridColumn42.FieldName = "yQty";
+ this.gridColumn42.MinWidth = 44;
+ this.gridColumn42.Name = "gridColumn42";
+ this.gridColumn42.OptionsColumn.ReadOnly = true;
+ this.gridColumn42.Tag = "query_a.ebeln_qty";
+ this.gridColumn42.Visible = true;
+ this.gridColumn42.VisibleIndex = 7;
+ this.gridColumn42.Width = 77;
+ //
+ // gridColumn43
+ //
+ this.gridColumn43.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn43.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn43.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn43.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn43.Caption = "鍙墦鍗版�婚噺";
+ this.gridColumn43.FieldName = "kQty";
+ this.gridColumn43.MinWidth = 44;
+ this.gridColumn43.Name = "gridColumn43";
+ this.gridColumn43.Visible = true;
+ this.gridColumn43.VisibleIndex = 8;
+ this.gridColumn43.Width = 73;
+ //
+ // gridColumn44
+ //
+ this.gridColumn44.Caption = "鐗╂枡鍗曚綅";
+ this.gridColumn44.FieldName = "wnDw";
+ this.gridColumn44.MinWidth = 44;
+ this.gridColumn44.Name = "gridColumn44";
+ this.gridColumn44.OptionsColumn.ReadOnly = true;
+ this.gridColumn44.Width = 139;
+ //
+ // gridColumn45
+ //
+ this.gridColumn45.Caption = "閲囪喘鍗曚綅";
+ this.gridColumn45.FieldName = "cgUnit";
+ this.gridColumn45.MinWidth = 44;
+ this.gridColumn45.Name = "gridColumn45";
+ this.gridColumn45.OptionsColumn.ReadOnly = true;
+ this.gridColumn45.Visible = true;
+ this.gridColumn45.VisibleIndex = 9;
+ this.gridColumn45.Width = 73;
+ //
+ // gridColumn46
+ //
+ this.gridColumn46.Caption = "搴撳瓨鍗曚綅";
+ this.gridColumn46.FieldName = "kcUnit";
+ this.gridColumn46.MinWidth = 44;
+ this.gridColumn46.Name = "gridColumn46";
+ this.gridColumn46.OptionsColumn.ReadOnly = true;
+ this.gridColumn46.Width = 73;
+ //
+ // gridColumn47
+ //
+ this.gridColumn47.Caption = "妫�楠岀姸鎬�";
+ this.gridColumn47.FieldName = "jyzt";
+ this.gridColumn47.MinWidth = 44;
+ this.gridColumn47.Name = "gridColumn47";
+ this.gridColumn47.Visible = true;
+ this.gridColumn47.VisibleIndex = 10;
+ this.gridColumn47.Width = 73;
+ //
+ // gridColumn48
+ //
+ this.gridColumn48.Caption = "妫�楠岀粨鏋�";
+ this.gridColumn48.FieldName = "jyjg";
+ this.gridColumn48.MinWidth = 44;
+ this.gridColumn48.Name = "gridColumn48";
+ this.gridColumn48.Visible = true;
+ this.gridColumn48.VisibleIndex = 11;
+ this.gridColumn48.Width = 80;
+ //
+ // gridColumn49
+ //
+ this.gridColumn49.Caption = "澶勭悊鎰忚";
+ this.gridColumn49.FieldName = "clyj";
+ this.gridColumn49.MinWidth = 22;
+ this.gridColumn49.Name = "gridColumn49";
+ this.gridColumn49.Visible = true;
+ this.gridColumn49.VisibleIndex = 12;
+ this.gridColumn49.Width = 82;
+ //
+ // gridColumn50
+ //
+ this.gridColumn50.Caption = "榛樿姣忓紶鏉＄爜鏁伴噺";
+ this.gridColumn50.FieldName = "mrtmsl";
+ this.gridColumn50.MinWidth = 22;
+ this.gridColumn50.Name = "gridColumn50";
+ this.gridColumn50.Width = 82;
+ //
+ // gridColumn51
+ //
+ this.gridColumn51.Caption = "鍏ュ簱绫诲瀷";
+ this.gridColumn51.ColumnEdit = this.repositoryItemComboBox2;
+ this.gridColumn51.FieldName = "rkType";
+ this.gridColumn51.Fixed = DevExpress.XtraGrid.Columns.FixedStyle.Right;
+ this.gridColumn51.Name = "gridColumn51";
+ this.gridColumn51.OptionsColumn.ReadOnly = true;
+ this.gridColumn51.Visible = true;
+ this.gridColumn51.VisibleIndex = 16;
+ this.gridColumn51.Width = 66;
+ //
+ // repositoryItemComboBox2
+ //
+ this.repositoryItemComboBox2.AutoHeight = false;
+ this.repositoryItemComboBox2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
+ //
+ // gridColumn52
+ //
+ this.gridColumn52.Caption = "浠撳簱缂栫爜";
+ this.gridColumn52.FieldName = "depotCode";
+ this.gridColumn52.Name = "gridColumn52";
+ this.gridColumn52.Visible = true;
+ this.gridColumn52.VisibleIndex = 13;
+ //
+ // gridColumn53
+ //
+ this.gridColumn53.Caption = "浠撳簱鍚嶇О";
+ this.gridColumn53.FieldName = "depotName";
+ this.gridColumn53.Name = "gridColumn53";
+ this.gridColumn53.Visible = true;
+ this.gridColumn53.VisibleIndex = 14;
+ //
+ // gridColumn54
+ //
+ this.gridColumn54.Caption = "浠撶鍛�";
+ this.gridColumn54.FieldName = "staffName";
+ this.gridColumn54.Name = "gridColumn54";
+ this.gridColumn54.Visible = true;
+ this.gridColumn54.VisibleIndex = 15;
+ //
+ // repositoryItemButtonEdit3
+ //
+ this.repositoryItemButtonEdit3.AutoHeight = false;
+ this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()});
- this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
+ this.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
//
- // repositoryItemButtonEdit2
+ // repositoryItemButtonEdit4
//
- this.repositoryItemButtonEdit2.AutoHeight = false;
- this.repositoryItemButtonEdit2.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ this.repositoryItemButtonEdit4.AutoHeight = false;
+ this.repositoryItemButtonEdit4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()});
- this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
- //
- // tabMxPage2
- //
- this.tabMxPage2.Controls.Add(this.gcMx2);
- this.tabMxPage2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.tabMxPage2.Name = "tabMxPage2";
- this.tabMxPage2.Size = new System.Drawing.Size(1174, 297);
- this.tabMxPage2.Text = "宸叉墦鏉＄爜鏄庣粏";
- //
- // gcMx2
- //
- this.gcMx2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMx2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.gcMx2.Location = new System.Drawing.Point(0, 0);
- this.gcMx2.MainView = this.gvMx2;
- this.gcMx2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.gcMx2.Name = "gcMx2";
- this.gcMx2.Size = new System.Drawing.Size(1174, 297);
- this.gcMx2.TabIndex = 0;
- this.gcMx2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMx2});
- //
- // gvMx2
- //
- this.gvMx2.Appearance.HeaderPanel.Options.UseTextOptions = true;
- this.gvMx2.Appearance.HeaderPanel.TextOptions.WordWrap = DevExpress.Utils.WordWrap.Wrap;
- this.gvMx2.Appearance.Row.Options.UseFont = true;
- this.gvMx2.ColumnPanelRowHeight = 39;
- this.gvMx2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gvMx2guid,
- this.gridColumn16,
- this.gvMx2itemBarcode,
- this.gvMx2itemNo,
- this.gridColumn18,
- this.gridColumn14,
- this.gvMx2oldqty,
- this.gridColumn21,
- this.gridColumn20,
- this.gridColumn17,
- this.gridColumn22,
- this.gridColumn23,
- this.gridColumn24,
- this.gridColumn32});
- this.gvMx2.DetailHeight = 272;
- this.gvMx2.GridControl = this.gcMx2;
- this.gvMx2.Name = "gvMx2";
- this.gvMx2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
- this.gvMx2.OptionsFind.ShowSearchNavButtons = false;
- this.gvMx2.OptionsView.ShowGroupPanel = false;
- //
- // gvMx2guid
- //
- this.gvMx2guid.AppearanceCell.Options.UseFont = true;
- this.gvMx2guid.Caption = "guid ";
- this.gvMx2guid.FieldName = "guid";
- this.gvMx2guid.MinWidth = 44;
- this.gvMx2guid.Name = "gvMx2guid";
- this.gvMx2guid.Tag = "query_a.guid";
- this.gvMx2guid.Width = 82;
- //
- // gridColumn16
- //
- this.gridColumn16.Caption = "鏄惁鍏ュ簱";
- this.gridColumn16.FieldName = "isRk";
- this.gridColumn16.MaxWidth = 44;
- this.gridColumn16.MinWidth = 44;
- this.gridColumn16.Name = "gridColumn16";
- this.gridColumn16.Visible = true;
- this.gridColumn16.VisibleIndex = 0;
- this.gridColumn16.Width = 44;
- //
- // gvMx2itemBarcode
- //
- this.gvMx2itemBarcode.AppearanceCell.Options.UseFont = true;
- this.gvMx2itemBarcode.Caption = "鐗╂枡鏉＄爜";
- this.gvMx2itemBarcode.FieldName = "itemBarcode";
- this.gvMx2itemBarcode.MinWidth = 44;
- this.gvMx2itemBarcode.Name = "gvMx2itemBarcode";
- this.gvMx2itemBarcode.Tag = "query_a.ITEM_BARCODE";
- this.gvMx2itemBarcode.Visible = true;
- this.gvMx2itemBarcode.VisibleIndex = 1;
- this.gvMx2itemBarcode.Width = 262;
- //
- // gvMx2itemNo
- //
- this.gvMx2itemNo.AppearanceCell.Options.UseFont = true;
- this.gvMx2itemNo.Caption = "鐗╂枡缂栫爜 ";
- this.gvMx2itemNo.FieldName = "itemNo";
- this.gvMx2itemNo.MinWidth = 44;
- this.gvMx2itemNo.Name = "gvMx2itemNo";
- this.gvMx2itemNo.Tag = "query_a.ITEM_NO";
- this.gvMx2itemNo.Visible = true;
- this.gvMx2itemNo.VisibleIndex = 2;
- this.gvMx2itemNo.Width = 87;
- //
- // gridColumn18
- //
- this.gridColumn18.Caption = "鐗╂枡鍚嶇О";
- this.gridColumn18.FieldName = "itemName";
- this.gridColumn18.MinWidth = 44;
- this.gridColumn18.Name = "gridColumn18";
- this.gridColumn18.Visible = true;
- this.gridColumn18.VisibleIndex = 3;
- this.gridColumn18.Width = 131;
- //
- // gridColumn14
- //
- this.gridColumn14.Caption = "瑙勬牸鍨嬪彿";
- this.gridColumn14.FieldName = "itemModel";
- this.gridColumn14.MinWidth = 44;
- this.gridColumn14.Name = "gridColumn14";
- this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 4;
- this.gridColumn14.Width = 131;
- //
- // gvMx2oldqty
- //
- this.gvMx2oldqty.AppearanceCell.Options.UseFont = true;
- this.gvMx2oldqty.Caption = "鏁伴噺";
- this.gvMx2oldqty.FieldName = "quantity";
- this.gvMx2oldqty.MinWidth = 44;
- this.gvMx2oldqty.Name = "gvMx2oldqty";
- this.gvMx2oldqty.Tag = "query_a.OLDQTY";
- this.gvMx2oldqty.Visible = true;
- this.gvMx2oldqty.VisibleIndex = 5;
- this.gvMx2oldqty.Width = 82;
- //
- // gridColumn21
- //
- this.gridColumn21.Caption = "鍗曚綅";
- this.gridColumn21.FieldName = "dwName";
- this.gridColumn21.MinWidth = 22;
- this.gridColumn21.Name = "gridColumn21";
- this.gridColumn21.Visible = true;
- this.gridColumn21.VisibleIndex = 6;
- this.gridColumn21.Width = 82;
- //
- // gridColumn20
- //
- this.gridColumn20.Caption = "鎵撶爜浜�";
- this.gridColumn20.FieldName = "createBy";
- this.gridColumn20.MinWidth = 22;
- this.gridColumn20.Name = "gridColumn20";
- this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 7;
- this.gridColumn20.Width = 82;
- //
- // gridColumn17
- //
- this.gridColumn17.Caption = "鎵撶爜鏃ユ湡";
- this.gridColumn17.FieldName = "createDate";
- this.gridColumn17.MinWidth = 10;
- this.gridColumn17.Name = "gridColumn17";
- this.gridColumn17.Visible = true;
- this.gridColumn17.VisibleIndex = 8;
- this.gridColumn17.Width = 157;
- //
- // gridColumn22
- //
- this.gridColumn22.Caption = "鍏ュ簱浜�";
- this.gridColumn22.FieldName = "rkUser";
- this.gridColumn22.MinWidth = 22;
- this.gridColumn22.Name = "gridColumn22";
- this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 9;
- this.gridColumn22.Width = 82;
- //
- // gridColumn23
- //
- this.gridColumn23.Caption = "鍏ュ簱鏃ユ湡";
- this.gridColumn23.FieldName = "rkDate";
- this.gridColumn23.MinWidth = 22;
- this.gridColumn23.Name = "gridColumn23";
- this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 10;
- this.gridColumn23.Width = 82;
- //
- // gridColumn24
- //
- this.gridColumn24.Caption = "鍏ュ簱浣�";
- this.gridColumn24.FieldName = "rkPositon";
- this.gridColumn24.MinWidth = 22;
- this.gridColumn24.Name = "gridColumn24";
- this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 11;
- this.gridColumn24.Width = 82;
- //
- // gridColumn32
- //
- this.gridColumn32.Caption = "鍏ュ簱绫诲瀷";
- this.gridColumn32.FieldName = "cgrkType";
- this.gridColumn32.Name = "gridColumn32";
- this.gridColumn32.Visible = true;
- this.gridColumn32.VisibleIndex = 12;
+ this.repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4";
//
// Frm_ArrivalBarcode
//
@@ -1977,14 +2348,25 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
+ this.xtraTabPage3.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel2)).EndInit();
+ this.splitContainerControl1.Panel2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1)).EndInit();
+ this.splitContainerControl1.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit();
this.ResumeLayout(false);
}
@@ -2036,24 +2418,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
private DevExpress.XtraTab.XtraTabControl tabMx;
private DevExpress.XtraTab.XtraTabPage tabMxPage1;
- private DevExpress.XtraGrid.GridControl gcMx1;
- private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
- private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
- private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
private DevExpress.XtraEditors.TextEdit txt_iCount_1;
private DevExpress.XtraEditors.TextEdit txt_psnQty_1;
private UserControl.UcBtnPrint ucBtnPrint1;
@@ -2088,7 +2452,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn26;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn11;
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;
@@ -2110,14 +2473,62 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
+ private DevExpress.XtraTab.XtraTabPage xtraTabPage3;
+ private DevExpress.XtraGrid.GridControl gcMx1;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx1;
+ private DevExpress.XtraGrid.Columns.GridColumn gvAbtGuid;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1guid;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1urgentFlag;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebeln;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1boardStyle;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn6;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn8;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1okRkqty;
+ private DevExpress.XtraGrid.Columns.GridColumn gvMx1ebelnQty;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn10;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn9;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn7;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn15;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn12;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn27;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn28;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
- private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox1;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn29;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn30;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn31;
- private DevExpress.XtraGrid.Columns.GridColumn gridColumn32;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit1;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit2;
+ private DevExpress.XtraEditors.SplitContainerControl splitContainerControl1;
+ private DevExpress.XtraGrid.GridControl gcMx3;
+ private DevExpress.XtraGrid.Views.Grid.GridView gvMx3;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn33;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn34;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn35;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn36;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn37;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn38;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn39;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn40;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn41;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn42;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn43;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn44;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn45;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn46;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn47;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn48;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn49;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn50;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn51;
+ private DevExpress.XtraEditors.Repository.RepositoryItemComboBox repositoryItemComboBox2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn52;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn53;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn54;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit3;
+ private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit repositoryItemButtonEdit4;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 68bb0e9..24d45a7 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -87,6 +87,7 @@
<Reference Include="DevExpress.Utils.v22.2" />
<Reference Include="DevExpress.Sparkline.v22.2.Core" />
<Reference Include="DevExpress.Utils.v22.2.UI, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a" />
+ <Reference Include="DevExpress.Xpo.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraBars.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraCharts.v22.2, Version=22.2.3.0, Culture=neutral, PublicKeyToken=b88d1754d700e49a, processorArchitecture=MSIL" />
<Reference Include="DevExpress.XtraEditors.v22.2" />
@@ -166,6 +167,7 @@
<Reference Include="System.Runtime.Serialization" />
<Reference Include="System.Runtime.Serialization.Formatters.Soap" />
<Reference Include="System.Security" />
+ <Reference Include="System.ServiceModel" />
<Reference Include="System.Text.Encodings.Web, Version=8.0.0.0, Culture=neutral, PublicKeyToken=cc7b13ffcd2ddd51, processorArchitecture=MSIL">
<HintPath>..\packages\System.Text.Encodings.Web.8.0.0\lib\net462\System.Text.Encodings.Web.dll</HintPath>
</Reference>
@@ -181,6 +183,7 @@
</Reference>
<Reference Include="System.Web" />
<Reference Include="System.Web.Extensions" />
+ <Reference Include="System.Web.Services" />
<Reference Include="System.Xaml" />
<Reference Include="System.Xml.Linq" />
<Reference Include="System.Data.DataSetExtensions" />
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
index d873c15..d1a7b73 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.Designer.cs
@@ -70,10 +70,13 @@
this.barLargeButtonItem2 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem3 = new DevExpress.XtraBars.BarLargeButtonItem();
this.barLargeButtonItem4 = new DevExpress.XtraBars.BarLargeButtonItem();
+ this.barButtonItem1 = new DevExpress.XtraBars.BarButtonItem();
this.barDockControlTop = new DevExpress.XtraBars.BarDockControl();
this.barDockControlBottom = new DevExpress.XtraBars.BarDockControl();
this.barDockControlLeft = new DevExpress.XtraBars.BarDockControl();
this.barDockControlRight = new DevExpress.XtraBars.BarDockControl();
+ this.barLargeButtonItem5 = new DevExpress.XtraBars.BarLargeButtonItem();
+
((System.ComponentModel.ISupportInitialize)(this.barManager1)).BeginInit();
this.SuspendLayout();
//
@@ -126,9 +129,11 @@
this.barLargeButtonItem2,
this.barLargeButtonItem3,
this.barLargeButtonItem4,
- this.btnFPiZhun});
+ this.btnFPiZhun,
+ this.barButtonItem1,
+ this.barLargeButtonItem5});
this.barManager1.MainMenu = this.bar2;
- this.barManager1.MaxItemId = 67;
+ this.barManager1.MaxItemId = 69;
//
// bar2
//
@@ -549,48 +554,69 @@
this.barLargeButtonItem4.Tag = "Never";
this.barLargeButtonItem4.Visibility = DevExpress.XtraBars.BarItemVisibility.Never;
//
+ // barButtonItem1
+ //
+ this.barButtonItem1.Caption = "鍚堝苟鎻愪氦";
+ this.barButtonItem1.Id = 67;
+ this.barButtonItem1.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barButtonItem1.ImageOptions.Image")));
+ this.barButtonItem1.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barButtonItem1.ImageOptions.LargeImage")));
+ this.barButtonItem1.Name = "barButtonItem1";
+ //
// barDockControlTop
//
this.barDockControlTop.CausesValidation = false;
this.barDockControlTop.Dock = System.Windows.Forms.DockStyle.Top;
this.barDockControlTop.Location = new System.Drawing.Point(0, 0);
this.barDockControlTop.Manager = this.barManager1;
- this.barDockControlTop.Size = new System.Drawing.Size(1543, 142);
+ this.barDockControlTop.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlTop.Size = new System.Drawing.Size(1350, 114);
//
// barDockControlBottom
//
this.barDockControlBottom.CausesValidation = false;
this.barDockControlBottom.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.barDockControlBottom.Location = new System.Drawing.Point(0, 146);
+ this.barDockControlBottom.Location = new System.Drawing.Point(0, 114);
this.barDockControlBottom.Manager = this.barManager1;
- this.barDockControlBottom.Size = new System.Drawing.Size(1543, 0);
+ this.barDockControlBottom.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlBottom.Size = new System.Drawing.Size(1350, 0);
//
// barDockControlLeft
//
this.barDockControlLeft.CausesValidation = false;
this.barDockControlLeft.Dock = System.Windows.Forms.DockStyle.Left;
- this.barDockControlLeft.Location = new System.Drawing.Point(0, 142);
+ this.barDockControlLeft.Location = new System.Drawing.Point(0, 114);
this.barDockControlLeft.Manager = this.barManager1;
- this.barDockControlLeft.Size = new System.Drawing.Size(0, 4);
+ this.barDockControlLeft.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlLeft.Size = new System.Drawing.Size(0, 0);
//
// barDockControlRight
//
this.barDockControlRight.CausesValidation = false;
this.barDockControlRight.Dock = System.Windows.Forms.DockStyle.Right;
- this.barDockControlRight.Location = new System.Drawing.Point(1543, 142);
+ this.barDockControlRight.Location = new System.Drawing.Point(1350, 114);
this.barDockControlRight.Manager = this.barManager1;
- this.barDockControlRight.Size = new System.Drawing.Size(0, 4);
+ this.barDockControlRight.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.barDockControlRight.Size = new System.Drawing.Size(0, 0);
+ //
+ // barLargeButtonItem5
+ //
+ this.barLargeButtonItem5.Caption = "鍚堝苟鎻愪氦";
+ this.barLargeButtonItem5.Id = 68;
+ this.barLargeButtonItem5.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem5.ImageOptions.Image")));
+ this.barLargeButtonItem5.ImageOptions.LargeImage = ((System.Drawing.Image)(resources.GetObject("barLargeButtonItem5.ImageOptions.LargeImage")));
+ this.barLargeButtonItem5.Name = "barLargeButtonItem5";
//
// UcToolBarMenu
//
- this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleDimensions = new System.Drawing.SizeF(7F, 14F);
this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
this.Controls.Add(this.barDockControlLeft);
this.Controls.Add(this.barDockControlRight);
this.Controls.Add(this.barDockControlBottom);
this.Controls.Add(this.barDockControlTop);
+ this.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.Name = "UcToolBarMenu";
- this.Size = new System.Drawing.Size(1543, 146);
+ this.Size = new System.Drawing.Size(1350, 114);
((System.ComponentModel.ISupportInitialize)(this.barManager1)).EndInit();
this.ResumeLayout(false);
this.PerformLayout();
@@ -641,5 +667,7 @@
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem3;
private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem4;
private DevExpress.XtraBars.BarLargeButtonItem btnFPiZhun;
+ private DevExpress.XtraBars.BarButtonItem barButtonItem1;
+ private DevExpress.XtraBars.BarLargeButtonItem barLargeButtonItem5;
}
}
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
index 1ca35cd..8651965 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.cs
@@ -56,6 +56,7 @@
btnCaiWuFchk.ItemClick += BtnCaiWuFchk_ItemClick;
btnShouHouChk.ItemClick += BtnShouHouChk_ItemClick;
btnShouHouFchk.ItemClick += BtnShouHouFchk_ItemClick;
+ btnHb.ItemClick += BtnHb_ItemClick;
var lst = new List<string>();
foreach (BarItem item in barManager1.Items)
if (item is BarLargeButtonItem largeButtonItem)
@@ -64,7 +65,7 @@
actions = lst;
}
-
+
/// <summary>
/// 鍒濆鍖栨寜閽姸鎬�
/// </summary>
@@ -397,6 +398,7 @@
lst.Add(btnCaiGouFchk.Name);
lst.Add(btnShouHouChk.Name);
lst.Add(btnShouHouFchk.Name);
+ lst.Add(btnHb.Name);
_enabledBtn(lst);
this.currentAction = "esc";
if (btnEscClick != null) btnEscClick(this, e);
@@ -443,6 +445,7 @@
lst.Add(btnCaiGouFchk.Name);
lst.Add(btnShouHouChk.Name);
lst.Add(btnShouHouFchk.Name);
+ lst.Add(btnEdit.Name);
_enabledBtn(lst);
}
@@ -526,6 +529,12 @@
{
if (btnWgClick != null) btnWgClick(this, e);
}
+
+ private void BtnHb_ItemClick(object sender, ItemClickEventArgs e)
+ {
+ if (btnHbClick != null) btnHbClick(this, e);
+ }
+
private void BtnbZhongTai_ItemClick(object sender, ItemClickEventArgs e)
{
@@ -966,6 +975,11 @@
/// </summary>
public event EventHandler btnOutClick;
+ /// <summary>
+ /// 鍚堝苟
+ /// </summary>
+ public event EventHandler btnHbClick;
+
#endregion
#region 鍏叡灞炴��
diff --git a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
index 637ac51..40a1fb5 100644
--- a/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
+++ b/DevApp/Gs.DevApp/UserControl/UcToolBarMenu.resx
@@ -311,4 +311,121 @@
AABJRU5ErkJggg==
</value>
</data>
+ <data name="barButtonItem1.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAACB0RVh0VGl0
+ bGUARWRpdDtCYXJzO1JpYmJvbjtTdGFuZGFyZDswE8PbAAACtUlEQVQ4T2WSW0hUQRjHT97Xy1oIJilt
+ og9GQgQVUQ+hBKWGIvnik/ViglCEBJVhpZTZFhEahuYFV1PUtvJSGaKihqVBpcZulkFZ2Orqqnt293j2
+ 8u+bcXe1GvjNDHPm9//OmTMCAIGab0OHfqCp+wsau6fW6JqCpvMzp4HRwdCjpn18kPYHMI+77gB/tnFj
+ czGoc1G3PrpQq9UxQUGP/woIqH+qpymwKjshubGtEpIDVskOq80Oi82B6vZJJgQzj7u8o4AarZ5X5ZJX
+ dHDJQrJImGle2TLBhJB/AwKr2ib4q65LDohWEgmz1YEVYpnmFY0fmRA6fOug0HtlnzcgiCWzb9wocVEk
+ 0WLHEmG2yhh+94MJkUQAsckToCjXfICTAswWmarZvRLDJMpUXcaCyYyX9SWgyqg7vfMueaHegDv173mA
+ VxRJNMtriBIMRhNGtWX4+iyL9n3D5KMM3DweU+4JCFY/HIPD6eLCIlVcpNG4TOOKhFnDAkbarmNKm8ll
+ afoMBgsToT4S5T5JOtUblW9hd7iwsLLKmV9io4Rfs/MYbC6GrjWdy+JkHvrOJ6BPfRi5ieG1noDQaxUj
+ kO0uzJE4tyRRgA3ff/5Gf2MRPjWlcdk0egq9Z+PRU3IIJxPCNORFeQOK7r2mAKf7N8owzBnRr7mM8bqj
+ XDb0Z6MnPxadhfuRHRfSTM42ws8TEFRQ+mrg0u0hXCTua8ZQ8aAFQ+pjXJ7pysSLPBW0BXuQpVK00v4Y
+ JmdvpT/pDvAhFISSCCd2JBzI0XZUlcIy8wbPc1Voyd+FjOjAx/RMRfhNN6cIJyL81wI2wm4Yte27k8/N
+ jo/0oKHsAoqT4pEaFfiE1mMJf111sqCrThLSN/v+H9B7la4nVdkSkwxl5F6jQhnXGRGsyKG1aCanKX0F
+ RmqYj5AS5iP8AQSCmu1rvrSCAAAAAElFTkSuQmCC
+</value>
+ </data>
+ <data name="barButtonItem1.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ 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
+ /wBqkiSvivDUAgAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="barLargeButtonItem5.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
+ YQUAAAAqdEVYdFRpdGxlAEhlYWRlcjtBZGQgR3JvdXAgSGVhZGVyO0hlYWRlcjtHcm91cMe603EAAAKl
+ SURBVDhPbZLbTxNBFIdXlIvg/2EiJggxKEJ49kET39XEQIQqGkCkoV1AwUqhXAsFKlvwgsUWYowUKhex
+ MVwsoIAkijwIvphws9AW6G5vP2e2XYTgSb49M7tzvjO7swyJCM48azP0zEGkew4cxTyLNsITimkWG5u7
+ MFhzUdyRDpZL/8Aa0hiWS6P1zNHajilIEZQgFwkpitpSsbDGQa6/ANtSPlPYkhISaLhJcWGl9VeIfoll
+ rDoFNL/JQYHuPO7pUmBdzER+4znkaQn1ySNUcEytnxAF6r4lqC3LqLAshfkJt8ePXG2y2Lln/grM85dh
+ +noJxrmLyNGchShQtYwTQRBK0yIUXT8I31FkXIDc+A2//3hQb7oDWVUSsiuT0D6diqyKRGQ9TsRN1Zl3
+ VBBZ1jSKQCAI17YPrh0vnHv4sEN24CfP6A4zHyWgcfwUMsoT0DB2krnx8DStZyJLGz6Ki7hu8uW7Z6A3
+ z6D11Rc0Gz9DZ5xGU+cUVtbdqOmU4XpxPK6y8YPX2HiGQiOKrbXB5w/C4fZi00UR4CDZsZe9ZGc+cRcu
+ t0DfO4YcCkMRBUWaEXh9ATR3TUP3ckrsqH0xCe1zO+qf2VH31I6yJht4bwCFFcOHBNFy9TAEIlh38tig
+ bPHieJ3mLQFrmzzWyNgj+FGgGqRVxw8IClRD4IUAGsLdajvsqGn/hGoDgZuApm0CJXXvscP7kVc2QKti
+ 9wticssHsEvsqw4PgccK6bhCM5mLmRwlHbs9Ptx9YD0soDep/V/HcVQRKvVjUFNaR6GsHhI/5O2SPloV
+ d0CQU9Iv2t27IehCCel/cG57sUWQsb2HBFFZ8tcjt1gLZMowit4QynBWWJBNcrbiLTLum22kJnq/4Agh
+ ihBLiPsPJ/ZB59GEiJAAzF/x46aYvGR5VQAAAABJRU5ErkJggg==
+</value>
+ </data>
+ <data name="barLargeButtonItem5.ImageOptions.LargeImage" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ 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
+</value>
+ </data>
</root>
\ No newline at end of file
--
Gitblit v1.9.3