From e411302bca8857e102443a5250c82b9580ef07a3 Mon Sep 17 00:00:00 2001
From: duheng <2286773002@qq.com>
Date: 星期五, 28 三月 2025 10:49:48 +0800
Subject: [PATCH] 修改成套设备增加逻辑

---
 WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/03-elbow/HydroElbowMatchingViewModel.cs |   13 ++++---------
 1 files changed, 4 insertions(+), 9 deletions(-)

diff --git a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/03-elbow/HydroElbowMatchingViewModel.cs b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/03-elbow/HydroElbowMatchingViewModel.cs
index f01c025..9d86942 100644
--- a/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/03-elbow/HydroElbowMatchingViewModel.cs
+++ b/WinFrmUI/Yw.WinFrmUI.Hydro.Core/14-matching/03-elbow/HydroElbowMatchingViewModel.cs
@@ -15,7 +15,6 @@
         /// </summary>
         public HydroElbowMatchingViewModel(Yw.Model.HydroElbowInfo rhs, Yw.Model.HydroModelInfo hydroInfo)
         {
-            this.ID = rhs.ID;
             this.Name = rhs.Name;
             this.Code = rhs.Code;
             this.DbLocked = rhs.DbLocked;
@@ -24,7 +23,7 @@
             this.Material = rhs.Material;
             this.Caliber = rhs.Caliber;
             this.MinorLoss = rhs.MinorLoss;
-            this.BendingAngle = rhs.BendingAngle.HasValue ? (int)rhs.BendingAngle.Value : null;
+            this.BendingAngle = (int)rhs.BendingAngle;
             this.ElbowType = HydroElbowTypeEnumHelper.GetElbowType(rhs.ElbowType);
         }
 
@@ -33,10 +32,6 @@
         /// </summary>
         public HydroElbowMatchingViewModel(HydroElbowViewModel rhs) : this(rhs.Vmo, rhs.HydroInfo) { }
 
-        /// <summary>
-        /// ID
-        /// </summary>
-        public long ID { get; set; }
 
         /// <summary>
         /// 缂栫爜
@@ -71,17 +66,17 @@
         /// <summary>
         /// 鍙e緞
         /// </summary>
-        public double? Caliber { get; set; }
+        public double Caliber { get; set; }
 
         /// <summary>
         /// 鎹熷け绯绘暟
         /// </summary>
-        public double? MinorLoss { get; set; }
+        public double MinorLoss { get; set; }
 
         /// <summary>
         /// 寮洸瑙掑害
         /// </summary>        
-        public int? BendingAngle { get; set; }
+        public int BendingAngle { get; set; }
 
         /// <summary>
         /// 寮ご绫诲瀷

--
Gitblit v1.9.3