From a6c50c87d1ba3f5c8785dcc9e8ea640b5a43209f Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期四, 26 九月 2024 15:07:09 +0800
Subject: [PATCH] 修改报错

---
 WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/03-valve/XhsProjectSimulationValveMatchingViewModel.cs |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/03-valve/XhsProjectSimulationValveMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/03-valve/XhsProjectSimulationValveMatchingViewModel.cs
index cd74671..f69e216 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/03-valve/XhsProjectSimulationValveMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/03-valve/XhsProjectSimulationValveMatchingViewModel.cs
@@ -17,11 +17,11 @@
             this.Code = rhs.Code;
             this.DbId = rhs.DbId;
             this.ModelType = rhs.ModelType;
-            this.MatchingCaliber = rhs.MatchingDiameter;
+            this.MatchingDiameter = rhs.MatchingDiameter.ToString();
             this.MatchingMinorLoss = rhs.MatchingMinorLoss;
             this.MatchingDbid = rhs.MatchingDbId;
             this.MatchingMaterial = rhs.MatchingMaterial;
-            if (rhs.DbId == null)
+            if (rhs.DbId == null || rhs.DbId == string.Empty)
             {
                 MatchingType = eMatchingStatus.Failed;
             }
@@ -57,7 +57,7 @@
         /// </summary>
         [DisplayName("MatchingDbid")]
         [Browsable(false)]
-        public long? MatchingDbid { get; set; }
+        public string MatchingDbid { get; set; }
 
         /// <summary>
         /// 缂栫爜
@@ -99,7 +99,7 @@
         /// </summary>
         [DisplayName("淇敼鍚庡彛寰�")]
         [Browsable(true)]
-        public string MatchingCaliber { get; set; }
+        public string MatchingDiameter { get; set; }
 
         /// <summary>
         /// Db閿佸畾

--
Gitblit v1.9.3