From cc9b9802eb626bced11edbd39c31f3c13db740f9 Mon Sep 17 00:00:00 2001
From: lixiaojun <1287241240@qq.com>
Date: 星期二, 08 十月 2024 16:51:44 +0800
Subject: [PATCH] 1
---
WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs | 24 ++++++++++++------------
1 files changed, 12 insertions(+), 12 deletions(-)
diff --git a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
index 4c5880e..c89f210 100644
--- a/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
+++ b/WinFrmUI/HStation.WinFrmUI.Xhs.Core/00-core/AssetsMatchingHelper.cs
@@ -387,7 +387,7 @@
// 缁濆鍖归厤
var absoluteMatch = adaptingManageVmos.Where(i =>
((input.Caliber == null && i.Caliber == null) || i.Caliber == input.Caliber) &&
- ((input.Material == null) || i.Material == input.Material)).ToList();
+ ((input.Material == null) || i.MaterialName == input.Material)).ToList();
if (absoluteMatch.Any())
{
foreach (var range in absoluteMatch)
@@ -425,13 +425,13 @@
foreach (var range in rangeMatch)
{
//浠ユ潗鏂欎负鏉′欢寮�濮嬪尮閰�
- if (range.Material == null)
+ if (range.MaterialName == null)
{
materialList.Add(range);
}
else
{
- int commonCount = GetIntersect(input.Material, range.Material);
+ int commonCount = GetIntersect(input.Material, range.MaterialName);
if (commonCount > firstCount)
{
materialList.Add(range);
@@ -470,7 +470,7 @@
{
input.MatchingMinorLoss = vmo.Coefficient;
input.MatchingDbId = vmo.ID.ToString();
- input.MatchingMaterial = vmo.Material;
+ input.MatchingMaterial = vmo.MaterialName;
input.MatchingModelType = vmo.Name;
return true;
}
@@ -486,7 +486,7 @@
// 缁濆鍖归厤
var absoluteMatch = adaptingManageVmos.Where(i =>
((input.Caliber == null && i.Caliber == null) || i.Caliber == input.Caliber) &&
- ((input.Material == null) || i.Material == input.Material)).ToList();
+ ((input.Material == null) || i.MaterialName == input.Material)).ToList();
if (absoluteMatch.Any())
{
foreach (var range in absoluteMatch)
@@ -524,13 +524,13 @@
foreach (var range in rangeMatch)
{
//浠ユ潗鏂欎负鏉′欢寮�濮嬪尮閰�
- if (range.Material == null)
+ if (range.MaterialName == null)
{
materialList.Add(range);
}
else
{
- int commonCount = GetIntersect(input.Material, range.Material);
+ int commonCount = GetIntersect(input.Material, range.MaterialName);
if (commonCount > firstCount)
{
materialList.Add(range);
@@ -569,7 +569,7 @@
{
input.MatchingMinorLoss = vmo.Coefficient;
input.MatchingDbId = vmo.ID.ToString();
- input.MatchingMaterial = vmo.Material;
+ input.MatchingMaterial = vmo.MaterialName;
input.MatchingModelType = vmo.Name;
return true;
}
@@ -585,7 +585,7 @@
// 缁濆鍖归厤
var absoluteMatch = adaptingManageVmos.Where(i =>
((input.Caliber == null && i.Caliber == null) || i.Caliber == input.Caliber) &&
- ((input.Material == null) || i.Material == input.Material)).ToList();
+ ((input.Material == null) || i.MaterialName == input.Material)).ToList();
if (absoluteMatch.Any())
{
foreach (var range in absoluteMatch)
@@ -623,13 +623,13 @@
foreach (var range in rangeMatch)
{
//浠ユ潗鏂欎负鏉′欢寮�濮嬪尮閰�
- if (range.Material == null)
+ if (range.MaterialName == null)
{
materialList.Add(range);
}
else
{
- int commonCount = GetIntersect(input.Material, range.Material);
+ int commonCount = GetIntersect(input.Material, range.MaterialName);
if (commonCount > firstCount)
{
materialList.Add(range);
@@ -668,7 +668,7 @@
{
input.MatchingMinorLoss = vmo.Coefficient;
input.MatchingDbId = vmo.ID.ToString();
- input.MatchingMaterial = vmo.Material;
+ input.MatchingMaterial = vmo.MaterialName;
input.MatchingModelType = vmo.Name;
return true;
}
--
Gitblit v1.9.3