diff --git a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/MainViewModel.cs b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/MainViewModel.cs
index eeb93a1..390d23d 100644
--- a/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/MainViewModel.cs
+++ b/Sinvo.EplanHpD.Plugin.WPFUI/ViewModel/MainViewModel.cs
@@ -193,16 +193,17 @@ public partial class MainViewModel : INotifyPropertyChanged
///
///
///
- public async Task> StuffData(List data)
+ public async Task> StuffData(List datas)
{
- var datas = new ConcurrentBag();
+ var
+ stuffedDatas = new ConcurrentBag();
//var isAllCe = true;
//var isL1 = false;
//var isL2 = false;
//var isL3 = false;
//var isPe = false;
//foreach (var item in Data)
- data.AsParallel().WithDegreeOfParallelism(8).ForAll(item =>
+ datas.AsParallel().WithDegreeOfParallelism(8).ForAll(item =>
{
try
{
@@ -282,7 +283,7 @@ public partial class MainViewModel : INotifyPropertyChanged
{
if (data != null)
- datas.Add(data);
+ stuffedDatas.Add(data);
}
}
catch (Exception ex)
@@ -296,7 +297,7 @@ public partial class MainViewModel : INotifyPropertyChanged
//IsUseDiscoloration = isL1 && isL2 && isL3 && isPe;
//Trace.WriteLine($"isAllCE: {isAllCe}");
//Trace.WriteLine($"isSDIProject: {isL1 && isL2 && isL3 && isPe}");
- return await Task.FromResult>([.. datas]);
+ return await Task.FromResult>([.. stuffedDatas]);
}
///
/// 获取颜色代号
@@ -379,38 +380,50 @@ public partial class MainViewModel : INotifyPropertyChanged
///
public string GetNumberTubeSpecification(string crossSection, string colorCode)
{
- if (crossSection == "16")
- {
- if (colorCode == "YE") return "黄色热缩管φ12/定制";
- if (colorCode == "GN") return "绿色热缩管φ12/定制";
- if (colorCode == "RD") return "红色热缩管φ12/定制";
- if (colorCode == "BU") return "蓝色热缩管φ12/定制";
- if (colorCode == "GNYE") return "黄绿色热缩管φ12/定制";
- }
- else if (crossSection == "0.3" || crossSection == "0.5" || crossSection == "0.75" || crossSection == "1")
- {
- return "白色号码管φ2.5/定制";
- }
- else if (crossSection == "1.5")
- {
- return "白色号码管φ3/定制";
- }
- else if (crossSection == "2.5")
- {
- return "白色号码管φ4/定制";
- }
- else if (crossSection == "4")
- {
- return "白色号码管φ5/定制";
- }
- else if (crossSection == "6")
- {
- return "白色号码管φ6/定制";
- }
- else if (crossSection == "10")
- {
- return "白色号码管φ8/定制";
- }
+ if (double.TryParse(crossSection, out double crossSectionDouble))
+ if (crossSectionDouble >= 25)
+ {
+ if (colorCode == "YE") return "黄色热缩管φ12/定制";
+ if (colorCode == "GN") return "绿色热缩管φ12/定制";
+ if (colorCode == "RD") return "红色热缩管φ12/定制";
+ if (colorCode == "BU") return "蓝色热缩管φ12/定制";
+ if (colorCode == "GNYE") return "黄绿色热缩管φ12/定制";
+ if (colorCode == "BK") return "白色号码管φ8/定制";
+ }
+ //else if (crossSection == "0.3" || crossSection == "0.5" || crossSection == "0.75" || crossSection == "1")
+ else if (crossSectionDouble < 1.5)
+ {
+ return "白色号码管φ2.5/定制";
+ }
+ //else if (crossSection == "1.5")
+ else if (crossSectionDouble >= 1.5 && crossSectionDouble < 2.5)
+ {
+ return "白色号码管φ3/定制";
+ }
+ //else if (crossSection == "2.5")
+ else if (crossSectionDouble >= 2.5 && crossSectionDouble < 4)
+
+ {
+ return "白色号码管φ4/定制";
+ }
+ //else if (crossSection == "4")
+ else if (crossSectionDouble >= 4 && crossSectionDouble < 6)
+
+ {
+ return "白色号码管φ5/定制";
+ }
+ //else if (crossSection == "6")
+ else if (crossSectionDouble >= 6 && crossSectionDouble < 10)
+
+ {
+ return "白色号码管φ6/定制";
+ }
+ //else if (crossSection == "10")
+ else if (crossSectionDouble >= 10 && crossSectionDouble < 25)
+
+ {
+ return "白色号码管φ8/定制";
+ }
return string.Empty;
}