From bee0b4fc0f1126dd10fb9d7be931121266f97f6e Mon Sep 17 00:00:00 2001
From: duheng <2784771470@qq.com>
Date: 星期二, 14 一月 2025 19:03:27 +0800
Subject: [PATCH] 修复报错
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs | 7 +++++--
1 files changed, 5 insertions(+), 2 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
index 0c7605b..0baaaf4 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/03-simulation/07-matching/00-core/AssetsMatchingHelper.cs
@@ -111,7 +111,7 @@
}
}
- //鍠峰ご鍖归厤
+ //鍐峰嵈濉斿尮閰�
foreach (var item in assetsAutoMatchingView.Coolings)
{
if (Matching(item, allCoolingMain))
@@ -1768,7 +1768,10 @@
{
input.MatchingBendingAngle = elbow.Angle;
}
- input.MatchingElbowType = (Yw.WinFrmUI.eElbowType)(int)elbow.ElbowType;
+ if (elbow.ElbowType != null)
+ {
+ input.MatchingElbowType = (Yw.WinFrmUI.eElbowType)(int)elbow.ElbowType;
+ }
if (input.Material == null || input.Material == string.Empty)
{
input.MatchingMaterial = elbow.Material;
--
Gitblit v1.9.3