From dd4da9a651330fabe210618581299ac3536bda2f Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期六, 26 十月 2024 21:41:24 +0800
Subject: [PATCH] 修复下载问题
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs | 64 ++++++++++++++++++++++++++-----
1 files changed, 53 insertions(+), 11 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs
index fa46010..a8a2bf0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs
@@ -2,14 +2,13 @@
namespace HStation.WinFrmUI.Assets
{
- public class ValveMainViewModel
+ public class AssetsValveMainViewModel
{
- public ValveMainViewModel(Vmo.ValveMainVmo rhs)
+ public AssetsValveMainViewModel(Vmo.AssetsValveMainVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
this.Description = rhs.Description;
- this.Material = rhs.Material;
if (rhs.Caliber == null)
{
this.Caliber = "榛樿";
@@ -18,18 +17,29 @@
{
this.Caliber = rhs.Caliber.ToString();
}
+ if (rhs.MaterialName == null)
+ {
+ this.Material = "榛樿";
+ }
+ else
+ {
+ this.Material = rhs.MaterialName.ToString();
+ }
this.Coefficient = rhs.Coefficient;
this.SeriesID = rhs.SeriesID;
- this.SeriesType = rhs.SeriesType;
+ this.SeriesType = rhs.Type;
+ this.ValveLift = rhs.ValveLift;
this.SortCode = rhs.SortCode;
+ this.KeyWord = rhs.KeyWord;
+ this.ValveSetting = rhs.ValveSetting;
}
- public void Reset(Vmo.ValveMainVmo rhs)
+ public void Reset(Vmo.AssetsValveMainVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
this.Description = rhs.Description;
- this.Material = rhs.Material;
+ this.Material = rhs.MaterialName;
if (rhs.Caliber == null)
{
this.Caliber = "榛樿";
@@ -38,10 +48,21 @@
{
this.Caliber = rhs.Caliber.ToString();
}
+ if (rhs.MaterialName == null)
+ {
+ this.Material = "榛樿";
+ }
+ else
+ {
+ this.Material = rhs.MaterialName.ToString();
+ }
this.Coefficient = rhs.Coefficient;
this.SeriesID = rhs.SeriesID;
- this.SeriesType = rhs.SeriesType;
+ this.SeriesType = rhs.Type;
this.SortCode = rhs.SortCode;
+ this.ValveLift = rhs.ValveLift;
+ this.KeyWord = rhs.KeyWord;
+ this.ValveSetting = rhs.ValveSetting;
}
[DisplayName("ID")]
@@ -81,14 +102,21 @@
/// </summary>
[DisplayName("绫诲瀷")]
[Browsable(true)]
- public HStation.Assets.eValveSeriesType SeriesType { get; set; }
+ public HStation.Assets.eAssetsValveSeriesType SeriesType { get; set; }
/// <summary>
/// 璇存槑
/// </summary>
[DisplayName("璇存槑")]
[Browsable(true)]
- public string? Description { get; set; }
+ public string Description { get; set; }
+
+ /// <summary>
+ /// 闃�闂ㄥ紑搴�
+ /// </summary>
+ [DisplayName("闃�闂ㄥ紑搴�")]
+ [Browsable(true)]
+ public int? ValveLift { get; set; }
/// <summary>
/// 鎺掑簭鐮�
@@ -108,14 +136,28 @@
/// 鍒涘缓浜�
/// </summary>
[DisplayName("鍒涘缓浜�")]
- [Browsable(true)]
+ [Browsable(false)]
public string CreateName { get; set; }
/// <summary>
/// 鍒涘缓鏃堕棿
/// </summary>
[DisplayName("鍒涘缓鏃堕棿")]
- [Browsable(true)]
+ [Browsable(false)]
public string CreateTime { get; set; }
+
+ /// <summary>
+ /// 璇嗗埆鍏抽敭瀛�
+ /// </summary>
+ [DisplayName("鍏抽敭瀛�")]
+ [Browsable(true)]
+ public string KeyWord { get; set; }
+
+ /// <summary>
+ /// 闃�闂ㄨ缃�
+ /// </summary>
+ [DisplayName("闃�闂ㄨ缃�")]
+ [Browsable(true)]
+ public string ValveSetting { get; set; }
}
}
\ No newline at end of file
--
Gitblit v1.9.3