From 767f92e1e3efb4170295279bc0a788fd4caeb56d Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期五, 05 九月 2025 11:18:46 +0800
Subject: [PATCH] bug
---
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs | 160 ++++++------
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs | 44 +-
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.resx | 18 +
DevApp/Gs.DevApp/UserControl/CopyXls.cs | 56 ++++
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 349 ++++++++++++++++----------
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs | 68 +++++
DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.resx | 26 +-
DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs | 8
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 5
10 files changed, 473 insertions(+), 265 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 7074e85..3168274 100644
--- a/DevApp/Gs.DevApp/App.config
+++ b/DevApp/Gs.DevApp/App.config
@@ -37,8 +37,8 @@
<appSettings>
<!--<add key="webapiurl" value="http://localhost:5263/" />-->
- <add key="WebApiUrl" value="http://192.168.1.145:8081/" />
- <!--<add key="WebApiUrl" value="http://192.168.1.145:81/" />-->
+ <!--<add key="WebApiUrl" value="http://192.168.1.145:8081/" />-->
+ <add key="WebApiUrl" value="http://192.168.1.145:81/" />
<add key="LogPath" value="logs" />
<add key="ProductName" value="G-MES V2.0" />
<add key="PageSize" value="50" />
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
index c02319b..ca0fff8 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -30,6 +30,7 @@
private void InitializeComponent()
{
this.components = new System.ComponentModel.Container();
+ System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemQt));
DevExpress.XtraLayout.ColumnDefinition columnDefinition1 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition2 = new DevExpress.XtraLayout.ColumnDefinition();
DevExpress.XtraLayout.ColumnDefinition columnDefinition3 = new DevExpress.XtraLayout.ColumnDefinition();
@@ -40,6 +41,7 @@
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.RowDefinition rowDefinition7 = 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();
@@ -76,6 +78,7 @@
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
this.layoutMx1 = new DevExpress.XtraLayout.LayoutControl();
+ this.btnCopyXls = new DevExpress.XtraEditors.SimpleButton();
this.lbGuid = new System.Windows.Forms.Label();
this.ucLookHuoZhu1 = new Gs.DevApp.UserControl.UcLookHuoZhu();
this.txt_qt010 = new DevExpress.XtraEditors.TextEdit();
@@ -102,7 +105,6 @@
this.txt_qtlx = new DevExpress.XtraEditors.ComboBoxEdit();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
- this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -125,6 +127,8 @@
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layoutControlItem25 = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -134,12 +138,13 @@
this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
this.repositoryItemSearchLookUpEdit1 = new DevExpress.XtraEditors.Repository.RepositoryItemSearchLookUpEdit();
this.gridView2 = new DevExpress.XtraGrid.Views.Grid.GridView();
- this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn8 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn9 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn19 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn10 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn11 = new DevExpress.XtraGrid.Columns.GridColumn();
- this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn7 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd002 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd003 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gvMx1qd004 = new DevExpress.XtraGrid.Columns.GridColumn();
@@ -153,6 +158,7 @@
this.gridColumn16 = new DevExpress.XtraGrid.Columns.GridColumn();
this.rptCk = new DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit();
this.gridColumn17 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
@@ -194,7 +200,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qtlx.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).BeginInit();
@@ -217,6 +222,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -559,11 +566,12 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1126, 570);
- this.splitMx1.SplitterPosition = 193;
+ this.splitMx1.SplitterPosition = 233;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.btnCopyXls);
this.layoutMx1.Controls.Add(this.lbGuid);
this.layoutMx1.Controls.Add(this.ucLookHuoZhu1);
this.layoutMx1.Controls.Add(this.txt_qt010);
@@ -593,11 +601,21 @@
this.layoutControlItem14});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(1108, 361, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(722, 358, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1126, 193);
+ this.layoutMx1.Size = new System.Drawing.Size(1126, 233);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
+ //
+ // btnCopyXls
+ //
+ this.btnCopyXls.ImageOptions.Image = ((System.Drawing.Image)(resources.GetObject("btnCopyXls.ImageOptions.Image")));
+ this.btnCopyXls.Location = new System.Drawing.Point(12, 198);
+ this.btnCopyXls.Name = "btnCopyXls";
+ this.btnCopyXls.Size = new System.Drawing.Size(116, 27);
+ this.btnCopyXls.StyleController = this.layoutMx1;
+ this.btnCopyXls.TabIndex = 445;
+ this.btnCopyXls.Text = "蹇嵎褰曞叆";
//
// lbGuid
//
@@ -612,36 +630,36 @@
//
this.ucLookHuoZhu1.HzId = null;
this.ucLookHuoZhu1.IsReadly = false;
- this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 69);
+ this.ucLookHuoZhu1.Location = new System.Drawing.Point(12, 74);
this.ucLookHuoZhu1.Margin = new System.Windows.Forms.Padding(0);
this.ucLookHuoZhu1.Name = "ucLookHuoZhu1";
this.ucLookHuoZhu1.OrgId = null;
- this.ucLookHuoZhu1.Size = new System.Drawing.Size(272, 54);
+ this.ucLookHuoZhu1.Size = new System.Drawing.Size(267, 58);
this.ucLookHuoZhu1.TabIndex = 318;
//
// txt_qt010
//
- this.txt_qt010.Location = new System.Drawing.Point(114, 127);
+ this.txt_qt010.Location = new System.Drawing.Point(114, 136);
this.txt_qt010.Name = "txt_qt010";
this.txt_qt010.Properties.Appearance.Options.UseFont = true;
- this.txt_qt010.Size = new System.Drawing.Size(170, 24);
+ this.txt_qt010.Size = new System.Drawing.Size(165, 24);
this.txt_qt010.StyleController = this.layoutMx1;
this.txt_qt010.TabIndex = 235;
//
// txt_qt009
//
this.txt_qt009.IsReadly = false;
- this.txt_qt009.Location = new System.Drawing.Point(390, 127);
+ this.txt_qt009.Location = new System.Drawing.Point(385, 136);
this.txt_qt009.Name = "txt_qt009";
- this.txt_qt009.Size = new System.Drawing.Size(170, 24);
+ this.txt_qt009.Size = new System.Drawing.Size(165, 24);
this.txt_qt009.TabIndex = 316;
//
// txt_qt013
//
this.txt_qt013.IsReadly = false;
- this.txt_qt013.Location = new System.Drawing.Point(390, 98);
+ this.txt_qt013.Location = new System.Drawing.Point(385, 105);
this.txt_qt013.Name = "txt_qt013";
- this.txt_qt013.Size = new System.Drawing.Size(170, 24);
+ this.txt_qt013.Size = new System.Drawing.Size(165, 24);
this.txt_qt013.TabIndex = 304;
//
// txt_qtck
@@ -649,7 +667,7 @@
this.txt_qtck.Location = new System.Drawing.Point(114, 12);
this.txt_qtck.Name = "txt_qtck";
this.txt_qtck.Properties.Appearance.Options.UseFont = true;
- this.txt_qtck.Size = new System.Drawing.Size(170, 24);
+ this.txt_qtck.Size = new System.Drawing.Size(165, 24);
this.txt_qtck.StyleController = this.layoutMx1;
this.txt_qtck.TabIndex = 211;
this.txt_qtck.Tag = "readonly";
@@ -657,7 +675,7 @@
// txt_qt019
//
this.txt_qt019.EditValue = "鏍囧噯鍏朵粬鍑哄簱鍗�(QTCKD01_SYS)";
- this.txt_qt019.Location = new System.Drawing.Point(390, 12);
+ this.txt_qt019.Location = new System.Drawing.Point(385, 12);
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)});
@@ -668,22 +686,22 @@
"璐圭敤鐗╂枡鍑哄簱(QTCKD04_SYS)",
"搴撳瓨璋冩暣(QTCKD05_SYS)"});
this.txt_qt019.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt019.Size = new System.Drawing.Size(170, 24);
+ this.txt_qt019.Size = new System.Drawing.Size(165, 24);
this.txt_qt019.StyleController = this.layoutMx1;
this.txt_qt019.TabIndex = 301;
//
// txt_qt024
//
this.txt_qt024.IsReadly = false;
- this.txt_qt024.Location = new System.Drawing.Point(390, 40);
+ this.txt_qt024.Location = new System.Drawing.Point(385, 43);
this.txt_qt024.Name = "txt_qt024";
- this.txt_qt024.Size = new System.Drawing.Size(170, 24);
+ this.txt_qt024.Size = new System.Drawing.Size(165, 24);
this.txt_qt024.TabIndex = 309;
//
// txt_qt020
//
this.txt_qt020.EditValue = "鏅��(GENERAL)";
- this.txt_qt020.Location = new System.Drawing.Point(390, 69);
+ this.txt_qt020.Location = new System.Drawing.Point(385, 74);
this.txt_qt020.Name = "txt_qt020";
this.txt_qt020.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -691,146 +709,146 @@
"鏅��(GENERAL)",
"閫�璐�(RETURN)"});
this.txt_qt020.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt020.Size = new System.Drawing.Size(170, 24);
+ this.txt_qt020.Size = new System.Drawing.Size(165, 24);
this.txt_qt020.StyleController = this.layoutMx1;
this.txt_qt020.TabIndex = 300;
//
// txt_qt023
//
this.txt_qt023.IsReadly = false;
- this.txt_qt023.Location = new System.Drawing.Point(114, 40);
+ this.txt_qt023.Location = new System.Drawing.Point(114, 43);
this.txt_qt023.Name = "txt_qt023";
- this.txt_qt023.Size = new System.Drawing.Size(170, 24);
+ this.txt_qt023.Size = new System.Drawing.Size(165, 24);
this.txt_qt023.TabIndex = 307;
//
// txt_qt016
//
- this.txt_qt016.Location = new System.Drawing.Point(942, 12);
+ this.txt_qt016.Location = new System.Drawing.Point(927, 12);
this.txt_qt016.Name = "txt_qt016";
this.txt_qt016.Properties.Appearance.Options.UseFont = true;
- this.txt_qt016.Size = new System.Drawing.Size(172, 24);
+ this.txt_qt016.Size = new System.Drawing.Size(166, 24);
this.txt_qt016.StyleController = this.layoutMx1;
this.txt_qt016.TabIndex = 262;
this.txt_qt016.Tag = "readonly";
//
// txt_qt002
//
- this.txt_qt002.Location = new System.Drawing.Point(942, 40);
+ this.txt_qt002.Location = new System.Drawing.Point(927, 43);
this.txt_qt002.Name = "txt_qt002";
this.txt_qt002.Properties.Appearance.Options.UseFont = true;
- this.txt_qt002.Size = new System.Drawing.Size(172, 24);
+ this.txt_qt002.Size = new System.Drawing.Size(166, 24);
this.txt_qt002.StyleController = this.layoutMx1;
this.txt_qt002.TabIndex = 216;
this.txt_qt002.Tag = "readonly";
//
// txt_qt015
//
- this.txt_qt015.Location = new System.Drawing.Point(840, 69);
+ this.txt_qt015.Location = new System.Drawing.Point(825, 74);
this.txt_qt015.Name = "txt_qt015";
this.txt_qt015.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_qt015.Size = new System.Drawing.Size(274, 24);
+ this.txt_qt015.Size = new System.Drawing.Size(268, 24);
this.txt_qt015.StyleController = this.layoutMx1;
this.txt_qt015.TabIndex = 310;
this.txt_qt015.Tag = "readonly";
//
// txt_qt031
//
- this.txt_qt031.Location = new System.Drawing.Point(942, 98);
+ this.txt_qt031.Location = new System.Drawing.Point(927, 105);
this.txt_qt031.Name = "txt_qt031";
- this.txt_qt031.Size = new System.Drawing.Size(172, 24);
+ this.txt_qt031.Size = new System.Drawing.Size(166, 24);
this.txt_qt031.StyleController = this.layoutMx1;
this.txt_qt031.TabIndex = 321;
this.txt_qt031.Tag = "readonly";
//
// txt_qt030
//
- this.txt_qt030.Location = new System.Drawing.Point(942, 127);
+ this.txt_qt030.Location = new System.Drawing.Point(927, 136);
this.txt_qt030.Name = "txt_qt030";
- this.txt_qt030.Size = new System.Drawing.Size(172, 24);
+ this.txt_qt030.Size = new System.Drawing.Size(166, 24);
this.txt_qt030.StyleController = this.layoutMx1;
this.txt_qt030.TabIndex = 322;
this.txt_qt030.Tag = "readonly";
//
// txt_qt029
//
- this.txt_qt029.Location = new System.Drawing.Point(840, 156);
+ this.txt_qt029.Location = new System.Drawing.Point(825, 167);
this.txt_qt029.Name = "txt_qt029";
this.txt_qt029.Properties.Caption = "璐㈠姟瀹℃牳鐘舵��";
- this.txt_qt029.Size = new System.Drawing.Size(274, 24);
+ this.txt_qt029.Size = new System.Drawing.Size(268, 24);
this.txt_qt029.StyleController = this.layoutMx1;
this.txt_qt029.TabIndex = 323;
this.txt_qt029.Tag = "readonly";
//
// txt_qt028
//
- this.txt_qt028.Location = new System.Drawing.Point(666, 98);
+ this.txt_qt028.Location = new System.Drawing.Point(656, 105);
this.txt_qt028.Name = "txt_qt028";
- this.txt_qt028.Size = new System.Drawing.Size(170, 24);
+ this.txt_qt028.Size = new System.Drawing.Size(165, 24);
this.txt_qt028.StyleController = this.layoutMx1;
this.txt_qt028.TabIndex = 324;
this.txt_qt028.Tag = "readonly";
//
// txt_qt027
//
- this.txt_qt027.Location = new System.Drawing.Point(666, 127);
+ this.txt_qt027.Location = new System.Drawing.Point(656, 136);
this.txt_qt027.Name = "txt_qt027";
- this.txt_qt027.Size = new System.Drawing.Size(170, 24);
+ this.txt_qt027.Size = new System.Drawing.Size(165, 24);
this.txt_qt027.StyleController = this.layoutMx1;
this.txt_qt027.TabIndex = 325;
this.txt_qt027.Tag = "readonly";
//
// txt_qt034
//
- this.txt_qt034.Location = new System.Drawing.Point(666, 12);
+ this.txt_qt034.Location = new System.Drawing.Point(656, 12);
this.txt_qt034.Name = "txt_qt034";
- this.txt_qt034.Size = new System.Drawing.Size(170, 24);
+ this.txt_qt034.Size = new System.Drawing.Size(165, 24);
this.txt_qt034.StyleController = this.layoutMx1;
this.txt_qt034.TabIndex = 326;
this.txt_qt034.Tag = "readonly";
//
// txt_qt026
//
- this.txt_qt026.Location = new System.Drawing.Point(564, 156);
+ this.txt_qt026.Location = new System.Drawing.Point(554, 167);
this.txt_qt026.Name = "txt_qt026";
this.txt_qt026.Properties.Caption = "鍞悗瀹℃牳鏍囪瘑";
- this.txt_qt026.Size = new System.Drawing.Size(272, 24);
+ this.txt_qt026.Size = new System.Drawing.Size(267, 24);
this.txt_qt026.StyleController = this.layoutMx1;
this.txt_qt026.TabIndex = 327;
this.txt_qt026.Tag = "readonly";
//
// txt_qt033
//
- this.txt_qt033.Location = new System.Drawing.Point(666, 40);
+ this.txt_qt033.Location = new System.Drawing.Point(656, 43);
this.txt_qt033.Name = "txt_qt033";
- this.txt_qt033.Size = new System.Drawing.Size(170, 24);
+ this.txt_qt033.Size = new System.Drawing.Size(165, 24);
this.txt_qt033.StyleController = this.layoutMx1;
this.txt_qt033.TabIndex = 328;
this.txt_qt033.Tag = "readonly";
//
// txt_qt032
//
- this.txt_qt032.Location = new System.Drawing.Point(564, 69);
+ this.txt_qt032.Location = new System.Drawing.Point(554, 74);
this.txt_qt032.Name = "txt_qt032";
this.txt_qt032.Properties.Caption = "閲囪喘瀹℃牳鏍囪瘑";
- this.txt_qt032.Size = new System.Drawing.Size(272, 24);
+ this.txt_qt032.Size = new System.Drawing.Size(267, 24);
this.txt_qt032.StyleController = this.layoutMx1;
this.txt_qt032.TabIndex = 329;
this.txt_qt032.Tag = "readonly";
//
// txt_qt035
//
- this.txt_qt035.Location = new System.Drawing.Point(114, 156);
+ this.txt_qt035.Location = new System.Drawing.Point(114, 167);
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(170, 24);
+ this.txt_qt035.Size = new System.Drawing.Size(165, 24);
this.txt_qt035.StyleController = this.layoutMx1;
this.txt_qt035.TabIndex = 330;
//
// txt_qtlx
//
this.txt_qtlx.EditValue = "璇烽�夋嫨";
- this.txt_qtlx.Location = new System.Drawing.Point(390, 156);
+ this.txt_qtlx.Location = new System.Drawing.Point(385, 167);
this.txt_qtlx.Name = "txt_qtlx";
this.txt_qtlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -843,7 +861,7 @@
"5:鎶ュ簾鍑哄簱",
"6:鏍锋満鍑哄簱"});
this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qtlx.Size = new System.Drawing.Size(170, 24);
+ this.txt_qtlx.Size = new System.Drawing.Size(165, 24);
this.txt_qtlx.StyleController = this.layoutMx1;
this.txt_qtlx.TabIndex = 331;
//
@@ -864,7 +882,6 @@
this.Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
this.Root.GroupBordersVisible = false;
this.Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
- this.layoutControlItem1,
this.layoutControlItem2,
this.layoutControlItem4,
this.layoutControlItem6,
@@ -886,7 +903,9 @@
this.layoutControlItem5,
this.layoutControlItem13,
this.layoutControlItem24,
- this.layoutControlItem12});
+ this.layoutControlItem12,
+ this.layoutControlItem1,
+ this.layoutControlItem25});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
@@ -914,74 +933,68 @@
rowDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
rowDefinition6.Height = 100D;
rowDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
rowDefinition1,
rowDefinition2,
rowDefinition3,
rowDefinition4,
rowDefinition5,
- rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1126, 193);
+ rowDefinition6,
+ rowDefinition7});
+ this.Root.Size = new System.Drawing.Size(1105, 237);
this.Root.TextVisible = false;
- //
- // layoutControlItem1
- //
- 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(276, 28);
- this.layoutControlItem1.Text = "鍗曟嵁缂栧彿";
- this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_qt019;
- this.layoutControlItem2.Location = new System.Drawing.Point(276, 0);
+ this.layoutControlItem2.Location = new System.Drawing.Point(271, 0);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem4
//
this.layoutControlItem4.Control = this.txt_qt023;
- 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(276, 29);
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem4.Text = "搴撳瓨缁勭粐";
this.layoutControlItem4.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem6
//
this.layoutControlItem6.Control = this.txt_qt016;
- this.layoutControlItem6.Location = new System.Drawing.Point(828, 0);
+ this.layoutControlItem6.Location = new System.Drawing.Point(813, 0);
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem6.Size = new System.Drawing.Size(278, 28);
+ this.layoutControlItem6.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem6.Text = "瀹℃牳浜哄憳";
this.layoutControlItem6.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem7
//
this.layoutControlItem7.Control = this.txt_qt002;
- this.layoutControlItem7.Location = new System.Drawing.Point(828, 28);
+ this.layoutControlItem7.Location = new System.Drawing.Point(813, 31);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem7.Size = new System.Drawing.Size(278, 29);
+ this.layoutControlItem7.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem7.Text = "瀹℃牳鏃堕棿";
this.layoutControlItem7.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem8
//
this.layoutControlItem8.Control = this.txt_qt015;
- this.layoutControlItem8.Location = new System.Drawing.Point(828, 57);
+ this.layoutControlItem8.Location = new System.Drawing.Point(813, 62);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem8.Size = new System.Drawing.Size(278, 29);
+ this.layoutControlItem8.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem8.Text = "瀹℃牳鏍囪瘑";
this.layoutControlItem8.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem8.TextVisible = false;
@@ -989,11 +1002,11 @@
// layoutControlItem9
//
this.layoutControlItem9.Control = this.ucLookHuoZhu1;
- this.layoutControlItem9.Location = new System.Drawing.Point(0, 57);
+ this.layoutControlItem9.Location = new System.Drawing.Point(0, 62);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(276, 58);
+ this.layoutControlItem9.Size = new System.Drawing.Size(271, 62);
this.layoutControlItem9.Text = "璐т富绫诲瀷";
this.layoutControlItem9.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem9.TextVisible = false;
@@ -1001,33 +1014,33 @@
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_qt031;
- this.layoutControlItem15.Location = new System.Drawing.Point(828, 86);
+ this.layoutControlItem15.Location = new System.Drawing.Point(813, 93);
this.layoutControlItem15.Name = "layoutControlItem15";
this.layoutControlItem15.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem15.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem15.Size = new System.Drawing.Size(278, 29);
+ this.layoutControlItem15.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem15.Text = "璐㈠姟瀹℃牳浜哄憳";
this.layoutControlItem15.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem16
//
this.layoutControlItem16.Control = this.txt_qt030;
- this.layoutControlItem16.Location = new System.Drawing.Point(828, 115);
+ this.layoutControlItem16.Location = new System.Drawing.Point(813, 124);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem16.Size = new System.Drawing.Size(278, 29);
+ this.layoutControlItem16.Size = new System.Drawing.Size(272, 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(828, 144);
+ this.layoutControlItem17.Location = new System.Drawing.Point(813, 155);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem17.Size = new System.Drawing.Size(278, 29);
+ this.layoutControlItem17.Size = new System.Drawing.Size(272, 31);
this.layoutControlItem17.Text = "璐㈠姟瀹℃牳鏍囪瘑";
this.layoutControlItem17.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem17.TextVisible = false;
@@ -1035,33 +1048,33 @@
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_qt028;
- this.layoutControlItem18.Location = new System.Drawing.Point(552, 86);
+ this.layoutControlItem18.Location = new System.Drawing.Point(542, 93);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem18.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem18.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem18.Text = "鍞悗瀹℃牳浜哄憳";
this.layoutControlItem18.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_qt027;
- this.layoutControlItem19.Location = new System.Drawing.Point(552, 115);
+ this.layoutControlItem19.Location = new System.Drawing.Point(542, 124);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem19.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem19.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem19.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem19.Text = "鍞悗瀹℃牳鏃堕棿";
this.layoutControlItem19.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_qt026;
- this.layoutControlItem21.Location = new System.Drawing.Point(552, 144);
+ this.layoutControlItem21.Location = new System.Drawing.Point(542, 155);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem21.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem21.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem21.Text = "鍞悗瀹℃牳鏍囪瘑";
this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem21.TextVisible = false;
@@ -1069,54 +1082,54 @@
// layoutControlItem20
//
this.layoutControlItem20.Control = this.txt_qt034;
- this.layoutControlItem20.Location = new System.Drawing.Point(552, 0);
+ this.layoutControlItem20.Location = new System.Drawing.Point(542, 0);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem20.Size = new System.Drawing.Size(276, 28);
+ this.layoutControlItem20.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem20.Text = "閲囪喘瀹℃牳浜哄憳";
this.layoutControlItem20.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_qt020;
- this.layoutControlItem3.Location = new System.Drawing.Point(276, 57);
+ this.layoutControlItem3.Location = new System.Drawing.Point(271, 62);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem3.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem3.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem11
//
this.layoutControlItem11.Control = this.txt_qt009;
- this.layoutControlItem11.Location = new System.Drawing.Point(276, 115);
+ this.layoutControlItem11.Location = new System.Drawing.Point(271, 124);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem11.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem11.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem11.Text = "棰嗘枡閮ㄩ棬";
this.layoutControlItem11.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem22
//
this.layoutControlItem22.Control = this.txt_qt033;
- this.layoutControlItem22.Location = new System.Drawing.Point(552, 28);
+ this.layoutControlItem22.Location = new System.Drawing.Point(542, 31);
this.layoutControlItem22.Name = "layoutControlItem22";
this.layoutControlItem22.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem22.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem22.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem22.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem22.Text = "閲囪喘瀹℃牳鏃堕棿";
this.layoutControlItem22.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem23
//
this.layoutControlItem23.Control = this.txt_qt032;
- this.layoutControlItem23.Location = new System.Drawing.Point(552, 57);
+ this.layoutControlItem23.Location = new System.Drawing.Point(542, 62);
this.layoutControlItem23.Name = "layoutControlItem23";
this.layoutControlItem23.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem23.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem23.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem23.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem23.Text = "閲囪喘瀹℃牳鏍囪瘑";
this.layoutControlItem23.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem23.TextVisible = false;
@@ -1124,55 +1137,78 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_qt013;
- this.layoutControlItem10.Location = new System.Drawing.Point(276, 86);
+ this.layoutControlItem10.Location = new System.Drawing.Point(271, 93);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem10.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem10.Text = "瀹㈡埛";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem5
//
this.layoutControlItem5.Control = this.txt_qt024;
- this.layoutControlItem5.Location = new System.Drawing.Point(276, 28);
+ this.layoutControlItem5.Location = new System.Drawing.Point(271, 31);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem5.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem5.Text = "棰嗙敤缁勭粐";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
this.layoutControlItem13.Control = this.txt_qt010;
- this.layoutControlItem13.Location = new System.Drawing.Point(0, 115);
+ this.layoutControlItem13.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem13.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem13.Text = "鐢宠澶囨敞";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem24
//
this.layoutControlItem24.Control = this.txt_qt035;
- this.layoutControlItem24.Location = new System.Drawing.Point(0, 144);
+ this.layoutControlItem24.Location = new System.Drawing.Point(0, 155);
this.layoutControlItem24.Name = "layoutControlItem24";
this.layoutControlItem24.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem24.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem24.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem24.Text = "鏉ユ簮鍗曞彿";
this.layoutControlItem24.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem12
//
this.layoutControlItem12.Control = this.txt_qtlx;
- this.layoutControlItem12.Location = new System.Drawing.Point(276, 144);
+ this.layoutControlItem12.Location = new System.Drawing.Point(271, 155);
this.layoutControlItem12.Name = "layoutControlItem12";
this.layoutControlItem12.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem12.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem12.Size = new System.Drawing.Size(276, 29);
+ this.layoutControlItem12.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem12.Text = "鍑哄簱绫诲瀷";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem1
+ //
+ 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(271, 31);
+ this.layoutControlItem1.Text = "鍗曟嵁缂栧彿";
+ this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
+ //
+ // layoutControlItem25
+ //
+ this.layoutControlItem25.Control = this.btnCopyXls;
+ this.layoutControlItem25.Location = new System.Drawing.Point(0, 186);
+ this.layoutControlItem25.MaxSize = new System.Drawing.Size(120, 31);
+ this.layoutControlItem25.MinSize = new System.Drawing.Size(90, 31);
+ this.layoutControlItem25.Name = "layoutControlItem25";
+ this.layoutControlItem25.OptionsTableLayoutItem.RowIndex = 6;
+ this.layoutControlItem25.Size = new System.Drawing.Size(271, 31);
+ this.layoutControlItem25.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
+ this.layoutControlItem25.Text = "蹇嵎褰曞叆";
+ this.layoutControlItem25.TextSize = new System.Drawing.Size(0, 0);
+ this.layoutControlItem25.TextVisible = false;
//
// tabMx
//
@@ -1180,7 +1216,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(1126, 365);
+ this.tabMx.Size = new System.Drawing.Size(1126, 325);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1});
@@ -1189,7 +1225,7 @@
//
this.tabMxPage1.Controls.Add(this.gcMx1);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1124, 333);
+ this.tabMxPage1.Size = new System.Drawing.Size(1124, 293);
this.tabMxPage1.Text = "鐢宠鏄庣粏";
//
// gcMx1
@@ -1202,7 +1238,7 @@
this.repositoryItemButtonEdit1,
this.repositoryItemSearchLookUpEdit1,
this.rptCk});
- this.gcMx1.Size = new System.Drawing.Size(1124, 333);
+ this.gcMx1.Size = new System.Drawing.Size(1124, 293);
this.gcMx1.TabIndex = 1;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
@@ -1223,7 +1259,8 @@
this.gvMxDel,
this.gridColumn12,
this.gridColumn16,
- this.gridColumn17});
+ this.gridColumn17,
+ this.gridColumn18});
this.gvMx1.GridControl = this.gcMx1;
this.gvMx1.Name = "gvMx1";
this.gvMx1.OptionsBehavior.AllowAddRows = DevExpress.Utils.DefaultBoolean.True;
@@ -1281,26 +1318,17 @@
// gridView2
//
this.gridView2.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
- this.gridColumn7,
this.gridColumn8,
this.gridColumn9,
+ this.gridColumn2,
+ this.gridColumn19,
this.gridColumn10,
this.gridColumn11,
- this.gridColumn2});
+ this.gridColumn7});
this.gridView2.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
this.gridView2.Name = "gridView2";
this.gridView2.OptionsSelection.EnableAppearanceFocusedCell = false;
this.gridView2.OptionsView.ShowGroupPanel = false;
- //
- // gridColumn7
- //
- this.gridColumn7.Caption = "浣跨敤缁勭粐";
- this.gridColumn7.FieldName = "fSubsidiary";
- this.gridColumn7.MinWidth = 200;
- this.gridColumn7.Name = "gridColumn7";
- this.gridColumn7.Visible = true;
- this.gridColumn7.VisibleIndex = 0;
- this.gridColumn7.Width = 200;
//
// gridColumn8
//
@@ -1308,8 +1336,6 @@
this.gridColumn8.FieldName = "id";
this.gridColumn8.MinWidth = 80;
this.gridColumn8.Name = "gridColumn8";
- this.gridColumn8.Visible = true;
- this.gridColumn8.VisibleIndex = 1;
this.gridColumn8.Width = 80;
//
// gridColumn9
@@ -1319,8 +1345,29 @@
this.gridColumn9.MinWidth = 100;
this.gridColumn9.Name = "gridColumn9";
this.gridColumn9.Visible = true;
- this.gridColumn9.VisibleIndex = 2;
+ this.gridColumn9.VisibleIndex = 0;
this.gridColumn9.Width = 100;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "鍗曚綅";
+ this.gridColumn2.FieldName = "dwName";
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 20;
+ //
+ // gridColumn19
+ //
+ this.gridColumn19.AppearanceCell.ForeColor = System.Drawing.Color.DarkGreen;
+ this.gridColumn19.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn19.AppearanceHeader.ForeColor = System.Drawing.Color.DarkGreen;
+ this.gridColumn19.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn19.Caption = "Mes/Erp搴撳瓨";
+ this.gridColumn19.FieldName = "kcQty";
+ this.gridColumn19.Name = "gridColumn19";
+ this.gridColumn19.Visible = true;
+ this.gridColumn19.VisibleIndex = 2;
//
// gridColumn10
//
@@ -1336,19 +1383,22 @@
//
this.gridColumn11.Caption = "鐗╂枡鍨嬪彿";
this.gridColumn11.FieldName = "itemModel";
- this.gridColumn11.MinWidth = 120;
+ this.gridColumn11.MaxWidth = 350;
+ this.gridColumn11.MinWidth = 10;
this.gridColumn11.Name = "gridColumn11";
this.gridColumn11.Visible = true;
this.gridColumn11.VisibleIndex = 4;
- this.gridColumn11.Width = 120;
+ this.gridColumn11.Width = 10;
//
- // gridColumn2
+ // gridColumn7
//
- this.gridColumn2.Caption = "鍗曚綅";
- this.gridColumn2.FieldName = "dwName";
- this.gridColumn2.Name = "gridColumn2";
- this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 5;
+ this.gridColumn7.Caption = "浣跨敤缁勭粐";
+ this.gridColumn7.FieldName = "fSubsidiary";
+ this.gridColumn7.MinWidth = 200;
+ this.gridColumn7.Name = "gridColumn7";
+ this.gridColumn7.Visible = true;
+ this.gridColumn7.VisibleIndex = 5;
+ this.gridColumn7.Width = 200;
//
// gvMx1qd002
//
@@ -1418,7 +1468,7 @@
//
this.gvMx1qd009.AppearanceCell.Options.UseFont = true;
this.gvMx1qd009.Caption = "鍗曚綅 ";
- this.gvMx1qd009.FieldName = "qd009dw";
+ this.gvMx1qd009.FieldName = "qd009";
this.gvMx1qd009.MinWidth = 25;
this.gvMx1qd009.Name = "gvMx1qd009";
this.gvMx1qd009.Tag = "query_a.qd009";
@@ -1449,7 +1499,7 @@
this.gvMxDel.MinWidth = 25;
this.gvMxDel.Name = "gvMxDel";
this.gvMxDel.Visible = true;
- this.gvMxDel.VisibleIndex = 9;
+ this.gvMxDel.VisibleIndex = 10;
this.gvMxDel.Width = 94;
//
// repositoryItemButtonEdit1
@@ -1503,6 +1553,20 @@
this.gridColumn17.MinWidth = 25;
this.gridColumn17.Name = "gridColumn17";
this.gridColumn17.Width = 94;
+ //
+ // gridColumn18
+ //
+ this.gridColumn18.AppearanceCell.ForeColor = System.Drawing.Color.DarkGreen;
+ this.gridColumn18.AppearanceCell.Options.UseForeColor = true;
+ this.gridColumn18.AppearanceHeader.ForeColor = System.Drawing.Color.DarkGreen;
+ this.gridColumn18.AppearanceHeader.Options.UseForeColor = true;
+ this.gridColumn18.Caption = "Mes/Erp鍙婃椂搴撳瓨";
+ this.gridColumn18.FieldName = "kcQty";
+ this.gridColumn18.MinWidth = 25;
+ this.gridColumn18.Name = "gridColumn18";
+ this.gridColumn18.Visible = true;
+ this.gridColumn18.VisibleIndex = 9;
+ this.gridColumn18.Width = 94;
//
// picCheckBox
//
@@ -1564,7 +1628,6 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qtlx.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem4)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem6)).EndInit();
@@ -1587,6 +1650,8 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem24)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem12)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem1)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem25)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1638,7 +1703,6 @@
private DevExpress.XtraEditors.TextEdit txt_qtck;
private DevExpress.XtraLayout.LayoutControl layoutMx1;
private DevExpress.XtraLayout.LayoutControlGroup Root;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem2;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem4;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem6;
@@ -1706,5 +1770,10 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraEditors.ComboBoxEdit txt_qtlx;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn18;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn19;
+ private DevExpress.XtraEditors.SimpleButton btnCopyXls;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem25;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
index 97398ee..e5f19fa 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.cs
@@ -7,6 +7,7 @@
using System;
using System.Collections.Generic;
using System.Data;
+using System.IO;
using System.Threading.Tasks;
using System.Windows.Forms;
@@ -73,6 +74,7 @@
var rtn = UtilityHelper.ReturnToTablePage(strReturn);
var dt = rtn.rtnData.list;
this.repositoryItemSearchLookUpEdit1.DataSource = dt;
+ repositoryItemSearchLookUpEdit1.BestFitMode = DevExpress.XtraEditors.Controls.BestFitMode.BestFitResizePopup;
}
catch (Exception ex)
{
@@ -102,6 +104,64 @@
};
frm.ShowDialog();
};
+
+ #region 2025-08-27 澶嶅埗beg
+ btnCopyXls.Click += (s, e) =>
+ {
+ string kcZz = txt_qt023.GetId();
+ if (string.IsNullOrEmpty(kcZz))
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("璇峰厛閫夋嫨搴撳瓨缁勭粐鍚庢墠鑳戒娇鐢ㄥ鍒跺姛鑳斤紒");
+ txt_qt023.Focus();
+ return;
+ }
+ string filePath = AppContext.BaseDirectory + "xlsCopy.xls";
+ if (File.Exists(filePath))
+ {
+ var frm = new CopyXls(kcZz, lbGuid.Text.Trim(), OrderType.鍏跺畠鍑哄簱.ToString());
+ frm.UpdateParent += (ss, ee) =>
+ {
+ try
+ {
+ var lst = ee.DynamicList;
+ DataTable _Table = (DataTable)gcMx1.DataSource;
+ foreach (dynamic dym in lst)
+ {
+ DataRow _row = _Table.NewRow();
+ _row["qd002"] = dym.itemNo;
+ _row["qd003"] = dym.itemName;
+ _row["qd004"] = dym.itemModel;
+ _row["qd009"] = dym.dwName;
+ _row["itemId"] = dym.itemId;
+ _row["qd007"] = dym.sl;
+ _row["qd010"] = dym.bz;
+ //榛樿浠撳簱鍜屼粨搴撴暟閲�
+ _row["depotName"] = dym.depotName;
+ _row["depotId"] = dym.depotId;
+ _row["kcQty"] = dym.kcQty;
+ _Table.Rows.Add(_row);
+ }
+ gcMx1.BindingContext = new BindingContext();
+ gcMx1.DataSource = _Table;
+ gcMx1.ForceInitialize();
+ gvMx1.CloseEditor();
+ gvMx1.PostEditor();
+ gvMx1.UpdateCurrentRow();
+ gvMx1.BestFitColumns();
+ }
+ catch (Exception ex)
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError(ex.Message);
+ }
+ };
+ frm.ShowDialog();
+ }
+ else
+ {
+ Gs.DevApp.ToolBox.MsgHelper.ShowError("鎵句笉鍒皒lsCopy.xls鏂囦欢锛岃鑱旂郴绠＄悊鍛橈紒");
+ }
+ };
+ #endregion
}
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
@@ -703,10 +763,16 @@
gvMx1.SetFocusedRowCellValue("qd004", SelectedDataRow["itemModel"]);
gvMx1.SetFocusedRowCellValue("qd009", SelectedDataRow["dwName"]);
gvMx1.SetFocusedRowCellValue("itemId", SelectedDataRow["id"]);
+
+ gvMx1.SetFocusedRowCellValue("depotName", SelectedDataRow["depotName"]);
+ gvMx1.SetFocusedRowCellValue("depotId", SelectedDataRow["depotId"]);
+ gvMx1.SetFocusedRowCellValue("kcQty", SelectedDataRow["kcQty"]);
+
gvMx1.CloseEditor();
gvMx1.PostEditor();
gvMx1.UpdateCurrentRow();
-
+ gvMx1.BestFitColumns();
+ Gs.DevApp.ToolBox.UtilityHelper.SetGridLayout(gvMx1);
}
/// <summary>
/// 鍒犻櫎鏄庣粏
diff --git a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.resx b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.resx
index a4826a3..fde1187 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.resx
@@ -117,6 +117,24 @@
<resheader name="writer">
<value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
</resheader>
+ <assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
+ <data name="btnCopyXls.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+ <value>
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE1vZGVsO0NvcHk7Q29weU1vZGVs
+ O4ktWcsAAAJgSURBVDhPjdFdSFNhHMfx1XQvbhokvdx00X3ddlEEQRB0WzeRvYBFkESRWVgstZpz5ZL5
+ Oo0CaysbFBlWSos2hroU1wsWmFA3WelyO9s82862s/36P4+4zqKLDnyQB5//9zx7jgpAgdFoVHc6g75u
+ 11t0ud6RIDqcQbQz96ZgJ7bb437ap1mZ+TtQ2uGcQj4PkudyTG6ZTG7emQTt0xcC9KwialKi1WoNg54Z
+ SJIEIZrgwkICkWgKMTGDdDaHG30BFihTBtSW3oDP2vcGLb0TJACLYwzNjgDM5FrPGG4NBBESREiZHCw9
+ oyxgUAZKmx2jRcdWHp0du9Hux49fUaTSMpra/SxgVAY0VztZIA8xmeWWkjIXF2V+bJPNi2/zAhKSDFOb
+ lwXKlQFtfauXvzGWyCLKiFkISxmOvfWs+SW+zC0iTv+7YPWwQIUyoDvf4uHHZQMRuqwI/Y1RRExl6XfL
+ ePZ6BqFwHIlUBi98n6HX6ytproSwy1eVnWp8jqycRyiaJhIWBInelsHcyCBmG2oKPpj3I9C6owgLGE6a
+ hiiQwzwNRuJpGk4jHEti9nIN4HVxKdd1DBzaDAgPufi0ma954PjFp8jQZf2MLH/vu8OfcODKSMEJ+znU
+ 9W8p8n346J9Add0Tfttx9hUSEvaccWNCBOeeDmFf/SYsop8b/9rE18qArur0fd+R2sc4XPsI7qH3PNDw
+ aoGr7p7gA86PO7lLD7byddfejbDuXm9jgdVETyrIGrLhfwK0by3R8G+pRI9uW5UDSruOrSuy/WBlGx9m
+ zz8CKycyKpQrsLWW0D6V6jdzUIrq8TztCAAAAABJRU5ErkJggg==
+</value>
+ </data>
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
<value>17, 17</value>
</metadata>
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
index 416eb67..fb39544 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.Designer.cs
@@ -685,7 +685,7 @@
this.splitMx1.Panel2.Text = "Panel2";
this.splitMx1.ShowSplitGlyph = DevExpress.Utils.DefaultBoolean.True;
this.splitMx1.Size = new System.Drawing.Size(1332, 570);
- this.splitMx1.SplitterPosition = 203;
+ this.splitMx1.SplitterPosition = 207;
this.splitMx1.TabIndex = 0;
//
// layoutMx1
@@ -725,7 +725,7 @@
this.layoutMx1.Name = "layoutMx1";
this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(600, 497, 812, 500);
this.layoutMx1.Root = this.Root;
- this.layoutMx1.Size = new System.Drawing.Size(1332, 203);
+ this.layoutMx1.Size = new System.Drawing.Size(1332, 207);
this.layoutMx1.TabIndex = 0;
this.layoutMx1.Text = "layoutControl1";
//
@@ -741,9 +741,9 @@
//
// txt_qt003
//
- this.txt_qt003.Location = new System.Drawing.Point(759, 43);
+ this.txt_qt003.Location = new System.Drawing.Point(770, 43);
this.txt_qt003.Name = "txt_qt003";
- this.txt_qt003.Size = new System.Drawing.Size(217, 24);
+ this.txt_qt003.Size = new System.Drawing.Size(222, 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\'";
@@ -762,7 +762,7 @@
this.txt_qt010.Location = new System.Drawing.Point(114, 136);
this.txt_qt010.Name = "txt_qt010";
this.txt_qt010.Properties.Appearance.Options.UseFont = true;
- this.txt_qt010.Size = new System.Drawing.Size(216, 24);
+ this.txt_qt010.Size = new System.Drawing.Size(222, 24);
this.txt_qt010.StyleController = this.layoutMx1;
this.txt_qt010.TabIndex = 240;
//
@@ -774,24 +774,24 @@
this.ucLookHuoZhu1.Margin = new System.Windows.Forms.Padding(0);
this.ucLookHuoZhu1.Name = "ucLookHuoZhu1";
this.ucLookHuoZhu1.OrgId = null;
- this.ucLookHuoZhu1.Size = new System.Drawing.Size(318, 58);
+ this.ucLookHuoZhu1.Size = new System.Drawing.Size(324, 58);
this.ucLookHuoZhu1.TabIndex = 329;
//
// txt_qt008
//
this.txt_qt008.IsReadly = false;
- this.txt_qt008.Location = new System.Drawing.Point(436, 105);
+ this.txt_qt008.Location = new System.Drawing.Point(442, 105);
this.txt_qt008.Margin = new System.Windows.Forms.Padding(0);
this.txt_qt008.Name = "txt_qt008";
- this.txt_qt008.Size = new System.Drawing.Size(217, 24);
+ this.txt_qt008.Size = new System.Drawing.Size(222, 24);
this.txt_qt008.TabIndex = 301;
//
// txt_qt016
//
- this.txt_qt016.Location = new System.Drawing.Point(759, 74);
+ this.txt_qt016.Location = new System.Drawing.Point(770, 74);
this.txt_qt016.Name = "txt_qt016";
this.txt_qt016.Properties.Appearance.Options.UseFont = true;
- this.txt_qt016.Size = new System.Drawing.Size(217, 24);
+ this.txt_qt016.Size = new System.Drawing.Size(222, 24);
this.txt_qt016.StyleController = this.layoutMx1;
this.txt_qt016.TabIndex = 267;
this.txt_qt016.Tag = "readonly";
@@ -799,10 +799,10 @@
// txt_qt018
//
this.txt_qt018.IsReadly = false;
- this.txt_qt018.Location = new System.Drawing.Point(436, 74);
+ this.txt_qt018.Location = new System.Drawing.Point(442, 74);
this.txt_qt018.Margin = new System.Windows.Forms.Padding(0);
this.txt_qt018.Name = "txt_qt018";
- this.txt_qt018.Size = new System.Drawing.Size(217, 24);
+ this.txt_qt018.Size = new System.Drawing.Size(222, 24);
this.txt_qt018.TabIndex = 302;
//
// txt_qt022
@@ -810,15 +810,15 @@
this.txt_qt022.IsReadly = false;
this.txt_qt022.Location = new System.Drawing.Point(114, 43);
this.txt_qt022.Name = "txt_qt022";
- this.txt_qt022.Size = new System.Drawing.Size(216, 24);
+ this.txt_qt022.Size = new System.Drawing.Size(222, 24);
this.txt_qt022.TabIndex = 326;
//
// txt_qt009
//
this.txt_qt009.IsReadly = false;
- this.txt_qt009.Location = new System.Drawing.Point(436, 43);
+ this.txt_qt009.Location = new System.Drawing.Point(442, 43);
this.txt_qt009.Name = "txt_qt009";
- this.txt_qt009.Size = new System.Drawing.Size(217, 24);
+ this.txt_qt009.Size = new System.Drawing.Size(222, 24);
this.txt_qt009.TabIndex = 304;
//
// txt_qtck
@@ -826,17 +826,17 @@
this.txt_qtck.Location = new System.Drawing.Point(114, 12);
this.txt_qtck.Name = "txt_qtck";
this.txt_qtck.Properties.Appearance.Options.UseFont = true;
- this.txt_qtck.Size = new System.Drawing.Size(216, 24);
+ this.txt_qtck.Size = new System.Drawing.Size(222, 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(759, 105);
+ this.txt_qt002.Location = new System.Drawing.Point(770, 105);
this.txt_qt002.Name = "txt_qt002";
this.txt_qt002.Properties.Appearance.Options.UseFont = true;
- this.txt_qt002.Size = new System.Drawing.Size(217, 24);
+ this.txt_qt002.Size = new System.Drawing.Size(222, 24);
this.txt_qt002.StyleController = this.layoutMx1;
this.txt_qt002.TabIndex = 217;
this.txt_qt002.Tag = "readonly";
@@ -844,7 +844,7 @@
// txt_qt019
//
this.txt_qt019.EditValue = "鏅��(GENERAL)";
- this.txt_qt019.Location = new System.Drawing.Point(759, 12);
+ this.txt_qt019.Location = new System.Drawing.Point(770, 12);
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)});
@@ -852,16 +852,16 @@
"鏅��(GENERAL)",
"閫�璐�(RETURN)"});
this.txt_qt019.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qt019.Size = new System.Drawing.Size(217, 24);
+ this.txt_qt019.Size = new System.Drawing.Size(222, 24);
this.txt_qt019.StyleController = this.layoutMx1;
this.txt_qt019.TabIndex = 299;
//
// txt_qt015
//
- this.txt_qt015.Location = new System.Drawing.Point(657, 136);
+ this.txt_qt015.Location = new System.Drawing.Point(668, 136);
this.txt_qt015.Name = "txt_qt015";
this.txt_qt015.Properties.Caption = "瀹℃牳鐘舵��";
- this.txt_qt015.Size = new System.Drawing.Size(319, 24);
+ this.txt_qt015.Size = new System.Drawing.Size(324, 24);
this.txt_qt015.StyleController = this.layoutMx1;
this.txt_qt015.TabIndex = 330;
this.txt_qt015.Tag = "readonly";
@@ -888,67 +888,67 @@
//
// txt_qt030
//
- this.txt_qt030.Location = new System.Drawing.Point(1082, 105);
+ this.txt_qt030.Location = new System.Drawing.Point(1098, 105);
this.txt_qt030.Name = "txt_qt030";
- this.txt_qt030.Size = new System.Drawing.Size(217, 24);
+ this.txt_qt030.Size = new System.Drawing.Size(222, 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(1082, 136);
+ this.txt_qt029.Location = new System.Drawing.Point(1098, 136);
this.txt_qt029.Name = "txt_qt029";
- this.txt_qt029.Size = new System.Drawing.Size(217, 24);
+ this.txt_qt029.Size = new System.Drawing.Size(222, 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(980, 167);
+ this.txt_qt028.Location = new System.Drawing.Point(996, 167);
this.txt_qt028.Name = "txt_qt028";
this.txt_qt028.Properties.Caption = "璐㈠姟瀹℃牳鏍囪瘑";
- this.txt_qt028.Size = new System.Drawing.Size(319, 24);
+ this.txt_qt028.Size = new System.Drawing.Size(324, 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(1082, 12);
+ this.txt_qt034.Location = new System.Drawing.Point(1098, 12);
this.txt_qt034.Name = "txt_qt034";
- this.txt_qt034.Size = new System.Drawing.Size(217, 24);
+ this.txt_qt034.Size = new System.Drawing.Size(222, 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(1082, 43);
+ this.txt_qt033.Location = new System.Drawing.Point(1098, 43);
this.txt_qt033.Name = "txt_qt033";
- this.txt_qt033.Size = new System.Drawing.Size(217, 24);
+ this.txt_qt033.Size = new System.Drawing.Size(222, 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(980, 74);
+ this.txt_qt032.Location = new System.Drawing.Point(996, 74);
this.txt_qt032.Name = "txt_qt032";
this.txt_qt032.Properties.Caption = "閲囪喘瀹℃牳鏍囪瘑";
- this.txt_qt032.Size = new System.Drawing.Size(319, 24);
+ this.txt_qt032.Size = new System.Drawing.Size(324, 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(436, 136);
+ this.txt_qt035.Location = new System.Drawing.Point(442, 136);
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(217, 24);
+ this.txt_qt035.Size = new System.Drawing.Size(222, 24);
this.txt_qt035.StyleController = this.layoutMx1;
this.txt_qt035.TabIndex = 340;
//
@@ -965,7 +965,7 @@
// txt_qtlx
//
this.txt_qtlx.EditValue = "璇烽�夋嫨";
- this.txt_qtlx.Location = new System.Drawing.Point(436, 12);
+ this.txt_qtlx.Location = new System.Drawing.Point(442, 12);
this.txt_qtlx.Name = "txt_qtlx";
this.txt_qtlx.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
@@ -975,7 +975,7 @@
"2:鍞悗缁翠慨",
"3:鎷嗗嵏鍏ュ簱"});
this.txt_qtlx.Properties.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.DisableTextEditor;
- this.txt_qtlx.Size = new System.Drawing.Size(217, 24);
+ this.txt_qtlx.Size = new System.Drawing.Size(222, 24);
this.txt_qtlx.StyleController = this.layoutMx1;
this.txt_qtlx.TabIndex = 445;
//
@@ -1086,7 +1086,7 @@
rowDefinition4,
rowDefinition5,
rowDefinition6});
- this.Root.Size = new System.Drawing.Size(1311, 206);
+ this.Root.Size = new System.Drawing.Size(1332, 207);
this.Root.TextVisible = false;
//
// layoutControlItem1
@@ -1094,7 +1094,7 @@
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(322, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(328, 31);
this.layoutControlItem1.Text = "鐢宠鍗曞彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1104,18 +1104,18 @@
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(322, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(328, 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(322, 31);
+ this.layoutControlItem5.Location = new System.Drawing.Point(328, 31);
this.layoutControlItem5.Name = "layoutControlItem5";
this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem5.Size = new System.Drawing.Size(328, 31);
this.layoutControlItem5.Text = "閫夋嫨閮ㄩ棬";
this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1123,22 +1123,22 @@
//
this.layoutControlItem7.Control = this.txt_qt018;
this.layoutControlItem7.CustomizationFormText = "閫変緵搴斿晢";
- this.layoutControlItem7.Location = new System.Drawing.Point(322, 62);
+ this.layoutControlItem7.Location = new System.Drawing.Point(328, 62);
this.layoutControlItem7.Name = "layoutControlItem7";
this.layoutControlItem7.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem7.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem7.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem7.Size = new System.Drawing.Size(328, 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(322, 93);
+ this.layoutControlItem8.Location = new System.Drawing.Point(328, 93);
this.layoutControlItem8.Name = "layoutControlItem8";
this.layoutControlItem8.OptionsTableLayoutItem.ColumnIndex = 1;
this.layoutControlItem8.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem8.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem8.Size = new System.Drawing.Size(328, 31);
this.layoutControlItem8.Text = "鏀舵枡浠撳簱";
this.layoutControlItem8.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1150,7 +1150,7 @@
this.layoutControlItem6.Name = "layoutControlItem6";
this.layoutControlItem6.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem6.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem6.Size = new System.Drawing.Size(322, 62);
+ this.layoutControlItem6.Size = new System.Drawing.Size(328, 62);
this.layoutControlItem6.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem6.TextVisible = false;
//
@@ -1160,40 +1160,40 @@
this.layoutControlItem13.Location = new System.Drawing.Point(0, 124);
this.layoutControlItem13.Name = "layoutControlItem13";
this.layoutControlItem13.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem13.Size = new System.Drawing.Size(322, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(328, 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(968, 93);
+ this.layoutControlItem16.Location = new System.Drawing.Point(984, 93);
this.layoutControlItem16.Name = "layoutControlItem16";
this.layoutControlItem16.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem16.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem16.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem16.Size = new System.Drawing.Size(328, 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(968, 124);
+ this.layoutControlItem17.Location = new System.Drawing.Point(984, 124);
this.layoutControlItem17.Name = "layoutControlItem17";
this.layoutControlItem17.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem17.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem17.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem17.Size = new System.Drawing.Size(328, 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(968, 155);
+ this.layoutControlItem18.Location = new System.Drawing.Point(984, 155);
this.layoutControlItem18.Name = "layoutControlItem18";
this.layoutControlItem18.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem18.OptionsTableLayoutItem.RowIndex = 5;
- this.layoutControlItem18.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem18.Size = new System.Drawing.Size(328, 32);
this.layoutControlItem18.Text = "璐㈠姟瀹℃牳鏍囪瘑";
this.layoutControlItem18.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem18.TextVisible = false;
@@ -1201,43 +1201,43 @@
// layoutControlItem19
//
this.layoutControlItem19.Control = this.txt_qt034;
- this.layoutControlItem19.Location = new System.Drawing.Point(968, 0);
+ this.layoutControlItem19.Location = new System.Drawing.Point(984, 0);
this.layoutControlItem19.Name = "layoutControlItem19";
this.layoutControlItem19.OptionsTableLayoutItem.ColumnIndex = 3;
- this.layoutControlItem19.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem19.Size = new System.Drawing.Size(328, 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(968, 31);
+ this.layoutControlItem20.Location = new System.Drawing.Point(984, 31);
this.layoutControlItem20.Name = "layoutControlItem20";
this.layoutControlItem20.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem20.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem20.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem20.Size = new System.Drawing.Size(328, 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(645, 93);
+ this.layoutControlItem10.Location = new System.Drawing.Point(656, 93);
this.layoutControlItem10.Name = "layoutControlItem10";
this.layoutControlItem10.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem10.OptionsTableLayoutItem.RowIndex = 3;
- this.layoutControlItem10.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem10.Size = new System.Drawing.Size(328, 31);
this.layoutControlItem10.Text = "瀹℃牳鏃ユ湡";
this.layoutControlItem10.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem21
//
this.layoutControlItem21.Control = this.txt_qt032;
- this.layoutControlItem21.Location = new System.Drawing.Point(968, 62);
+ this.layoutControlItem21.Location = new System.Drawing.Point(984, 62);
this.layoutControlItem21.Name = "layoutControlItem21";
this.layoutControlItem21.OptionsTableLayoutItem.ColumnIndex = 3;
this.layoutControlItem21.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem21.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem21.Size = new System.Drawing.Size(328, 31);
this.layoutControlItem21.Text = "閲囪喘瀹℃牳鏍囪瘑";
this.layoutControlItem21.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem21.TextVisible = false;
@@ -1245,11 +1245,11 @@
// layoutControlItem35
//
this.layoutControlItem35.Control = this.txt_qt035;
- this.layoutControlItem35.Location = new System.Drawing.Point(322, 124);
+ this.layoutControlItem35.Location = new System.Drawing.Point(328, 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.Size = new System.Drawing.Size(328, 31);
this.layoutControlItem35.Text = "鏉ユ簮鍗曞彿";
this.layoutControlItem35.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1261,7 +1261,7 @@
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.Size = new System.Drawing.Size(328, 32);
this.layoutControlItem37.SizeConstraintsType = DevExpress.XtraLayout.SizeConstraintsType.Custom;
this.layoutControlItem37.Text = "浠嶺LS澶嶅埗鏄庣粏";
this.layoutControlItem37.TextSize = new System.Drawing.Size(0, 0);
@@ -1270,22 +1270,22 @@
// layoutControlItem9
//
this.layoutControlItem9.Control = this.txt_qt016;
- this.layoutControlItem9.Location = new System.Drawing.Point(645, 62);
+ this.layoutControlItem9.Location = new System.Drawing.Point(656, 62);
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem9.Size = new System.Drawing.Size(328, 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(645, 124);
+ this.layoutControlItem11.Location = new System.Drawing.Point(656, 124);
this.layoutControlItem11.Name = "layoutControlItem11";
this.layoutControlItem11.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem11.OptionsTableLayoutItem.RowIndex = 4;
- this.layoutControlItem11.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem11.Size = new System.Drawing.Size(328, 31);
this.layoutControlItem11.Text = "瀹℃牳鐘舵��";
this.layoutControlItem11.TextSize = new System.Drawing.Size(0, 0);
this.layoutControlItem11.TextVisible = false;
@@ -1293,31 +1293,31 @@
// layoutControlItem2
//
this.layoutControlItem2.Control = this.txt_qt003;
- this.layoutControlItem2.Location = new System.Drawing.Point(645, 31);
+ this.layoutControlItem2.Location = new System.Drawing.Point(656, 31);
this.layoutControlItem2.Name = "layoutControlItem2";
this.layoutControlItem2.OptionsTableLayoutItem.ColumnIndex = 2;
this.layoutControlItem2.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem2.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(328, 31);
this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem38
//
this.layoutControlItem38.Control = this.txt_qtlx;
- this.layoutControlItem38.Location = new System.Drawing.Point(322, 0);
+ this.layoutControlItem38.Location = new System.Drawing.Point(328, 0);
this.layoutControlItem38.Name = "layoutControlItem38";
this.layoutControlItem38.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem38.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem38.Size = new System.Drawing.Size(328, 31);
this.layoutControlItem38.Text = "鍏ュ簱绫诲瀷";
this.layoutControlItem38.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem3
//
this.layoutControlItem3.Control = this.txt_qt019;
- this.layoutControlItem3.Location = new System.Drawing.Point(645, 0);
+ this.layoutControlItem3.Location = new System.Drawing.Point(656, 0);
this.layoutControlItem3.Name = "layoutControlItem3";
this.layoutControlItem3.OptionsTableLayoutItem.ColumnIndex = 2;
- this.layoutControlItem3.Size = new System.Drawing.Size(323, 31);
+ this.layoutControlItem3.Size = new System.Drawing.Size(328, 31);
this.layoutControlItem3.Text = "搴撳瓨鏂瑰悜";
this.layoutControlItem3.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1327,7 +1327,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, 355);
+ this.tabMx.Size = new System.Drawing.Size(1332, 351);
this.tabMx.TabIndex = 3;
this.tabMx.TabPages.AddRange(new DevExpress.XtraTab.XtraTabPage[] {
this.tabMxPage1,
@@ -1337,7 +1337,7 @@
//
this.tabMxPage1.Controls.Add(this.split99);
this.tabMxPage1.Name = "tabMxPage1";
- this.tabMxPage1.Size = new System.Drawing.Size(1330, 323);
+ this.tabMxPage1.Size = new System.Drawing.Size(1330, 319);
this.tabMxPage1.Text = "鐗╂枡鏄庣粏";
//
// split99
@@ -1357,7 +1357,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, 323);
+ this.split99.Size = new System.Drawing.Size(1330, 319);
this.split99.SplitterPosition = 131;
this.split99.TabIndex = 2;
//
@@ -1751,7 +1751,7 @@
this.repositoryItemSearchLookUpEdit1,
this.rptBl,
this.repositoryItemMemoEdit1});
- this.gcMx1.Size = new System.Drawing.Size(1330, 180);
+ this.gcMx1.Size = new System.Drawing.Size(1330, 176);
this.gcMx1.TabIndex = 0;
this.gcMx1.ViewCollection.AddRange(new DevExpress.XtraGrid.Views.Base.BaseView[] {
this.gvMx1});
diff --git a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.resx b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.resx
index ccc86df..7c9d60d 100644
--- a/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.resx
+++ b/DevApp/Gs.DevApp/DevFrm/Rk/Frm_MesItemQtrk.resx
@@ -120,19 +120,19 @@
<assembly alias="System.Drawing" name="System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a" />
<data name="btnCopyXls.ImageOptions.Image" type="System.Drawing.Bitmap, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
<value>
- iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAAAXNSR0IArs4c6QAAAARnQU1BAACxjwv8
- YQUAAAAZdEVYdFNvZnR3YXJlAEFkb2JlIEltYWdlUmVhZHlxyWU8AAAAG3RFWHRUaXRsZQBNb2RlbDtD
- b3B5O0NvcHlNb2RlbDuJLVnLAAACYElEQVQ4T43RXUhTYRzH8dV0L24aJL3cdNF93XZRBEEQdFs3kb2A
- RZBEkVlYLLWac+WS+TqNAmsrGxQZVkqLNoa6FNcLFphQN1npcjvbPNvOtrP9+j+PuM6iiw58kAef//c8
- e44KQIHRaFR3OoO+btdbdLnekSA6nEG0M/emYCe22+N+2qdZmfk7UNrhnEI+D5LnckxumUxu3pkE7dMX
- AvSsImpSotVqDYOeGUiSBCGa4MJCApFoCjExg3Q2hxt9ARYoUwbUlt6Az9r3Bi29EyQAi2MMzY4AzORa
- zxhuDQQREkRImRwsPaMsYFAGSpsdo0XHVh6dHbvR7sePX1Gk0jKa2v0sYFQGNFc7WSAPMZnllpIyFxdl
- fmyTzYtv8wISkgxTm5cFypUBbX2rl78xlsgiyohZCEsZjr31rPklvswtIk7/u2D1sECFMqA73+Lhx2UD
- EbqsCP2NUURMZel3y3j2egahcByJVAYvfJ+h1+sraa6EsMtXlZ1qfI6snEcomiYSFgSJ3pbB3MggZhtq
- Cj6Y9yPQuqMICxhOmoYokMM8DUbiaRpOIxxLYvZyDeB1cSnXdQwc2gwID7n4tJmveeD4xafI0GX9jCx/
- 77vDn3DgykjBCfs51PVvKfJ9+OifQHXdE37bcfYVEhL2nHFjQgTnng5hX/0mLKKfG//axNfKgK7q9H3f
- kdrHOFz7CO6h9zzQ8GqBq+6e4APOjzu5Sw+28nXX3o2w7l5vY4HVRE8qyBqy4X8CtG8t0fBvqUSPbluV
- A0q7jq0rsv1gZRsfZs8/AisnMiqUK7C1ltA+leo3c1CK6vE87QgAAAAASUVORK5CYII=
+ iVBORw0KGgoAAAANSUhEUgAAABAAAAAQCAYAAAAf8/9hAAAABGdBTUEAALGPC/xhBQAAABl0RVh0U29m
+ dHdhcmUAQWRvYmUgSW1hZ2VSZWFkeXHJZTwAAAAbdEVYdFRpdGxlAE1vZGVsO0NvcHk7Q29weU1vZGVs
+ O4ktWcsAAAJgSURBVDhPjdFdSFNhHMfx1XQvbhokvdx00X3ddlEEQRB0WzeRvYBFkESRWVgstZpz5ZL5
+ Oo0CaysbFBlWSos2hroU1wsWmFA3WelyO9s82862s/36P4+4zqKLDnyQB5//9zx7jgpAgdFoVHc6g75u
+ 11t0ud6RIDqcQbQz96ZgJ7bb437ap1mZ+TtQ2uGcQj4PkudyTG6ZTG7emQTt0xcC9KwialKi1WoNg54Z
+ SJIEIZrgwkICkWgKMTGDdDaHG30BFihTBtSW3oDP2vcGLb0TJACLYwzNjgDM5FrPGG4NBBESREiZHCw9
+ oyxgUAZKmx2jRcdWHp0du9Hux49fUaTSMpra/SxgVAY0VztZIA8xmeWWkjIXF2V+bJPNi2/zAhKSDFOb
+ lwXKlQFtfauXvzGWyCLKiFkISxmOvfWs+SW+zC0iTv+7YPWwQIUyoDvf4uHHZQMRuqwI/Y1RRExl6XfL
+ ePZ6BqFwHIlUBi98n6HX6ytproSwy1eVnWp8jqycRyiaJhIWBInelsHcyCBmG2oKPpj3I9C6owgLGE6a
+ hiiQwzwNRuJpGk4jHEti9nIN4HVxKdd1DBzaDAgPufi0ma954PjFp8jQZf2MLH/vu8OfcODKSMEJ+znU
+ 9W8p8n346J9Add0Tfttx9hUSEvaccWNCBOeeDmFf/SYsop8b/9rE18qArur0fd+R2sc4XPsI7qH3PNDw
+ aoGr7p7gA86PO7lLD7byddfejbDuXm9jgdVETyrIGrLhfwK0by3R8G+pRI9uW5UDSruOrSuy/WBlGx9m
+ zz8CKycyKpQrsLWW0D6V6jdzUIrq8TztCAAAAABJRU5ErkJggg==
</value>
</data>
<metadata name="tips.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
index b886fce..c8e79ce 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.Designer.cs
@@ -76,6 +76,7 @@
this.layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
+ this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
this.simpleButton7 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton6 = new DevExpress.XtraEditors.SimpleButton();
this.simpleButton5 = new DevExpress.XtraEditors.SimpleButton();
@@ -131,7 +132,6 @@
this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.alertControl1 = new DevExpress.XtraBars.Alerter.AlertControl(this.components);
- this.layDianJian = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.splitMx1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.splitMx1.Panel1)).BeginInit();
this.splitMx1.Panel1.SuspendLayout();
@@ -178,6 +178,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).BeginInit();
this.panel3.SuspendLayout();
this.panel2.SuspendLayout();
@@ -191,7 +192,6 @@
this.tabMxPage2.SuspendLayout();
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).BeginInit();
this.SuspendLayout();
//
// splitMx1
@@ -677,6 +677,17 @@
this.layoutControlItem11.Text = "浜у搧瑙勬牸";
this.layoutControlItem11.TextSize = new System.Drawing.Size(87, 18);
//
+ // layDianJian
+ //
+ this.layDianJian.Control = this.txt_dianJianPath;
+ this.layDianJian.Location = new System.Drawing.Point(202, 174);
+ this.layDianJian.Name = "layDianJian";
+ this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
+ this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
+ this.layDianJian.Size = new System.Drawing.Size(202, 35);
+ this.layDianJian.Text = "鐢垫璺緞";
+ this.layDianJian.TextSize = new System.Drawing.Size(87, 18);
+ //
// simpleButton7
//
this.simpleButton7.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Warning;
@@ -967,8 +978,6 @@
this.gridColumn6.FieldName = "itemModel";
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.OptionsColumn.ReadOnly = true;
- this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 4;
this.gridColumn6.Width = 94;
//
// gridColumn3
@@ -979,7 +988,7 @@
this.gridColumn3.Name = "gridColumn3";
this.gridColumn3.OptionsColumn.ReadOnly = true;
this.gridColumn3.Visible = true;
- this.gridColumn3.VisibleIndex = 6;
+ this.gridColumn3.VisibleIndex = 5;
this.gridColumn3.Width = 94;
//
// gvMx2tlQty
@@ -991,7 +1000,7 @@
this.gvMx2tlQty.OptionsColumn.ReadOnly = true;
this.gvMx2tlQty.Tag = "query_a.tl_qty";
this.gvMx2tlQty.Visible = true;
- this.gvMx2tlQty.VisibleIndex = 5;
+ this.gvMx2tlQty.VisibleIndex = 4;
this.gvMx2tlQty.Width = 94;
//
// gridColumn2
@@ -1002,7 +1011,7 @@
this.gridColumn2.Name = "gridColumn2";
this.gridColumn2.OptionsColumn.ReadOnly = true;
this.gridColumn2.Visible = true;
- this.gridColumn2.VisibleIndex = 7;
+ this.gridColumn2.VisibleIndex = 6;
this.gridColumn2.Width = 94;
//
// gridColumn1
@@ -1022,7 +1031,7 @@
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.OptionsColumn.ReadOnly = true;
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 8;
+ this.gridColumn4.VisibleIndex = 7;
this.gridColumn4.Width = 94;
//
// gridColumn14
@@ -1033,7 +1042,7 @@
this.gridColumn14.Name = "gridColumn14";
this.gridColumn14.OptionsColumn.ReadOnly = true;
this.gridColumn14.Visible = true;
- this.gridColumn14.VisibleIndex = 9;
+ this.gridColumn14.VisibleIndex = 8;
this.gridColumn14.Width = 94;
//
// gridColumn15
@@ -1044,7 +1053,7 @@
this.gridColumn15.Name = "gridColumn15";
this.gridColumn15.OptionsColumn.ReadOnly = true;
this.gridColumn15.Visible = true;
- this.gridColumn15.VisibleIndex = 10;
+ this.gridColumn15.VisibleIndex = 9;
this.gridColumn15.Width = 94;
//
// gridColumn24
@@ -1055,7 +1064,7 @@
this.gridColumn24.Name = "gridColumn24";
this.gridColumn24.OptionsColumn.ReadOnly = true;
this.gridColumn24.Visible = true;
- this.gridColumn24.VisibleIndex = 11;
+ this.gridColumn24.VisibleIndex = 10;
this.gridColumn24.Width = 94;
//
// tabMxPage2
@@ -1265,17 +1274,6 @@
this.gridColumn25.VisibleIndex = 12;
this.gridColumn25.Width = 94;
//
- // layDianJian
- //
- this.layDianJian.Control = this.txt_dianJianPath;
- this.layDianJian.Location = new System.Drawing.Point(202, 174);
- this.layDianJian.Name = "layDianJian";
- this.layDianJian.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layDianJian.OptionsTableLayoutItem.RowIndex = 5;
- this.layDianJian.Size = new System.Drawing.Size(202, 35);
- this.layDianJian.Text = "鐢垫璺緞";
- this.layDianJian.TextSize = new System.Drawing.Size(87, 18);
- //
// Frm_Work01
//
this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
@@ -1334,6 +1332,7 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem13)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem11)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.prog1.Properties)).EndInit();
this.panel3.ResumeLayout(false);
this.panel3.PerformLayout();
@@ -1351,7 +1350,6 @@
this.tabMxPage2.ResumeLayout(false);
((System.ComponentModel.ISupportInitialize)(this.gcMx2)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.gvMx2)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layDianJian)).EndInit();
this.ResumeLayout(false);
}
diff --git a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
index 5679160..d1be399 100644
--- a/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Work/Frm_Work01.cs
@@ -421,25 +421,25 @@
{
ziduan = "t007",
wenben = "鎺ュ湴缁撴灉",
- visibleIndex = -1,
+ visibleIndex = 1,
});
_lst.Add(new
{
ziduan = "t009",
wenben = "浜よ�愮粨鏋�",
- visibleIndex = -1,
+ visibleIndex = 1,
});
_lst.Add(new
{
ziduan = "t010",
wenben = "娉勬紡缁撴灉",
- visibleIndex = -1,
+ visibleIndex = 1,
});
_lst.Add(new
{
ziduan = "t011",
wenben = "鍔熺巼缁撴灉",
- visibleIndex = -1,
+ visibleIndex = 1,
});
}
if (txt_gx.Text.Trim() == fGxShouJian)
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index b369d8a..23cca95 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -1945,7 +1945,7 @@
column.Width = 500;
}
}
-
+
/// <summary>
/// 璁剧疆閫夐」鍗�
/// </summary>
@@ -2528,7 +2528,8 @@
public enum OrderType
{
鍏跺畠鍏ュ簱,
- 鐗╂枡璋冩嫧
+ 鐗╂枡璋冩嫧,
+ 鍏跺畠鍑哄簱
}
diff --git a/DevApp/Gs.DevApp/UserControl/CopyXls.cs b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
index 7854fe6..bc48303 100644
--- a/DevApp/Gs.DevApp/UserControl/CopyXls.cs
+++ b/DevApp/Gs.DevApp/UserControl/CopyXls.cs
@@ -53,6 +53,12 @@
SetCellText(spreadsheetControl1.ActiveWorksheet, "B1", "鐢宠鏁伴噺", true);
SetCellText(spreadsheetControl1.ActiveWorksheet, "C1", "鐢宠澶囨敞", true);
break;
+ case "鍏跺畠鍑哄簱":
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "A1", "鐗╂枡缂栧彿", true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "B1", "鐢宠鏁伴噺", true);
+ SetCellText(spreadsheetControl1.ActiveWorksheet, "C1", "鐢宠澶囨敞", true);
+ //SetCellText(spreadsheetControl1.ActiveWorksheet, "D1", "涓嶈壇绫诲瀷", true);
+ break;
}
}
else
@@ -191,6 +197,56 @@
}
#endregion
break;
+ case "鍏跺畠鍑哄簱":
+ #region MyRegion
+ {
+ for (int row = 2; row <= rowsCount; row++)
+ {
+ string itemNo = spreadsheetControl1.ActiveWorksheet.Cells["A" + row.ToString()].Value.ToString().Trim();
+ string sl = spreadsheetControl1.ActiveWorksheet.Cells["B" + row.ToString()].Value.ToString().Trim();
+ string bz = spreadsheetControl1.ActiveWorksheet.Cells["C" + row.ToString()].Value.ToString().Trim();
+ var _obj = new
+ {
+ itemNo = itemNo,
+ orgId = this.orgId,
+ };
+ try
+ {
+ var strJson = UtilityHelper.HttpPost("", "MesItemsManager/GetModelByOrg", JsonConvert.SerializeObject(_obj));
+ var _rtn = UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ var dy = _rtn.rtnData;
+ list.Add(new
+ {
+ itemNo = itemNo,
+ sl = sl,
+ bz = bz,
+ itemName = dy.itemName,
+ itemModel = dy.itemModel,
+ dwName = dy.kfName,
+ itemId = dy.itemId,
+ //榛樿浠撳簱鍜屼粨搴撴暟閲�
+ depotName = dy.depotName,
+ depotId = dy.depotId,
+ kcQty = dy.kcQty,
+ });
+ }
+ else
+ {
+ MsgHelper.ShowError("澶嶅埗澶辫触锛氥��" + itemNo + "銆戝彲鑳戒笉瀛樺湪,璇锋鏌ュ悗閲嶈瘯锛�");
+ return;
+ }
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.ShowError("澶嶅埗澶辫触锛氥��" + itemNo + "銆戝彂鐢熼敊璇�,璇锋鏌ュ悗閲嶈瘯锛�" + ex.Message);
+ return;
+ }
+ }
+ }
+ #endregion
+ break;
}
UpdateParent?.Invoke(this,
--
Gitblit v1.9.3