From c351f3bdcb7d13d66e66f5b7394417e85fcf1ecc Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期三, 27 八月 2025 18:05:33 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 492 ++++++++++++++++++----------------
DevApp/Gs.DevApp/UserControl/CopyXls.resx | 120 ++++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/UserControl/CopyXls.cs | 70 +++++
DevApp/Gs.DevApp/UserControl/CopyXls.Designer.cs | 87 ++++++
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs | 30 +
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 5
7 files changed, 580 insertions(+), 233 deletions(-)
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index da05a68..4c7dd91 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -30,36 +30,36 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition21 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition22 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition23 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition24 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition21 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition22 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition23 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition24 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition25 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition26 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition25 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition26 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition27 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition27 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition28 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition29 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition30 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition28 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition29 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition30 = new DevExpress.XtraLayout.RowDefinition();
- 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();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition4 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition1 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition2 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition3 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition4 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition5 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition6 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition7 = 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 rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
+ DevExpress.XtraEditors.Controls.EditorButtonImageOptions 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();
this.toolBarMenu1 = new Gs.DevApp.UserControl.UcToolBarMenu();
this.xtraTabControl1 = new DevExpress.XtraTab.XtraTabControl();
this.xtraTabPage1 = new DevExpress.XtraTab.XtraTabPage();
@@ -132,7 +132,6 @@
this.layoutControlItem9 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -213,6 +212,9 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
+ this.layoutControlItem35 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.btnCopyXls = new DevExpress.XtraEditors.SimpleButton();
+ this.layoutControlItem37 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -268,7 +270,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
@@ -321,6 +322,8 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -677,11 +680,12 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1332, 570);
- this.splitMx1.SplitterPosition = 192;
+ this.splitMx1.SplitterPosition = 194;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.btnCopyXls);
this.layoutMx1.Controls.Add(this.txt_qt003);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.txt_qt010);
@@ -711,17 +715,17 @@
this.layoutControlItem36});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(289, 480, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(578, 285, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1332, 192);
+ this.layoutMx1.Size = new System.Drawing.Size(1332, 194);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
// txt_qt003
//
- this.txt_qt003.Location = new System.Drawing.Point(770, 12);
+ this.txt_qt003.Location = new System.Drawing.Point(759, 0);
this.txt_qt003.Name = "txt_qt003";
- this.txt_qt003.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt003.Size = new System.Drawing.Size(217, 24);
this.txt_qt003.TabIndex = 333;
this.txt_qt003.TextTxt = "鍏跺畠鍏ュ簱(QTRKD01_SYS)";
this.txt_qt003.WhereTxt = "a.s_type=\'鍏跺畠鍏ュ簱鍗曟嵁绫诲瀷\' and a.pid<>\'00000000-0000-0000-0000-000000000000\'";
@@ -737,10 +741,10 @@
//
// txt_qt010
//
- this.txt_qt010.Location = new System.Drawing.Point(114, 126);
+ this.txt_qt010.Location = new System.Drawing.Point(114, 124);
this.txt_qt010.Name = "txt_qt010";
this.txt_qt010.Properties.Appearance.Options.UseFont = true;
- this.txt_qt010.Size = new System.Drawing.Size(550, 24);
+ this.txt_qt010.Size = new System.Drawing.Size(216, 24);
this.txt_qt010.StyleController = this.layoutMx1;
this.txt_qt010.TabIndex = 240;
//
@@ -748,28 +752,28 @@
//
this.ucLookHuoZhu1.HzId = null;
this.ucLookHuoZhu1.IsReadly = false;
- this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 68);
+ this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 62);
this.ucLookHuoZhu1.Margin = new System.Windows.Forms.Padding(0);
this.ucLookHuoZhu1.Name = "ucLookHuoZhu1";
this.ucLookHuoZhu1.OrgId = null;
- this.ucLookHuoZhu1.Size = new System.Drawing.Size(324, 54);
+ this.ucLookHuoZhu1.Size = new System.Drawing.Size(318, 58);
this.ucLookHuoZhu1.TabIndex = 329;
//
// txt_qt008
//
this.txt_qt008.IsReadly = false;
- this.txt_qt008.Location = new System.Drawing.Point(442, 97);
+ this.txt_qt008.Location = new System.Drawing.Point(436, 93);
this.txt_qt008.Margin = new System.Windows.Forms.Padding(0);
this.txt_qt008.Name = "txt_qt008";
- this.txt_qt008.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt008.Size = new System.Drawing.Size(217, 24);
this.txt_qt008.TabIndex = 301;
//
// txt_qt016
//
- this.txt_qt016.Location = new System.Drawing.Point(770, 126);
+ this.txt_qt016.Location = new System.Drawing.Point(759, 124);
this.txt_qt016.Name = "txt_qt016";
this.txt_qt016.Properties.Appearance.Options.UseFont = true;
- this.txt_qt016.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt016.Size = new System.Drawing.Size(217, 24);
this.txt_qt016.StyleController = this.layoutMx1;
this.txt_qt016.TabIndex = 267;
this.txt_qt016.Tag = "readonly";
@@ -777,44 +781,44 @@
// txt_qt018
//
this.txt_qt018.IsReadly = false;
- this.txt_qt018.Location = new System.Drawing.Point(442, 68);
+ this.txt_qt018.Location = new System.Drawing.Point(436, 62);
this.txt_qt018.Margin = new System.Windows.Forms.Padding(0);
this.txt_qt018.Name = "txt_qt018";
- this.txt_qt018.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt018.Size = new System.Drawing.Size(217, 24);
this.txt_qt018.TabIndex = 302;
//
// txt_qt022
//
this.txt_qt022.IsReadly = false;
- this.txt_qt022.Location = new System.Drawing.Point(114, 40);
+ this.txt_qt022.Location = new System.Drawing.Point(114, 31);
this.txt_qt022.Name = "txt_qt022";
- this.txt_qt022.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt022.Size = new System.Drawing.Size(216, 24);
this.txt_qt022.TabIndex = 326;
//
// txt_qt009
//
this.txt_qt009.IsReadly = false;
- this.txt_qt009.Location = new System.Drawing.Point(442, 40);
+ this.txt_qt009.Location = new System.Drawing.Point(436, 31);
this.txt_qt009.Name = "txt_qt009";
- this.txt_qt009.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt009.Size = new System.Drawing.Size(217, 24);
this.txt_qt009.TabIndex = 304;
//
// txt_qtck
//
- this.txt_qtck.Location = new System.Drawing.Point(114, 12);
+ this.txt_qtck.Location = new System.Drawing.Point(114, 0);
this.txt_qtck.Name = "txt_qtck";
this.txt_qtck.Properties.Appearance.Options.UseFont = true;
- this.txt_qtck.Size = new System.Drawing.Size(222, 24);
+ this.txt_qtck.Size = new System.Drawing.Size(216, 24);
this.txt_qtck.StyleController = this.layoutMx1;
this.txt_qtck.TabIndex = 213;
this.txt_qtck.Tag = "readonly";
//
// txt_qt002
//
- this.txt_qt002.Location = new System.Drawing.Point(770, 97);
+ this.txt_qt002.Location = new System.Drawing.Point(759, 93);
this.txt_qt002.Name = "txt_qt002";
this.txt_qt002.Properties.Appearance.Options.UseFont = true;
- this.txt_qt002.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt002.Size = new System.Drawing.Size(217, 24);
this.txt_qt002.StyleController = this.layoutMx1;
this.txt_qt002.TabIndex = 217;
this.txt_qt002.Tag = "readonly";
@@ -822,7 +826,7 @@
// txt_qt019
//
this.txt_qt019.EditValue = "璇烽�夋嫨";
- this.txt_qt019.Location = new System.Drawing.Point(442, 12);
+ this.txt_qt019.Location = new System.Drawing.Point(436, 0);
this.txt_qt019.Name = "txt_qt019";
this.txt_qt019.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -831,103 +835,103 @@
"鏅��(GENERAL)",
"閫�璐�(RETURN)"});
this.txt_qt019.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt019.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt019.Size = new System.Drawing.Size(217, 24);
this.txt_qt019.StyleController = this.layoutMx1;
this.txt_qt019.TabIndex = 299;
//
// txt_qt015
//
- this.txt_qt015.Location = new System.Drawing.Point(668, 155);
+ this.txt_qt015.Location = new System.Drawing.Point(657, 155);
this.txt_qt015.Name = "txt_qt015";
this.txt_qt015.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_qt015.Size = new System.Drawing.Size(324, 24);
+ this.txt_qt015.Size = new System.Drawing.Size(319, 24);
this.txt_qt015.StyleController = this.layoutMx1;
this.txt_qt015.TabIndex = 330;
this.txt_qt015.Tag = "readonly";
//
// txt_qt005
//
- this.txt_qt005.Location = new System.Drawing.Point(770, 40);
+ this.txt_qt005.Location = new System.Drawing.Point(759, 31);
this.txt_qt005.Name = "txt_qt005";
this.txt_qt005.Properties.Appearance.Options.UseFont = true;
- this.txt_qt005.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt005.Size = new System.Drawing.Size(217, 24);
this.txt_qt005.StyleController = this.layoutMx1;
this.txt_qt005.TabIndex = 331;
this.txt_qt005.Tag = "readonly";
//
// txt_qt001
//
- this.txt_qt001.Location = new System.Drawing.Point(770, 68);
+ this.txt_qt001.Location = new System.Drawing.Point(759, 62);
this.txt_qt001.Name = "txt_qt001";
this.txt_qt001.Properties.Appearance.Options.UseFont = true;
- this.txt_qt001.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt001.Size = new System.Drawing.Size(217, 24);
this.txt_qt001.StyleController = this.layoutMx1;
this.txt_qt001.TabIndex = 332;
this.txt_qt001.Tag = "readonly";
//
// txt_qt030
//
- this.txt_qt030.Location = new System.Drawing.Point(1098, 97);
+ this.txt_qt030.Location = new System.Drawing.Point(1082, 93);
this.txt_qt030.Name = "txt_qt030";
- this.txt_qt030.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt030.Size = new System.Drawing.Size(217, 24);
this.txt_qt030.StyleController = this.layoutMx1;
this.txt_qt030.TabIndex = 334;
this.txt_qt030.Tag = "readonly";
//
// txt_qt029
//
- this.txt_qt029.Location = new System.Drawing.Point(1098, 126);
+ this.txt_qt029.Location = new System.Drawing.Point(1082, 124);
this.txt_qt029.Name = "txt_qt029";
- this.txt_qt029.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt029.Size = new System.Drawing.Size(217, 24);
this.txt_qt029.StyleController = this.layoutMx1;
this.txt_qt029.TabIndex = 335;
this.txt_qt029.Tag = "readonly";
//
// txt_qt028
//
- this.txt_qt028.Location = new System.Drawing.Point(996, 155);
+ this.txt_qt028.Location = new System.Drawing.Point(980, 155);
this.txt_qt028.Name = "txt_qt028";
this.txt_qt028.Properties.Caption = "璐㈠姟瀹℃牳鏍囪瘑";
- this.txt_qt028.Size = new System.Drawing.Size(324, 24);
+ this.txt_qt028.Size = new System.Drawing.Size(319, 24);
this.txt_qt028.StyleController = this.layoutMx1;
this.txt_qt028.TabIndex = 336;
this.txt_qt028.Tag = "readonly";
//
// txt_qt034
//
- this.txt_qt034.Location = new System.Drawing.Point(1098, 12);
+ this.txt_qt034.Location = new System.Drawing.Point(1082, 0);
this.txt_qt034.Name = "txt_qt034";
- this.txt_qt034.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt034.Size = new System.Drawing.Size(217, 24);
this.txt_qt034.StyleController = this.layoutMx1;
this.txt_qt034.TabIndex = 337;
this.txt_qt034.Tag = "readonly";
//
// txt_qt033
//
- this.txt_qt033.Location = new System.Drawing.Point(1098, 40);
+ this.txt_qt033.Location = new System.Drawing.Point(1082, 31);
this.txt_qt033.Name = "txt_qt033";
- this.txt_qt033.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt033.Size = new System.Drawing.Size(217, 24);
this.txt_qt033.StyleController = this.layoutMx1;
this.txt_qt033.TabIndex = 338;
this.txt_qt033.Tag = "readonly";
//
// txt_qt032
//
- this.txt_qt032.Location = new System.Drawing.Point(996, 68);
+ this.txt_qt032.Location = new System.Drawing.Point(980, 62);
this.txt_qt032.Name = "txt_qt032";
this.txt_qt032.Properties.Caption = "閲囪喘瀹℃牳鏍囪瘑";
- this.txt_qt032.Size = new System.Drawing.Size(324, 24);
+ this.txt_qt032.Size = new System.Drawing.Size(319, 24);
this.txt_qt032.StyleController = this.layoutMx1;
this.txt_qt032.TabIndex = 339;
this.txt_qt032.Tag = "readonly";
//
// txt_qt035
//
- this.txt_qt035.Location = new System.Drawing.Point(114, 155);
+ this.txt_qt035.Location = new System.Drawing.Point(436, 124);
this.txt_qt035.Name = "txt_qt035";
this.txt_qt035.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton()});
- this.txt_qt035.Size = new System.Drawing.Size(222, 24);
+ this.txt_qt035.Size = new System.Drawing.Size(217, 24);
this.txt_qt035.StyleController = this.layoutMx1;
this.txt_qt035.TabIndex = 340;
//
@@ -987,45 +991,46 @@
this.layoutControlItem9,
this.layoutControlItem11,
this.layoutControlItem21,
- this.layoutControlItem35,
this.layoutControlItem2,
this.layoutControlItem15,
- this.layoutControlItem14});
+ this.layoutControlItem14,
+ this.layoutControlItem35,
+ this.layoutControlItem37});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition21.Width = 100D;
- columnDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition22.Width = 100D;
- columnDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition23.Width = 100D;
- columnDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition24.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[] {
- columnDefinition21,
- columnDefinition22,
- columnDefinition23,
- columnDefinition24});
- rowDefinition21.Height = 100D;
- rowDefinition21.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition22.Height = 100D;
- rowDefinition22.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition23.Height = 100D;
- rowDefinition23.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition24.Height = 100D;
- rowDefinition24.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition25.Height = 100D;
- rowDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition26.Height = 100D;
- rowDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1,
+ columnDefinition2,
+ columnDefinition3,
+ columnDefinition4});
+ rowDefinition1.Height = 100D;
+ rowDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition2.Height = 100D;
+ rowDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition3.Height = 100D;
+ rowDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition4.Height = 100D;
+ rowDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition5.Height = 100D;
+ rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition6.Height = 100D;
+ rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition21,
- rowDefinition22,
- rowDefinition23,
- rowDefinition24,
- rowDefinition25,
- rowDefinition26});
- this.Root.Size = new System.Drawing.Size(1332, 192);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6});
+ this.Root.Size = new System.Drawing.Size(1311, 206);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1033,28 +1038,28 @@
this.layoutControlItem1.Control = this.txt_qtck;
this.layoutControlItem1.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem1.Name = "layoutControlItem1";
- this.layoutControlItem1.Size = new System.Drawing.Size(328, 28);
+ this.layoutControlItem1.Size = new System.Drawing.Size(322, 31);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_qt022;
- this.layoutControlItem4.Location = new System.Drawing.Point(0, 28);
+ this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(328, 28);
+ this.layoutControlItem4.Size = new System.Drawing.Size(322, 31);
this.layoutControlItem4.Text = "搴撳瓨缁勭粐";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_qt009;
- this.layoutControlItem5.Location = new System.Drawing.Point(328, 28);
+ this.layoutControlItem5.Location = new System.Drawing.Point(322, 31);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(328, 28);
+ this.layoutControlItem5.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem5.Text = "閫夋嫨閮ㄩ棬";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1062,22 +1067,22 @@
//
this.layoutControlItem7.Control = this.txt_qt018;
this.layoutControlItem7.CustomizationFormText = "閫変緵搴斿晢";
- this.layoutControlItem7.Location = new System.Drawing.Point(328, 56);
+ this.layoutControlItem7.Location = new System.Drawing.Point(322, 62);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(328, 29);
+ this.layoutControlItem7.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem7.Text = "閫変緵搴斿晢";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_qt008;
- this.layoutControlItem8.Location = new System.Drawing.Point(328, 85);
+ this.layoutControlItem8.Location = new System.Drawing.Point(322, 93);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(328, 29);
+ this.layoutControlItem8.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem8.Text = "鏀舵枡浠撳簱";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1085,65 +1090,64 @@
//
this.layoutControlItem6.Control = this.ucLookHuoZhu1;
this.layoutControlItem6.CustomizationFormText = "閫夋嫨璐т富";
- this.layoutControlItem6.Location = new System.Drawing.Point(0, 56);
+ this.layoutControlItem6.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(328, 58);
+ this.layoutControlItem6.Size = new System.Drawing.Size(322, 62);
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_qt019;
- this.layoutControlItem3.Location = new System.Drawing.Point(328, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(322, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem3.Size = new System.Drawing.Size(328, 28);
+ this.layoutControlItem3.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_qt010;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 114);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem13.Name = "layoutControlItem13";
- this.layoutControlItem13.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(656, 29);
+ this.layoutControlItem13.Size = new System.Drawing.Size(322, 31);
this.layoutControlItem13.Text = "鐢宠澶囨敞";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_qt030;
- this.layoutControlItem16.Location = new System.Drawing.Point(984, 85);
+ this.layoutControlItem16.Location = new System.Drawing.Point(968, 93);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(328, 29);
+ this.layoutControlItem16.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem16.Text = "璐㈠姟瀹℃牳浜哄憳";
this.layoutControlItem16.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem17
//
this.layoutControlItem17.Control = this.txt_qt029;
- this.layoutControlItem17.Location = new System.Drawing.Point(984, 114);
+ this.layoutControlItem17.Location = new System.Drawing.Point(968, 124);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(328, 29);
+ this.layoutControlItem17.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem17.Text = "璐㈠姟瀹℃牳鏃堕棿";
this.layoutControlItem17.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_qt028;
- this.layoutControlItem18.Location = new System.Drawing.Point(984, 143);
+ this.layoutControlItem18.Location = new System.Drawing.Point(968, 155);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem18.Size = new System.Drawing.Size(328, 29);
+ this.layoutControlItem18.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem18.Text = "璐㈠姟瀹℃牳鏍囪瘑";
this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem18.TextVisible = false;
@@ -1151,54 +1155,54 @@
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_qt034;
- this.layoutControlItem19.Location = new System.Drawing.Point(984, 0);
+ this.layoutControlItem19.Location = new System.Drawing.Point(968, 0);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(328, 28);
+ this.layoutControlItem19.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem19.Text = "閲囪喘瀹℃牳浜哄憳";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_qt033;
- this.layoutControlItem20.Location = new System.Drawing.Point(984, 28);
+ this.layoutControlItem20.Location = new System.Drawing.Point(968, 31);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem20.Size = new System.Drawing.Size(328, 28);
+ this.layoutControlItem20.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem20.Text = "閲囪喘瀹℃牳鏃堕棿";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_qt002;
- this.layoutControlItem10.Location = new System.Drawing.Point(656, 85);
+ this.layoutControlItem10.Location = new System.Drawing.Point(645, 93);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(328, 29);
+ this.layoutControlItem10.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem10.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_qt016;
- this.layoutControlItem9.Location = new System.Drawing.Point(656, 114);
+ this.layoutControlItem9.Location = new System.Drawing.Point(645, 124);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem9.Size = new System.Drawing.Size(328, 29);
+ this.layoutControlItem9.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem9.Text = "瀹℃牳浜哄憳";
this.layoutControlItem9.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_qt015;
- this.layoutControlItem11.Location = new System.Drawing.Point(656, 143);
+ this.layoutControlItem11.Location = new System.Drawing.Point(645, 155);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem11.Size = new System.Drawing.Size(328, 29);
+ this.layoutControlItem11.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem11.Text = "瀹℃牳鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -1206,43 +1210,33 @@
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_qt032;
- this.layoutControlItem21.Location = new System.Drawing.Point(984, 56);
+ this.layoutControlItem21.Location = new System.Drawing.Point(968, 62);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem21.Size = new System.Drawing.Size(328, 29);
+ this.layoutControlItem21.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem21.Text = "閲囪喘瀹℃牳鏍囪瘑";
this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem21.TextVisible = false;
//
- // layoutControlItem35
- //
- this.layoutControlItem35.Control = this.txt_qt035;
- this.layoutControlItem35.Location = new System.Drawing.Point(0, 143);
- this.layoutControlItem35.Name = "layoutControlItem35";
- this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem35.Size = new System.Drawing.Size(328, 29);
- this.layoutControlItem35.Text = "鏉ユ簮鍗曞彿";
- this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18);
- //
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_qt003;
- this.layoutControlItem2.Location = new System.Drawing.Point(656, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(645, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem2.Size = new System.Drawing.Size(328, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_qt001;
- this.layoutControlItem15.Location = new System.Drawing.Point(656, 56);
+ this.layoutControlItem15.Location = new System.Drawing.Point(645, 62);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem15.Size = new System.Drawing.Size(328, 29);
+ this.layoutControlItem15.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem15.Text = "鐢宠鏃堕棿";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1250,11 +1244,11 @@
//
this.layoutControlItem14.Control = this.txt_qt005;
this.layoutControlItem14.CustomizationFormText = "鐢宠浜�";
- this.layoutControlItem14.Location = new System.Drawing.Point(656, 28);
+ this.layoutControlItem14.Location = new System.Drawing.Point(645, 31);
this.layoutControlItem14.Name = "layoutControlItem14";
this.layoutControlItem14.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem14.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem14.Size = new System.Drawing.Size(328, 28);
+ this.layoutControlItem14.Size = new System.Drawing.Size(323, 31);
this.layoutControlItem14.Text = "鐢宠浜哄憳";
this.layoutControlItem14.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1264,7 +1258,7 @@
this.tabMx.Location = new System.Drawing.Point(0, 0);
this.tabMx.Name = "tabMx";
this.tabMx.SelectedTabPage = this.tabMxPage1;
- this.tabMx.Size = new System.Drawing.Size(1332, 366);
+ this.tabMx.Size = new System.Drawing.Size(1332, 364);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1274,7 +1268,7 @@
//
this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1330, 334);
+ this.tabMxPage1.Size = new System.Drawing.Size(1330, 332);
this.tabMxPage1.Text = "鐗╂枡鏄庣粏";
//
// split99
@@ -1294,7 +1288,7 @@
this.split99.Panel2.Controls.Add(this.gcMx1);
this.split99.Panel2.Text = "Panel2";
this.split99.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
- this.split99.Size = new System.Drawing.Size(1330, 334);
+ this.split99.Size = new System.Drawing.Size(1330, 332);
this.split99.SplitterPosition = 131;
this.split99.TabIndex = 2;
//
@@ -1335,11 +1329,11 @@
//
this.ucBtnPrint1.allClickKey = null;
this.ucBtnPrint1.guidKey = null;
- this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 49);
+ this.ucBtnPrint1.Location = new System.Drawing.Point(1032, 48);
this.ucBtnPrint1.Margin = new System.Windows.Forms.Padding(0);
this.ucBtnPrint1.Name = "ucBtnPrint1";
this.ucBtnPrint1.rptParameter = null;
- this.ucBtnPrint1.Size = new System.Drawing.Size(336, 33);
+ this.ucBtnPrint1.Size = new System.Drawing.Size(336, 32);
this.ucBtnPrint1.TabIndex = 480;
//
// radOut
@@ -1353,7 +1347,7 @@
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鍙墦鏁村紶"),
new DevExpress.XtraEditors.Controls.RadioGroupItem(null, "鎵嬪姩鎵�")});
this.radOut.Properties.Padding = new System.Windows.Forms.Padding(0);
- this.radOut.Size = new System.Drawing.Size(336, 33);
+ this.radOut.Size = new System.Drawing.Size(336, 32);
this.radOut.StyleController = this.lay99;
this.radOut.TabIndex = 479;
//
@@ -1361,10 +1355,10 @@
//
this.layoutControl1.Controls.Add(this.txt_iCount_1);
this.layoutControl1.Controls.Add(this.txt_yuliang_1);
- this.layoutControl1.Location = new System.Drawing.Point(692, 86);
+ this.layoutControl1.Location = new System.Drawing.Point(692, 84);
this.layoutControl1.Name = "layoutControl1";
this.layoutControl1.Root = this.layoutControlGroup2;
- this.layoutControl1.Size = new System.Drawing.Size(336, 33);
+ this.layoutControl1.Size = new System.Drawing.Size(336, 32);
this.layoutControl1.TabIndex = 478;
this.layoutControl1.Text = "layoutControl1";
//
@@ -1396,19 +1390,19 @@
this.layoutControlItem34});
this.layoutControlGroup2.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup2.Name = "layoutControlGroup2";
- columnDefinition25.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition25.Width = 100D;
- columnDefinition26.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition26.Width = 100D;
+ columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5.Width = 100D;
+ columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition6.Width = 100D;
this.layoutControlGroup2.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition25,
- columnDefinition26});
- rowDefinition27.Height = 100D;
- rowDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition5,
+ columnDefinition6});
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup2.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition27});
+ rowDefinition7});
this.layoutControlGroup2.Padding = new DevExpress.XtraLayout.Utils.Padding(0, 0, 0, 0);
- this.layoutControlGroup2.Size = new System.Drawing.Size(336, 33);
+ this.layoutControlGroup2.Size = new System.Drawing.Size(336, 32);
this.layoutControlGroup2.TextVisible = false;
//
// layoutControlItem33
@@ -1416,7 +1410,7 @@
this.layoutControlItem33.Control = this.txt_iCount_1;
this.layoutControlItem33.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem33.Name = "layoutControlItem33";
- this.layoutControlItem33.Size = new System.Drawing.Size(168, 33);
+ this.layoutControlItem33.Size = new System.Drawing.Size(168, 32);
this.layoutControlItem33.Text = "鎵撳嵃鏁村紶鏁板��";
this.layoutControlItem33.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1426,7 +1420,7 @@
this.layoutControlItem34.Location = new System.Drawing.Point(168, 0);
this.layoutControlItem34.Name = "layoutControlItem34";
this.layoutControlItem34.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem34.Size = new System.Drawing.Size(168, 33);
+ this.layoutControlItem34.Size = new System.Drawing.Size(168, 32);
this.layoutControlItem34.Text = "鎵撳嵃浣欐暟";
this.layoutControlItem34.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1444,7 +1438,7 @@
//
// txt_psnQty_1
//
- this.txt_psnQty_1.Location = new System.Drawing.Point(794, 49);
+ this.txt_psnQty_1.Location = new System.Drawing.Point(794, 48);
this.txt_psnQty_1.Name = "txt_psnQty_1";
this.txt_psnQty_1.Properties.Appearance.Options.UseFont = true;
this.txt_psnQty_1.Size = new System.Drawing.Size(234, 24);
@@ -1463,7 +1457,7 @@
//
// txt_yQty
//
- this.txt_yQty.Location = new System.Drawing.Point(454, 49);
+ this.txt_yQty.Location = new System.Drawing.Point(454, 48);
this.txt_yQty.Name = "txt_yQty";
this.txt_yQty.Properties.Appearance.Options.UseFont = true;
this.txt_yQty.Properties.ReadOnly = true;
@@ -1483,7 +1477,7 @@
//
// txtWlmc
//
- this.txtWlmc.Location = new System.Drawing.Point(114, 49);
+ this.txtWlmc.Location = new System.Drawing.Point(114, 48);
this.txtWlmc.Name = "txtWlmc";
this.txtWlmc.Properties.Appearance.Options.UseFont = true;
this.txtWlmc.Properties.ReadOnly = true;
@@ -1493,7 +1487,7 @@
//
// txtWlgg
//
- this.txtWlgg.Location = new System.Drawing.Point(114, 86);
+ this.txtWlgg.Location = new System.Drawing.Point(114, 84);
this.txtWlgg.Name = "txtWlgg";
this.txtWlgg.Properties.Appearance.Options.UseFont = true;
this.txtWlgg.Properties.ReadOnly = true;
@@ -1530,30 +1524,30 @@
this.layoutControlItem31});
this.layoutControlGroup1.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.layoutControlGroup1.Name = "Root";
- columnDefinition27.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition27.Width = 100D;
- columnDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition28.Width = 100D;
- columnDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition29.Width = 100D;
- columnDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition30.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.layoutControlGroup1.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition27,
- columnDefinition28,
- columnDefinition29,
- columnDefinition30});
- rowDefinition28.Height = 100D;
- rowDefinition28.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition29.Height = 100D;
- rowDefinition29.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition30.Height = 100D;
- rowDefinition30.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition7,
+ columnDefinition8,
+ columnDefinition9,
+ columnDefinition10});
+ rowDefinition8.Height = 100D;
+ rowDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition9.Height = 100D;
+ rowDefinition9.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition10.Height = 100D;
+ rowDefinition10.SizeType = System.Windows.Forms.SizeType.Percent;
this.layoutControlGroup1.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition28,
- rowDefinition29,
- rowDefinition30});
- this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 131);
+ rowDefinition8,
+ rowDefinition9,
+ rowDefinition10});
+ this.layoutControlGroup1.Size = new System.Drawing.Size(1380, 128);
this.layoutControlGroup1.TextVisible = false;
//
// layoutControlItem23
@@ -1562,7 +1556,7 @@
this.layoutControlItem23.Location = new System.Drawing.Point(1020, 0);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem23.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem23.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem23.Text = "鎵撳嵃鏂瑰紡";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1570,11 +1564,11 @@
// layoutControlItem22
//
this.layoutControlItem22.Control = this.layoutControl1;
- this.layoutControlItem22.Location = new System.Drawing.Point(680, 74);
+ this.layoutControlItem22.Location = new System.Drawing.Point(680, 72);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem22.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem22.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem22.Text = "鎵撳嵃寮犳暟";
this.layoutControlItem22.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem22.TextVisible = false;
@@ -1587,7 +1581,7 @@
this.layoutControlItem27.Location = new System.Drawing.Point(680, 0);
this.layoutControlItem27.Name = "layoutControlItem27";
this.layoutControlItem27.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem27.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem27.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem27.Text = "鍙墦鍗版�绘暟";
this.layoutControlItem27.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1596,11 +1590,11 @@
this.layoutControlItem28.Control = this.txt_psnQty_1;
this.layoutControlItem28.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem28.CustomizationFormText = "姣忓紶鏉＄爜鏁伴噺";
- this.layoutControlItem28.Location = new System.Drawing.Point(680, 37);
+ this.layoutControlItem28.Location = new System.Drawing.Point(680, 36);
this.layoutControlItem28.Name = "layoutControlItem28";
this.layoutControlItem28.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem28.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem28.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem28.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem28.Text = "姣忓紶鏉＄爜鏁伴噺";
this.layoutControlItem28.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1612,7 +1606,7 @@
this.layoutControlItem25.Location = new System.Drawing.Point(340, 0);
this.layoutControlItem25.Name = "layoutControlItem25";
this.layoutControlItem25.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem25.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem25.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem25.Text = "鏈鐢宠鎬婚噺";
this.layoutControlItem25.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1621,11 +1615,11 @@
this.layoutControlItem26.Control = this.txt_yQty;
this.layoutControlItem26.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem26.CustomizationFormText = "宸叉墦鍗版�婚噺";
- this.layoutControlItem26.Location = new System.Drawing.Point(340, 37);
+ this.layoutControlItem26.Location = new System.Drawing.Point(340, 36);
this.layoutControlItem26.Name = "layoutControlItem26";
this.layoutControlItem26.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem26.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem26.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem26.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem26.Text = "宸叉墦鍗版�婚噺";
this.layoutControlItem26.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1636,7 +1630,7 @@
this.layoutControlItem24.CustomizationFormText = "鐗╂枡缂栫爜";
this.layoutControlItem24.Location = new System.Drawing.Point(0, 0);
this.layoutControlItem24.Name = "layoutControlItem24";
- this.layoutControlItem24.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem24.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem24.Text = "鐗╂枡缂栫爜";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1645,10 +1639,10 @@
this.layoutControlItem29.Control = this.txtWlmc;
this.layoutControlItem29.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem29.CustomizationFormText = "鐗╂枡鍚嶇О";
- this.layoutControlItem29.Location = new System.Drawing.Point(0, 37);
+ this.layoutControlItem29.Location = new System.Drawing.Point(0, 36);
this.layoutControlItem29.Name = "layoutControlItem29";
this.layoutControlItem29.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem29.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem29.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem29.Text = "鐗╂枡鍚嶇О";
this.layoutControlItem29.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1657,22 +1651,22 @@
this.layoutControlItem30.Control = this.txtWlgg;
this.layoutControlItem30.ControlAlignment = System.Drawing.ContentAlignment.TopLeft;
this.layoutControlItem30.CustomizationFormText = "鐗╂枡瑙勬牸";
- this.layoutControlItem30.Location = new System.Drawing.Point(0, 74);
+ this.layoutControlItem30.Location = new System.Drawing.Point(0, 72);
this.layoutControlItem30.Name = "layoutControlItem30";
this.layoutControlItem30.OptionsTableLayoutItem.ColumnSpan = 2;
this.layoutControlItem30.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem30.Size = new System.Drawing.Size(680, 37);
+ this.layoutControlItem30.Size = new System.Drawing.Size(680, 36);
this.layoutControlItem30.Text = "鐗╂枡瑙勬牸";
this.layoutControlItem30.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem31
//
this.layoutControlItem31.Control = this.ucBtnPrint1;
- this.layoutControlItem31.Location = new System.Drawing.Point(1020, 37);
+ this.layoutControlItem31.Location = new System.Drawing.Point(1020, 36);
this.layoutControlItem31.Name = "layoutControlItem31";
this.layoutControlItem31.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem31.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem31.Size = new System.Drawing.Size(340, 37);
+ this.layoutControlItem31.Size = new System.Drawing.Size(340, 36);
this.layoutControlItem31.Text = "鎵撳嵃鎸夐挳";
this.layoutControlItem31.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem31.TextVisible = false;
@@ -1688,7 +1682,7 @@
this.repositoryItemSearchLookUpEdit1,
this.rptBl,
this.repositoryItemMemoEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1330, 191);
+ this.gcMx1.Size = new System.Drawing.Size(1330, 189);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1967,10 +1961,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions5.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions5.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions5, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject17, serializableAppearanceObject18, serializableAppearanceObject19, serializableAppearanceObject20, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1994,9 +1988,9 @@
// rptBl
//
this.rptBl.AutoHeight = false;
- editorButtonImageOptions6.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
this.rptBl.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- 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)});
+ 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.rptBl.Name = "rptBl";
this.rptBl.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptBl_ButtonClick);
//
@@ -2202,6 +2196,41 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
+ // layoutControlItem35
+ //
+ this.layoutControlItem35.Control = this.txt_qt035;
+ this.layoutControlItem35.Location = new System.Drawing.Point(322, 124);
+ this.layoutControlItem35.Name = "layoutControlItem35";
+ this.layoutControlItem35.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layoutControlItem35.OptionsTableLayoutItem.RowIndex = 4;
+ this.layoutControlItem35.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem35.Text = "鏉ユ簮鍗曞彿";
+ this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // btnCopyXls
+ //
+ this.btnCopyXls.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ this.btnCopyXls.Location = new System.Drawing.Point(12, 155);
+ this.btnCopyXls.Name = "btnCopyXls";
+ this.btnCopyXls.Size = new System.Drawing.Size(131, 27);
+ this.btnCopyXls.StyleController = this.layoutMx1;
+ this.btnCopyXls.TabIndex = 444;
+ this.btnCopyXls.Text = "浠嶺LS澶嶅埗鏄庣粏";
+ //
+ // layoutControlItem37
+ //
+ this.layoutControlItem37.Control = this.btnCopyXls;
+ this.layoutControlItem37.Location = new System.Drawing.Point(0, 155);
+ this.layoutControlItem37.MaxSize = new System.Drawing.Size(135, 31);
+ this.layoutControlItem37.MinSize = new System.Drawing.Size(129, 31);
+ this.layoutControlItem37.Name = "layoutControlItem37";
+ this.layoutControlItem37.OptionsTableLayoutItem.RowIndex = 5;
+ this.layoutControlItem37.Size = new System.Drawing.Size(322, 31);
+ this.layoutControlItem37.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem37.Text = "浠嶺LS澶嶅埗鏄庣粏";
+ this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem37.TextVisible = false;
+ //
// Frm_MesItemQtrk
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -2267,7 +2296,6 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem9)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem21)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem15)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
@@ -2320,6 +2348,8 @@
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem35)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem37)).EndInit();
this.ResumeLayout(false);
}
@@ -2441,7 +2471,6 @@
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptBl;
private DevExpress.XtraEditors.Repository.RepositoryItemMemoEdit repositoryItemMemoEdit1;
private DevExpress.XtraEditors.ButtonEdit txt_qt035;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem14;
@@ -2477,5 +2506,8 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem32;
private DevExpress.XtraEditors.CheckEdit txt_isIqc;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem36;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem35;
+ private DevExpress.XtraEditors.SimpleButton btnCopyXls;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem37;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
index 42c80f1..2ab4cfc 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.cs
@@ -9,6 +9,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.IO;
using System.Threading.Tasks;
using System.Windows.Forms;
namespace Gs.DevApp.DevFrm
@@ -184,6 +185,29 @@
Gs.DevApp.ToolBox.UtilityHelper.PrintAuto(txt_psnQty_1, txt_iCount_1, radOut, txt_yuliang_1);
};
+ #region 2025-08-27 澶嶅埗beg
+ btnCopyXls.Click += (s, e) =>
+ {
+ string kcZz = txt_qt022.GetId();
+ if (string.IsNullOrEmpty(kcZz))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨搴撳瓨缁勭粐鍚庢墠鑳戒娇鐢ㄥ鍒跺姛鑳斤紒");
+ txt_qt022.Focus();
+ return;
+ }
+ string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
+ if (File.Exists(filePath))
+ {
+ var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.鍏跺畠鍏ュ簱.ToString());
+ frm.ShowDialog();
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鎵句笉鍒皒lsCopy.xls鏂囦欢锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+
+ };
+ #endregion
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -548,7 +572,7 @@
/// <param name="strGuid"></param>
private void getModel(string strGuid)
{
-
+
gcMx1.DataSource = null;
bool isEdit = false;
if (toolBarMenu1.currentAction == "add") return;
@@ -688,7 +712,7 @@
getModel(lbGuid.Text);
}
else
- MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
}
catch (Exception ex)
{
@@ -808,7 +832,7 @@
_webServiceName + "EditModelSubmit",
JsonConvert.SerializeObject(_obj));
var _rtn = UtilityHelper.ReturnToDynamic(strJson);
-
+
if (_rtn.rtnCode > 0 && _rtn.rtnData.outSum * 1 > 0)
{
MsgHelper.ShowInformation(_rtn.rtnData.outMsg.ToString());
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index 9ccc9f6..9361f9f 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1154,6 +1154,12 @@
<DesignTime>True</DesignTime>
<DependentUpon>Resources.resx</DependentUpon>
</Compile>
+ <Compile Include="UserControl\CopyXls.cs">
+ <SubType>Form</SubType>
+ </Compile>
+ <Compile Include="UserControl\CopyXls.Designer.cs">
+ <DependentUpon>CopyXls.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\SelectCk.cs">
<SubType>Form</SubType>
</Compile>
@@ -2015,6 +2021,9 @@
<EmbeddedResource Include="DevFrm\WW\showWwZhongTai.resx">
<DependentUpon>showWwZhongTai.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\CopyXls.resx">
+ <DependentUpon>CopyXls.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\SelectCk.resx">
<DependentUpon>SelectCk.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 4a74803..07e1a34 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -2525,6 +2525,11 @@
鍙楁墭鍏ュ簱
}
+ public enum OrderType
+ {
+ 鍏跺畠鍏ュ簱
+ }
+
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/CopyXls.Designer.cs b/DevApp/Gs.DevApp/UserControl/CopyXls.Designer.cs
new file mode 100644
index 0000000..993c528
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/CopyXls.Designer.cs
@@ -0,0 +1,87 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class CopyXls
+ {
+ /// <summary>
+ /// Required designer variable.
+ /// </summary>
+ private System.ComponentModel.IContainer components = null;
+
+ /// <summary>
+ /// Clean up any resources being used.
+ /// </summary>
+ /// <param name="disposing">true if managed resources should be disposed; otherwise, false.</param>
+ protected override void Dispose(bool disposing)
+ {
+ if (disposing && (components != null))
+ {
+ components.Dispose();
+ }
+ base.Dispose(disposing);
+ }
+
+ #region Windows Form Designer generated code
+
+ /// <summary>
+ /// Required method for Designer support - do not modify
+ /// the contents of this method with the code editor.
+ /// </summary>
+ private void InitializeComponent()
+ {
+ this.spreadsheetControl1 = new DevExpress.XtraSpreadsheet.SpreadsheetControl();
+ this.panel1 = new System.Windows.Forms.Panel();
+ this.btnSave = new DevExpress.XtraEditors.SimpleButton();
+ this.panel1.SuspendLayout();
+ this.SuspendLayout();
+ //
+ // spreadsheetControl1
+ //
+ this.spreadsheetControl1.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.spreadsheetControl1.Location = new System.Drawing.Point(0, 0);
+ this.spreadsheetControl1.Name = "spreadsheetControl1";
+ this.spreadsheetControl1.Size = new System.Drawing.Size(895, 593);
+ this.spreadsheetControl1.TabIndex = 0;
+ this.spreadsheetControl1.Text = "spreadsheetControl1";
+ //
+ // panel1
+ //
+ this.panel1.Controls.Add(this.btnSave);
+ this.panel1.Dock = System.Windows.Forms.DockStyle.Bottom;
+ this.panel1.Location = new System.Drawing.Point(0, 545);
+ this.panel1.Name = "panel1";
+ this.panel1.Size = new System.Drawing.Size(895, 48);
+ this.panel1.TabIndex = 2;
+ //
+ // btnSave
+ //
+ this.btnSave.ImageOptions.Image = global::Gs.DevApp.Properties.Resources.print_16x161;
+ this.btnSave.Location = new System.Drawing.Point(359, 7);
+ this.btnSave.Name = "btnSave";
+ this.btnSave.Size = new System.Drawing.Size(94, 29);
+ this.btnSave.TabIndex = 3;
+ this.btnSave.Text = "纭畾淇濆瓨";
+ this.btnSave.Click += new System.EventHandler(this.btnSave_Click);
+ //
+ // CopyXls
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.ClientSize = new System.Drawing.Size(895, 593);
+ this.Controls.Add(this.panel1);
+ this.Controls.Add(this.spreadsheetControl1);
+ this.MinimizeBox = false;
+ this.Name = "CopyXls";
+ this.StartPosition = System.Windows.Forms.FormStartPosition.CenterParent;
+ this.Text = "Xls";
+ this.panel1.ResumeLayout(false);
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraSpreadsheet.SpreadsheetControl spreadsheetControl1;
+ private System.Windows.Forms.Panel panel1;
+ private DevExpress.XtraEditors.SimpleButton btnSave;
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/CopyXls.cs b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
new file mode 100644
index 0000000..0317ead
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
@@ -0,0 +1,70 @@
+锘縰sing DevExpress.Spreadsheet;
+using DevExpress.XtraEditors;
+using System;
+using System.Collections.Generic;
+using System.ComponentModel;
+using System.Configuration;
+using System.Data;
+using System.Drawing;
+using System.IO;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using System.Windows.Forms;
+
+namespace Gs.DevApp.UserControl
+{
+ public partial class CopyXls : DevExpress.XtraEditors.XtraForm
+ {
+ private string orderType;
+ private string orderGuid;
+ private static readonly string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
+
+ public CopyXls(string orgId, string _orderGuid, string _orderType)
+ {
+ InitializeComponent();
+ this.Text = "姝ｅ湪澶嶅埗锛�" + _orderType;
+ this.orderType = _orderType;
+ this.orderGuid = _orderGuid;
+ this.spreadsheetControl1.DocumentLoaded += new EventHandler(spreadsheetControl1_DocumentLoaded);
+ if (!string.IsNullOrEmpty(filePath))
+ {
+ if (File.Exists(filePath))
+ {
+ IWorkbook workbook = spreadsheetControl1.Document;
+ workbook.LoadDocument(filePath);
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鎵句笉鍒皒lsCopy.xls鏂囦欢锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+ }
+ }
+
+ /// <summary>
+ /// 鏂囨。鍙樺寲鍚庯紝瀹炵幇瀵规柊鏂囦欢鍚嶇О鐨勬樉绀�
+ /// </summary>
+ void spreadsheetControl1_DocumentLoaded(object sender, EventArgs e)
+ {
+ string fileName = Path.GetFileName(this.spreadsheetControl1.Document.Path);
+ if (String.IsNullOrEmpty(fileName))
+ {
+ Text = "璇烽�夋嫨鏂囦欢";
+ }
+ else
+ {
+ Text = fileName;
+ }
+ }
+
+ /// <summary>
+ /// 淇濆瓨
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ private void btnSave_Click(object sender, EventArgs e)
+ {
+ spreadsheetControl1.SaveDocument();
+ }
+ }
+}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/UserControl/CopyXls.resx b/DevApp/Gs.DevApp/UserControl/CopyXls.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/CopyXls.resx
@@ -0,0 +1,120 @@
+锘�<?xml version="1.0" encoding="utf-8"?>
+<root>
+ <!--
+ Microsoft ResX Schema
+
+ Version 2.0
+
+ The primary goals of this format is to allow a simple XML format
+ that is mostly human readable. The generation and parsing of the
+ various data types are done through the TypeConverter classes
+ associated with the data types.
+
+ Example:
+
+ ... ado.net/XML headers & schema ...
+ <resheader name="resmimetype">text/microsoft-resx</resheader>
+ <resheader name="version">2.0</resheader>
+ <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+ <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+ <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+ <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+ <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+ <value>[base64 mime encoded serialized .NET Framework object]</value>
+ </data>
+ <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+ <comment>This is a comment</comment>
+ </data>
+
+ There are any number of "resheader" rows that contain simple
+ name/value pairs.
+
+ Each data row contains a name, and value. The row also contains a
+ type or mimetype. Type corresponds to a .NET class that support
+ text/value conversion through the TypeConverter architecture.
+ Classes that don't support this are serialized and stored with the
+ mimetype set.
+
+ The mimetype is used for serialized objects, and tells the
+ ResXResourceReader how to depersist the object. This is currently not
+ extensible. For a given mimetype the value must be set accordingly:
+
+ Note - application/x-microsoft.net.object.binary.base64 is the format
+ that the ResXResourceWriter will generate, however the reader can
+ read any of the formats listed below.
+
+ mimetype: application/x-microsoft.net.object.binary.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.soap.base64
+ value : The object must be serialized with
+ : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+ : and then encoded with base64 encoding.
+
+ mimetype: application/x-microsoft.net.object.bytearray.base64
+ value : The object must be serialized into a byte array
+ : using a System.ComponentModel.TypeConverter
+ : and then encoded with base64 encoding.
+ -->
+ <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+ <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+ <xsd:element name="root" msdata:IsDataSet="true">
+ <xsd:complexType>
+ <xsd:choice maxOccurs="unbounded">
+ <xsd:element name="metadata">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" />
+ </xsd:sequence>
+ <xsd:attribute name="name" use="required" type="xsd:string" />
+ <xsd:attribute name="type" type="xsd:string" />
+ <xsd:attribute name="mimetype" type="xsd:string" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="assembly">
+ <xsd:complexType>
+ <xsd:attribute name="alias" type="xsd:string" />
+ <xsd:attribute name="name" type="xsd:string" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="data">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+ <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+ <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+ <xsd:attribute ref="xml:space" />
+ </xsd:complexType>
+ </xsd:element>
+ <xsd:element name="resheader">
+ <xsd:complexType>
+ <xsd:sequence>
+ <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+ </xsd:sequence>
+ <xsd:attribute name="name" type="xsd:string" use="required" />
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:choice>
+ </xsd:complexType>
+ </xsd:element>
+ </xsd:schema>
+ <resheader name="resmimetype">
+ <value>text/microsoft-resx</value>
+ </resheader>
+ <resheader name="version">
+ <value>2.0</value>
+ </resheader>
+ <resheader name="reader">
+ <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+ <resheader name="writer">
+ <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+ </resheader>
+</root>
\ No newline at end of file
--
Gitblit v1.9.3