From b32c0a21755ac3e86df0242d993398773cb627f2 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期三, 04 十二月 2024 17:04:15 +0800
Subject: [PATCH] 修改资产界面

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/BluntheadViewModel.cs |   66 +++++++++++---------------------
 1 files changed, 23 insertions(+), 43 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/BluntheadViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/BluntheadViewModel.cs
index 0cb49c4..6296ccf 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/BluntheadViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/14-tank/BluntheadViewModel.cs
@@ -12,52 +12,18 @@
         {
             this.ID = rhs.ID;
             this.Description = rhs.Description;
-            if (rhs.Caliber == null)
-            {
-                this.Caliber = "榛樿";
-            }
-            else
-            {
-                this.Caliber = rhs.Caliber.ToString();
-            }
-            if (rhs.Material == null)
-            {
-                this.Material = "榛樿";
-            }
-            else
-            {
-                this.Material = rhs.Material.ToString();
-            }
             this.Name = rhs.Name;
             this.SortCode = rhs.SortCode;
             this.KeyWord = string.Join(",", rhs.KeyWord);
-            this.MinorLoss = rhs.MinorLoss;
         }
 
         public void Reset(Vmo.AssetsTankMainVmo rhs)
         {
             this.ID = rhs.ID;
-            if (rhs.Caliber == null)
-            {
-                this.Caliber = "榛樿";
-            }
-            else
-            {
-                this.Caliber = rhs.Caliber.ToString();
-            }
-            if (rhs.Material == null)
-            {
-                this.Material = "榛樿";
-            }
-            else
-            {
-                this.Material = rhs.Material.ToString();
-            }
             this.Description = rhs.Description;
             this.Name = rhs.Name;
             this.KeyWord = string.Join(",", rhs.KeyWord);
             this.SortCode = rhs.SortCode;
-            this.MinorLoss = rhs.MinorLoss;
         }
 
         /// <summary>
@@ -73,25 +39,39 @@
         public string Name { get; set; }
 
         /// <summary>
-        /// 鍙e緞
+        /// 鏈�浣庢按浣�
         /// </summary>
-        [DisplayName("鍙e緞(mm)")]
+        [DisplayName("鏈�浣庢按浣�")]
         [Browsable(true)]
-        public string Caliber { get; set; }
+        public double MinLevel { get; set; }
 
         /// <summary>
-        /// 鏉愭枡
+        /// 鏈�楂樻按浣�
         /// </summary>
-        [DisplayName("鏉愭枡")]
+        [DisplayName("鏈�楂樻按浣�")]
         [Browsable(true)]
-        public string Material { get; set; }
+        public double MaxLevel { get; set; }
 
         /// <summary>
-        /// 绯绘暟
+        /// 鍏О鐩村緞
         /// </summary>
-        [DisplayName("绯绘暟")]
+        [DisplayName("鍏О鐩村緞")]
         [Browsable(true)]
-        public double MinorLoss { get; set; }
+        public double DN { get; set; }
+
+        /// <summary>
+        /// 鏈�灏忓绉�
+        /// </summary>
+        [DisplayName("鏈�灏忓绉�")]
+        [Browsable(true)]
+        public double MinVol { get; set; }
+
+        /// <summary>
+        /// 鏄惁鍏佽婧㈡祦
+        /// </summary>
+        [DisplayName("鏄惁鍏佽婧㈡祦")]
+        [Browsable(true)]
+        public bool OverFlow { get; set; }
 
         /// <summary>
         /// 璇嗗埆鍏抽敭瀛�

--
Gitblit v1.9.3