From 1165b8354b7fc38aa358804b9708f24ad07e20e1 Mon Sep 17 00:00:00 2001
From: kyy <3283105747@qq.com>
Date: 星期四, 28 八月 2025 19:18:26 +0800
Subject: [PATCH] 1、到货他们标签页默认显示
---
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs | 121 ++--
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs | 2
DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs | 1318 ++++++++++++++++++++++++------------------------
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs | 176 +++---
DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs | 2
5 files changed, 817 insertions(+), 802 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
index 23305b1..0e47921 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.Designer.cs
@@ -32,44 +32,44 @@
this.components = new System.ComponentModel.Container();
DevExpress.XtraGrid.Columns.GridColumn gv_remainingReceivedQty;
DevExpress.XtraGrid.Columns.GridColumn gridColumn61;
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions10 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject37 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject38 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject39 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject40 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions11 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject41 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject42 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject43 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject44 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions12 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject45 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject46 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject47 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject48 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = 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.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions7 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject25 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject26 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject27 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject28 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions8 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject29 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject30 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject31 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject32 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions9 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject33 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject34 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject35 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject36 = new DevExpress.Utils.SerializableAppearanceObject();
+ 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.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.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.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.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions5 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject17 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject18 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject19 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject20 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions6 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject21 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject22 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject23 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject24 = new DevExpress.Utils.SerializableAppearanceObject();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -347,7 +347,7 @@
this.xtraTabPage1.Controls.Add(this.split1);
this.xtraTabPage1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage1.Name = "xtraTabPage1";
- this.xtraTabPage1.Size = new System.Drawing.Size(1077, 442);
+ this.xtraTabPage1.Size = new System.Drawing.Size(1447, 654);
this.xtraTabPage1.Text = "鏁版嵁鍒楄〃";
//
// split1
@@ -370,7 +370,7 @@
this.split1.Panel2.Controls.Add(this.xtraTabControl2);
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split1.Size = new System.Drawing.Size(1077, 442);
+ this.split1.Size = new System.Drawing.Size(1447, 654);
this.split1.SplitterPosition = 184;
this.split1.TabIndex = 0;
//
@@ -382,7 +382,7 @@
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1077, 218);
+ this.gcMain1.Size = new System.Drawing.Size(1447, 430);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -605,11 +605,11 @@
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 218);
+ this.pageBar1.Location = new System.Drawing.Point(0, 430);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
- this.pageBar1.Size = new System.Drawing.Size(1077, 30);
+ this.pageBar1.Size = new System.Drawing.Size(1447, 30);
this.pageBar1.TabIndex = 4;
this.pageBar1.TotalPages = 0;
//
@@ -620,7 +620,7 @@
this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabControl2.Name = "xtraTabControl2";
this.xtraTabControl2.SelectedTabPage = this.xtraTabPage3;
- this.xtraTabControl2.Size = new System.Drawing.Size(1077, 184);
+ this.xtraTabControl2.Size = new System.Drawing.Size(1447, 184);
this.xtraTabControl2.TabIndex = 4;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.xtraTabPage3});
@@ -630,7 +630,7 @@
this.xtraTabPage3.Controls.Add(this.gcMxL1);
this.xtraTabPage3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabPage3.Name = "xtraTabPage3";
- this.xtraTabPage3.Size = new System.Drawing.Size(1075, 158);
+ this.xtraTabPage3.Size = new System.Drawing.Size(1445, 158);
this.xtraTabPage3.Text = "鏀舵枡鏄庣粏";
//
// gcMxL1
@@ -645,7 +645,7 @@
this.repositoryItemButtonEdit4,
this.repositoryItemButtonEdit3,
this.repositoryItemButtonEdit5});
- this.gcMxL1.Size = new System.Drawing.Size(1075, 158);
+ this.gcMxL1.Size = new System.Drawing.Size(1445, 158);
this.gcMxL1.TabIndex = 0;
this.gcMxL1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMxL1});
@@ -1020,10 +1020,10 @@
// repositoryItemButtonEdit3
//
this.repositoryItemButtonEdit3.AutoHeight = false;
- editorButtonImageOptions10.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
- editorButtonImageOptions10.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit3.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫�鏂�", -1, true, true, false, editorButtonImageOptions10, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject37, serializableAppearanceObject38, serializableAppearanceObject39, serializableAppearanceObject40, "", 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.repositoryItemButtonEdit3.Name = "repositoryItemButtonEdit3";
this.repositoryItemButtonEdit3.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
@@ -1040,10 +1040,10 @@
// repositoryItemButtonEdit4
//
this.repositoryItemButtonEdit4.AutoHeight = false;
- editorButtonImageOptions11.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions11.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions11, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject41, serializableAppearanceObject42, serializableAppearanceObject43, serializableAppearanceObject44, "", 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.repositoryItemButtonEdit4.Name = "repositoryItemButtonEdit4";
this.repositoryItemButtonEdit4.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
@@ -1098,10 +1098,10 @@
// repositoryItemButtonEdit5
//
this.repositoryItemButtonEdit5.AutoHeight = false;
- editorButtonImageOptions12.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
- editorButtonImageOptions12.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
+ editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit5.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁板綍", -1, true, true, false, editorButtonImageOptions12, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject45, serializableAppearanceObject46, serializableAppearanceObject47, serializableAppearanceObject48, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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)});
this.repositoryItemButtonEdit5.Name = "repositoryItemButtonEdit5";
this.repositoryItemButtonEdit5.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
//
@@ -1466,32 +1466,32 @@
this.layoutControlItem16});
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});
- 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;
- rowDefinition8.Height = 100D;
- rowDefinition8.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;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5,
- rowDefinition6,
- rowDefinition7,
- rowDefinition8});
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4});
this.Root.Size = new System.Drawing.Size(1447, 116);
this.Root.TextVisible = false;
//
@@ -2032,10 +2032,10 @@
// repositoryItemButtonEdit2
//
this.repositoryItemButtonEdit2.AutoHeight = false;
- editorButtonImageOptions7.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
- editorButtonImageOptions7.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.edit_16x16;
+ editorButtonImageOptions4.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, editorButtonImageOptions7, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject25, serializableAppearanceObject26, serializableAppearanceObject27, serializableAppearanceObject28, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ 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)});
this.repositoryItemButtonEdit2.Name = "repositoryItemButtonEdit2";
this.repositoryItemButtonEdit2.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit2.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit2_ButtonClick);
@@ -2053,10 +2053,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions8.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions8.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions5.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, editorButtonImageOptions8, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject29, serializableAppearanceObject30, serializableAppearanceObject31, serializableAppearanceObject32, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", 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);
@@ -2112,10 +2112,10 @@
// rptHistory
//
this.rptHistory.AutoHeight = false;
- editorButtonImageOptions9.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
- editorButtonImageOptions9.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.historyitem_16x16;
+ editorButtonImageOptions6.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptHistory.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁板綍", -1, true, true, false, editorButtonImageOptions9, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject33, serializableAppearanceObject34, serializableAppearanceObject35, serializableAppearanceObject36, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "璁板綍", -1, true, true, false, editorButtonImageOptions6, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject21, serializableAppearanceObject22, serializableAppearanceObject23, serializableAppearanceObject24, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptHistory.Name = "rptHistory";
this.rptHistory.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.rptHistory.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptHistory_ButtonClick);
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
index 3ac8d88..e2507ac 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesInvItemArn.cs
@@ -366,6 +366,7 @@
{
Guid? _guid = UtilityHelper.ToGuid(row["guid"].ToString());
string _msl = row["quantity"].ToString();
+
if (string.IsNullOrEmpty(_msl))
{
MsgHelper.ShowError("鏁伴噺涓嶈兘涓虹┖锛�");
@@ -377,6 +378,7 @@
AboutGuid = Gs.DevApp.ToolBox.UtilityHelper.ToGuid(row["aboutGuid"].ToString()),
ItemId = int.Parse(row["itemId"].ToString()),
Quantity = decimal.Parse(row["quantity"].ToString()),
+
UrgentFlag = Gs.DevApp.ToolBox.UtilityHelper.ToBit(row["urgentFlag"].ToString()),
Remark = row["memo"].ToString(),
});
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
index 4b60202..1bd0594 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.Designer.cs
@@ -38,16 +38,6 @@
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.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
@@ -58,6 +48,16 @@
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 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -83,6 +83,30 @@
this.gridColumn106 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabControl2 = new DevExpress.XtraTab.XtraTabControl();
+ this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
+ this.gcMxL2 = new DevExpress.XtraGrid.GridControl();
+ this.gvMxL2 = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn88 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn89 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn90 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn91 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn92 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn93 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn94 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn95 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn96 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn97 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn98 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn100 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn101 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn103 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn104 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.repositoryItemButtonEdit7 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.repositoryItemButtonEdit8 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
+ this.repositoryItemComboBox4 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.xtraTabPage4 = new DevExpress.XtraTab.XtraTabPage();
this.gcMxL1 = new DevExpress.XtraGrid.GridControl();
this.gvMxL1 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -111,30 +135,6 @@
this.gridColumn72 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemButtonEdit5 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.repositoryItemButtonEdit6 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.xtraTabPage5 = new DevExpress.XtraTab.XtraTabPage();
- this.gcMxL2 = new DevExpress.XtraGrid.GridControl();
- this.gvMxL2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn88 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn89 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn90 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn91 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn92 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn93 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn94 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn95 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn96 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn97 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn98 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn99 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn100 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn101 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn102 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn103 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn104 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn105 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.repositoryItemButtonEdit7 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.repositoryItemButtonEdit8 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
- this.repositoryItemComboBox4 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
this.xtraTabPage6 = new DevExpress.XtraTab.XtraTabPage();
this.gcMxL3 = new DevExpress.XtraGrid.GridControl();
this.gvMxL3 = new DevExpress.XtraGrid.Views.Grid.GridView();
@@ -242,27 +242,10 @@
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.gridColumn32 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gv_hbdy = new DevExpress.XtraGrid.Columns.GridColumn();
this.xtraTabPage3 = new DevExpress.XtraTab.XtraTabPage();
this.splitContainerControl1 = new DevExpress.XtraEditors.SplitContainerControl();
this.lay99 = new DevExpress.XtraLayout.LayoutControl();
+ this.ucBtnPrintOne1 = new Gs.DevApp.UserControl.UcBtnPrintOne();
this.layoutControl2 = new DevExpress.XtraLayout.LayoutControl();
this.txt_iCount_2 = new DevExpress.XtraEditors.TextEdit();
this.txt_yuliang_2 = new DevExpress.XtraEditors.TextEdit();
@@ -291,6 +274,7 @@
this.layoutControlItem38 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem39 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
this.gcMx3 = new DevExpress.XtraGrid.GridControl();
this.gvMx3 = new DevExpress.XtraGrid.Views.Grid.GridView();
this.gridColumn33 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -314,10 +298,26 @@
this.repositoryItemButtonEdit3 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.repositoryItemButtonEdit4 = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.repositoryItemComboBox2 = new DevExpress.XtraEditors.Repository.RepositoryItemComboBox();
+ 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.gv_hbdy = new DevExpress.XtraGrid.Columns.GridColumn();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
this.behaviorManager1 = new DevExpress.Utils.Behaviors.BehaviorManager(this.components);
- this.ucBtnPrintOne1 = new Gs.DevApp.UserControl.UcBtnPrintOne();
- this.layoutControlItem40 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -331,18 +331,18 @@
((System.ComponentModel.ISupportInitialize)(this.gridView1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).BeginInit();
this.xtraTabControl2.SuspendLayout();
- this.xtraTabPage4.SuspendLayout();
- ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMxL1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit5)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit6)).BeginInit();
this.xtraTabPage5.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMxL2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMxL2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit7)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit8)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).BeginInit();
+ this.xtraTabPage4.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMxL1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit5)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit6)).BeginInit();
this.xtraTabPage6.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMxL3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMxL3)).BeginInit();
@@ -424,9 +424,6 @@
((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.splitContainerControl1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitContainerControl1.Panel1)).BeginInit();
@@ -464,13 +461,16 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).BeginInit();
+ this.tabMxPage2.SuspendLayout();
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -532,7 +532,7 @@
this.split1.Panel2.Text = "Panel2";
this.split1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split1.Size = new System.Drawing.Size(1176, 669);
- this.split1.SplitterPosition = 377;
+ this.split1.SplitterPosition = 416;
this.split1.TabIndex = 0;
//
// gcMain1
@@ -543,7 +543,7 @@
this.gcMain1.MainView = this.gridView1;
this.gcMain1.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMain1.Name = "gcMain1";
- this.gcMain1.Size = new System.Drawing.Size(1176, 252);
+ this.gcMain1.Size = new System.Drawing.Size(1176, 213);
this.gcMain1.TabIndex = 2;
this.gcMain1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gridView1});
@@ -787,7 +787,7 @@
//
this.pageBar1.CurrentPage = 1;
this.pageBar1.Dock = System.Windows.Forms.DockStyle.Bottom;
- this.pageBar1.Location = new System.Drawing.Point(0, 252);
+ this.pageBar1.Location = new System.Drawing.Point(0, 213);
this.pageBar1.Margin = new System.Windows.Forms.Padding(3, 4, 3, 4);
this.pageBar1.Name = "pageBar1";
this.pageBar1.RecordCount = 0;
@@ -801,19 +801,279 @@
this.xtraTabControl2.Location = new System.Drawing.Point(0, 0);
this.xtraTabControl2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.xtraTabControl2.Name = "xtraTabControl2";
- this.xtraTabControl2.SelectedTabPage = this.xtraTabPage4;
- this.xtraTabControl2.Size = new System.Drawing.Size(1176, 377);
+ this.xtraTabControl2.SelectedTabPage = this.xtraTabPage5;
+ this.xtraTabControl2.Size = new System.Drawing.Size(1176, 416);
this.xtraTabControl2.TabIndex = 4;
this.xtraTabControl2.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
- this.xtraTabPage4,
this.xtraTabPage5,
+ this.xtraTabPage4,
this.xtraTabPage6});
+ //
+ // xtraTabPage5
+ //
+ this.xtraTabPage5.Controls.Add(this.gcMxL2);
+ this.xtraTabPage5.Name = "xtraTabPage5";
+ this.xtraTabPage5.Size = new System.Drawing.Size(1174, 390);
+ this.xtraTabPage5.Text = "鍚堝苟鏄庣粏";
+ //
+ // gcMxL2
+ //
+ this.gcMxL2.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.gcMxL2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMxL2.Location = new System.Drawing.Point(0, 0);
+ this.gcMxL2.MainView = this.gvMxL2;
+ this.gcMxL2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
+ this.gcMxL2.Name = "gcMxL2";
+ this.gcMxL2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
+ this.repositoryItemButtonEdit7,
+ this.repositoryItemButtonEdit8,
+ this.repositoryItemComboBox4});
+ this.gcMxL2.Size = new System.Drawing.Size(1174, 390);
+ this.gcMxL2.TabIndex = 3;
+ this.gcMxL2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
+ this.gvMxL2});
+ //
+ // gvMxL2
+ //
+ this.gvMxL2.Appearance.Row.Options.UseFont = true;
+ this.gvMxL2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn88,
+ this.gridColumn89,
+ this.gridColumn90,
+ this.gridColumn91,
+ this.gridColumn92,
+ this.gridColumn93,
+ this.gridColumn94,
+ this.gridColumn95,
+ this.gridColumn96,
+ this.gridColumn97,
+ this.gridColumn98,
+ this.gridColumn99,
+ this.gridColumn100,
+ this.gridColumn101,
+ this.gridColumn102,
+ this.gridColumn103,
+ this.gridColumn104,
+ this.gridColumn105});
+ this.gvMxL2.DetailHeight = 272;
+ this.gvMxL2.GridControl = this.gcMxL2;
+ this.gvMxL2.Name = "gvMxL2";
+ this.gvMxL2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
+ this.gvMxL2.OptionsFilter.AllowFilterEditor = false;
+ this.gvMxL2.OptionsFind.ShowSearchNavButtons = false;
+ this.gvMxL2.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
+ this.gvMxL2.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn88
+ //
+ this.gridColumn88.Caption = "abtGuid涓嶈兘鍒犻櫎";
+ this.gridColumn88.FieldName = "aboutGuid";
+ this.gridColumn88.MinWidth = 44;
+ this.gridColumn88.Name = "gridColumn88";
+ this.gridColumn88.OptionsColumn.ReadOnly = true;
+ this.gridColumn88.Width = 82;
+ //
+ // gridColumn89
+ //
+ this.gridColumn89.Caption = "鐗╂枡缂栧彿";
+ this.gridColumn89.FieldName = "itemNo";
+ this.gridColumn89.MinWidth = 44;
+ this.gridColumn89.Name = "gridColumn89";
+ this.gridColumn89.OptionsColumn.ReadOnly = true;
+ this.gridColumn89.Visible = true;
+ this.gridColumn89.VisibleIndex = 0;
+ this.gridColumn89.Width = 77;
+ //
+ // gridColumn90
+ //
+ this.gridColumn90.AppearanceCell.Options.UseFont = true;
+ this.gridColumn90.Caption = "鐗╂枡鍚嶇О";
+ this.gridColumn90.FieldName = "itemName";
+ this.gridColumn90.MinWidth = 44;
+ this.gridColumn90.Name = "gridColumn90";
+ this.gridColumn90.OptionsColumn.ReadOnly = true;
+ this.gridColumn90.Tag = "query_a.board_style";
+ this.gridColumn90.Visible = true;
+ this.gridColumn90.VisibleIndex = 1;
+ this.gridColumn90.Width = 139;
+ //
+ // gridColumn91
+ //
+ this.gridColumn91.Caption = "鐗╂枡瑙勬牸";
+ this.gridColumn91.FieldName = "itemModel";
+ this.gridColumn91.MinWidth = 44;
+ this.gridColumn91.Name = "gridColumn91";
+ this.gridColumn91.Visible = true;
+ this.gridColumn91.VisibleIndex = 2;
+ this.gridColumn91.Width = 95;
+ //
+ // gridColumn92
+ //
+ this.gridColumn92.Caption = "鏈鏀惰揣鏁伴噺";
+ this.gridColumn92.FieldName = "quantity";
+ this.gridColumn92.MinWidth = 44;
+ this.gridColumn92.Name = "gridColumn92";
+ this.gridColumn92.Visible = true;
+ this.gridColumn92.VisibleIndex = 3;
+ this.gridColumn92.Width = 73;
+ //
+ // gridColumn93
+ //
+ this.gridColumn93.AppearanceCell.Options.UseFont = true;
+ this.gridColumn93.Caption = "宸插叆搴撴暟閲�";
+ this.gridColumn93.FieldName = "okRkqty";
+ this.gridColumn93.MinWidth = 44;
+ this.gridColumn93.Name = "gridColumn93";
+ this.gridColumn93.OptionsColumn.ReadOnly = true;
+ this.gridColumn93.Tag = "query_a.ok_rkqty";
+ this.gridColumn93.Visible = true;
+ this.gridColumn93.VisibleIndex = 4;
+ this.gridColumn93.Width = 77;
+ //
+ // gridColumn94
+ //
+ this.gridColumn94.AppearanceCell.Options.UseFont = true;
+ this.gridColumn94.Caption = "宸叉墦鍗版暟閲�";
+ this.gridColumn94.FieldName = "yQty";
+ this.gridColumn94.MinWidth = 44;
+ this.gridColumn94.Name = "gridColumn94";
+ this.gridColumn94.OptionsColumn.ReadOnly = true;
+ this.gridColumn94.Tag = "query_a.ebeln_qty";
+ this.gridColumn94.Visible = true;
+ this.gridColumn94.VisibleIndex = 5;
+ this.gridColumn94.Width = 77;
+ //
+ // gridColumn95
+ //
+ this.gridColumn95.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn95.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn95.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
+ this.gridColumn95.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn95.Caption = "鍙墦鍗版�婚噺";
+ this.gridColumn95.FieldName = "kQty";
+ this.gridColumn95.MinWidth = 44;
+ this.gridColumn95.Name = "gridColumn95";
+ this.gridColumn95.Visible = true;
+ this.gridColumn95.VisibleIndex = 6;
+ this.gridColumn95.Width = 73;
+ //
+ // gridColumn96
+ //
+ this.gridColumn96.Caption = "鐗╂枡鍗曚綅";
+ this.gridColumn96.FieldName = "wnDw";
+ this.gridColumn96.MinWidth = 44;
+ this.gridColumn96.Name = "gridColumn96";
+ this.gridColumn96.OptionsColumn.ReadOnly = true;
+ this.gridColumn96.Width = 139;
+ //
+ // gridColumn97
+ //
+ this.gridColumn97.Caption = "閲囪喘鍗曚綅";
+ this.gridColumn97.FieldName = "cgUnit";
+ this.gridColumn97.MinWidth = 44;
+ this.gridColumn97.Name = "gridColumn97";
+ this.gridColumn97.OptionsColumn.ReadOnly = true;
+ this.gridColumn97.Visible = true;
+ this.gridColumn97.VisibleIndex = 7;
+ this.gridColumn97.Width = 73;
+ //
+ // gridColumn98
+ //
+ this.gridColumn98.Caption = "搴撳瓨鍗曚綅";
+ this.gridColumn98.FieldName = "kcUnit";
+ this.gridColumn98.MinWidth = 44;
+ this.gridColumn98.Name = "gridColumn98";
+ this.gridColumn98.OptionsColumn.ReadOnly = true;
+ this.gridColumn98.Width = 73;
+ //
+ // gridColumn99
+ //
+ this.gridColumn99.Caption = "妫�楠岀姸鎬�";
+ this.gridColumn99.FieldName = "jyzt";
+ this.gridColumn99.MinWidth = 44;
+ this.gridColumn99.Name = "gridColumn99";
+ this.gridColumn99.Visible = true;
+ this.gridColumn99.VisibleIndex = 8;
+ this.gridColumn99.Width = 73;
+ //
+ // gridColumn100
+ //
+ this.gridColumn100.Caption = "妫�楠岀粨鏋�";
+ this.gridColumn100.FieldName = "jyjg";
+ this.gridColumn100.MinWidth = 44;
+ this.gridColumn100.Name = "gridColumn100";
+ this.gridColumn100.Visible = true;
+ this.gridColumn100.VisibleIndex = 9;
+ this.gridColumn100.Width = 80;
+ //
+ // gridColumn101
+ //
+ this.gridColumn101.Caption = "澶勭悊鎰忚";
+ this.gridColumn101.FieldName = "clyj";
+ this.gridColumn101.MinWidth = 22;
+ this.gridColumn101.Name = "gridColumn101";
+ this.gridColumn101.Visible = true;
+ this.gridColumn101.VisibleIndex = 10;
+ this.gridColumn101.Width = 82;
+ //
+ // gridColumn102
+ //
+ this.gridColumn102.Caption = "榛樿姣忓紶鏉＄爜鏁伴噺";
+ this.gridColumn102.FieldName = "mrtmsl";
+ this.gridColumn102.MinWidth = 22;
+ this.gridColumn102.Name = "gridColumn102";
+ this.gridColumn102.Width = 82;
+ //
+ // gridColumn103
+ //
+ this.gridColumn103.Caption = "浠撳簱缂栫爜";
+ this.gridColumn103.FieldName = "depotCode";
+ this.gridColumn103.Name = "gridColumn103";
+ this.gridColumn103.Visible = true;
+ this.gridColumn103.VisibleIndex = 11;
+ //
+ // gridColumn104
+ //
+ this.gridColumn104.Caption = "浠撳簱鍚嶇О";
+ this.gridColumn104.FieldName = "depotName";
+ this.gridColumn104.Name = "gridColumn104";
+ this.gridColumn104.Visible = true;
+ this.gridColumn104.VisibleIndex = 12;
+ //
+ // gridColumn105
+ //
+ this.gridColumn105.Caption = "浠撶鍛�";
+ this.gridColumn105.FieldName = "staffName";
+ this.gridColumn105.Name = "gridColumn105";
+ this.gridColumn105.Visible = true;
+ this.gridColumn105.VisibleIndex = 13;
+ //
+ // repositoryItemButtonEdit7
+ //
+ this.repositoryItemButtonEdit7.AutoHeight = false;
+ this.repositoryItemButtonEdit7.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.repositoryItemButtonEdit7.Name = "repositoryItemButtonEdit7";
+ //
+ // repositoryItemButtonEdit8
+ //
+ this.repositoryItemButtonEdit8.AutoHeight = false;
+ this.repositoryItemButtonEdit8.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton()});
+ this.repositoryItemButtonEdit8.Name = "repositoryItemButtonEdit8";
+ //
+ // repositoryItemComboBox4
+ //
+ this.repositoryItemComboBox4.AutoHeight = false;
+ this.repositoryItemComboBox4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.repositoryItemComboBox4.Name = "repositoryItemComboBox4";
//
// xtraTabPage4
//
this.xtraTabPage4.Controls.Add(this.gcMxL1);
this.xtraTabPage4.Name = "xtraTabPage4";
- this.xtraTabPage4.Size = new System.Drawing.Size(1174, 351);
+ this.xtraTabPage4.Size = new System.Drawing.Size(1174, 390);
this.xtraTabPage4.Text = "鏉ユ枡鏄庣粏";
//
// gcMxL1
@@ -828,7 +1088,7 @@
this.repositoryItemButtonEdit5,
this.repositoryItemButtonEdit6,
this.repositoryItemComboBox3});
- this.gcMxL1.Size = new System.Drawing.Size(1174, 351);
+ this.gcMxL1.Size = new System.Drawing.Size(1174, 390);
this.gcMxL1.TabIndex = 2;
this.gcMxL1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMxL1});
@@ -1124,271 +1384,11 @@
new DevExpress.XtraEditors.Controls.EditorButton()});
this.repositoryItemButtonEdit6.Name = "repositoryItemButtonEdit6";
//
- // xtraTabPage5
- //
- this.xtraTabPage5.Controls.Add(this.gcMxL2);
- this.xtraTabPage5.Name = "xtraTabPage5";
- this.xtraTabPage5.Size = new System.Drawing.Size(1174, 351);
- this.xtraTabPage5.Text = "鍚堝苟鏄庣粏";
- //
- // gcMxL2
- //
- this.gcMxL2.Dock = System.Windows.Forms.DockStyle.Fill;
- this.gcMxL2.EmbeddedNavigator.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.gcMxL2.Location = new System.Drawing.Point(0, 0);
- this.gcMxL2.MainView = this.gvMxL2;
- this.gcMxL2.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
- this.gcMxL2.Name = "gcMxL2";
- this.gcMxL2.RepositoryItems.AddRange(new DevExpress.XtraEditors.Repository.RepositoryItem[] {
- this.repositoryItemButtonEdit7,
- this.repositoryItemButtonEdit8,
- this.repositoryItemComboBox4});
- this.gcMxL2.Size = new System.Drawing.Size(1174, 351);
- this.gcMxL2.TabIndex = 3;
- this.gcMxL2.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
- this.gvMxL2});
- //
- // gvMxL2
- //
- this.gvMxL2.Appearance.Row.Options.UseFont = true;
- this.gvMxL2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn88,
- this.gridColumn89,
- this.gridColumn90,
- this.gridColumn91,
- this.gridColumn92,
- this.gridColumn93,
- this.gridColumn94,
- this.gridColumn95,
- this.gridColumn96,
- this.gridColumn97,
- this.gridColumn98,
- this.gridColumn99,
- this.gridColumn100,
- this.gridColumn101,
- this.gridColumn102,
- this.gridColumn103,
- this.gridColumn104,
- this.gridColumn105});
- this.gvMxL2.DetailHeight = 272;
- this.gvMxL2.GridControl = this.gcMxL2;
- this.gvMxL2.Name = "gvMxL2";
- this.gvMxL2.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.False;
- this.gvMxL2.OptionsFilter.AllowFilterEditor = false;
- this.gvMxL2.OptionsFind.ShowSearchNavButtons = false;
- this.gvMxL2.OptionsView.ColumnHeaderAutoHeight = DevExpress.Utils.DefaultBoolean.True;
- this.gvMxL2.OptionsView.ShowGroupPanel = false;
- //
- // gridColumn88
- //
- this.gridColumn88.Caption = "abtGuid涓嶈兘鍒犻櫎";
- this.gridColumn88.FieldName = "aboutGuid";
- this.gridColumn88.MinWidth = 44;
- this.gridColumn88.Name = "gridColumn88";
- this.gridColumn88.OptionsColumn.ReadOnly = true;
- this.gridColumn88.Width = 82;
- //
- // gridColumn89
- //
- this.gridColumn89.Caption = "鐗╂枡缂栧彿";
- this.gridColumn89.FieldName = "itemNo";
- this.gridColumn89.MinWidth = 44;
- this.gridColumn89.Name = "gridColumn89";
- this.gridColumn89.OptionsColumn.ReadOnly = true;
- this.gridColumn89.Visible = true;
- this.gridColumn89.VisibleIndex = 0;
- this.gridColumn89.Width = 77;
- //
- // gridColumn90
- //
- this.gridColumn90.AppearanceCell.Options.UseFont = true;
- this.gridColumn90.Caption = "鐗╂枡鍚嶇О";
- this.gridColumn90.FieldName = "itemName";
- this.gridColumn90.MinWidth = 44;
- this.gridColumn90.Name = "gridColumn90";
- this.gridColumn90.OptionsColumn.ReadOnly = true;
- this.gridColumn90.Tag = "query_a.board_style";
- this.gridColumn90.Visible = true;
- this.gridColumn90.VisibleIndex = 1;
- this.gridColumn90.Width = 139;
- //
- // gridColumn91
- //
- this.gridColumn91.Caption = "鐗╂枡瑙勬牸";
- this.gridColumn91.FieldName = "itemModel";
- this.gridColumn91.MinWidth = 44;
- this.gridColumn91.Name = "gridColumn91";
- this.gridColumn91.Visible = true;
- this.gridColumn91.VisibleIndex = 2;
- this.gridColumn91.Width = 95;
- //
- // gridColumn92
- //
- this.gridColumn92.Caption = "鏈鏀惰揣鏁伴噺";
- this.gridColumn92.FieldName = "quantity";
- this.gridColumn92.MinWidth = 44;
- this.gridColumn92.Name = "gridColumn92";
- this.gridColumn92.Visible = true;
- this.gridColumn92.VisibleIndex = 3;
- this.gridColumn92.Width = 73;
- //
- // gridColumn93
- //
- this.gridColumn93.AppearanceCell.Options.UseFont = true;
- this.gridColumn93.Caption = "宸插叆搴撴暟閲�";
- this.gridColumn93.FieldName = "okRkqty";
- this.gridColumn93.MinWidth = 44;
- this.gridColumn93.Name = "gridColumn93";
- this.gridColumn93.OptionsColumn.ReadOnly = true;
- this.gridColumn93.Tag = "query_a.ok_rkqty";
- this.gridColumn93.Visible = true;
- this.gridColumn93.VisibleIndex = 4;
- this.gridColumn93.Width = 77;
- //
- // gridColumn94
- //
- this.gridColumn94.AppearanceCell.Options.UseFont = true;
- this.gridColumn94.Caption = "宸叉墦鍗版暟閲�";
- this.gridColumn94.FieldName = "yQty";
- this.gridColumn94.MinWidth = 44;
- this.gridColumn94.Name = "gridColumn94";
- this.gridColumn94.OptionsColumn.ReadOnly = true;
- this.gridColumn94.Tag = "query_a.ebeln_qty";
- this.gridColumn94.Visible = true;
- this.gridColumn94.VisibleIndex = 5;
- this.gridColumn94.Width = 77;
- //
- // gridColumn95
- //
- this.gridColumn95.AppearanceCell.ForeColor = System.Drawing.Color.Blue;
- this.gridColumn95.AppearanceCell.Options.UseForeColor = true;
- this.gridColumn95.AppearanceHeader.ForeColor = System.Drawing.Color.Blue;
- this.gridColumn95.AppearanceHeader.Options.UseForeColor = true;
- this.gridColumn95.Caption = "鍙墦鍗版�婚噺";
- this.gridColumn95.FieldName = "kQty";
- this.gridColumn95.MinWidth = 44;
- this.gridColumn95.Name = "gridColumn95";
- this.gridColumn95.Visible = true;
- this.gridColumn95.VisibleIndex = 6;
- this.gridColumn95.Width = 73;
- //
- // gridColumn96
- //
- this.gridColumn96.Caption = "鐗╂枡鍗曚綅";
- this.gridColumn96.FieldName = "wnDw";
- this.gridColumn96.MinWidth = 44;
- this.gridColumn96.Name = "gridColumn96";
- this.gridColumn96.OptionsColumn.ReadOnly = true;
- this.gridColumn96.Width = 139;
- //
- // gridColumn97
- //
- this.gridColumn97.Caption = "閲囪喘鍗曚綅";
- this.gridColumn97.FieldName = "cgUnit";
- this.gridColumn97.MinWidth = 44;
- this.gridColumn97.Name = "gridColumn97";
- this.gridColumn97.OptionsColumn.ReadOnly = true;
- this.gridColumn97.Visible = true;
- this.gridColumn97.VisibleIndex = 7;
- this.gridColumn97.Width = 73;
- //
- // gridColumn98
- //
- this.gridColumn98.Caption = "搴撳瓨鍗曚綅";
- this.gridColumn98.FieldName = "kcUnit";
- this.gridColumn98.MinWidth = 44;
- this.gridColumn98.Name = "gridColumn98";
- this.gridColumn98.OptionsColumn.ReadOnly = true;
- this.gridColumn98.Width = 73;
- //
- // gridColumn99
- //
- this.gridColumn99.Caption = "妫�楠岀姸鎬�";
- this.gridColumn99.FieldName = "jyzt";
- this.gridColumn99.MinWidth = 44;
- this.gridColumn99.Name = "gridColumn99";
- this.gridColumn99.Visible = true;
- this.gridColumn99.VisibleIndex = 8;
- this.gridColumn99.Width = 73;
- //
- // gridColumn100
- //
- this.gridColumn100.Caption = "妫�楠岀粨鏋�";
- this.gridColumn100.FieldName = "jyjg";
- this.gridColumn100.MinWidth = 44;
- this.gridColumn100.Name = "gridColumn100";
- this.gridColumn100.Visible = true;
- this.gridColumn100.VisibleIndex = 9;
- this.gridColumn100.Width = 80;
- //
- // gridColumn101
- //
- this.gridColumn101.Caption = "澶勭悊鎰忚";
- this.gridColumn101.FieldName = "clyj";
- this.gridColumn101.MinWidth = 22;
- this.gridColumn101.Name = "gridColumn101";
- this.gridColumn101.Visible = true;
- this.gridColumn101.VisibleIndex = 10;
- this.gridColumn101.Width = 82;
- //
- // gridColumn102
- //
- this.gridColumn102.Caption = "榛樿姣忓紶鏉＄爜鏁伴噺";
- this.gridColumn102.FieldName = "mrtmsl";
- this.gridColumn102.MinWidth = 22;
- this.gridColumn102.Name = "gridColumn102";
- this.gridColumn102.Width = 82;
- //
- // gridColumn103
- //
- this.gridColumn103.Caption = "浠撳簱缂栫爜";
- this.gridColumn103.FieldName = "depotCode";
- this.gridColumn103.Name = "gridColumn103";
- this.gridColumn103.Visible = true;
- this.gridColumn103.VisibleIndex = 11;
- //
- // gridColumn104
- //
- this.gridColumn104.Caption = "浠撳簱鍚嶇О";
- this.gridColumn104.FieldName = "depotName";
- this.gridColumn104.Name = "gridColumn104";
- this.gridColumn104.Visible = true;
- this.gridColumn104.VisibleIndex = 12;
- //
- // gridColumn105
- //
- this.gridColumn105.Caption = "浠撶鍛�";
- this.gridColumn105.FieldName = "staffName";
- this.gridColumn105.Name = "gridColumn105";
- this.gridColumn105.Visible = true;
- this.gridColumn105.VisibleIndex = 13;
- //
- // repositoryItemButtonEdit7
- //
- this.repositoryItemButtonEdit7.AutoHeight = false;
- this.repositoryItemButtonEdit7.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton()});
- this.repositoryItemButtonEdit7.Name = "repositoryItemButtonEdit7";
- //
- // repositoryItemButtonEdit8
- //
- this.repositoryItemButtonEdit8.AutoHeight = false;
- this.repositoryItemButtonEdit8.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton()});
- this.repositoryItemButtonEdit8.Name = "repositoryItemButtonEdit8";
- //
- // repositoryItemComboBox4
- //
- this.repositoryItemComboBox4.AutoHeight = false;
- this.repositoryItemComboBox4.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
- this.repositoryItemComboBox4.Name = "repositoryItemComboBox4";
- //
// xtraTabPage6
//
this.xtraTabPage6.Controls.Add(this.gcMxL3);
this.xtraTabPage6.Name = "xtraTabPage6";
- this.xtraTabPage6.Size = new System.Drawing.Size(1174, 351);
+ this.xtraTabPage6.Size = new System.Drawing.Size(1174, 390);
this.xtraTabPage6.Text = "宸叉墦鏉＄爜鏄庣粏";
//
// gcMxL3
@@ -1399,7 +1399,7 @@
this.gcMxL3.MainView = this.gvMxL3;
this.gcMxL3.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.gcMxL3.Name = "gcMxL3";
- this.gcMxL3.Size = new System.Drawing.Size(1174, 351);
+ this.gcMxL3.Size = new System.Drawing.Size(1174, 390);
this.gcMxL3.TabIndex = 1;
this.gcMxL3.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMxL3});
@@ -1965,13 +1965,13 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.tabMx.Name = "tabMx";
- this.tabMx.SelectedTabPage = this.tabMxPage1;
+ this.tabMx.SelectedTabPage = this.xtraTabPage3;
this.tabMx.Size = new System.Drawing.Size(1176, 550);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
+ this.xtraTabPage3,
this.tabMxPage1,
- this.tabMxPage2,
- this.xtraTabPage3});
+ this.tabMxPage2});
//
// tabMxPage1
//
@@ -2000,7 +2000,7 @@
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.split99.Size = new System.Drawing.Size(1174, 524);
- this.split99.SplitterPosition = 144;
+ this.split99.SplitterPosition = 222;
this.split99.TabIndex = 2;
//
// layout99
@@ -2024,7 +2024,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, 144);
+ this.layout99.Size = new System.Drawing.Size(1174, 222);
this.layout99.TabIndex = 0;
this.layout99.Text = "layoutControl1";
//
@@ -2032,11 +2032,11 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(588, 94);
+ this.layoutControl1.Location = new System.Drawing.Point(588, 146);
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(284, 38);
+ this.layoutControl1.Size = new System.Drawing.Size(284, 64);
this.layoutControl1.TabIndex = 477;
this.layoutControl1.Text = "layoutControl1";
//
@@ -2073,19 +2073,19 @@
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;
+ columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11.Width = 100D;
+ columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition12.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6});
- rowDefinition5.Height = 100D;
- rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition11,
+ columnDefinition12});
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition5});
+ rowDefinition9});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(284, 38);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(284, 64);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem26
@@ -2093,7 +2093,7 @@
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(142, 38);
+ this.layoutControlItem26.Size = new System.Drawing.Size(142, 64);
this.layoutControlItem26.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem26.TextSize = new System.Drawing.Size(72, 14);
//
@@ -2103,7 +2103,7 @@
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(142, 38);
+ this.layoutControlItem27.Size = new System.Drawing.Size(142, 64);
this.layoutControlItem27.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem27.TextSize = new System.Drawing.Size(72, 14);
//
@@ -2122,11 +2122,11 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(875, 51);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(875, 77);
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(288, 41);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(288, 67);
this.ucBtnPrint1.TabIndex = 232;
//
// radOut
@@ -2140,13 +2140,13 @@
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(287, 41);
+ this.radOut.Size = new System.Drawing.Size(287, 67);
this.radOut.StyleController = this.layout99;
this.radOut.TabIndex = 476;
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(672, 53);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(672, 79);
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;
@@ -2170,7 +2170,7 @@
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(96, 53);
+ this.txtWlmc.Location = new System.Drawing.Point(96, 79);
this.txtWlmc.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
@@ -2181,7 +2181,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(96, 94);
+ this.txtWlgg.Location = new System.Drawing.Point(96, 146);
this.txtWlgg.Margin = new System.Windows.Forms.Padding(3, 2, 3, 2);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
@@ -2216,7 +2216,7 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(384, 53);
+ this.txt_yQty.Location = new System.Drawing.Point(384, 79);
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;
@@ -2254,30 +2254,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;
+ columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition13.Width = 100D;
+ columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition14.Width = 100D;
+ columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition15.Width = 100D;
+ columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition16.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;
+ columnDefinition13,
+ columnDefinition14,
+ columnDefinition15,
+ columnDefinition16});
+ 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.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition6,
- rowDefinition7,
- rowDefinition8});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1174, 144);
+ rowDefinition10,
+ rowDefinition11,
+ rowDefinition12});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1174, 222);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem15
@@ -2285,28 +2285,28 @@
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(288, 41);
+ this.layoutControlItem15.Size = new System.Drawing.Size(288, 67);
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, 41);
+ this.layoutControlItem16.Location = new System.Drawing.Point(0, 67);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem16.Size = new System.Drawing.Size(288, 41);
+ this.layoutControlItem16.Size = new System.Drawing.Size(288, 67);
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, 82);
+ this.layoutControlItem17.Location = new System.Drawing.Point(0, 134);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem17.Size = new System.Drawing.Size(576, 42);
+ this.layoutControlItem17.Size = new System.Drawing.Size(576, 68);
this.layoutControlItem17.Text = "鐗╂枡瑙勬牸123";
this.layoutControlItem17.TextSize = new System.Drawing.Size(72, 14);
//
@@ -2316,18 +2316,18 @@
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(288, 41);
+ this.layoutControlItem18.Size = new System.Drawing.Size(288, 67);
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(288, 41);
+ this.layoutControlItem19.Location = new System.Drawing.Point(288, 67);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem19.Size = new System.Drawing.Size(288, 41);
+ this.layoutControlItem19.Size = new System.Drawing.Size(288, 67);
this.layoutControlItem19.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem19.TextSize = new System.Drawing.Size(72, 14);
//
@@ -2337,18 +2337,18 @@
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(288, 41);
+ this.layoutControlItem20.Size = new System.Drawing.Size(288, 67);
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(576, 41);
+ this.layoutControlItem21.Location = new System.Drawing.Point(576, 67);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem21.Size = new System.Drawing.Size(288, 41);
+ this.layoutControlItem21.Size = new System.Drawing.Size(288, 67);
this.layoutControlItem21.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem21.TextSize = new System.Drawing.Size(72, 14);
//
@@ -2359,7 +2359,7 @@
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(290, 41);
+ this.layoutControlItem22.Size = new System.Drawing.Size(290, 67);
this.layoutControlItem22.Text = "鑷姩璁＄畻";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -2367,12 +2367,12 @@
// layoutControlItem23
//
this.layoutControlItem23.Control = this.ucBtnPrint1;
- this.layoutControlItem23.Location = new System.Drawing.Point(864, 41);
+ this.layoutControlItem23.Location = new System.Drawing.Point(864, 67);
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(290, 41);
+ this.layoutControlItem23.Size = new System.Drawing.Size(290, 67);
this.layoutControlItem23.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -2380,11 +2380,11 @@
// layoutControlItem25
//
this.layoutControlItem25.Control = this.layoutControl1;
- this.layoutControlItem25.Location = new System.Drawing.Point(576, 82);
+ this.layoutControlItem25.Location = new System.Drawing.Point(576, 134);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem25.Size = new System.Drawing.Size(288, 42);
+ this.layoutControlItem25.Size = new System.Drawing.Size(288, 68);
this.layoutControlItem25.Text = "鎵撳嵃鏁伴噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem25.TextVisible = false;
@@ -2401,7 +2401,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemButtonEdit2,
this.repositoryItemComboBox1});
- this.gcMx1.Size = new System.Drawing.Size(1174, 370);
+ this.gcMx1.Size = new System.Drawing.Size(1174, 292);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -2705,209 +2705,6 @@
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, 524);
- 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, 524);
- 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.gv_hbdy});
- 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;
- //
- // gv_hbdy
- //
- this.gv_hbdy.Caption = "鏄惁鍚堝苟鎵撳嵃";
- this.gv_hbdy.FieldName = "hbdy2";
- this.gv_hbdy.Name = "gv_hbdy";
- this.gv_hbdy.Visible = true;
- this.gv_hbdy.VisibleIndex = 13;
- //
// xtraTabPage3
//
this.xtraTabPage3.Controls.Add(this.splitContainerControl1);
@@ -2958,6 +2755,17 @@
this.lay99.TabIndex = 0;
this.lay99.Text = "layoutControl2";
//
+ // ucBtnPrintOne1
+ //
+ this.ucBtnPrintOne1.allClickKey = null;
+ this.ucBtnPrintOne1.guidKey = null;
+ this.ucBtnPrintOne1.Location = new System.Drawing.Point(876, 12);
+ this.ucBtnPrintOne1.Margin = new System.Windows.Forms.Padding(0);
+ this.ucBtnPrintOne1.Name = "ucBtnPrintOne1";
+ this.ucBtnPrintOne1.rptParameter = null;
+ this.ucBtnPrintOne1.Size = new System.Drawing.Size(286, 32);
+ this.ucBtnPrintOne1.TabIndex = 485;
+ //
// layoutControl2
//
this.layoutControl2.Controls.Add(this.txt_iCount_2);
@@ -3003,17 +2811,17 @@
this.layoutControlItem32});
this.layoutControlGroup4.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup4.Name = "Root";
- columnDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition11.Width = 100D;
- columnDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition12.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
this.layoutControlGroup4.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition11,
- columnDefinition12});
- rowDefinition9.Height = 100D;
- rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6});
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup4.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition9});
+ rowDefinition5});
this.layoutControlGroup4.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
this.layoutControlGroup4.Size = new System.Drawing.Size(284, 33);
this.layoutControlGroup4.TextVisible = false;
@@ -3156,29 +2964,29 @@
this.layoutControlItem40});
this.layoutControlGroup3.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup3.Name = "Root";
- columnDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition13.Width = 100D;
- columnDefinition14.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition14.Width = 100D;
- columnDefinition15.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition15.Width = 100D;
- columnDefinition16.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition16.Width = 100D;
+ 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.layoutControlGroup3.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition13,
- columnDefinition14,
- columnDefinition15,
- columnDefinition16});
- 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;
+ 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.layoutControlGroup3.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition10,
- rowDefinition11,
- rowDefinition12});
+ rowDefinition6,
+ rowDefinition7,
+ rowDefinition8});
this.layoutControlGroup3.Size = new System.Drawing.Size(1174, 130);
this.layoutControlGroup3.TextVisible = false;
//
@@ -3299,6 +3107,16 @@
this.layoutControlItem35.Size = new System.Drawing.Size(288, 37);
this.layoutControlItem35.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem35.TextSize = new System.Drawing.Size(72, 14);
+ //
+ // layoutControlItem40
+ //
+ this.layoutControlItem40.Control = this.ucBtnPrintOne1;
+ this.layoutControlItem40.Location = new System.Drawing.Point(864, 0);
+ this.layoutControlItem40.Name = "layoutControlItem40";
+ this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 3;
+ this.layoutControlItem40.Size = new System.Drawing.Size(290, 36);
+ this.layoutControlItem40.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem40.TextVisible = false;
//
// gcMx3
//
@@ -3553,26 +3371,208 @@
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.repositoryItemComboBox2.Name = "repositoryItemComboBox2";
//
- // ucBtnPrintOne1
+ // tabMxPage2
//
- this.ucBtnPrintOne1.allClickKey = null;
- this.ucBtnPrintOne1.guidKey = null;
- this.ucBtnPrintOne1.Location = new System.Drawing.Point(876, 12);
- this.ucBtnPrintOne1.Margin = new System.Windows.Forms.Padding(0);
- this.ucBtnPrintOne1.Name = "ucBtnPrintOne1";
- this.ucBtnPrintOne1.rptParameter = null;
- this.ucBtnPrintOne1.Size = new System.Drawing.Size(286, 32);
- this.ucBtnPrintOne1.TabIndex = 485;
+ 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, 524);
+ this.tabMxPage2.Text = "宸叉墦鏉＄爜鏄庣粏";
//
- // layoutControlItem40
+ // gcMx2
//
- this.layoutControlItem40.Control = this.ucBtnPrintOne1;
- this.layoutControlItem40.Location = new System.Drawing.Point(864, 0);
- this.layoutControlItem40.Name = "layoutControlItem40";
- this.layoutControlItem40.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem40.Size = new System.Drawing.Size(290, 36);
- this.layoutControlItem40.TextSize = new System.Drawing.Size(0, 0);
- this.layoutControlItem40.TextVisible = false;
+ 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, 524);
+ 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.gv_hbdy});
+ 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;
+ //
+ // gv_hbdy
+ //
+ this.gv_hbdy.Caption = "鏄惁鍚堝苟鎵撳嵃";
+ this.gv_hbdy.FieldName = "hbdy2";
+ this.gv_hbdy.Name = "gv_hbdy";
+ this.gv_hbdy.Visible = true;
+ this.gv_hbdy.VisibleIndex = 13;
//
// Frm_ArrivalBarcode
//
@@ -3597,18 +3597,18 @@
((System.ComponentModel.ISupportInitialize)(this.gridView1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl2)).EndInit();
this.xtraTabControl2.ResumeLayout(false);
- this.xtraTabPage4.ResumeLayout(false);
- ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.gvMxL1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit5)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit6)).EndInit();
this.xtraTabPage5.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMxL2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMxL2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit7)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit8)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox4)).EndInit();
+ this.xtraTabPage4.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMxL1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMxL1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox3)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit5)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit6)).EndInit();
this.xtraTabPage6.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMxL3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMxL3)).EndInit();
@@ -3690,9 +3690,6 @@
((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.splitContainerControl1.Panel1)).EndInit();
this.splitContainerControl1.Panel1.ResumeLayout(false);
@@ -3730,13 +3727,16 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem38)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem39)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gcMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit3)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.repositoryItemComboBox2)).EndInit();
+ this.tabMxPage2.ResumeLayout(false);
+ ((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.behaviorManager1)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem40)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
index 6accb25..dc43129 100644
--- a/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Warehouse/Frm_ArrivalBarcode.cs
@@ -37,7 +37,10 @@
});
Gs.DevApp.ToolBox.UtilityHelper.SetTabParameter(gridView1, xtraTabControl1, pageBar1, (value) =>
{
+
getModel(value);
+
+
}, (value) =>
{
getPageList(this.pageBar1.CurrentPage);
@@ -277,45 +280,45 @@
releaseNosStr // s5 鈫� @in6锛歳eleaseNo鍒楄〃
};
- //string paramContent = string.Join(",", reportParams);
- //string rptParam = $"rpt_Arrival_One{{{paramContent}}}";
+ /*string paramContent = string.Join(",", reportParams);
+ string rptParam = $"rpt_Arrival_One{{{paramContent}}}";
- //this.ucBtnPrintOne1.guidKey = mainGuid;
- //this.ucBtnPrintOne1.rptParameter = rptParam;
+ this.ucBtnPrintOne1.guidKey = mainGuid;
+ this.ucBtnPrintOne1.rptParameter = rptParam;
+
+ // 5. 璋冪敤棰勮锛堥�昏緫涓嶅彉锛�
+ try
+ {
+ using (Form rptPreviewForm = new RptPreview(mainGuid, rptParam))
+ {
+ DialogResult previewResult = rptPreviewForm.ShowDialog();
+ if (previewResult == DialogResult.OK)
+ {
+ getModel(mainGuid);
+ Gs.DevApp.ToolBox.MsgHelper.ShowError($"鎵归噺鎵撳嵃瀹屾垚锛佸叡鎵撳嵃 {validReleaseNos.Count} 鏉℃湁鏁堟槑缁�");
+ }
+ else if (previewResult == DialogResult.Cancel)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢ㄦ埛鍙栨秷鎵归噺鎵撳嵃鎿嶄綔");
+ }
+ }
+ }
+ catch (Exception ex)
+ {
+ string errorMsg = $"鎵归噺鎵撳嵃寮傚父锛歿ex.Message}";
+ if (ex.InnerException != null)
+ {
+ errorMsg += $"\n鍐呴儴閿欒锛歿ex.InnerException.Message}";
+ }
+ Gs.DevApp.ToolBox.MsgHelper.ShowError(errorMsg);
+ this.ucBtnPrintOne1.rptParameter = "return false";
+ }
+*/
this.ucBtnPrintOne1.guidKey = mainGuid;
this.ucBtnPrintOne1.rptParameter = "rpt_Arrival_One{"
+ string.Join(",", reportParams) // 鎷兼帴reportParams鏁扮粍鍏冪礌
+ "}";
-
- /* // 5. 璋冪敤棰勮锛堥�昏緫涓嶅彉锛�
- try
- {
- using (Form rptPreviewForm = new RptPreview(mainGuid, rptParam))
- {
- DialogResult previewResult = rptPreviewForm.ShowDialog();
- if (previewResult == DialogResult.OK)
- {
- getModel(mainGuid);
- Gs.DevApp.ToolBox.MsgHelper.ShowError($"鎵归噺鎵撳嵃瀹屾垚锛佸叡鎵撳嵃 {validReleaseNos.Count} 鏉℃湁鏁堟槑缁�");
- }
- else if (previewResult == DialogResult.Cancel)
- {
- Gs.DevApp.ToolBox.MsgHelper.ShowError("鐢ㄦ埛鍙栨秷鎵归噺鎵撳嵃鎿嶄綔");
- }
- }
- }
- catch (Exception ex)
- {
- string errorMsg = $"鎵归噺鎵撳嵃寮傚父锛歿ex.Message}";
- if (ex.InnerException != null)
- {
- errorMsg += $"\n鍐呴儴閿欒锛歿ex.InnerException.Message}";
- }
- Gs.DevApp.ToolBox.MsgHelper.ShowError(errorMsg);
- this.ucBtnPrintOne1.rptParameter = "return false";
- }
- */
// 6. 娓呯┖鎺т欢
txt_iCount_2.Text = "";
txt_psnQty_2.Text = "";
@@ -360,6 +363,8 @@
// 妫�鏌ユ暟鎹姞杞藉悗鍐嶈缃鑹�
this.Load += (s, e) => {
+
+
System.Windows.Forms.Timer timer = new System.Windows.Forms.Timer();
timer.Interval = 1000; // 1绉掑悗鎵ц锛岀‘淇濇暟鎹凡鍔犺浇
timer.Tick += (sender, args) => {
@@ -568,9 +573,10 @@
}
private void getModel(string strGuid)
{
+ gcMx3.DataSource = null;
gcMx1.DataSource = null;
gcMx2.DataSource = null;
- gcMx3.DataSource = null;
+
bool isEdit = false;
if (toolBarMenu1.currentAction == "add") return;
if (toolBarMenu1.currentAction == "edit") isEdit = true;
@@ -587,6 +593,7 @@
{
string strJson = UtilityHelper.HttpPost("", _webServiceName + "GetModel", JsonConvert.SerializeObject(_obj));
ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+
if (_rtn.rtnCode > 0)
{
dynamic dy = _rtn.rtnData;
@@ -596,7 +603,27 @@
gvList.Add(gvMx2);
gvList.Add(gvMx3);
UtilityHelper.SetValueByObj(this.layoutMx1.Controls, dy, isEdit, gvList);
-
+
+ JArray array3 = new JArray();
+ foreach (var a in dy["list3"])
+ {
+ array3.Add(a);
+ }
+ DataTable dt3 = JsonConvert.DeserializeObject<DataTable>(array3.ToString());
+ if (dt3.Rows.Count > 0)
+ {
+ gcMx3.BindingContext = new BindingContext();
+ gcMx3.DataSource = dt3;
+ gcMx3.ForceInitialize();
+ gvMx3.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx3);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3);
+ }
+
+
JArray array1 = new JArray();
foreach (var a in dy["list1"])
{
@@ -616,6 +643,7 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx1, gvMx1);
}
+
JArray array2 = new JArray();
foreach (var a in dy["list2"])
{
@@ -634,25 +662,10 @@
{
Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx2, gvMx2);
}
- JArray array3 = new JArray();
- foreach (var a in dy["list3"])
- {
- array3.Add(a);
- }
- DataTable dt3 = JsonConvert.DeserializeObject<DataTable>(array3.ToString());
- if (dt3.Rows.Count > 0)
- {
- gcMx3.BindingContext = new BindingContext();
- gcMx3.DataSource = dt3;
- gcMx3.ForceInitialize();
- gvMx3.BestFitColumns();
- Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx3);
- }
- else
- {
- Gs.DevApp.ToolBox.UtilityHelper.SetDefaultTable(gcMx3, gvMx3);
- }
- }
+
+ }
+
+
else
ToolBox.MsgHelper.Warning("鎻愮ず锛�" + _rtn.rtnMsg);
}
diff --git a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
index 5603c0d..7d4cc59 100644
--- a/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/SelectCgMx.Designer.cs
@@ -347,7 +347,7 @@
// gridColumn8
//
this.gridColumn8.Caption = "鏈鏀堕噺";
- this.gridColumn8.FieldName = "bcsl";
+ this.gridColumn8.FieldName = "bcslErp";
this.gridColumn8.Name = "gridColumn8";
this.gridColumn8.Visible = true;
this.gridColumn8.VisibleIndex = 17;
--
Gitblit v1.9.3