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/07-fourlink/XhsProjectSimulationFourlinkMatchingViewModel.cs |   10 +++++-----
 1 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingViewModel.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingViewModel.cs
index d6cc0e0..801afe0 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingViewModel.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/04-simulation/06-simulation/01-matching/07-fourlink/XhsProjectSimulationFourlinkMatchingViewModel.cs
@@ -15,14 +15,14 @@
             this.Material = rhs.Material;
             this.Caliber = rhs.Caliber;
             this.Code = rhs.Code;
-            this.Dbid = rhs.Dbid;
+            this.Dbid = rhs.DbId;
             this.ModelType = rhs.ModelType;
-            this.MatchingCaliber = rhs.MatchingCaliber;
+            this.MatchingCaliber = rhs.MatchingCaliber.ToString();
             this.MatchingMinorLoss = rhs.MatchingMinorLoss;
-            this.MatchingDbid = rhs.MatchingDbid;
+            this.MatchingDbId = rhs.MatchingDbId;
             this.MatchingMaterial = rhs.MatchingMaterial;
 
-            if (rhs.Dbid == null)
+            if (rhs.DbId == null || rhs.DbId == string.Empty)
             {
                 MatchingType = eMatchingStatus.Failed;
             }
@@ -58,7 +58,7 @@
         /// </summary>
         [DisplayName("MatchingDbid")]
         [Browsable(false)]
-        public long? MatchingDbid { get; set; }
+        public string MatchingDbId { get; set; }
 
         /// <summary>
         /// 缂栫爜

--
Gitblit v1.9.3