From e411302bca8857e102443a5250c82b9580ef07a3 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 10:49:48 +0800
Subject: [PATCH] 修改成套设备增加逻辑
---
WinFrmUI/HStation.WinFrmUI.Assets.Core/03-valve/00-viewmodel/ValveMainViewModel.cs | 64 +++++++++++++++++++++----------
1 files changed, 43 insertions(+), 21 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..281c807 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
@@ -1,15 +1,12 @@
-锘縰sing System.ComponentModel;
-
-namespace HStation.WinFrmUI.Assets
+锘縩amespace 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,13 +15,22 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- this.Coefficient = rhs.Coefficient;
+ if (rhs.Material == null || rhs.Material == string.Empty)
+ {
+ this.Material = "榛樿";
+ }
+ else
+ {
+ this.Material = rhs.Material.ToString();
+ }
+ this.Coefficient = rhs.MinorLoss;
this.SeriesID = rhs.SeriesID;
- this.SeriesType = rhs.SeriesType;
this.SortCode = rhs.SortCode;
+ this.KeyWord = string.Join(",", rhs.KeyWords);
+ this.ValveSetting = rhs.ValveSetting;
}
- public void Reset(Vmo.ValveMainVmo rhs)
+ public void Reset(Vmo.AssetsValveMainVmo rhs)
{
this.ID = rhs.ID;
this.Name = rhs.Name;
@@ -38,10 +44,19 @@
{
this.Caliber = rhs.Caliber.ToString();
}
- this.Coefficient = rhs.Coefficient;
+ if (rhs.Material == null || rhs.Material == string.Empty)
+ {
+ this.Material = "榛樿";
+ }
+ else
+ {
+ this.Material = rhs.Material.ToString();
+ }
+ this.Coefficient = rhs.MinorLoss;
this.SeriesID = rhs.SeriesID;
- this.SeriesType = rhs.SeriesType;
this.SortCode = rhs.SortCode;
+ this.KeyWord = string.Join(",", rhs.KeyWords);
+ this.ValveSetting = rhs.ValveSetting;
}
[DisplayName("ID")]
@@ -77,18 +92,11 @@
public double Coefficient { get; set; }
/// <summary>
- /// 绫诲瀷
- /// </summary>
- [DisplayName("绫诲瀷")]
- [Browsable(true)]
- public HStation.Assets.eValveSeriesType SeriesType { get; set; }
-
- /// <summary>
/// 璇存槑
/// </summary>
[DisplayName("璇存槑")]
[Browsable(true)]
- public string? Description { get; set; }
+ public string Description { get; set; }
/// <summary>
/// 鎺掑簭鐮�
@@ -108,14 +116,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