From e0e3ba17d3e48a586c49b9fe84e2c791438651bd Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期一, 29 七月 2024 19:12:25 +0800
Subject: [PATCH] 增加属性配置
---
BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpMain.cs | 0
Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs | 10
BLL/HStation.BLL.Assets.Core/03-localclient/09-dbfirst/XhsDbFirstHelper.cs | 26 ++
Service/HStation.Service.Assets.Core/03-service/00-core/03-helper/DbFirstHelper.cs | 84 +++++++
BLL/HStation.BLL.Phart.Core/04-bll/09-dbfirst/XhsDbFirstHelper.cs | 6
BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpGroupAndMainMap.cs | 0
HStation.Xhs.Core.sln | 58 ++++
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/AddPumpProductMainDlg.cs | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/AddPumpProductMainDlg.Designer.cs | 228 ++++--------------
BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpPropContent.cs | 0
Service/HStation.Service.Assets.Core/HStation.Service.Assets.Core.csproj | 4
WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.cs | 2
BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpGroup.cs | 0
/dev/null | 96 --------
BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpPart.cs | 0
BLL/HStation.BLL.Assets.Core/04-bll/09-dbfirst/XhsDbFirstHelper.cs | 15 +
BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpSeries.cs | 0
Desktop/HStation.DeskTop.Xhs.Main/Login/LoginFrm.cs | 2
Desktop/HStation.Desktop.Xhs.Core/DbFirstHelper.cs | 4
Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj | 2
Desktop/HStation.Desktop.Xhs.Core/MainForm.cs | 138 +++++++++--
BLL/HStation.BLL.Assets.Core/01-interface/09-dbfirst/IAssetsDbFirstHelper.cs | 15 +
22 files changed, 383 insertions(+), 311 deletions(-)
diff --git a/BLL/HStation.BLL.Assets.Core/01-interface/09-dbfirst/IAssetsDbFirstHelper.cs b/BLL/HStation.BLL.Assets.Core/01-interface/09-dbfirst/IAssetsDbFirstHelper.cs
new file mode 100644
index 0000000..355d18e
--- /dev/null
+++ b/BLL/HStation.BLL.Assets.Core/01-interface/09-dbfirst/IAssetsDbFirstHelper.cs
@@ -0,0 +1,15 @@
+锘縰sing Yw.CAL;
+
+namespace HStation.CAL
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public interface IXhsDbFirstHelper : IBaseCAL
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ Task<bool> Initial();
+ }
+}
\ No newline at end of file
diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpGroup.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpGroup.cs
similarity index 100%
rename from BLL/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpGroup.cs
rename to BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpGroup.cs
diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpGroupAndMainMap.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpGroupAndMainMap.cs
similarity index 100%
rename from BLL/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpGroupAndMainMap.cs
rename to BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpGroupAndMainMap.cs
diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpMain.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpMain.cs
similarity index 100%
rename from BLL/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpMain.cs
rename to BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpMain.cs
diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpPart.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpPart.cs
similarity index 100%
rename from BLL/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpPart.cs
rename to BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpPart.cs
diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpPropContent.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpPropContent.cs
similarity index 100%
rename from BLL/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpPropContent.cs
rename to BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpPropContent.cs
diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpSeries.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpSeries.cs
similarity index 100%
rename from BLL/HStation.BLL.Assets.Core/03-localclient/PumpProduct/PumpSeries.cs
rename to BLL/HStation.BLL.Assets.Core/03-localclient/01-PumpProduct/PumpSeries.cs
diff --git a/BLL/HStation.BLL.Assets.Core/03-localclient/09-dbfirst/XhsDbFirstHelper.cs b/BLL/HStation.BLL.Assets.Core/03-localclient/09-dbfirst/XhsDbFirstHelper.cs
new file mode 100644
index 0000000..7036cbe
--- /dev/null
+++ b/BLL/HStation.BLL.Assets.Core/03-localclient/09-dbfirst/XhsDbFirstHelper.cs
@@ -0,0 +1,26 @@
+锘縰sing Yw.Dto;
+
+namespace HStation.CAL.LocalClient
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class XhsDbFirstHelper : IXhsDbFirstHelper
+ {
+ /// <summary>
+ ///
+ /// </summary>
+ public async Task<bool> Initial()
+ {
+ return await Task.Run(() =>
+ {
+ var bol = HStation.Service.Assets.DbFirstHelper.Initial(out string Msg);
+ if (!bol)
+ {
+ throw YOops.Oh(eResultCode.Alert, InternalErrorCodes.L001, Msg);
+ }
+ return bol;
+ });
+ }
+ }
+}
\ No newline at end of file
diff --git a/BLL/HStation.BLL.Assets.Core/04-bll/09-dbfirst/XhsDbFirstHelper.cs b/BLL/HStation.BLL.Assets.Core/04-bll/09-dbfirst/XhsDbFirstHelper.cs
new file mode 100644
index 0000000..bf2db6d
--- /dev/null
+++ b/BLL/HStation.BLL.Assets.Core/04-bll/09-dbfirst/XhsDbFirstHelper.cs
@@ -0,0 +1,15 @@
+锘縩amespace HStation.BLL
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class AssetsDbFirstHelper : HStation.CAL.IXhsDbFirstHelper
+ {
+ private readonly HStation.CAL.IXhsDbFirstHelper _cal = CALCreateHelper.CreateCAL<HStation.CAL.IXhsDbFirstHelper>();
+
+ public Task<bool> Initial()
+ {
+ return _cal.Initial();
+ }
+ }
+}
\ No newline at end of file
diff --git a/BLL/HStation.BLL.Phart.Core/04-bll/09-dbfirst/XhsDbFirstHelper.cs b/BLL/HStation.BLL.Phart.Core/04-bll/09-dbfirst/XhsDbFirstHelper.cs
index 1f7e7cb..7350c98 100644
--- a/BLL/HStation.BLL.Phart.Core/04-bll/09-dbfirst/XhsDbFirstHelper.cs
+++ b/BLL/HStation.BLL.Phart.Core/04-bll/09-dbfirst/XhsDbFirstHelper.cs
@@ -1,9 +1,9 @@
锘縩amespace HStation.BLL
{
/// <summary>
- ///
+ ///
/// </summary>
- public class XhsDbFirstHelper : HStation.CAL.IXhsDbFirstHelper
+ public class XhsPhartDbFirstHelper : HStation.CAL.IXhsDbFirstHelper
{
private readonly HStation.CAL.IXhsDbFirstHelper _cal = CALCreateHelper.CreateCAL<HStation.CAL.IXhsDbFirstHelper>();
@@ -12,4 +12,4 @@
return _cal.Initial();
}
}
-}
+}
\ No newline at end of file
diff --git a/Desktop/HStation.DeskTop.Xhs.Main/Login/LoginFrm.cs b/Desktop/HStation.DeskTop.Xhs.Main/Login/LoginFrm.cs
index 9d1b0ae..d13f687 100644
--- a/Desktop/HStation.DeskTop.Xhs.Main/Login/LoginFrm.cs
+++ b/Desktop/HStation.DeskTop.Xhs.Main/Login/LoginFrm.cs
@@ -161,7 +161,7 @@
}
if (!found)
{
- MessageBoxHelper.ShowError("鐧诲綍澶辫触");
+ WinFrmUI.MessageBoxHelper.ShowError("鐧诲綍澶辫触");
this.itemForProgress.Visibility = DevExpress.XtraLayout.Utils.LayoutVisibility.Never;
}
}
diff --git a/Desktop/HStation.Desktop.Xhs.Core/DbFirstHelper.cs b/Desktop/HStation.Desktop.Xhs.Core/DbFirstHelper.cs
index 9bbd9b9..075bb8d 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/DbFirstHelper.cs
+++ b/Desktop/HStation.Desktop.Xhs.Core/DbFirstHelper.cs
@@ -17,10 +17,12 @@
public static void Initial()
{
new BLL.XhsDbFirstHelper().Initial();
+ new BLL.XhsPhartDbFirstHelper().Initial();
+ new BLL.AssetsDbFirstHelper().Initial();
new Yw.BLL.MapDbFirstHelper().Initial();
new Yw.BLL.BasicDbFirstHelper().Initial();
new Yw.BLL.HydroDbFirstHelper().Initial();
new Yw.BLL.BimfaceDbFirstHelper().Initial();
}
}
-}
+}
\ No newline at end of file
diff --git a/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj b/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj
index 8abf142..fda6898 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj
+++ b/Desktop/HStation.Desktop.Xhs.Core/HStation.Desktop.Xhs.Core.csproj
@@ -14,6 +14,8 @@
</ItemGroup>
<ItemGroup>
+ <ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Assets.Core\HStation.WinFrmUI.Assets.Core.csproj" />
+ <ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Basic\HStation.WinFrmUI.Basic.csproj" />
<ProjectReference Include="..\..\WinFrmUI\HStation.WinFrmUI.Xhs.Core\HStation.WinFrmUI.Xhs.Core.csproj" />
</ItemGroup>
diff --git a/Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs b/Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs
index 2a2d305..8d60c06 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs
+++ b/Desktop/HStation.Desktop.Xhs.Core/MainForm.Designer.cs
@@ -52,6 +52,7 @@
flyoutPanel1 = new DevExpress.Utils.FlyoutPanel();
flyoutPanelControl1 = new DevExpress.Utils.FlyoutPanelControl();
svgImg32 = new DevExpress.Utils.SvgImageCollection(components);
+ nbSystemConfig = new DevExpress.XtraBars.Navigation.NavButton();
((System.ComponentModel.ISupportInitialize)tileNavPane).BeginInit();
((System.ComponentModel.ISupportInitialize)documentManager1).BeginInit();
((System.ComponentModel.ISupportInitialize)barManager1).BeginInit();
@@ -68,6 +69,7 @@
tileNavPane.Buttons.Add(nbTitle);
tileNavPane.Buttons.Add(nbProjectMgr);
tileNavPane.Buttons.Add(nbBimfaceMgr);
+ tileNavPane.Buttons.Add(nbSystemConfig);
tileNavPane.Buttons.Add(nbMin);
tileNavPane.Buttons.Add(nbNormal);
tileNavPane.Buttons.Add(nbClose);
@@ -266,6 +268,13 @@
svgImg32.ImageSize = new Size(32, 32);
svgImg32.Add("bold", "image://svgimages/outlook inspired/bold.svg");
//
+ // nbSystemConfig
+ //
+ nbSystemConfig.Alignment = DevExpress.XtraBars.Navigation.NavButtonAlignment.Right;
+ nbSystemConfig.Caption = "绯荤粺閰嶇疆";
+ nbSystemConfig.Name = "nbSystemConfig";
+ nbSystemConfig.ElementClick += nbSystemConfig_ElementClick;
+ //
// MainForm
//
AutoScaleDimensions = new SizeF(7F, 14F);
@@ -323,5 +332,6 @@
private DevExpress.Utils.FlyoutPanel flyoutPanel1;
private DevExpress.Utils.FlyoutPanelControl flyoutPanelControl1;
private DevExpress.Utils.SvgImageCollection svgImg32;
+ private DevExpress.XtraBars.Navigation.NavButton nbSystemConfig;
}
}
diff --git a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
index c704232..691f631 100644
--- a/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
+++ b/Desktop/HStation.Desktop.Xhs.Core/MainForm.cs
@@ -6,6 +6,8 @@
using DevExpress.XtraBars.Ribbon;
using DevExpress.XtraEditors;
using HStation.WinFrmUI;
+using HStation.WinFrmUI.Basic;
+using HStation.WinFrmUI.Xhs.PumpProduct;
using System.IO;
using Yw.WinFrmUI;
using Yw.WinFrmUI.Page;
@@ -78,7 +80,6 @@
{
if (item.Tag is string)
{
-
}
}
}
@@ -147,24 +148,118 @@
};
_bimfaceMgrBeakCtrl = peakItemList.CreatePeekCtrl();
_bimfaceMgrBeakCtrl.Dock = DockStyle.Fill;
- this.flyoutPanel1.Size = _bimfaceMgrBeakCtrl.Size;
- this.flyoutPanelControl1.Controls.Clear();
- this.flyoutPanelControl1.Controls.Add(_bimfaceMgrBeakCtrl);
}
+ this.flyoutPanel1.Size = _bimfaceMgrBeakCtrl.Size;
+ this.flyoutPanelControl1.Controls.Clear();
+ this.flyoutPanelControl1.Controls.Add(_bimfaceMgrBeakCtrl);
this.flyoutPanel1.ShowBeakForm(hitInfo.ButtonInfo.Bounds);
}
-
}
+
private Control _bimfaceMgrBeakCtrl = null;//bimface管理弹出界面
- #endregion
+ //系统配置
+ private void nbSystemConfig_ElementClick(object sender, NavElementEventArgs e)
+ {
+ var pt = this.tileNavPane.PointToClient(MousePosition);
+ var hitInfo = this.tileNavPane.CalcHitInfo(pt);
+ if (hitInfo.ButtonInfo != null)
+ {
+ if (_SystemConfigBeakCtrl == null)
+ {
+ var peakItemList = new List<Yw.WinFrmUI.TilePeekItem>()
+ {
+ new TilePeekItem(){
+ Caption="水泵管理",
+ SvgImage=svgImg32[0],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Asstes",
+ MoudingType=eMoudingType.Tab,
+ Function="pumpMgr",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new PumpProductMainPanel();
+ CreatePage(page,guid);
+ }
+ }
+ },
+ new TilePeekItem(){
+ Caption="类型管理",
+ SvgImage=svgImg32[0],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Basic",
+ MoudingType=eMoudingType.Tab,
+ Function="TypeMgr",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new SysTypeManageMainPanel();
+ CreatePage(page,guid);
+ }
+ }
+ },
+ new TilePeekItem(){
+ Caption="分类管理",
+ SvgImage=svgImg32[0],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Basic",
+ MoudingType=eMoudingType.Tab,
+ Function="CataLogMgr",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new SysCatalogManageMainPanel();
+ CreatePage(page,guid);
+ }
+ }
+ }, new TilePeekItem(){
+ Caption="属性管理",
+ SvgImage=svgImg32[0],
+ SvgImageSize=new Size(24,24),
+ Click=()=>{
+ this.flyoutPanel1.HideBeakForm();
+ var guid=new PageGuid(){
+ Modular="Basic",
+ MoudingType=eMoudingType.Tab,
+ Function="PropMgr",
+ };
+ if(!IsExistPage(guid,true))
+ {
+ var page=new SysPropManageMainPanel();
+ CreatePage(page,guid);
+ }
+ }
+ }
+ };
+ _SystemConfigBeakCtrl = peakItemList.CreatePeekCtrl();
+ _SystemConfigBeakCtrl.Dock = DockStyle.Fill;
+ }
+ this.flyoutPanel1.Size = _SystemConfigBeakCtrl.Size;
+ this.flyoutPanelControl1.Controls.Clear();
+ this.flyoutPanelControl1.Controls.Add(_SystemConfigBeakCtrl);
+ this.flyoutPanel1.ShowBeakForm(hitInfo.ButtonInfo.Bounds);
+ }
+ }
+
+ private Control _SystemConfigBeakCtrl = null;//系统配置弹出界面
+
+ #endregion TileNavPane 相关处理
#region 窗体事件
//界面记载事件
private void MainForm_Load(object sender, EventArgs e)
{
-
}
//界面显示事件
@@ -199,7 +294,6 @@
//界面退出
private void MainForm_FormClosed(object sender, FormClosedEventArgs e)
{
-
}
//窗体尺寸改变
@@ -207,15 +301,13 @@
{
if (this.WindowState == FormWindowState.Maximized)
{
-
}
else
{
-
}
}
- #endregion
+ #endregion 窗体事件
#region TabbedView 相关事件处理程序
@@ -230,10 +322,9 @@
SelectModular(surfaceGuid.Modular, surfaceGuid);
}
- //添加
+ //添加
private void tabbedView1_DocumentAdded(object sender, DocumentEventArgs e)
{
-
}
//激活
@@ -247,10 +338,9 @@
//关闭 此时控件已经为空
private void tabbedView1_DocumentClosed(object sender, DocumentEventArgs e)
{
-
}
- #endregion
+ #endregion TabbedView 相关事件处理程序
#region Page
@@ -436,6 +526,7 @@
docPnl.Show();
}
break;
+
case eMoudingType.Tab:
{
this.tabbedView1.BeginUpdate();
@@ -454,6 +545,7 @@
this.tabbedView1.Controller.Activate(doc);
}
break;
+
default: break;
}
page.InitialDataSource();
@@ -479,6 +571,7 @@
}
}
break;
+
case eMoudingType.Tab:
{
if (this.tabbedView1.Documents != null && this.tabbedView1.Documents.Count > 0)
@@ -491,11 +584,12 @@
}
}
break;
+
default: break;
}
}
- #endregion
+ #endregion Page
#region Modular
@@ -528,14 +622,6 @@
//}
}
-
- #endregion
-
-
-
-
-
-
-
+ #endregion Modular
}
-}
+}
\ No newline at end of file
diff --git a/HStation.Xhs.Core.sln b/HStation.Xhs.Core.sln
index 03eeb53..6b9e981 100644
--- a/HStation.Xhs.Core.sln
+++ b/HStation.Xhs.Core.sln
@@ -67,7 +67,23 @@
EndProject
Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yw.BIMFace.SDK.Core", "Component\Yw.BIMFace.SDK.Core\Yw.BIMFace.SDK.Core.csproj", "{D6D805ED-C848-4403-97AB-E86715B9E2DB}"
EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "Yw.WinFrmUI.Hydro.Q3d.Core", "WinFrmUI\Yw.WinFrmUI.Hydro.Q3d.Core\Yw.WinFrmUI.Hydro.Q3d.Core.csproj", "{454B8C89-EFF0-42E2-B569-C211F0168F5D}"
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Yw.WinFrmUI.Hydro.Q3d.Core", "WinFrmUI\Yw.WinFrmUI.Hydro.Q3d.Core\Yw.WinFrmUI.Hydro.Q3d.Core.csproj", "{454B8C89-EFF0-42E2-B569-C211F0168F5D}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.Basic", "WinFrmUI\HStation.WinFrmUI.Basic\HStation.WinFrmUI.Basic.csproj", "{DC59BC8F-4B0E-4A76-AC52-32C7C49949B0}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.WinFrmUI.Assets.Core", "WinFrmUI\HStation.WinFrmUI.Assets.Core\HStation.WinFrmUI.Assets.Core.csproj", "{2AC76D6E-7035-4FD0-84EA-E00BA7D9876B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.BLL.Assets.Core", "BLL\HStation.BLL.Assets.Core\HStation.BLL.Assets.Core.csproj", "{EC0D8314-B4AB-4FA6-A490-C34E5773C8AA}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.BLL.Phart.Core", "BLL\HStation.BLL.Phart.Core\HStation.BLL.Phart.Core.csproj", "{083E94C0-36A0-4E6D-B5F5-707791292A51}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Dto.Assets.Core", "Dto\HStation.Dto.Assets.Core\HStation.Dto.Assets.Core.csproj", "{A9253100-6A3B-47E8-AACC-289C9756336B}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Dto.Phart.Core", "Dto\HStation.Dto.Phart.Core\HStation.Dto.Phart.Core.csproj", "{9E270671-8077-4EB1-8A4F-62C3B8FD44EB}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Service.Assets.Core", "Service\HStation.Service.Assets.Core\HStation.Service.Assets.Core.csproj", "{0AFD5926-BBB4-4DC9-92B3-5FCD15C84A42}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "HStation.Service.Phart.Core", "Service\HStation.Service.Phart.Core\HStation.Service.Phart.Core.csproj", "{80A54B20-D3FF-450D-86DC-DCF11E4A6B82}"
EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
@@ -167,6 +183,38 @@
{454B8C89-EFF0-42E2-B569-C211F0168F5D}.Debug|Any CPU.Build.0 = Debug|Any CPU
{454B8C89-EFF0-42E2-B569-C211F0168F5D}.Release|Any CPU.ActiveCfg = Release|Any CPU
{454B8C89-EFF0-42E2-B569-C211F0168F5D}.Release|Any CPU.Build.0 = Release|Any CPU
+ {DC59BC8F-4B0E-4A76-AC52-32C7C49949B0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {DC59BC8F-4B0E-4A76-AC52-32C7C49949B0}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {DC59BC8F-4B0E-4A76-AC52-32C7C49949B0}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {DC59BC8F-4B0E-4A76-AC52-32C7C49949B0}.Release|Any CPU.Build.0 = Release|Any CPU
+ {2AC76D6E-7035-4FD0-84EA-E00BA7D9876B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {2AC76D6E-7035-4FD0-84EA-E00BA7D9876B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {2AC76D6E-7035-4FD0-84EA-E00BA7D9876B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {2AC76D6E-7035-4FD0-84EA-E00BA7D9876B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {EC0D8314-B4AB-4FA6-A490-C34E5773C8AA}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {EC0D8314-B4AB-4FA6-A490-C34E5773C8AA}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {EC0D8314-B4AB-4FA6-A490-C34E5773C8AA}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {EC0D8314-B4AB-4FA6-A490-C34E5773C8AA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {083E94C0-36A0-4E6D-B5F5-707791292A51}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {083E94C0-36A0-4E6D-B5F5-707791292A51}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {083E94C0-36A0-4E6D-B5F5-707791292A51}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {083E94C0-36A0-4E6D-B5F5-707791292A51}.Release|Any CPU.Build.0 = Release|Any CPU
+ {A9253100-6A3B-47E8-AACC-289C9756336B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {A9253100-6A3B-47E8-AACC-289C9756336B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {A9253100-6A3B-47E8-AACC-289C9756336B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {A9253100-6A3B-47E8-AACC-289C9756336B}.Release|Any CPU.Build.0 = Release|Any CPU
+ {9E270671-8077-4EB1-8A4F-62C3B8FD44EB}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {9E270671-8077-4EB1-8A4F-62C3B8FD44EB}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {9E270671-8077-4EB1-8A4F-62C3B8FD44EB}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {9E270671-8077-4EB1-8A4F-62C3B8FD44EB}.Release|Any CPU.Build.0 = Release|Any CPU
+ {0AFD5926-BBB4-4DC9-92B3-5FCD15C84A42}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {0AFD5926-BBB4-4DC9-92B3-5FCD15C84A42}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {0AFD5926-BBB4-4DC9-92B3-5FCD15C84A42}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {0AFD5926-BBB4-4DC9-92B3-5FCD15C84A42}.Release|Any CPU.Build.0 = Release|Any CPU
+ {80A54B20-D3FF-450D-86DC-DCF11E4A6B82}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {80A54B20-D3FF-450D-86DC-DCF11E4A6B82}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {80A54B20-D3FF-450D-86DC-DCF11E4A6B82}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {80A54B20-D3FF-450D-86DC-DCF11E4A6B82}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -195,6 +243,14 @@
{4724474E-66CD-4237-B3A0-085125AD2D8F} = {276C57AF-5A9C-4A50-A79E-A5098D322FE9}
{D6D805ED-C848-4403-97AB-E86715B9E2DB} = {0469F9DE-F12C-4B83-A871-A77A82DCB4C8}
{454B8C89-EFF0-42E2-B569-C211F0168F5D} = {4F0A7BA1-6ED6-4F4F-A3B4-B9B3A133D869}
+ {DC59BC8F-4B0E-4A76-AC52-32C7C49949B0} = {4F0A7BA1-6ED6-4F4F-A3B4-B9B3A133D869}
+ {2AC76D6E-7035-4FD0-84EA-E00BA7D9876B} = {4F0A7BA1-6ED6-4F4F-A3B4-B9B3A133D869}
+ {EC0D8314-B4AB-4FA6-A490-C34E5773C8AA} = {4D3764D7-19DE-4C77-8F75-0EFB19D64B3F}
+ {083E94C0-36A0-4E6D-B5F5-707791292A51} = {4D3764D7-19DE-4C77-8F75-0EFB19D64B3F}
+ {A9253100-6A3B-47E8-AACC-289C9756336B} = {929B3BD5-B817-4EAF-ADA4-3DFBD1580DA6}
+ {9E270671-8077-4EB1-8A4F-62C3B8FD44EB} = {929B3BD5-B817-4EAF-ADA4-3DFBD1580DA6}
+ {0AFD5926-BBB4-4DC9-92B3-5FCD15C84A42} = {CF8E0A6C-9342-430D-BD10-6E1B5DE18571}
+ {80A54B20-D3FF-450D-86DC-DCF11E4A6B82} = {CF8E0A6C-9342-430D-BD10-6E1B5DE18571}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {E02989A8-9B6F-43E5-AACA-790328215089}
diff --git a/Service/HStation.Service.Assets.Core/03-service/00-core/03-helper/DbFirstHelper.cs b/Service/HStation.Service.Assets.Core/03-service/00-core/03-helper/DbFirstHelper.cs
new file mode 100644
index 0000000..1346ed9
--- /dev/null
+++ b/Service/HStation.Service.Assets.Core/03-service/00-core/03-helper/DbFirstHelper.cs
@@ -0,0 +1,84 @@
+锘縩amespace HStation.Service.Assets
+{
+ /// <summary>
+ ///
+ /// </summary>
+ public class DbFirstHelper
+ {
+ /// <summary>
+ /// 鍒濆鍖�
+ /// </summary>
+ public static bool Initial(out string msg)
+ {
+ msg = string.Empty;
+ try
+ {
+ var connectConfig = HStation.Xhs.ConfigHelper.PostgreSqlConnectionConfig;
+ if (connectConfig == null)
+ {
+ msg = "杩炴帴閰嶇疆鍒濆鍖栧け璐�";
+ return false;
+ }
+
+ connectConfig.ConfigureExternalServices = new ConfigureExternalServices()
+ {
+ EntityService = (property, column) =>
+ {
+ //闄や富閿鍏朵粬鍒楅兘鍙┖
+ if (!column.IsPrimarykey)
+ {
+ column.IsNullable = true;
+ }
+ if (column.DataType == StaticConfig.CodeFirst_BigString)
+ {
+ if (HStation.Settings.XhsParasHelper.Xhs.DataBase.DbType == HStation.Xhs.DbType.PostgreSql)
+ {
+ column.DataType = "character varying";
+ }
+ }
+ }
+ };
+
+ var typeList = new List<Type>()
+ {
+ typeof(Entity.PumpGroup),
+ typeof(Entity.PumpGroupAndMainMap),
+ typeof(Entity.PumpMain),
+ typeof(Entity.PumpMainAndPartMap),
+ typeof(Entity.PumpPartMain),
+ typeof(Entity.PumpPropContent),
+ typeof(Entity.PumpSeries),
+ typeof(Yw.Entity.SysModule),
+ typeof(Yw.Entity.SysType),
+ typeof(Yw.Entity.SysCatalog),
+ typeof(Yw.Entity.SysPropGroup),
+ typeof(Yw.Entity.SysProp),
+ typeof(Yw.Entity.SysPropMapping),
+ typeof(Yw.Entity.SysPropChoice),
+ typeof(Yw.Entity.SysPropValue),
+ typeof(Yw.Entity.SysPropValuePure),
+ };
+
+ using (var db = new SqlSugarClient(connectConfig))
+ {
+ //璁剧疆瀛楃涓查粯璁ら暱搴�
+ //db.CodeFirst.SetStringDefaultLength(250);
+ //db.CodeFirst.SetStringDefaultLength(int.MaxValue);
+ //寤哄簱锛氬鏋滀笉瀛樺湪鍒涘缓鏁版嵁搴撳瓨鍦ㄤ笉浼氶噸澶嶅垱寤� createdb;娉ㄦ剰 锛歄racle鍜屼釜鍒浗浜у簱闇�涓嶆敮鎸佽鏂规硶锛岄渶瑕佹墜鍔ㄥ缓搴�
+ db.DbMaintenance.CreateDatabase();
+ db.CodeFirst.InitTables
+ (
+ typeList.ToArray()
+ );
+ }
+
+ return true;
+ }
+ catch (Exception ex)
+ {
+ msg = ex.Message;
+ return false;
+ }
+ }
+ }
+}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/DbFirstHelper.cs b/Service/HStation.Service.Assets.Core/DbFirstHelper.cs
deleted file mode 100644
index c057d1d..0000000
--- a/Service/HStation.Service.Assets.Core/DbFirstHelper.cs
+++ /dev/null
@@ -1,96 +0,0 @@
-锘縩amespace HStation.Xhs.DAL
-{
- /// <summary>
- ///
- /// </summary>
- public class DbFirstHelper
- {
- public static ConnectionConfig ConnectionConfig
- {
- get { return Xhs.ConfigHelper.PostgreSqlConnectionConfig; }
- }
-
- /// <summary>
- /// 鍒濆鍖�
- /// </summary>
- public bool Initial(out string msg)
- {
- msg = string.Empty;
- try
- {
- #region 鍩虹妯″潡
-
- var basicConnectConfig = ConnectionConfig;
- if (basicConnectConfig == null)
- {
- msg = "杩炴帴閰嶇疆鍒濆鍖栧け璐�";
- return false;
- }
- basicConnectConfig.ConfigureExternalServices = new ConfigureExternalServices()
- {
- EntityService = (property, column) =>
- {
- //闄や富閿鍏朵粬鍒楅兘鍙┖
- if (!column.IsPrimarykey)
- {
- column.IsNullable = true;
- }
- if (column.DataType == StaticConfig.CodeFirst_BigString)
- {
- column.DataType = "character varying";
- }
- }
- };
-
- var basicTypeList = new List<Type>();
- //鍩虹妯″潡
-
- basicTypeList.Add(typeof(Yw.Entity.SysModule));
- basicTypeList.Add(typeof(Yw.Entity.SysType));
- basicTypeList.Add(typeof(Yw.Entity.SysCatalog));
- basicTypeList.Add(typeof(Yw.Entity.SysPropGroup));
- basicTypeList.Add(typeof(Yw.Entity.SysProp));
- basicTypeList.Add(typeof(Yw.Entity.SysPropMapping));
- basicTypeList.Add(typeof(Yw.Entity.SysPropChoice));
- basicTypeList.Add(typeof(Yw.Entity.SysPropValue));
- basicTypeList.Add(typeof(Yw.Entity.SysPropValuePure));
- basicTypeList.Add(typeof(Entity.PumpPartMain));
- basicTypeList.Add(typeof(Entity.PumpPropContent));
- basicTypeList.Add(typeof(Entity.PumpMainAndPartMap));
- basicTypeList.Add(typeof(Entity.PumpMain));
- basicTypeList.Add(typeof(Entity.PumpGroup));
- basicTypeList.Add(typeof(Entity.PumpGroupAndMainMap));
- basicTypeList.Add(typeof(Entity.PumpSeries));
-
- // basicTypeList.Add(typeof(Yw.Entity.SysCatalogOrg));
-
- //绯荤粺灞炴��
-
- if (basicTypeList.Count > 0)
- {
- using (var db = new SqlSugarClient(basicConnectConfig))
- {
- //璁剧疆瀛楃涓查粯璁ら暱搴�
- //db.CodeFirst.SetStringDefaultLength(250);
- //db.CodeFirst.SetStringDefaultLength(int.MaxValue);
- //寤哄簱锛氬鏋滀笉瀛樺湪鍒涘缓鏁版嵁搴撳瓨鍦ㄤ笉浼氶噸澶嶅垱寤� createdb;娉ㄦ剰 锛歄racle鍜屼釜鍒浗浜у簱闇�涓嶆敮鎸佽鏂规硶锛岄渶瑕佹墜鍔ㄥ缓搴�
- db.DbMaintenance.CreateDatabase();
- db.CodeFirst.InitTables
- (
- basicTypeList.ToArray()
- );
- }
- }
-
- #endregion 鍩虹妯″潡
-
- return true;
- }
- catch (Exception ex)
- {
- msg = ex.Message;
- return false;
- }
- }
- }
-}
\ No newline at end of file
diff --git a/Service/HStation.Service.Assets.Core/HStation.Service.Assets.Core.csproj b/Service/HStation.Service.Assets.Core/HStation.Service.Assets.Core.csproj
index 7d30017..7688ffc 100644
--- a/Service/HStation.Service.Assets.Core/HStation.Service.Assets.Core.csproj
+++ b/Service/HStation.Service.Assets.Core/HStation.Service.Assets.Core.csproj
@@ -9,15 +9,17 @@
<ItemGroup>
<Compile Remove="00-core\**" />
<Compile Remove="02-settings\**" />
+ <Compile Remove="03-service\00-core\03-extensions\**" />
<EmbeddedResource Remove="00-core\**" />
<EmbeddedResource Remove="02-settings\**" />
+ <EmbeddedResource Remove="03-service\00-core\03-extensions\**" />
<None Remove="00-core\**" />
<None Remove="02-settings\**" />
+ <None Remove="03-service\00-core\03-extensions\**" />
</ItemGroup>
<ItemGroup>
<Folder Include="02-dal\03-sqlite\" />
- <Folder Include="03-service\00-core\03-extensions\" />
</ItemGroup>
<ItemGroup>
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/AddPumpProductMainDlg.Designer.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/AddPumpProductMainDlg.Designer.cs
index a5547e2..3f5d86c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/AddPumpProductMainDlg.Designer.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/AddPumpProductMainDlg.Designer.cs
@@ -42,7 +42,6 @@
TextEditRatedHead = new DevExpress.XtraEditors.TextEdit();
TextEditRatedFlow = new DevExpress.XtraEditors.TextEdit();
TextEditRatedSpeed = new DevExpress.XtraEditors.TextEdit();
- TextEditCatalog = new DevExpress.XtraEditors.ImageComboBoxEdit();
Root = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem2 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem3 = new DevExpress.XtraLayout.LayoutControlItem();
@@ -58,21 +57,12 @@
layoutControlGroup1 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlItem5 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem6 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem16 = new DevExpress.XtraLayout.LayoutControlItem();
layoutControlItem1 = new DevExpress.XtraLayout.LayoutControlItem();
dxErrorProvider1 = new DevExpress.XtraEditors.DXErrorProvider.DXErrorProvider(components);
layoutControlItem13 = new DevExpress.XtraLayout.LayoutControlItem();
imageComboBoxEdit1 = new DevExpress.XtraEditors.ImageComboBoxEdit();
layoutControlItem15 = new DevExpress.XtraLayout.LayoutControlItem();
imageComboBoxEdit2 = new DevExpress.XtraEditors.ImageComboBoxEdit();
- layoutControlItem17 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem18 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem19 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem20 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem21 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem22 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem23 = new DevExpress.XtraLayout.LayoutControlItem();
- layoutControlItem24 = new DevExpress.XtraLayout.LayoutControlItem();
tabbedControlGroup2 = new DevExpress.XtraLayout.TabbedControlGroup();
layoutControlGroup3 = new DevExpress.XtraLayout.LayoutControlGroup();
layoutControlGroup4 = new DevExpress.XtraLayout.LayoutControlGroup();
@@ -89,7 +79,6 @@
((System.ComponentModel.ISupportInitialize)TextEditRatedHead.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditRatedFlow.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)TextEditRatedSpeed.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)TextEditCatalog.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)Root).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).BeginInit();
@@ -105,21 +94,12 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem5).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem16).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).BeginInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).BeginInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem15).BeginInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit2.Properties).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem17).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem18).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem19).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem20).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem21).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem22).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem23).BeginInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem24).BeginInit();
((System.ComponentModel.ISupportInitialize)tabbedControlGroup2).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).BeginInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).BeginInit();
@@ -140,7 +120,6 @@
layoutControl1.Controls.Add(TextEditRatedHead);
layoutControl1.Controls.Add(TextEditRatedFlow);
layoutControl1.Controls.Add(TextEditRatedSpeed);
- layoutControl1.Controls.Add(TextEditCatalog);
layoutControl1.Dock = DockStyle.Fill;
layoutControl1.Location = new Point(0, 0);
layoutControl1.Name = "layoutControl1";
@@ -184,92 +163,83 @@
//
// DescriptionTextEdit
//
- DescriptionTextEdit.Location = new Point(91, 212);
+ DescriptionTextEdit.Location = new Point(91, 164);
DescriptionTextEdit.Name = "DescriptionTextEdit";
- DescriptionTextEdit.Size = new Size(570, 224);
+ DescriptionTextEdit.Size = new Size(570, 272);
DescriptionTextEdit.StyleController = layoutControl1;
- DescriptionTextEdit.TabIndex = 1;
+ DescriptionTextEdit.TabIndex = 11;
//
// TextEditErosion
//
- TextEditErosion.Location = new Point(385, 80);
+ TextEditErosion.Location = new Point(413, 32);
TextEditErosion.Name = "TextEditErosion";
- TextEditErosion.Size = new Size(288, 20);
+ TextEditErosion.Size = new Size(260, 20);
TextEditErosion.StyleController = layoutControl1;
- TextEditErosion.TabIndex = 6;
+ TextEditErosion.TabIndex = 3;
//
// TextEditRatedPower
//
- TextEditRatedPower.Location = new Point(385, 56);
+ TextEditRatedPower.Location = new Point(79, 104);
TextEditRatedPower.Name = "TextEditRatedPower";
- TextEditRatedPower.Size = new Size(288, 20);
+ TextEditRatedPower.Size = new Size(259, 20);
TextEditRatedPower.StyleController = layoutControl1;
- TextEditRatedPower.TabIndex = 4;
+ TextEditRatedPower.TabIndex = 8;
//
// TextEditRatedeffciency
//
- TextEditRatedeffciency.Location = new Point(79, 32);
+ TextEditRatedeffciency.Location = new Point(413, 56);
TextEditRatedeffciency.Name = "TextEditRatedeffciency";
- TextEditRatedeffciency.Size = new Size(594, 20);
+ TextEditRatedeffciency.Size = new Size(260, 20);
TextEditRatedeffciency.StyleController = layoutControl1;
- TextEditRatedeffciency.TabIndex = 2;
+ TextEditRatedeffciency.TabIndex = 5;
//
// TextEditD2
//
- TextEditD2.Location = new Point(385, 104);
+ TextEditD2.Location = new Point(413, 80);
TextEditD2.Name = "TextEditD2";
- TextEditD2.Size = new Size(288, 20);
+ TextEditD2.Size = new Size(260, 20);
TextEditD2.StyleController = layoutControl1;
- TextEditD2.TabIndex = 8;
+ TextEditD2.TabIndex = 7;
//
// TextEditTagName
//
- TextEditTagName.Location = new Point(79, 128);
+ TextEditTagName.Location = new Point(413, 104);
TextEditTagName.Name = "TextEditTagName";
- TextEditTagName.Size = new Size(594, 20);
+ TextEditTagName.Size = new Size(260, 20);
TextEditTagName.StyleController = layoutControl1;
TextEditTagName.TabIndex = 9;
//
// TextEditRatedHead
//
- TextEditRatedHead.Location = new Point(79, 104);
+ TextEditRatedHead.Location = new Point(79, 80);
TextEditRatedHead.Name = "TextEditRatedHead";
- TextEditRatedHead.Size = new Size(231, 20);
+ TextEditRatedHead.Size = new Size(259, 20);
TextEditRatedHead.StyleController = layoutControl1;
- TextEditRatedHead.TabIndex = 7;
+ TextEditRatedHead.TabIndex = 6;
//
// TextEditRatedFlow
//
- TextEditRatedFlow.Location = new Point(79, 56);
+ TextEditRatedFlow.Location = new Point(79, 32);
TextEditRatedFlow.Name = "TextEditRatedFlow";
- TextEditRatedFlow.Size = new Size(231, 20);
+ TextEditRatedFlow.Size = new Size(259, 20);
TextEditRatedFlow.StyleController = layoutControl1;
- TextEditRatedFlow.TabIndex = 3;
+ TextEditRatedFlow.TabIndex = 2;
//
// TextEditRatedSpeed
//
- TextEditRatedSpeed.Location = new Point(79, 80);
+ TextEditRatedSpeed.Location = new Point(79, 56);
TextEditRatedSpeed.Name = "TextEditRatedSpeed";
- TextEditRatedSpeed.Size = new Size(231, 20);
+ TextEditRatedSpeed.Size = new Size(259, 20);
TextEditRatedSpeed.StyleController = layoutControl1;
- TextEditRatedSpeed.TabIndex = 5;
+ TextEditRatedSpeed.TabIndex = 4;
//
- // TextEditCatalog
- //
- TextEditCatalog.Location = new Point(79, 152);
- TextEditCatalog.Name = "TextEditCatalog";
- TextEditCatalog.Properties.Buttons.AddRange(new DevExpress.XtraEditors.Controls.EditorButton[] { new DevExpress.XtraEditors.Controls.EditorButton(DevExpress.XtraEditors.Controls.ButtonPredefines.Combo) });
- TextEditCatalog.Size = new Size(594, 20);
- TextEditCatalog.StyleController = layoutControl1;
- TextEditCatalog.TabIndex = 10;
- //
// Root
//
Root.AppearanceItemCaption.Options.UseTextOptions = true;
Root.AppearanceItemCaption.TextOptions.HAlignment = DevExpress.Utils.HorzAlignment.Far;
Root.EnableIndentsWithoutBorders = DevExpress.Utils.DefaultBoolean.True;
Root.GroupBordersVisible = false;
- Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem3, layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem7, layoutControlItem9, layoutControlItem10, layoutControlItem11, layoutControlItem12, tabbedControlGroup1, layoutControlItem6, layoutControlItem16, layoutControlItem1 });
+ Root.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem2, layoutControlItem3, layoutControlItem4, emptySpaceItem1, layoutControlItem8, layoutControlItem7, tabbedControlGroup1, layoutControlItem1, layoutControlItem10, layoutControlItem11, layoutControlItem9, layoutControlItem12, layoutControlItem6 });
Root.Name = "Root";
Root.Padding = new DevExpress.XtraLayout.Utils.Padding(6, 6, 6, 6);
Root.Size = new Size(681, 482);
@@ -279,9 +249,9 @@
//
layoutControlItem2.AllowHtmlStringInCaption = true;
layoutControlItem2.Control = TextEditRatedSpeed;
- layoutControlItem2.Location = new Point(0, 72);
+ layoutControlItem2.Location = new Point(0, 48);
layoutControlItem2.Name = "layoutControlItem2";
- layoutControlItem2.Size = new Size(306, 24);
+ layoutControlItem2.Size = new Size(334, 24);
layoutControlItem2.Text = "<color=red>*</color>棰濆畾杞��:";
layoutControlItem2.TextSize = new Size(59, 14);
//
@@ -289,9 +259,9 @@
//
layoutControlItem3.AllowHtmlStringInCaption = true;
layoutControlItem3.Control = TextEditRatedFlow;
- layoutControlItem3.Location = new Point(0, 48);
+ layoutControlItem3.Location = new Point(0, 24);
layoutControlItem3.Name = "layoutControlItem3";
- layoutControlItem3.Size = new Size(306, 24);
+ layoutControlItem3.Size = new Size(334, 24);
layoutControlItem3.Text = "<color=red>*</color>棰濆畾娴侀噺:";
layoutControlItem3.TextSize = new Size(59, 14);
//
@@ -325,54 +295,55 @@
//
layoutControlItem7.AllowHtmlStringInCaption = true;
layoutControlItem7.Control = TextEditRatedHead;
- layoutControlItem7.Location = new Point(0, 96);
+ layoutControlItem7.Location = new Point(0, 72);
layoutControlItem7.Name = "layoutControlItem7";
- layoutControlItem7.Size = new Size(306, 24);
+ layoutControlItem7.Size = new Size(334, 24);
layoutControlItem7.Text = "<color=red>*</color>棰濆畾鎵▼:";
layoutControlItem7.TextSize = new Size(59, 14);
//
// layoutControlItem9
//
layoutControlItem9.Control = TextEditRatedeffciency;
- layoutControlItem9.Location = new Point(0, 24);
+ layoutControlItem9.Location = new Point(334, 48);
layoutControlItem9.Name = "layoutControlItem9";
- layoutControlItem9.Size = new Size(669, 24);
+ layoutControlItem9.Size = new Size(335, 24);
layoutControlItem9.Text = "棰濆畾鏁堢巼:";
layoutControlItem9.TextSize = new Size(59, 14);
//
// layoutControlItem10
//
+ layoutControlItem10.AllowHtmlStringInCaption = true;
layoutControlItem10.Control = TextEditRatedPower;
- layoutControlItem10.Location = new Point(306, 48);
+ layoutControlItem10.Location = new Point(0, 96);
layoutControlItem10.Name = "layoutControlItem10";
- layoutControlItem10.Size = new Size(363, 24);
- layoutControlItem10.Text = "棰濆畾鍔熺巼:";
+ layoutControlItem10.Size = new Size(334, 24);
+ layoutControlItem10.Text = "<color=red>*</color>棰濆畾鍔熺巼:";
layoutControlItem10.TextSize = new Size(59, 14);
//
// layoutControlItem11
//
layoutControlItem11.Control = TextEditErosion;
- layoutControlItem11.Location = new Point(306, 72);
+ layoutControlItem11.Location = new Point(334, 24);
layoutControlItem11.Name = "layoutControlItem11";
- layoutControlItem11.Size = new Size(363, 24);
+ layoutControlItem11.Size = new Size(335, 24);
layoutControlItem11.Text = "姘旇殌:";
layoutControlItem11.TextSize = new Size(59, 14);
//
// layoutControlItem12
//
layoutControlItem12.Control = TextEditD2;
- layoutControlItem12.Location = new Point(306, 96);
+ layoutControlItem12.Location = new Point(334, 72);
layoutControlItem12.Name = "layoutControlItem12";
- layoutControlItem12.Size = new Size(363, 24);
+ layoutControlItem12.Size = new Size(335, 24);
layoutControlItem12.Text = "鍙惰疆澶栧緞:";
layoutControlItem12.TextSize = new Size(59, 14);
//
// tabbedControlGroup1
//
- tabbedControlGroup1.Location = new Point(0, 168);
+ tabbedControlGroup1.Location = new Point(0, 120);
tabbedControlGroup1.Name = "tabbedControlGroup1";
tabbedControlGroup1.SelectedTabPage = layoutControlGroup1;
- tabbedControlGroup1.Size = new Size(669, 276);
+ tabbedControlGroup1.Size = new Size(669, 324);
tabbedControlGroup1.TabPages.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlGroup1 });
tabbedControlGroup1.Text = "璇存槑";
//
@@ -381,7 +352,7 @@
layoutControlGroup1.Items.AddRange(new DevExpress.XtraLayout.BaseLayoutItem[] { layoutControlItem5 });
layoutControlGroup1.Location = new Point(0, 0);
layoutControlGroup1.Name = "layoutControlGroup1";
- layoutControlGroup1.Size = new Size(645, 228);
+ layoutControlGroup1.Size = new Size(645, 276);
layoutControlGroup1.Text = "璇存槑";
//
// layoutControlItem5
@@ -389,27 +360,18 @@
layoutControlItem5.Control = DescriptionTextEdit;
layoutControlItem5.Location = new Point(0, 0);
layoutControlItem5.Name = "layoutControlItem5";
- layoutControlItem5.Size = new Size(645, 228);
+ layoutControlItem5.Size = new Size(645, 276);
layoutControlItem5.Text = "璇存槑:";
layoutControlItem5.TextSize = new Size(59, 14);
//
// layoutControlItem6
//
layoutControlItem6.Control = TextEditTagName;
- layoutControlItem6.Location = new Point(0, 120);
+ layoutControlItem6.Location = new Point(334, 96);
layoutControlItem6.Name = "layoutControlItem6";
- layoutControlItem6.Size = new Size(669, 24);
+ layoutControlItem6.Size = new Size(335, 24);
layoutControlItem6.Text = "鏍囩鍚嶇О:";
layoutControlItem6.TextSize = new Size(59, 14);
- //
- // layoutControlItem16
- //
- layoutControlItem16.Control = TextEditCatalog;
- layoutControlItem16.Location = new Point(0, 144);
- layoutControlItem16.Name = "layoutControlItem16";
- layoutControlItem16.Size = new Size(669, 24);
- layoutControlItem16.Text = "閫夋嫨鍒嗙被";
- layoutControlItem16.TextSize = new Size(59, 14);
//
// layoutControlItem1
//
@@ -456,78 +418,6 @@
imageComboBoxEdit2.Name = "imageComboBoxEdit2";
imageComboBoxEdit2.Size = new Size(100, 20);
imageComboBoxEdit2.TabIndex = 0;
- //
- // layoutControlItem17
- //
- layoutControlItem17.Control = TextEditCatalog;
- layoutControlItem17.Location = new Point(0, 120);
- layoutControlItem17.Name = "layoutControlItem16";
- layoutControlItem17.Size = new Size(669, 24);
- layoutControlItem17.Text = "閫夋嫨鍒嗙被";
- layoutControlItem17.TextSize = new Size(59, 14);
- //
- // layoutControlItem18
- //
- layoutControlItem18.Control = TextEditCatalog;
- layoutControlItem18.Location = new Point(0, 120);
- layoutControlItem18.Name = "layoutControlItem16";
- layoutControlItem18.Size = new Size(669, 24);
- layoutControlItem18.Text = "閫夋嫨鍒嗙被";
- layoutControlItem18.TextSize = new Size(59, 14);
- //
- // layoutControlItem19
- //
- layoutControlItem19.Control = TextEditCatalog;
- layoutControlItem19.Location = new Point(0, 120);
- layoutControlItem19.Name = "layoutControlItem16";
- layoutControlItem19.Size = new Size(669, 24);
- layoutControlItem19.Text = "閫夋嫨鍒嗙被";
- layoutControlItem19.TextSize = new Size(59, 14);
- //
- // layoutControlItem20
- //
- layoutControlItem20.Control = TextEditCatalog;
- layoutControlItem20.Location = new Point(0, 120);
- layoutControlItem20.Name = "layoutControlItem16";
- layoutControlItem20.Size = new Size(669, 24);
- layoutControlItem20.Text = "閫夋嫨鍒嗙被";
- layoutControlItem20.TextSize = new Size(59, 14);
- //
- // layoutControlItem21
- //
- layoutControlItem21.Control = TextEditCatalog;
- layoutControlItem21.Location = new Point(0, 120);
- layoutControlItem21.Name = "layoutControlItem16";
- layoutControlItem21.Size = new Size(669, 24);
- layoutControlItem21.Text = "閫夋嫨鍒嗙被";
- layoutControlItem21.TextSize = new Size(59, 14);
- //
- // layoutControlItem22
- //
- layoutControlItem22.Control = TextEditCatalog;
- layoutControlItem22.Location = new Point(0, 120);
- layoutControlItem22.Name = "layoutControlItem16";
- layoutControlItem22.Size = new Size(669, 24);
- layoutControlItem22.Text = "閫夋嫨鍒嗙被";
- layoutControlItem22.TextSize = new Size(59, 14);
- //
- // layoutControlItem23
- //
- layoutControlItem23.Control = TextEditCatalog;
- layoutControlItem23.Location = new Point(0, 120);
- layoutControlItem23.Name = "layoutControlItem16";
- layoutControlItem23.Size = new Size(669, 24);
- layoutControlItem23.Text = "閫夋嫨鍒嗙被";
- layoutControlItem23.TextSize = new Size(59, 14);
- //
- // layoutControlItem24
- //
- layoutControlItem24.Control = TextEditCatalog;
- layoutControlItem24.Location = new Point(0, 120);
- layoutControlItem24.Name = "layoutControlItem16";
- layoutControlItem24.Size = new Size(669, 24);
- layoutControlItem24.Text = "閫夋嫨鍒嗙被";
- layoutControlItem24.TextSize = new Size(59, 14);
//
// tabbedControlGroup2
//
@@ -584,7 +474,6 @@
((System.ComponentModel.ISupportInitialize)TextEditRatedHead.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditRatedFlow.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)TextEditRatedSpeed.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)TextEditCatalog.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)Root).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem2).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem3).EndInit();
@@ -600,21 +489,12 @@
((System.ComponentModel.ISupportInitialize)layoutControlGroup1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem5).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem6).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem16).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem1).EndInit();
((System.ComponentModel.ISupportInitialize)dxErrorProvider1).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem13).EndInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit1.Properties).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlItem15).EndInit();
((System.ComponentModel.ISupportInitialize)imageComboBoxEdit2.Properties).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem17).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem18).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem19).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem20).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem21).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem22).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem23).EndInit();
- ((System.ComponentModel.ISupportInitialize)layoutControlItem24).EndInit();
((System.ComponentModel.ISupportInitialize)tabbedControlGroup2).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup3).EndInit();
((System.ComponentModel.ISupportInitialize)layoutControlGroup4).EndInit();
@@ -650,7 +530,6 @@
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem10;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem11;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem12;
- private DevExpress.XtraEditors.ImageComboBoxEdit TextEditCatalog;
private DevExpress.XtraLayout.TabbedControlGroup tabbedControlGroup1;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem5;
@@ -662,15 +541,6 @@
private DevExpress.XtraEditors.ImageComboBoxEdit imageComboBoxEdit1;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem15;
private DevExpress.XtraEditors.ImageComboBoxEdit imageComboBoxEdit2;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem16;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem17;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem18;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem19;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem20;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem21;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem22;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem23;
- private DevExpress.XtraLayout.LayoutControlItem layoutControlItem24;
private DevExpress.XtraLayout.LayoutControlItem layoutControlItem1;
private DevExpress.XtraLayout.TabbedControlGroup tabbedControlGroup2;
private DevExpress.XtraLayout.LayoutControlGroup layoutControlGroup3;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/AddPumpProductMainDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/AddPumpProductMainDlg.cs
index 6ba4524..4d55097 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/AddPumpProductMainDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/AddPumpProductMainDlg.cs
@@ -17,7 +17,7 @@
public async void SetBindingData(long ID)
{
- var pumpseries = await new BLL.PumpSeries().GetByID(ID);
+/* var pumpseries = await new BLL.PumpSeries().GetByID(ID);
if (pumpseries != null)
{
_PumpMain = new AddPumpMainDto();
@@ -32,7 +32,7 @@
_proplist = new List<PropGroupChoiceViewModel>();
TextEditCatalog.EditValue = pumpseries.CatalogID;
}
- }
+*/ }
public event Func<AddPumpMainDto, Task<bool>> ReloadDataEvent = null;
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.cs
index 07332ba..90e2564 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/00-PumpProductManage/EditPumpPartDlg.cs
@@ -191,7 +191,7 @@
{
foreach (var prop in item.PropList)
{
- _proplist.Add(new PropGroupChoiceViewModel() { PropGroupName = item.Name, PropName = prop.Name, ID = prop.ID });
+ _proplist.Add(new PropGroupChoiceViewModel() { PropGroupName = item.Name, PropName = prop.Name, ID = prop.ID, Value = prop.DefaultValue });
}
}
this.propGroupChoiceViewModelBindingSource.ResetBindings(false);
--
Gitblit v1.9.3