From 09f8dfa6d6b382ed21e262e0a34704f61dab5e82 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期五, 12 七月 2024 13:34:50 +0800
Subject: [PATCH] 添加数据库初始化
---
Desktop/HStation.DeskTop.Xhs.Main/Program.cs | 4
Service/HStation.Service.Xhs.Core/00-core/DbFirstHelper.cs | 1
WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SetSysPropChoiceDlg.cs | 1
WinFrmUI/HStation.WinFrmUI.Xhs.Project/00-PumpProductManage/AddPumpProductMainDlg.Designer.cs | 178 ++++++++++++++++++++++++++++---------------
WinFrmUI/HStation.WinFrmUI.Xhs.Project/00-PumpProductManage/AddPumpProductMainDlg.cs | 24 +++++
Desktop/HStation.DeskTop.Xhs.Main/HStation.Desktop.Xhs.Main.csproj | 1
WinFrmUI/HStation.WinFrmUI.Basic/HStation.WinFrmUI.Basic.csproj | 2
WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/EditSysTypeDlg.cs | 1
Service/HStation.Service.Xhs.PumpProduct.Core/01-entity/PartMain.cs | 6
WinFrmUI/HStation.WinFrmUI.Xhs.Project/HStation.WinFrmUI.Xhs.PumpProduct.csproj | 3
10 files changed, 147 insertions(+), 74 deletions(-)
diff --git a/Desktop/HStation.DeskTop.Xhs.Main/HStation.Desktop.Xhs.Main.csproj b/Desktop/HStation.DeskTop.Xhs.Main/HStation.Desktop.Xhs.Main.csproj
index c263477..c1963d2 100644
--- a/Desktop/HStation.DeskTop.Xhs.Main/HStation.Desktop.Xhs.Main.csproj
+++ b/Desktop/HStation.DeskTop.Xhs.Main/HStation.Desktop.Xhs.Main.csproj
@@ -13,7 +13,6 @@
</ItemGroup>
<ItemGroup>
- <ProjectReference Include="..\..\Service\HStation.Service.Xhs.Core\HStation.Service.Xhs.Project.csproj" />
<ProjectReference Include="..\..\Setting\Hstation.Hxs.Setting\HStation.Setting.Xhs.Core.csproj" />
<ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Basic\HStation.WinFrmUI.Basic.csproj" />
<ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.PumpProject\HStation.WinFrmUI.Xhs.PumpProject.csproj" />
diff --git a/Desktop/HStation.DeskTop.Xhs.Main/Program.cs b/Desktop/HStation.DeskTop.Xhs.Main/Program.cs
index e5ab037..cc76756 100644
--- a/Desktop/HStation.DeskTop.Xhs.Main/Program.cs
+++ b/Desktop/HStation.DeskTop.Xhs.Main/Program.cs
@@ -63,8 +63,8 @@
var loginHelper = new LoginHelper();
if (!loginHelper.Login())
return;
- /* var databaseHelper = new HStation.DAL.DbFirstHelper();
- var result = databaseHelper.Initial(out string mss);*/
+ var databaseHelper = new HStation.DAL.DbFirstHelper();
+ var result = databaseHelper.Initial(out string msg);
Application.Run(new GuideMain());
}
}
diff --git a/Service/HStation.Service.Xhs.Core/00-core/DbFirstHelper.cs b/Service/HStation.Service.Xhs.Core/00-core/DbFirstHelper.cs
index 8a0413e..dba794c 100644
--- a/Service/HStation.Service.Xhs.Core/00-core/DbFirstHelper.cs
+++ b/Service/HStation.Service.Xhs.Core/00-core/DbFirstHelper.cs
@@ -46,6 +46,7 @@
var basicTypeList = new List<Type>();
//鍩虹妯″潡
+
basicTypeList.Add(typeof(Yw.Entity.SysModule));
basicTypeList.Add(typeof(Yw.Entity.SysType));
basicTypeList.Add(typeof(Yw.Entity.SysCatalog));
diff --git a/Service/HStation.Service.Xhs.PumpProduct.Core/01-entity/PartMain.cs b/Service/HStation.Service.Xhs.PumpProduct.Core/01-entity/PartMain.cs
index fcd1e1d..acb45c5 100644
--- a/Service/HStation.Service.Xhs.PumpProduct.Core/01-entity/PartMain.cs
+++ b/Service/HStation.Service.Xhs.PumpProduct.Core/01-entity/PartMain.cs
@@ -4,10 +4,10 @@
namespace HStation.Entity
{
/// <summary>
- /// 涓氬姟绔�
+ /// 娉典骇鍝�
/// </summary>
- [SysType("xhs-pumpmain")]
- [SugarTable("xhs-pumpmain")]
+ [SysType("xhs-PartMain")]
+ [SugarTable("xhs-PartMain")]
public class PartMain : BaseEntity, IParas, IFlags, ITagName, ISorter, System.ICloneable
{
/// <summary>
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/EditSysTypeDlg.cs b/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/EditSysTypeDlg.cs
index eef5a63..a929ca2 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/EditSysTypeDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/00-SysTypeManage/EditSysTypeDlg.cs
@@ -36,6 +36,7 @@
}
this.TextEditName.Text = _UpdateSysTypeDto.Name;
this.TextEditDescription.Text = _UpdateSysTypeDto.Description;
+ this.TextEditCode.Text = _UpdateSysTypeDto.Code;
}
//鏁版嵁楠岃瘉
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SetSysPropChoiceDlg.cs b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SetSysPropChoiceDlg.cs
index c57e938..738bdba 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SetSysPropChoiceDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/02-SysPropManage/SetSysPropChoiceDlg.cs
@@ -1,4 +1,5 @@
锘縰sing Mapster;
+using System.ComponentModel;
using Yw.Dto;
namespace HStation.WinFrmUI.Basic
diff --git a/WinFrmUI/HStation.WinFrmUI.Basic/HStation.WinFrmUI.Basic.csproj b/WinFrmUI/HStation.WinFrmUI.Basic/HStation.WinFrmUI.Basic.csproj
index 60b4087..660c904 100644
--- a/WinFrmUI/HStation.WinFrmUI.Basic/HStation.WinFrmUI.Basic.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Basic/HStation.WinFrmUI.Basic.csproj
@@ -8,7 +8,7 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
- <PackageReference Include="Yw.BLL.Basic.Core" Version="3.1.7" />
+ <PackageReference Include="Yw.BLL.Basic.Core" Version="3.1.8" />
</ItemGroup>
<ItemGroup>
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Project/00-PumpProductManage/AddPumpProductMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Project/00-PumpProductManage/AddPumpProductMainDlg.Designer.cs
index 7e40761..7652c35 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Project/00-PumpProductManage/AddPumpProductMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Project/00-PumpProductManage/AddPumpProductMainDlg.Designer.cs
@@ -42,12 +42,12 @@
TextEditRatedHead = new DevExpress.XtraEditors.TextEdit();
TextEditRatedFlow = new DevExpress.XtraEditors.TextEdit();
TextEditRatedSpeed = new DevExpress.XtraEditors.TextEdit();
+ TextEditCatalogChoice = new DevExpress.XtraEditors.ImageComboBoxEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem4 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
emptySpaceItem1 = new DevExpress.XtraLayout.EmptySpaceItem();
layoutControlItem8 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem7 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -56,7 +56,11 @@
layoutControlItem10 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem11 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem12 = new DevExpress.XtraLayout.LayoutControlItem();
+ layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
+ tabbedControlGroup1 = new DevExpress.XtraLayout.TabbedControlGroup();
+ layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
+ layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
((System.ComponentModel.ISupportInitialize)layoutControl1).BeginInit();
layoutControl1.SuspendLayout();
((System.ComponentModel.ISupportInitialize)TextEditName.Properties).BeginInit();
@@ -69,12 +73,12 @@
((System.ComponentModel.ISupportInitialize)TextEditRatedHead.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditRatedFlow.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditRatedSpeed.Properties).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)TextEditCatalogChoice.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem8).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem7).BeginInit();
@@ -83,7 +87,11 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem10).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem11).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem12).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)tabbedControlGroup1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
SuspendLayout();
//
// layoutControl1
@@ -100,11 +108,12 @@
layoutControl1.Controls.Add(TextEditRatedHead);
layoutControl1.Controls.Add(TextEditRatedFlow);
layoutControl1.Controls.Add(TextEditRatedSpeed);
+ layoutControl1.Controls.Add(TextEditCatalogChoice);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
layoutControl1.Root = Root;
- layoutControl1.Size = new Size(547, 308);
+ layoutControl1.Size = new Size(587, 423);
layoutControl1.TabIndex = 0;
layoutControl1.Text = "layoutControl1";
//
@@ -112,11 +121,11 @@
//
BtnOk.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Primary;
BtnOk.Appearance.Options.UseBackColor = true;
- BtnOk.Location = new Point(342, 278);
+ BtnOk.Location = new Point(367, 393);
BtnOk.Name = "BtnOk";
- BtnOk.Size = new Size(92, 22);
+ BtnOk.Size = new Size(99, 22);
BtnOk.StyleController = layoutControl1;
- BtnOk.TabIndex = 11;
+ BtnOk.TabIndex = 12;
BtnOk.Text = "瀹屾垚";
BtnOk.Click += BtnOk_ClickAsync;
//
@@ -125,74 +134,74 @@
simpleButton1.Appearance.BackColor = DevExpress.LookAndFeel.DXSkinColors.FillColors.Danger;
simpleButton1.Appearance.Options.UseBackColor = true;
simpleButton1.DialogResult = DialogResult.Cancel;
- simpleButton1.Location = new Point(438, 278);
+ simpleButton1.Location = new Point(470, 393);
simpleButton1.Name = "simpleButton1";
- simpleButton1.Size = new Size(101, 22);
+ simpleButton1.Size = new Size(109, 22);
simpleButton1.StyleController = layoutControl1;
- simpleButton1.TabIndex = 12;
+ simpleButton1.TabIndex = 13;
simpleButton1.Text = "鍙栨秷";
//
// TextEditName
//
TextEditName.Location = new Point(79, 8);
TextEditName.Name = "TextEditName";
- TextEditName.Size = new Size(170, 20);
+ TextEditName.Size = new Size(188, 20);
TextEditName.StyleController = layoutControl1;
TextEditName.TabIndex = 0;
//
// DescriptionTextEdit
//
- DescriptionTextEdit.Location = new Point(79, 128);
+ DescriptionTextEdit.Location = new Point(91, 188);
DescriptionTextEdit.Name = "DescriptionTextEdit";
- DescriptionTextEdit.Size = new Size(460, 146);
+ DescriptionTextEdit.Size = new Size(476, 189);
DescriptionTextEdit.StyleController = layoutControl1;
- DescriptionTextEdit.TabIndex = 10;
+ DescriptionTextEdit.TabIndex = 11;
//
// TextEditErosion
//
- TextEditErosion.Location = new Point(324, 56);
+ TextEditErosion.Location = new Point(342, 56);
TextEditErosion.Name = "TextEditErosion";
- TextEditErosion.Size = new Size(215, 20);
+ TextEditErosion.Size = new Size(237, 20);
TextEditErosion.StyleController = layoutControl1;
TextEditErosion.TabIndex = 6;
//
// TextEditRatedPower
//
- TextEditRatedPower.Location = new Point(324, 32);
+ TextEditRatedPower.Location = new Point(342, 32);
TextEditRatedPower.Name = "TextEditRatedPower";
- TextEditRatedPower.Size = new Size(215, 20);
+ TextEditRatedPower.Size = new Size(237, 20);
TextEditRatedPower.StyleController = layoutControl1;
TextEditRatedPower.TabIndex = 4;
//
// TextEditRatedeffciency
//
- TextEditRatedeffciency.Location = new Point(324, 8);
+ TextEditRatedeffciency.Location = new Point(342, 8);
TextEditRatedeffciency.Name = "TextEditRatedeffciency";
- TextEditRatedeffciency.Size = new Size(215, 20);
+ TextEditRatedeffciency.Size = new Size(237, 20);
TextEditRatedeffciency.StyleController = layoutControl1;
TextEditRatedeffciency.TabIndex = 2;
//
// TextEditD2
//
- TextEditD2.Location = new Point(324, 80);
+ TextEditD2.Location = new Point(342, 80);
TextEditD2.Name = "TextEditD2";
- TextEditD2.Size = new Size(215, 20);
+ TextEditD2.Size = new Size(237, 20);
TextEditD2.StyleController = layoutControl1;
TextEditD2.TabIndex = 8;
//
// TextEditTagName
//
- TextEditTagName.Location = new Point(79, 104);
+ TextEditTagName.Location = new Point(79, 128);
TextEditTagName.Name = "TextEditTagName";
- TextEditTagName.Size = new Size(460, 20);
+ TextEditTagName.Size = new Size(500, 20);
TextEditTagName.StyleController = layoutControl1;
- TextEditTagName.TabIndex = 9;
+ TextEditTagName.TabIndex = 10;
//
// TextEditRatedHead
//
TextEditRatedHead.Location = new Point(79, 80);
TextEditRatedHead.Name = "TextEditRatedHead";
- TextEditRatedHead.Size = new Size(170, 20);
+ TextEditRatedHead.Size = new Size(188, 20);
TextEditRatedHead.StyleController = layoutControl1;
TextEditRatedHead.TabIndex = 7;
//
@@ -200,7 +209,7 @@
//
TextEditRatedFlow.Location = new Point(79, 32);
TextEditRatedFlow.Name = "TextEditRatedFlow";
- TextEditRatedFlow.Size = new Size(170, 20);
+ TextEditRatedFlow.Size = new Size(188, 20);
TextEditRatedFlow.StyleController = layoutControl1;
TextEditRatedFlow.TabIndex = 3;
//
@@ -208,9 +217,19 @@
//
TextEditRatedSpeed.Location = new Point(79, 56);
TextEditRatedSpeed.Name = "TextEditRatedSpeed";
- TextEditRatedSpeed.Size = new Size(170, 20);
+ TextEditRatedSpeed.Size = new Size(188, 20);
TextEditRatedSpeed.StyleController = layoutControl1;
TextEditRatedSpeed.TabIndex = 5;
+ //
+ // TextEditCatalogChoice
+ //
+ TextEditCatalogChoice.Location = new Point(79, 104);
+ TextEditCatalogChoice.Name = "TextEditCatalogChoice";
+ TextEditCatalogChoice.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
+ TextEditCatalogChoice.Size = new Size(500, 20);
+ TextEditCatalogChoice.StyleController = layoutControl1;
+ TextEditCatalogChoice.TabIndex = 9;
+ TextEditCatalogChoice.SelectedValueChanged += TextEditCatalogChoice_SelectedValueChanged;
//
// Root
//
@@ -218,10 +237,10 @@
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, layoutControlItem5, emptySpaceItem1, layoutControlItem8, layoutControlItem7, layoutControlItem6, layoutControlItem9, layoutControlItem10, layoutControlItem11, layoutControlItem12 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem1, layoutControlItem2, layoutControlItem3, layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem7, layoutControlItem6, layoutControlItem9, layoutControlItem10, layoutControlItem11, layoutControlItem12, layoutControlItem13, tabbedControlGroup1 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
- Root.Size = new Size(547, 308);
+ Root.Size = new Size(587, 423);
Root.TextVisible = false;
//
// layoutControlItem1
@@ -230,7 +249,7 @@
layoutControlItem1.Control = TextEditName;
layoutControlItem1.Location = new Point(0, 0);
layoutControlItem1.Name = "layoutControlItem1";
- layoutControlItem1.Size = new Size(245, 24);
+ layoutControlItem1.Size = new Size(263, 24);
layoutControlItem1.Text = "<color=red>*</color>鍚嶇О:";
layoutControlItem1.TextSize = new Size(59, 14);
//
@@ -240,7 +259,7 @@
layoutControlItem2.Control = TextEditRatedSpeed;
layoutControlItem2.Location = new Point(0, 48);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(245, 24);
+ layoutControlItem2.Size = new Size(263, 24);
layoutControlItem2.Text = "<color=red>*</color>棰濆畾杞��:";
layoutControlItem2.TextSize = new Size(59, 14);
//
@@ -250,42 +269,33 @@
layoutControlItem3.Control = TextEditRatedFlow;
layoutControlItem3.Location = new Point(0, 24);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(245, 24);
+ layoutControlItem3.Size = new Size(263, 24);
layoutControlItem3.Text = "<color=red>*</color>棰濆畾娴侀噺:";
layoutControlItem3.TextSize = new Size(59, 14);
//
// layoutControlItem4
//
layoutControlItem4.Control = BtnOk;
- layoutControlItem4.Location = new Point(334, 270);
+ layoutControlItem4.Location = new Point(359, 385);
layoutControlItem4.Name = "layoutControlItem4";
- layoutControlItem4.Size = new Size(96, 26);
+ layoutControlItem4.Size = new Size(103, 26);
layoutControlItem4.TextSize = new Size(0, 0);
layoutControlItem4.TextVisible = false;
- //
- // layoutControlItem5
- //
- layoutControlItem5.Control = DescriptionTextEdit;
- layoutControlItem5.Location = new Point(0, 120);
- layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(535, 150);
- layoutControlItem5.Text = "璇存槑:";
- layoutControlItem5.TextSize = new Size(59, 14);
//
// emptySpaceItem1
//
emptySpaceItem1.AllowHotTrack = false;
- emptySpaceItem1.Location = new Point(0, 270);
+ emptySpaceItem1.Location = new Point(0, 385);
emptySpaceItem1.Name = "emptySpaceItem1";
- emptySpaceItem1.Size = new Size(334, 26);
+ emptySpaceItem1.Size = new Size(359, 26);
emptySpaceItem1.TextSize = new Size(0, 0);
//
// layoutControlItem8
//
layoutControlItem8.Control = simpleButton1;
- layoutControlItem8.Location = new Point(430, 270);
+ layoutControlItem8.Location = new Point(462, 385);
layoutControlItem8.Name = "layoutControlItem8";
- layoutControlItem8.Size = new Size(105, 26);
+ layoutControlItem8.Size = new Size(113, 26);
layoutControlItem8.TextSize = new Size(0, 0);
layoutControlItem8.TextVisible = false;
//
@@ -295,66 +305,100 @@
layoutControlItem7.Control = TextEditRatedHead;
layoutControlItem7.Location = new Point(0, 72);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(245, 24);
+ layoutControlItem7.Size = new Size(263, 24);
layoutControlItem7.Text = "<color=red>*</color>棰濆畾鎵▼:";
layoutControlItem7.TextSize = new Size(59, 14);
//
// layoutControlItem6
//
layoutControlItem6.Control = TextEditTagName;
- layoutControlItem6.Location = new Point(0, 96);
+ layoutControlItem6.Location = new Point(0, 120);
layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(535, 24);
+ layoutControlItem6.Size = new Size(575, 24);
layoutControlItem6.Text = "鏍囩鍚嶇О:";
layoutControlItem6.TextSize = new Size(59, 14);
//
// layoutControlItem9
//
layoutControlItem9.Control = TextEditRatedeffciency;
- layoutControlItem9.Location = new Point(245, 0);
+ layoutControlItem9.Location = new Point(263, 0);
layoutControlItem9.Name = "layoutControlItem9";
- layoutControlItem9.Size = new Size(290, 24);
+ layoutControlItem9.Size = new Size(312, 24);
layoutControlItem9.Text = "棰濆畾鏁堢巼:";
layoutControlItem9.TextSize = new Size(59, 14);
//
// layoutControlItem10
//
layoutControlItem10.Control = TextEditRatedPower;
- layoutControlItem10.Location = new Point(245, 24);
+ layoutControlItem10.Location = new Point(263, 24);
layoutControlItem10.Name = "layoutControlItem10";
- layoutControlItem10.Size = new Size(290, 24);
+ layoutControlItem10.Size = new Size(312, 24);
layoutControlItem10.Text = "棰濆畾鍔熺巼:";
layoutControlItem10.TextSize = new Size(59, 14);
//
// layoutControlItem11
//
layoutControlItem11.Control = TextEditErosion;
- layoutControlItem11.Location = new Point(245, 48);
+ layoutControlItem11.Location = new Point(263, 48);
layoutControlItem11.Name = "layoutControlItem11";
- layoutControlItem11.Size = new Size(290, 24);
+ layoutControlItem11.Size = new Size(312, 24);
layoutControlItem11.Text = "姘旇殌:";
layoutControlItem11.TextSize = new Size(59, 14);
//
// layoutControlItem12
//
layoutControlItem12.Control = TextEditD2;
- layoutControlItem12.Location = new Point(245, 72);
+ layoutControlItem12.Location = new Point(263, 72);
layoutControlItem12.Name = "layoutControlItem12";
- layoutControlItem12.Size = new Size(290, 24);
+ layoutControlItem12.Size = new Size(312, 24);
layoutControlItem12.Text = "鍙惰疆澶栧緞:";
layoutControlItem12.TextSize = new Size(59, 14);
+ //
+ // layoutControlItem13
+ //
+ layoutControlItem13.Control = TextEditCatalogChoice;
+ layoutControlItem13.Location = new Point(0, 96);
+ layoutControlItem13.Name = "layoutControlItem13";
+ layoutControlItem13.Size = new Size(575, 24);
+ layoutControlItem13.Text = "閫夋嫨鍒嗙被";
+ layoutControlItem13.TextSize = new Size(59, 14);
//
// dxErrorProvider1
//
dxErrorProvider1.ContainerControl = this;
//
- // AddPumpMainDlg
+ // tabbedControlGroup1
+ //
+ tabbedControlGroup1.Location = new Point(0, 144);
+ tabbedControlGroup1.Name = "tabbedControlGroup1";
+ tabbedControlGroup1.SelectedTabPage = layoutControlGroup1;
+ tabbedControlGroup1.Size = new Size(575, 241);
+ tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 });
+ tabbedControlGroup1.Text = "璇存槑";
+ //
+ // layoutControlGroup1
+ //
+ layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
+ layoutControlGroup1.Location = new Point(0, 0);
+ layoutControlGroup1.Name = "layoutControlGroup1";
+ layoutControlGroup1.Size = new Size(551, 193);
+ //
+ // layoutControlItem5
+ //
+ layoutControlItem5.Control = DescriptionTextEdit;
+ layoutControlItem5.Location = new Point(0, 0);
+ layoutControlItem5.Name = "layoutControlItem5";
+ layoutControlItem5.Size = new Size(551, 193);
+ layoutControlItem5.Text = "璇存槑:";
+ layoutControlItem5.TextSize = new Size(59, 14);
+ //
+ // AddPumpProductMainDlg
//
AutoScaleDimensions = new SizeF(7F, 14F);
AutoScaleMode = AutoScaleMode.Font;
- ClientSize = new Size(547, 308);
+ ClientSize = new Size(587, 423);
Controls.Add(layoutControl1);
- Name = "AddPumpMainDlg";
+ Name = "AddPumpProductMainDlg";
StartPosition = FormStartPosition.CenterScreen;
Text = "娣诲姞鍨嬪彿";
((System.ComponentModel.ISupportInitialize)layoutControl1).EndInit();
@@ -369,12 +413,12 @@
((System.ComponentModel.ISupportInitialize)TextEditRatedHead.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditRatedFlow.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditRatedSpeed.Properties).EndInit();
+ ((System.ComponentModel.ISupportInitialize)TextEditCatalogChoice.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem4).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
((System.ComponentModel.ISupportInitialize)emptySpaceItem1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem8).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem7).EndInit();
@@ -383,7 +427,11 @@
((System.ComponentModel.ISupportInitialize)layoutControlItem10).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem11).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem12).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)tabbedControlGroup1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
+ ((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
ResumeLayout(false);
}
@@ -393,7 +441,6 @@
private DevExpress.XtraEditors.TextEdit TextEditName;
private DevExpress.XtraLayout.LayoutControlGroup Root;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
private DevExpress.XtraEditors.MemoEdit DescriptionTextEdit;
private DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider dxErrorProvider1;
private DevExpress.XtraEditors.SimpleButton BtnOk;
@@ -417,5 +464,10 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
+ private DevExpress.XtraEditors.ImageComboBoxEdit TextEditCatalogChoice;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem13;
+ private DevExpress.XtraLayout.TabbedControlGroup tabbedControlGroup1;
+ private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
+ private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Project/00-PumpProductManage/AddPumpProductMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Project/00-PumpProductManage/AddPumpProductMainDlg.cs
index cf26f7e..8c6850d 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Project/00-PumpProductManage/AddPumpProductMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Project/00-PumpProductManage/AddPumpProductMainDlg.cs
@@ -1,4 +1,4 @@
-锘縰sing DevExpress.CodeParser.VB.Preprocessor;
+锘縰sing DevExpress.XtraEditors.Controls;
using HStation.Dto;
namespace HStation.WinFrmUI.Xhs.PumpProduct
@@ -10,12 +10,21 @@
InitializeComponent();
}
+ private Yw.BLL.SysCatalog _bll = null;
+
private AddPumpMainDto model = null;
- public void SetBindingData(long ID)
+ public async void SetBindingData(long ID)
{
model = new AddPumpMainDto();
model.PumpSeriesID = ID;
+ _bll = new Yw.BLL.SysCatalog();
+ var alllist = await _bll.GetAll();
+ foreach (var item in alllist)
+ {
+ var imageItem = new ImageComboBoxItem(item.Name, item.ID);
+ TextEditCatalogChoice.Properties.Items.Add(imageItem);
+ }
}
public event Func<AddPumpMainDto, Task<bool>> ReloadDataEvent = null;
@@ -87,5 +96,16 @@
this.DialogResult = DialogResult.OK;
this.Close();
}
+
+ //鍒嗙被閫夋嫨鍙樻崲
+ private async void TextEditCatalogChoice_SelectedValueChanged(object sender, EventArgs e)
+ {
+ var bll = new Yw.BLL.SysPropStruct();
+ var catlogID = this.TextEditCatalogChoice.EditValue;
+ if (catlogID == null)
+ return;
+ var id = Convert.ToInt64(catlogID);
+ var catlog = await bll.GetByCatalogID(id);
+ }
}
}
\ No newline at end of file
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Project/HStation.WinFrmUI.Xhs.PumpProduct.csproj b/WinFrmUI/HStation.WinFrmUI.Xhs.Project/HStation.WinFrmUI.Xhs.PumpProduct.csproj
index 755f6ab..ede781e 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Project/HStation.WinFrmUI.Xhs.PumpProduct.csproj
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Project/HStation.WinFrmUI.Xhs.PumpProduct.csproj
@@ -17,14 +17,13 @@
<ItemGroup>
<PackageReference Include="DevExpress.Win.Design" Version="23.2.4" />
<PackageReference Include="Microsoft.Web.WebView2" Version="1.0.2535.41" />
- <PackageReference Include="Yw.BLL.Basic.Core" Version="3.1.7" />
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\BLL\HStation.BLL.Xhs.Core\HStation.BLL.Xhs.Core.csproj" />
<ProjectReference Include="..\..\Model\HStation.Model.Xhs.PumpProduct\HStation.Model.Xhs.PumpProduct.csproj" />
- <ProjectReference Include="..\..\Service\HStation.Service.Xhs.Core\HStation.Service.Xhs.Core.csproj" />
<ProjectReference Include="..\..\Setting\Hstation.Hxs.Setting\Hstation.Setting.Xhs.Core.csproj" />
+ <ProjectReference Include="..\HStation.WinFrmUI.Basic\HStation.WinFrmUI.Basic.csproj" />
<ProjectReference Include="..\Hstation.WinFrmUI.Core\HStation.WinFrmUI.Core.csproj" />
</ItemGroup>
--
Gitblit v1.9.3