From b636536b754ef512f8dd44842f50846ef8fa9a9c Mon Sep 17 00:00:00 2001
From: lu <123456>
Date: 星期一, 13 十月 2025 13:50:02 +0800
Subject: [PATCH] 增加不需要过滤的组织
---
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs | 2
DevApp/Gs.DevApp/UserControl/UcLookOrgAll.cs | 101 ++++++
DevApp/Gs.DevApp/Gs.DevApp.csproj | 9
DevApp/Gs.DevApp/UserControl/UcLookOrg.cs | 1
DevApp/Gs.DevApp/App.config | 4
DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs | 63 +++
DevApp/Gs.DevApp/UserControl/UcLookOrgAll.resx | 120 +++++++
DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs | 435 +++++++++++++++-----------
DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs | 4
DevApp/Gs.DevApp/UserControl/UcLookOrg.Designer.cs | 3
DevApp/Gs.DevApp/UserControl/UcLookOrgAll.Designer.cs | 119 +++++++
DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs | 46 ++
12 files changed, 711 insertions(+), 196 deletions(-)
diff --git a/DevApp/Gs.DevApp/App.config b/DevApp/Gs.DevApp/App.config
index 8cf35bf..432ab84 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 d70e1e7..986de58 100644
--- a/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Ck/Frm_MesItemQt.Designer.cs
@@ -31,27 +31,27 @@
{
this.components = new System.ComponentModel.Container();
System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(Frm_MesItemQt));
- DevExpress.XtraLayout.ColumnDefinition columnDefinition5 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition6 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition7 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.ColumnDefinition columnDefinition8 = new DevExpress.XtraLayout.ColumnDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition8 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition9 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition10 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition11 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition12 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition13 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraLayout.RowDefinition rowDefinition14 = new DevExpress.XtraLayout.RowDefinition();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions3 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject9 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject10 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject11 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject12 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.XtraEditors.Controls.EditorButtonImageOptions editorButtonImageOptions4 = new DevExpress.XtraEditors.Controls.EditorButtonImageOptions();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject13 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject14 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject15 = new DevExpress.Utils.SerializableAppearanceObject();
- DevExpress.Utils.SerializableAppearanceObject serializableAppearanceObject16 = new DevExpress.Utils.SerializableAppearanceObject();
+ DevExpress.XtraLayout.ColumnDefinition 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.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();
+ 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();
@@ -77,6 +77,9 @@
this.gridColumn20 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn21 = new DevExpress.XtraGrid.Columns.GridColumn();
this.gridColumn22 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn24 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn25 = new DevExpress.XtraGrid.Columns.GridColumn();
this.pageBar1 = new UserControls.Data.UcPageBar();
this.xtraTabPage2 = new DevExpress.XtraTab.XtraTabPage();
this.splitMx1 = new DevExpress.XtraEditors.SplitContainerControl();
@@ -90,7 +93,6 @@
this.txt_qt013 = new Gs.DevApp.UserControl.UcLookCustomer();
this.txt_qtck = new DevExpress.XtraEditors.TextEdit();
this.txt_qt019 = new DevExpress.XtraEditors.ComboBoxEdit();
- this.txt_qt024 = new Gs.DevApp.UserControl.UcLookOrg();
this.txt_qt020 = new DevExpress.XtraEditors.ComboBoxEdit();
this.txt_qt023 = new Gs.DevApp.UserControl.UcLookOrg();
this.txt_qt016 = new DevExpress.XtraEditors.TextEdit();
@@ -107,6 +109,7 @@
this.txt_qt032 = new DevExpress.XtraEditors.CheckEdit();
this.txt_qt035 = new DevExpress.XtraEditors.ButtonEdit();
this.txt_qtlx = new DevExpress.XtraEditors.ComboBoxEdit();
+ this.txt_lyRemark = new DevExpress.XtraEditors.MemoEdit();
this.layoutControlItem14 = new DevExpress.XtraLayout.LayoutControlItem();
this.Root = new DevExpress.XtraLayout.LayoutControlGroup();
this.layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -127,13 +130,13 @@
this.layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
this.layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
- this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
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.layItemWwgys = new DevExpress.XtraLayout.LayoutControlItem();
+ this.txt_lyRemarklb = new DevExpress.XtraLayout.LayoutControlItem();
this.tabMx = new DevExpress.XtraTab.XtraTabControl();
this.tabMxPage1 = new DevExpress.XtraTab.XtraTabPage();
this.gcMx1 = new DevExpress.XtraGrid.GridControl();
@@ -166,7 +169,8 @@
this.gridColumn18 = new DevExpress.XtraGrid.Columns.GridColumn();
this.picCheckBox = new System.Windows.Forms.PictureBox();
this.tips = new DevExpress.Utils.ToolTipController(this.components);
- this.gridColumn23 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.txt_qt024 = new Gs.DevApp.UserControl.UcLookOrgAll();
+ this.layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)(this.xtraTabControl1)).BeginInit();
this.xtraTabControl1.SuspendLayout();
this.xtraTabPage1.SuspendLayout();
@@ -204,6 +208,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qtlx.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemark.Properties)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).BeginInit();
@@ -224,13 +229,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).BeginInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
((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.layItemWwgys)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemarklb)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).BeginInit();
this.tabMx.SuspendLayout();
this.tabMxPage1.SuspendLayout();
@@ -241,6 +246,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.rptCk)).BeginInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).BeginInit();
this.SuspendLayout();
//
// toolBarMenu1
@@ -337,7 +343,9 @@
this.gridColumn20,
this.gridColumn21,
this.gridColumn22,
- this.gridColumn23});
+ this.gridColumn23,
+ this.gridColumn24,
+ this.gridColumn25});
this.gridView1.GridControl = this.gcMain1;
this.gridView1.IndicatorWidth = 50;
this.gridView1.Name = "gridView1";
@@ -404,7 +412,7 @@
this.gv_qt020.OptionsColumn.AllowEdit = false;
this.gv_qt020.Tag = "query_a.qt020";
this.gv_qt020.Visible = true;
- this.gv_qt020.VisibleIndex = 7;
+ this.gv_qt020.VisibleIndex = 13;
this.gv_qt020.Width = 94;
//
// gridColumn4
@@ -414,7 +422,7 @@
this.gridColumn4.MinWidth = 25;
this.gridColumn4.Name = "gridColumn4";
this.gridColumn4.Visible = true;
- this.gridColumn4.VisibleIndex = 13;
+ this.gridColumn4.VisibleIndex = 15;
this.gridColumn4.Width = 94;
//
// gv_qt005
@@ -489,7 +497,7 @@
this.gridColumn5.MinWidth = 25;
this.gridColumn5.Name = "gridColumn5";
this.gridColumn5.Visible = true;
- this.gridColumn5.VisibleIndex = 15;
+ this.gridColumn5.VisibleIndex = 17;
this.gridColumn5.Width = 94;
//
// gridColumn6
@@ -499,7 +507,7 @@
this.gridColumn6.MinWidth = 25;
this.gridColumn6.Name = "gridColumn6";
this.gridColumn6.Visible = true;
- this.gridColumn6.VisibleIndex = 16;
+ this.gridColumn6.VisibleIndex = 18;
this.gridColumn6.Width = 94;
//
// gridColumn13
@@ -545,7 +553,7 @@
this.gridColumn20.MinWidth = 25;
this.gridColumn20.Name = "gridColumn20";
this.gridColumn20.Visible = true;
- this.gridColumn20.VisibleIndex = 6;
+ this.gridColumn20.VisibleIndex = 14;
this.gridColumn20.Width = 94;
//
// gridColumn21
@@ -564,8 +572,38 @@
this.gridColumn22.MinWidth = 25;
this.gridColumn22.Name = "gridColumn22";
this.gridColumn22.Visible = true;
- this.gridColumn22.VisibleIndex = 14;
+ this.gridColumn22.VisibleIndex = 16;
this.gridColumn22.Width = 94;
+ //
+ // gridColumn23
+ //
+ this.gridColumn23.Caption = "瀹岀粨鏍囪瘑";
+ this.gridColumn23.FieldName = "txtColor";
+ this.gridColumn23.MinWidth = 25;
+ this.gridColumn23.Name = "gridColumn23";
+ this.gridColumn23.Visible = true;
+ this.gridColumn23.VisibleIndex = 0;
+ this.gridColumn23.Width = 94;
+ //
+ // gridColumn24
+ //
+ this.gridColumn24.Caption = "棰嗙敤瀹㈡埛";
+ this.gridColumn24.FieldName = "khName";
+ this.gridColumn24.MinWidth = 25;
+ this.gridColumn24.Name = "gridColumn24";
+ this.gridColumn24.Visible = true;
+ this.gridColumn24.VisibleIndex = 7;
+ this.gridColumn24.Width = 94;
+ //
+ // gridColumn25
+ //
+ this.gridColumn25.Caption = "棰嗙敤閮ㄩ棬";
+ this.gridColumn25.FieldName = "bmName";
+ this.gridColumn25.MinWidth = 25;
+ this.gridColumn25.Name = "gridColumn25";
+ this.gridColumn25.Visible = true;
+ this.gridColumn25.VisibleIndex = 6;
+ this.gridColumn25.Width = 94;
//
// pageBar1
//
@@ -609,6 +647,7 @@
//
// layoutMx1
//
+ this.layoutMx1.Controls.Add(this.txt_qt024);
this.layoutMx1.Controls.Add(this.txt_wwgys);
this.layoutMx1.Controls.Add(this.btnCopyXls);
this.layoutMx1.Controls.Add(this.lbGuid);
@@ -618,7 +657,6 @@
this.layoutMx1.Controls.Add(this.txt_qt013);
this.layoutMx1.Controls.Add(this.txt_qtck);
this.layoutMx1.Controls.Add(this.txt_qt019);
- this.layoutMx1.Controls.Add(this.txt_qt024);
this.layoutMx1.Controls.Add(this.txt_qt020);
this.layoutMx1.Controls.Add(this.txt_qt023);
this.layoutMx1.Controls.Add(this.txt_qt016);
@@ -635,12 +673,13 @@
this.layoutMx1.Controls.Add(this.txt_qt032);
this.layoutMx1.Controls.Add(this.txt_qt035);
this.layoutMx1.Controls.Add(this.txt_qtlx);
+ this.layoutMx1.Controls.Add(this.txt_lyRemark);
this.layoutMx1.Dock = System.Windows.Forms.DockStyle.Fill;
this.layoutMx1.HiddenItems.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] {
this.layoutControlItem14});
this.layoutMx1.Location = new System.Drawing.Point(0, 0);
this.layoutMx1.Name = "layoutMx1";
- this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(722, 358, 812, 500);
+ this.layoutMx1.OptionsCustomizationForm.DesignTimeCustomizationFormPositionAndSize = new System.Drawing.Rectangle(561, 558, 812, 500);
this.layoutMx1.Root = this.Root;
this.layoutMx1.Size = new System.Drawing.Size(1126, 233);
this.layoutMx1.TabIndex = 0;
@@ -649,10 +688,10 @@
// txt_wwgys
//
this.txt_wwgys.IsReadly = false;
- this.txt_wwgys.Location = new System.Drawing.Point(390, 198);
+ this.txt_wwgys.Location = new System.Drawing.Point(385, 198);
this.txt_wwgys.Margin = new System.Windows.Forms.Padding(0);
this.txt_wwgys.Name = "txt_wwgys";
- this.txt_wwgys.Size = new System.Drawing.Size(170, 24);
+ this.txt_wwgys.Size = new System.Drawing.Size(165, 24);
this.txt_wwgys.TabIndex = 446;
//
// btnCopyXls
@@ -682,7 +721,7 @@
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, 58);
+ this.ucLookHuoZhu1.Size = new System.Drawing.Size(267, 58);
this.ucLookHuoZhu1.TabIndex = 318;
//
// txt_qt010
@@ -690,24 +729,24 @@
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, 136);
+ 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, 105);
+ 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
@@ -715,7 +754,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";
@@ -723,7 +762,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)});
@@ -734,22 +773,14 @@
"璐圭敤鐗╂枡鍑哄簱(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, 43);
- this.txt_qt024.Name = "txt_qt024";
- this.txt_qt024.Size = new System.Drawing.Size(170, 24);
- this.txt_qt024.TabIndex = 309;
//
// txt_qt020
//
this.txt_qt020.EditValue = "鏅��(GENERAL)";
- this.txt_qt020.Location = new System.Drawing.Point(390, 74);
+ 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)});
@@ -757,7 +788,7 @@
"鏅��(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;
//
@@ -766,119 +797,119 @@
this.txt_qt023.IsReadly = false;
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, 43);
+ 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, 74);
+ 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, 105);
+ 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, 136);
+ 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, 167);
+ 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, 105);
+ 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, 136);
+ 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, 167);
+ 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, 43);
+ 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, 74);
+ 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";
@@ -889,14 +920,14 @@
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, 167);
+ 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)});
@@ -911,9 +942,18 @@
"7:鏃犳簮鍗曞澶栭��鏂�",
"8:鐩樹簭"});
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;
+ //
+ // txt_lyRemark
+ //
+ this.txt_lyRemark.Location = new System.Drawing.Point(656, 198);
+ this.txt_lyRemark.Name = "txt_lyRemark";
+ this.txt_lyRemark.Size = new System.Drawing.Size(437, 27);
+ this.txt_lyRemark.StyleController = this.layoutMx1;
+ this.txt_lyRemark.TabIndex = 447;
+ this.txt_lyRemark.Tag = "readonly";
//
// layoutControlItem14
//
@@ -950,60 +990,61 @@
this.layoutControlItem22,
this.layoutControlItem23,
this.layoutControlItem10,
- this.layoutControlItem5,
this.layoutControlItem13,
this.layoutControlItem24,
this.layoutControlItem12,
this.layoutControlItem1,
this.layoutControlItem25,
- this.layItemWwgys});
+ this.layItemWwgys,
+ this.txt_lyRemarklb,
+ this.layoutControlItem5});
this.Root.LayoutMode = DevExpress.XtraLayout.Utils.LayoutMode.Table;
this.Root.Name = "Root";
- columnDefinition5.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition5.Width = 100D;
- columnDefinition6.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition6.Width = 100D;
- columnDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition7.Width = 100D;
- columnDefinition8.SizeType = System.Windows.Forms.SizeType.Percent;
- columnDefinition8.Width = 100D;
+ columnDefinition1.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition1.Width = 100D;
+ columnDefinition2.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition2.Width = 100D;
+ columnDefinition3.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition3.Width = 100D;
+ columnDefinition4.SizeType = System.Windows.Forms.SizeType.Percent;
+ columnDefinition4.Width = 100D;
this.Root.OptionsTableLayoutGroup.ColumnDefinitions.AddRange(new DevExpress.XtraLayout.ColumnDefinition[] {
- columnDefinition5,
- columnDefinition6,
- columnDefinition7,
- columnDefinition8});
- 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;
- rowDefinition11.Height = 100D;
- rowDefinition11.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition12.Height = 100D;
- rowDefinition12.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition13.Height = 100D;
- rowDefinition13.SizeType = System.Windows.Forms.SizeType.Percent;
- rowDefinition14.Height = 100D;
- rowDefinition14.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;
+ rowDefinition7.Height = 100D;
+ rowDefinition7.SizeType = System.Windows.Forms.SizeType.Percent;
this.Root.OptionsTableLayoutGroup.RowDefinitions.AddRange(new DevExpress.XtraLayout.RowDefinition[] {
- rowDefinition8,
- rowDefinition9,
- rowDefinition10,
- rowDefinition11,
- rowDefinition12,
- rowDefinition13,
- rowDefinition14});
- this.Root.Size = new System.Drawing.Size(1126, 237);
+ rowDefinition1,
+ rowDefinition2,
+ rowDefinition3,
+ rowDefinition4,
+ rowDefinition5,
+ rowDefinition6,
+ rowDefinition7});
+ this.Root.Size = new System.Drawing.Size(1105, 237);
this.Root.TextVisible = false;
//
// 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, 31);
+ this.layoutControlItem2.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem2.Text = "鍗曟嵁绫诲瀷";
this.layoutControlItem2.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1013,39 +1054,39 @@
this.layoutControlItem4.Location = new System.Drawing.Point(0, 31);
this.layoutControlItem4.Name = "layoutControlItem4";
this.layoutControlItem4.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem4.Size = new System.Drawing.Size(276, 31);
+ this.layoutControlItem4.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem4.Text = "搴撳瓨缁勭粐";
this.layoutControlItem4.TextSize = new System.Drawing.Size(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, 31);
+ 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, 31);
+ 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, 31);
+ 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, 62);
+ 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, 31);
+ 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;
@@ -1057,7 +1098,7 @@
this.layoutControlItem9.Name = "layoutControlItem9";
this.layoutControlItem9.OptionsTableLayoutItem.RowIndex = 2;
this.layoutControlItem9.OptionsTableLayoutItem.RowSpan = 2;
- this.layoutControlItem9.Size = new System.Drawing.Size(276, 62);
+ 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;
@@ -1065,33 +1106,33 @@
// layoutControlItem15
//
this.layoutControlItem15.Control = this.txt_qt031;
- this.layoutControlItem15.Location = new System.Drawing.Point(828, 93);
+ 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, 31);
+ 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, 124);
+ 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, 31);
+ 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, 155);
+ 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, 31);
+ 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;
@@ -1099,33 +1140,33 @@
// layoutControlItem18
//
this.layoutControlItem18.Control = this.txt_qt028;
- this.layoutControlItem18.Location = new System.Drawing.Point(552, 93);
+ 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, 31);
+ 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, 124);
+ 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, 31);
+ 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, 155);
+ 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, 31);
+ 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;
@@ -1133,54 +1174,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, 31);
+ 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, 62);
+ 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, 31);
+ 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, 124);
+ 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, 31);
+ 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, 31);
+ 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, 31);
+ 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, 62);
+ 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, 31);
+ 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;
@@ -1188,24 +1229,13 @@
// layoutControlItem10
//
this.layoutControlItem10.Control = this.txt_qt013;
- this.layoutControlItem10.Location = new System.Drawing.Point(276, 93);
+ 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, 31);
+ 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, 31);
- this.layoutControlItem5.Name = "layoutControlItem5";
- this.layoutControlItem5.OptionsTableLayoutItem.ColumnIndex = 1;
- this.layoutControlItem5.OptionsTableLayoutItem.RowIndex = 1;
- this.layoutControlItem5.Size = new System.Drawing.Size(276, 31);
- this.layoutControlItem5.Text = "棰嗙敤缁勭粐";
- this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// layoutControlItem13
//
@@ -1213,7 +1243,7 @@
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, 31);
+ this.layoutControlItem13.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem13.Text = "鐢宠澶囨敞";
this.layoutControlItem13.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1223,18 +1253,18 @@
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, 31);
+ 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, 155);
+ 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, 31);
+ this.layoutControlItem12.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem12.Text = "鍑哄簱绫诲瀷";
this.layoutControlItem12.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1243,7 +1273,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(276, 31);
+ this.layoutControlItem1.Size = new System.Drawing.Size(271, 31);
this.layoutControlItem1.Text = "鍗曟嵁缂栧彿";
this.layoutControlItem1.TextSize = new System.Drawing.Size(90, 18);
//
@@ -1255,7 +1285,7 @@
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(276, 31);
+ 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);
@@ -1266,14 +1296,26 @@
this.layItemWwgys.AppearanceItemCaption.ForeColor = System.Drawing.Color.Blue;
this.layItemWwgys.AppearanceItemCaption.Options.UseForeColor = true;
this.layItemWwgys.Control = this.txt_wwgys;
- this.layItemWwgys.Location = new System.Drawing.Point(276, 186);
+ this.layItemWwgys.Location = new System.Drawing.Point(271, 186);
this.layItemWwgys.Name = "layItemWwgys";
this.layItemWwgys.OptionsTableLayoutItem.ColumnIndex = 1;
this.layItemWwgys.OptionsTableLayoutItem.RowIndex = 6;
- this.layItemWwgys.Size = new System.Drawing.Size(276, 31);
+ this.layItemWwgys.Size = new System.Drawing.Size(271, 31);
this.layItemWwgys.Text = "濮斿渚涘簲鍟�";
this.layItemWwgys.TextSize = new System.Drawing.Size(90, 18);
this.layItemWwgys.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
+ //
+ // txt_lyRemarklb
+ //
+ this.txt_lyRemarklb.Control = this.txt_lyRemark;
+ this.txt_lyRemarklb.Location = new System.Drawing.Point(542, 186);
+ this.txt_lyRemarklb.Name = "txt_lyRemarklb";
+ this.txt_lyRemarklb.OptionsTableLayoutItem.ColumnIndex = 2;
+ this.txt_lyRemarklb.OptionsTableLayoutItem.ColumnSpan = 2;
+ this.txt_lyRemarklb.OptionsTableLayoutItem.RowIndex = 6;
+ this.txt_lyRemarklb.Size = new System.Drawing.Size(543, 31);
+ this.txt_lyRemarklb.Text = "棰嗙敤缁煎悎淇℃伅";
+ this.txt_lyRemarklb.TextSize = new System.Drawing.Size(90, 18);
//
// tabMx
//
@@ -1570,10 +1612,10 @@
// repositoryItemButtonEdit1
//
this.repositoryItemButtonEdit1.AutoHeight = false;
- editorButtonImageOptions3.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
- editorButtonImageOptions3.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions1.Image = global::Gs.DevApp.Properties.Resources.removegroupfooter_16x16;
+ editorButtonImageOptions1.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.repositoryItemButtonEdit1.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions3, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject9, serializableAppearanceObject10, serializableAppearanceObject11, serializableAppearanceObject12, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "绉诲嚭", -1, true, true, false, editorButtonImageOptions1, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject1, serializableAppearanceObject2, serializableAppearanceObject3, serializableAppearanceObject4, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.repositoryItemButtonEdit1.Name = "repositoryItemButtonEdit1";
this.repositoryItemButtonEdit1.TextEditStyle = DevExpress.XtraEditors.Controls.TextEditStyles.HideTextEditor;
this.repositoryItemButtonEdit1.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.repositoryItemButtonEdit1_ButtonClick);
@@ -1604,10 +1646,10 @@
// rptCk
//
this.rptCk.AutoHeight = false;
- editorButtonImageOptions4.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
- editorButtonImageOptions4.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
+ editorButtonImageOptions2.Image = global::Gs.DevApp.Properties.Resources.lookup_reference_16x16;
+ editorButtonImageOptions2.ImageToTextAlignment = DevExpress.XtraEditors.ImageAlignToText.LeftCenter;
this.rptCk.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
- new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions4, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject13, serializableAppearanceObject14, serializableAppearanceObject15, serializableAppearanceObject16, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Glyph, "閫夋嫨", -1, true, true, false, editorButtonImageOptions2, new DevExpress.Utils.KeyShortcut(System.Windows.Forms.Keys.None), serializableAppearanceObject5, serializableAppearanceObject6, serializableAppearanceObject7, serializableAppearanceObject8, "", null, null, DevExpress.Utils.ToolTipAnchor.Default)});
this.rptCk.Name = "rptCk";
this.rptCk.ButtonClick += new DevExpress.XtraEditors.Controls.ButtonPressedEventHandler(this.rptCk_ButtonClick);
//
@@ -1644,15 +1686,24 @@
this.picCheckBox.TabStop = false;
this.picCheckBox.Visible = false;
//
- // gridColumn23
+ // txt_qt024
//
- this.gridColumn23.Caption = "瀹岀粨鏍囪瘑";
- this.gridColumn23.FieldName = "txtColor";
- this.gridColumn23.MinWidth = 25;
- this.gridColumn23.Name = "gridColumn23";
- this.gridColumn23.Visible = true;
- this.gridColumn23.VisibleIndex = 0;
- this.gridColumn23.Width = 94;
+ this.txt_qt024.IsReadly = false;
+ this.txt_qt024.Location = new System.Drawing.Point(385, 43);
+ this.txt_qt024.Name = "txt_qt024";
+ this.txt_qt024.Size = new System.Drawing.Size(165, 24);
+ this.txt_qt024.TabIndex = 448;
+ //
+ // layoutControlItem5
+ //
+ this.layoutControlItem5.Control = this.txt_qt024;
+ 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(271, 31);
+ this.layoutControlItem5.Text = "棰嗙敤缁勭粐";
+ this.layoutControlItem5.TextSize = new System.Drawing.Size(90, 18);
//
// Frm_MesItemQt
//
@@ -1701,6 +1752,7 @@
((System.ComponentModel.ISupportInitialize)(this.txt_qt032.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qt035.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.txt_qtlx.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemark.Properties)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem14)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.Root)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem2)).EndInit();
@@ -1721,13 +1773,13 @@
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem22)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem23)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.layoutControlItem10)).EndInit();
- ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
((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.layItemWwgys)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.txt_lyRemarklb)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.tabMx)).EndInit();
this.tabMx.ResumeLayout(false);
this.tabMxPage1.ResumeLayout(false);
@@ -1738,6 +1790,7 @@
((System.ComponentModel.ISupportInitialize)(this.repositoryItemButtonEdit1)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.rptCk)).EndInit();
((System.ComponentModel.ISupportInitialize)(this.picCheckBox)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.layoutControlItem5)).EndInit();
this.ResumeLayout(false);
}
@@ -1767,7 +1820,6 @@
private DevExpress.XtraEditors.SplitContainerControl splitMx1;
private UserControl.UcLookHuoZhu ucLookHuoZhu1;
private UserControl.UcLookDepartment txt_qt009;
- private UserControl.UcLookOrg txt_qt024;
private UserControl.UcLookOrg txt_qt023;
private UserControl.UcLookCustomer txt_qt013;
private DevExpress.XtraEditors.ComboBoxEdit txt_qt019;
@@ -1841,7 +1893,6 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn17;
private DevExpress.XtraEditors.Repository.RepositoryItemButtonEdit rptCk;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraEditors.ComboBoxEdit txt_qtlx;
@@ -1857,5 +1908,11 @@
private DevExpress.XtraGrid.Columns.GridColumn gridColumn21;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn22;
private DevExpress.XtraGrid.Columns.GridColumn gridColumn23;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn24;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn25;
+ private DevExpress.XtraEditors.MemoEdit txt_lyRemark;
+ private DevExpress.XtraLayout.LayoutControlItem txt_lyRemarklb;
+ private UserControl.UcLookOrgAll txt_qt024;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
}
}
\ No newline at end of file
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
index 5eb483f..5a0cf14 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliver.cs
@@ -105,6 +105,8 @@
_row["kcQty"] = dym.kcQty; //搴撳瓨鏁伴噺
_row["depotId"] = dym.depotId; //搴撳瓨鏁伴噺
_row["depotName"] = dym.depotName; //搴撳瓨鏁伴噺
+ _row["yjfhDate"] = DateTime.Now.ToString("yyyy-MM-dd");
+ _row["fEntrynote"] = dym.entryNote; ;
_Table.Rows.Add(_row);
}
gcMx1.BindingContext = new BindingContext();
diff --git a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs
index 020dccb..bf0d78c 100644
--- a/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs
+++ b/DevApp/Gs.DevApp/DevFrm/Sales/Frm_SalesDeliverSelect.cs
@@ -18,7 +18,6 @@
{
public partial class Frm_SalesDeliverSelect : DevExpress.XtraEditors.XtraForm
{
- private readonly string _webServiceName = "MesShouTuiManager/";
private string xiaoShouId = "";
/// <summary>
///
@@ -79,7 +78,8 @@
kcQty = dr["kcQty"].ToString(),
depotId = dr["depotId"].ToString(),
depotName = dr["depotName"].ToString(),
- });
+ entryNote = dr["entryNote"].ToString(),
+ });
}
}
}
diff --git a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
index 21f4d55..ff9655d 100644
--- a/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
+++ b/DevApp/Gs.DevApp/DevFrm/WOM/Frm_Womdaa.cs
@@ -43,6 +43,7 @@
this.toolBarMenu1.btnShouJianClick += ToolBarMenu1_btnShouJianClick;
this.toolBarMenu1.btnDelClick += ToolBarMenu1_btnDelClick;
this.toolBarMenu1.btnGxClick += ToolBarMenu1_btnGxClick;
+ this.toolBarMenu1.btnOutClick += ToolBarMenu1_btnOutClick;
this.toolBarMenu1.getXmlConfig();
gvMx1.Columns["barbl"].DisplayFormat.FormatType = FormatType.Numeric;
gvMx1.Columns["barbl"].DisplayFormat.FormatString = "p0";
@@ -284,7 +285,7 @@
inP3 = "",
inP4 = ""
};
- var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOutDaa", "", "", "", _params);
+ var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOutDaaMx", "", "", "", _params);
try
{
string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", JsonConvert.SerializeObject(_obj));
@@ -315,6 +316,7 @@
};
}
+
private void GridView1_ColumnFilterChanged(object sender, EventArgs e)
{
@@ -634,6 +636,65 @@
}
/// <summary>
+ /// 宸ュ崟瀵煎嚭
+ /// </summary>
+ /// <param name="sender"></param>
+ /// <param name="e"></param>
+ /// <exception cref="NotImplementedException"></exception>
+ private void ToolBarMenu1_btnOutClick(object sender, EventArgs e)
+ {
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ _sbSqlWhere.Append(" and a.ERP_SCZZ in");
+ _sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ _sbSqlWhere.Append(UtilityHelper.GetSearchWhere(_filterList));
+ using (FolderBrowserDialog folderBrowserDialog = new FolderBrowserDialog())
+ {
+ folderBrowserDialog.Description = "閫夋嫨瀵煎嚭鏂囦欢鐨勪繚瀛樿矾寰�";
+ DialogResult dialogResult = folderBrowserDialog.ShowDialog();
+ if (dialogResult == DialogResult.OK)
+ {
+ string _folder = folderBrowserDialog.SelectedPath;
+ var _params = new
+ {
+ inQueryWhere = _sbSqlWhere.ToString(),
+ inFid = "",
+ inP1 = "",
+ inP2 = "",
+ inP3 = "",
+ inP4 = ""
+ };
+ var _obj = new Gs.DevApp.Entity.XlsOutModel("xlsOutDaa", "", "", "", _params);
+ try
+ {
+ string strJson = UtilityHelper.HttpPost("", "XlsInOut/XlsOutView_NEW", JsonConvert.SerializeObject(_obj));
+ ReturnModel<dynamic> _rtn = ToolBox.UtilityHelper.ReturnToDynamic(strJson);
+ if (_rtn.rtnCode > 0)
+ {
+ string _file = _rtn.rtnData.fileUrl.ToString();
+ string _folderName = _folder + "\\" + _file.Replace("down/", "");
+ string _url = ConfigurationManager.AppSettings["WebApiUrl"].ToString() + _file;
+ using (WebClient client = new WebClient())
+ {
+ client.DownloadFile(_url, _folderName);
+ }
+ var frm = new Gs.DevApp.DevFrm.QC.Xls(_folderName);
+ frm.ShowDialog();
+ }
+ else
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + _rtn.rtnMsg);
+ }
+ }
+ catch (Exception ex)
+ {
+ ToolBox.MsgHelper.ShowError("鎻愮ず锛�" + ex.Message);
+ }
+ }
+ }
+
+ }
+
+ /// <summary>
///
/// </summary>
/// <param name="curPage">绗嚑椤�</param>
diff --git a/DevApp/Gs.DevApp/Gs.DevApp.csproj b/DevApp/Gs.DevApp/Gs.DevApp.csproj
index eec217d..15d1501 100644
--- a/DevApp/Gs.DevApp/Gs.DevApp.csproj
+++ b/DevApp/Gs.DevApp/Gs.DevApp.csproj
@@ -1548,6 +1548,12 @@
<Compile Include="UserControl\UcLookOrg.Designer.cs">
<DependentUpon>UcLookOrg.cs</DependentUpon>
</Compile>
+ <Compile Include="UserControl\UcLookOrgAll.cs">
+ <SubType>UserControl</SubType>
+ </Compile>
+ <Compile Include="UserControl\UcLookOrgAll.Designer.cs">
+ <DependentUpon>UcLookOrgAll.cs</DependentUpon>
+ </Compile>
<Compile Include="UserControl\UcLookPrint.cs">
<SubType>UserControl</SubType>
</Compile>
@@ -2285,6 +2291,9 @@
<EmbeddedResource Include="UserControl\UcLookOrg.resx">
<DependentUpon>UcLookOrg.cs</DependentUpon>
</EmbeddedResource>
+ <EmbeddedResource Include="UserControl\UcLookOrgAll.resx">
+ <DependentUpon>UcLookOrgAll.cs</DependentUpon>
+ </EmbeddedResource>
<EmbeddedResource Include="UserControl\UcLookPrint.resx">
<DependentUpon>UcLookPrint.cs</DependentUpon>
</EmbeddedResource>
diff --git a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
index 1c5b347..fda637d 100644
--- a/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
+++ b/DevApp/Gs.DevApp/ToolBox/UtilityHelper.cs
@@ -577,6 +577,14 @@
txt.IsReadly = isEdt;
continue;
}
+ //鑷畾缁勭粐all
+ if (colType is UcLookOrgAll)
+ {
+ var txt = colType as UcLookOrgAll;
+ txt.SetIdOrCode(strVal);
+ txt.IsReadly = isEdt;
+ continue;
+ }
//鑷畾鐢ㄦ埛
if (colType is UcLookUser)
{
@@ -882,6 +890,14 @@
txt.IsReadly = isEdt;
continue;
}
+ //鑷畾缁勭粐All
+ if (ctrl is UcLookOrgAll)
+ {
+ var txt = ctrl as UcLookOrgAll;
+ txt.SetIdOrCode("-1");
+ txt.IsReadly = isEdt;
+ continue;
+ }
//鑷畾鐢ㄦ埛
if (ctrl is UcLookUser)
{
@@ -1130,6 +1146,13 @@
if (ctrl is UcLookOrg)
{
var txt = ctrl as UcLookOrg;
+ txt.IsReadly = isEdt;
+ continue;
+ }
+ //鑷畾缁勭粐
+ if (ctrl is UcLookOrgAll)
+ {
+ var txt = ctrl as UcLookOrgAll;
txt.IsReadly = isEdt;
continue;
}
@@ -2544,6 +2567,29 @@
return "";
}
}
+ public static string GetFirstOrg(UserControl.UcLookOrgAll txt_erpSczz)
+ {
+ string userGuid = LoginInfoModel.CurrentUser.LoginUserGuid;
+ var pgq = new PageQueryModel(1, 999999, "FID", "asc", userGuid, " and IS_STATUS=1");
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
+ var _obj = UtilityHelper.ReturnToDynamic(strReturn);
+ string _extendText = _obj.rtnData.extendText;
+ string[] _dftOrg = _extendText.Split(',');
+ if (_dftOrg.Length > 0)
+ {
+ txt_erpSczz.SetIdOrCode(_dftOrg[0].Trim());
+ return _dftOrg[0].Trim();
+ }
+ return "";
+ }
+ catch (Exception ex)
+ {
+ return "";
+ }
+ }
}
/// <summary>
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookOrg.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookOrg.Designer.cs
index 4f9b1c4..af23991 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookOrg.Designer.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookOrg.Designer.cs
@@ -44,12 +44,11 @@
this.lookSearchSupplier.EditValue = "璇烽�夋嫨";
this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0);
this.lookSearchSupplier.Name = "lookSearchSupplier";
-
this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
- this.lookSearchSupplier.Size = new System.Drawing.Size(309, 28);
+ this.lookSearchSupplier.Size = new System.Drawing.Size(309, 24);
this.lookSearchSupplier.TabIndex = 10;
//
// searchLookUpEdit1View
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs b/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
index 80054cb..0bf33e9 100644
--- a/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
+++ b/DevApp/Gs.DevApp/UserControl/UcLookOrg.cs
@@ -9,6 +9,7 @@
{
public partial class UcLookOrg : DevExpress.XtraEditors.XtraUserControl
{
+
public UcLookOrg()
{
InitializeComponent();
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookOrgAll.Designer.cs b/DevApp/Gs.DevApp/UserControl/UcLookOrgAll.Designer.cs
new file mode 100644
index 0000000..f758219
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookOrgAll.Designer.cs
@@ -0,0 +1,119 @@
+锘縩amespace Gs.DevApp.UserControl
+{
+ partial class UcLookOrgAll
+ {
+ /// <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 Component 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.lookSearchSupplier = new DevExpress.XtraEditors.SearchLookUpEdit();
+ this.searchLookUpEdit1View = new DevExpress.XtraGrid.Views.Grid.GridView();
+ this.gridColumn1 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn5 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn2 = new DevExpress.XtraGrid.Columns.GridColumn();
+ this.gridColumn4 = new DevExpress.XtraGrid.Columns.GridColumn();
+ ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).BeginInit();
+ this.SuspendLayout();
+ //
+ // lookSearchSupplier
+ //
+ this.lookSearchSupplier.Dock = System.Windows.Forms.DockStyle.Fill;
+ this.lookSearchSupplier.EditValue = "璇烽�夋嫨";
+ this.lookSearchSupplier.Location = new System.Drawing.Point(0, 0);
+ this.lookSearchSupplier.Name = "lookSearchSupplier";
+ this.lookSearchSupplier.Properties.Appearance.Options.UseFont = true;
+ this.lookSearchSupplier.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] {
+ new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo)});
+ this.lookSearchSupplier.Properties.PopupView = this.searchLookUpEdit1View;
+ this.lookSearchSupplier.Size = new System.Drawing.Size(309, 24);
+ this.lookSearchSupplier.TabIndex = 10;
+ //
+ // searchLookUpEdit1View
+ //
+ this.searchLookUpEdit1View.Columns.AddRange(new DevExpress.XtraGrid.Columns.GridColumn[] {
+ this.gridColumn1,
+ this.gridColumn5,
+ this.gridColumn2,
+ this.gridColumn4});
+ this.searchLookUpEdit1View.FocusRectStyle = DevExpress.XtraGrid.Views.Grid.DrawFocusRectStyle.RowFocus;
+ this.searchLookUpEdit1View.Name = "searchLookUpEdit1View";
+ this.searchLookUpEdit1View.OptionsSelection.EnableAppearanceFocusedCell = false;
+ this.searchLookUpEdit1View.OptionsView.ShowGroupPanel = false;
+ //
+ // gridColumn1
+ //
+ this.gridColumn1.Caption = "缁勭粐ID";
+ this.gridColumn1.FieldName = "fid";
+ this.gridColumn1.Name = "gridColumn1";
+ //
+ // gridColumn5
+ //
+ this.gridColumn5.Caption = "缁勭粐鍚嶇О";
+ this.gridColumn5.FieldName = "name";
+ this.gridColumn5.Name = "gridColumn5";
+ this.gridColumn5.Visible = true;
+ this.gridColumn5.VisibleIndex = 0;
+ //
+ // gridColumn2
+ //
+ this.gridColumn2.Caption = "缁勭粐缂栧彿";
+ this.gridColumn2.FieldName = "fNumber";
+ this.gridColumn2.MinWidth = 80;
+ this.gridColumn2.Name = "gridColumn2";
+ this.gridColumn2.UnboundDataType = typeof(string);
+ this.gridColumn2.Visible = true;
+ this.gridColumn2.VisibleIndex = 1;
+ this.gridColumn2.Width = 80;
+ //
+ // gridColumn4
+ //
+ this.gridColumn4.Caption = "guid";
+ this.gridColumn4.FieldName = "guid";
+ this.gridColumn4.Name = "gridColumn4";
+ //
+ // UcLookOrgAll
+ //
+ this.AutoScaleDimensions = new System.Drawing.SizeF(8F, 18F);
+ this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Font;
+ this.Controls.Add(this.lookSearchSupplier);
+ this.Name = "UcLookOrgAll";
+ this.Size = new System.Drawing.Size(309, 30);
+ ((System.ComponentModel.ISupportInitialize)(this.lookSearchSupplier.Properties)).EndInit();
+ ((System.ComponentModel.ISupportInitialize)(this.searchLookUpEdit1View)).EndInit();
+ this.ResumeLayout(false);
+
+ }
+
+ #endregion
+
+ private DevExpress.XtraEditors.SearchLookUpEdit lookSearchSupplier;
+ private DevExpress.XtraGrid.Views.Grid.GridView searchLookUpEdit1View;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn5;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn1;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn2;
+ private DevExpress.XtraGrid.Columns.GridColumn gridColumn4;
+ }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookOrgAll.cs b/DevApp/Gs.DevApp/UserControl/UcLookOrgAll.cs
new file mode 100644
index 0000000..7d98a60
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookOrgAll.cs
@@ -0,0 +1,101 @@
+锘縰sing Gs.DevApp.Entity;
+using Gs.DevApp.ToolBox;
+using Newtonsoft.Json;
+using System;
+using System.Data;
+
+namespace Gs.DevApp.UserControl
+{
+ public partial class UcLookOrgAll : DevExpress.XtraEditors.XtraUserControl
+ {
+ public UcLookOrgAll()
+ {
+ InitializeComponent();
+ lookSearchSupplier.Properties.NullText = "璇烽�夋嫨";
+ lookSearchSupplier.EditValueChanged +=
+ LookSearchSupplier_EditValueChanged;
+ getSuppler();
+ }
+ private bool _rdy; public bool IsReadly { set { _rdy = value; this.lookSearchSupplier.ReadOnly = _rdy; } get { return _rdy; } }
+
+ /// <summary>
+ /// 鏀瑰彉浜嬩欢
+ /// </summary>
+ public event EventHandler EditChanged;
+
+ private void LookSearchSupplier_EditValueChanged(object sender,
+ EventArgs e)
+ {
+ if (EditChanged != null) EditChanged(this, e);
+ }
+ private void getSuppler()
+ {
+ System.Text.StringBuilder _sbSqlWhere = new System.Text.StringBuilder();
+ //_sbSqlWhere.Append(" and IS_STATUS=1 and fid in");
+ //_sbSqlWhere.Append(ToolBox.UtilityHelper.GetOrgWhere());
+ var pgq = new PageQueryModel(1, 999999, "fNumber", "asc", "", _sbSqlWhere.ToString());
+ var json = JsonConvert.SerializeObject(pgq);
+ try
+ {
+ var strReturn = UtilityHelper.HttpPost("", "Organization/GetListPage", json);
+ var rtn = UtilityHelper.ReturnToTablePage(strReturn);
+ var dt = rtn.rtnData.list;
+ lookSearchSupplier.Properties.DataSource = dt;
+ lookSearchSupplier.Properties.DisplayMember = "name";
+ lookSearchSupplier.Properties.ValueMember = "fid";
+ }
+ catch (Exception ex)
+ {
+ MsgHelper.Warning("鎻愮ず锛�" + ex.Message);
+ }
+ }
+
+ public string GetId()
+ {
+ var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+ if (row != null)
+ {
+ string id = row["fid"].ToString();
+ return id;
+ }
+ return "";
+ }
+ public string GetCode()
+ {
+ var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+ if (row != null)
+ {
+ string id = row["FNumber"].ToString();
+ return id;
+ }
+ return "";
+ }
+ public string GetName()
+ {
+ var name = lookSearchSupplier.Text.Trim();
+ return name;
+ }
+
+ public void SetIdOrCode(string Code)
+ {
+ if (Code == "-1" || string.IsNullOrEmpty(Code))
+ {
+ lookSearchSupplier.EditValue = null;
+ return;
+ }
+ //lookSearchSupplier.EditValue = Int64.Parse(((Code.ToString().Trim())));
+ lookSearchSupplier.EditValue = (((Code.ToString().Trim())));
+ }
+
+ public string GetGuid()
+ {
+ var row = lookSearchSupplier.GetSelectedDataRow() as DataRowView;
+ if (row != null)
+ {
+ string id = row["guid"].ToString();
+ return id;
+ }
+ return "";
+ }
+ }
+}
diff --git a/DevApp/Gs.DevApp/UserControl/UcLookOrgAll.resx b/DevApp/Gs.DevApp/UserControl/UcLookOrgAll.resx
new file mode 100644
index 0000000..1af7de1
--- /dev/null
+++ b/DevApp/Gs.DevApp/UserControl/UcLookOrgAll.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