From 0bc0468692ad7b16cd2d49d20c4689ddcd6fb212 Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 12 十一月 2024 17:43:14 +0800
Subject: [PATCH] 修改资产界面

---
 WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/ThreeLinkViewModel.cs |   74 +++++++++++++++++++++---------------
 1 files changed, 43 insertions(+), 31 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ThreeLinkViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/ThreeLinkViewModel.cs
similarity index 69%
rename from WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ThreeLinkViewModel.cs
rename to WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/ThreeLinkViewModel.cs
index 861ac78..1b2011c 100644
--- a/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/02-main/ThreeLinkViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Assets.Core/06-threeLink/ThreeLinkViewModel.cs
@@ -11,7 +11,6 @@
         public ThreeLinkViewModel(Vmo.AssetsThreelinkMainVmo rhs)
         {
             this.ID = rhs.ID;
-            this.Description = rhs.Description;
             if (rhs.Caliber == null)
             {
                 this.Caliber = "榛樿";
@@ -20,19 +19,21 @@
             {
                 this.Caliber = rhs.Caliber.ToString();
             }
-            if (rhs.MaterialName == null)
+            if (rhs.Material == null)
             {
-                this.MaterialName = "榛樿";
+                this.Material = "榛樿";
             }
             else
             {
-                this.MaterialName = rhs.MaterialName.ToString();
+                this.Material = rhs.Material.ToString();
             }
             this.Name = rhs.Name;
             this.SortCode = rhs.SortCode;
-            this.KeyWord = rhs.KeyWord;
-            this.IsDefault = rhs.IsDefault;
-            this.Coefficient = rhs.Coefficient;
+            this.KeyWord = string.Join(",", rhs.KeyWord);
+            this.RunThroughMinorLoss = rhs.RunThroughMinorLoss;
+            this.BranchThroughMinorLoss = rhs.BranchThroughMinorLoss;
+            this.MinorLoss = rhs.MinorLoss;
+            this.Description = rhs.Description;
         }
 
         public void Reset(Vmo.AssetsThreelinkMainVmo rhs)
@@ -46,20 +47,22 @@
             {
                 this.Caliber = rhs.Caliber.ToString();
             }
-            if (rhs.MaterialName == null)
+            if (rhs.Material == null)
             {
-                this.MaterialName = "榛樿";
+                this.Material = "榛樿";
             }
             else
             {
-                this.MaterialName = rhs.MaterialName.ToString();
+                this.Material = rhs.Material.ToString();
             }
-            this.Description = rhs.Description;
             this.Name = rhs.Name;
-            this.KeyWord = rhs.KeyWord;
-            this.IsDefault = rhs.IsDefault;
             this.SortCode = rhs.SortCode;
-            this.Coefficient = rhs.Coefficient;
+            this.KeyWord = string.Join(",", rhs.KeyWord);
+            this.RunThroughMinorLoss = rhs.RunThroughMinorLoss;
+            this.BranchThroughMinorLoss = rhs.BranchThroughMinorLoss;
+            this.MinorLoss = rhs.MinorLoss;
+            this.Description = rhs.Description;
+
         }
 
         /// <summary>
@@ -70,65 +73,74 @@
         /// <summary>
         /// 鍚嶇О
         /// </summary>
-        [DisplayName("鍚嶇О")]
+
+        [DisplayName("鍨嬪彿")]
         [Browsable(true)]
         public string Name { get; set; }
 
         /// <summary>
+        /// 绯诲垪ID
+        /// </summary>
+
+        [DisplayName("绯诲垪ID")]
+        [Browsable(false)]
+        public long SeriesID { get; set; }
+
+        /// <summary>
         /// 鍙ｅ緞
         /// </summary>
-        [DisplayName("鍙ｅ緞(mm)")]
+
+        [DisplayName("鍙ｅ緞")]
         [Browsable(true)]
         public string Caliber { get; set; }
 
         /// <summary>
         /// 鏉愭枡
         /// </summary>
+
         [DisplayName("鏉愭枡")]
         [Browsable(true)]
-        public string MaterialName { get; set; }
+        public string Material { get; set; }
 
         /// <summary>
         /// 绯绘暟
         /// </summary>
-        [DisplayName("鎹熷け绯绘暟")]
+
+        [DisplayName("绯绘暟")]
         [Browsable(true)]
-        public double? Coefficient { get; set; }
+        public double MinorLoss { get; set; }
 
         /// <summary>
         /// 杩愯閫氳繃鎹熷け绯绘暟
         /// </summary>
+
         [DisplayName("杩愯閫氳繃鎹熷け绯绘暟")]
         [Browsable(true)]
-        public double? RunThroughCoefficient { get; set; }
+        public double? RunThroughMinorLoss { get; set; }
 
         /// <summary>
         /// 鏀閫氳繃鎹熷け绯绘暟
         /// </summary>
+
         [DisplayName("鏀閫氳繃鎹熷け绯绘暟")]
         [Browsable(true)]
-        public double? BranchThroughCoefficient { get; set; }
-
-        /// <summary>
-        /// 鎺掑簭鐮�
-        /// </summary>
-        [DisplayName("鎺掑簭鐮�")]
-        [Browsable(true)]
-        public int SortCode { get; set; }
+        public double? BranchThroughMinorLoss { get; set; }
 
         /// <summary>
         /// 璇嗗埆鍏抽敭瀛�
         /// </summary>
+
         [DisplayName("鍏抽敭瀛�")]
         [Browsable(true)]
         public string KeyWord { get; set; }
 
         /// <summary>
-        /// 鏄惁榛樿
+        /// 鎺掑簭鐮�
         /// </summary>
-        [DisplayName("鏄惁榛樿")]
+
+        [DisplayName("鎺掑簭鐮�")]
         [Browsable(true)]
-        public bool IsDefault { get; set; }
+        public int SortCode { get; set; }
 
         /// <summary>
         /// 璇存槑

--
Gitblit v1.9.3