TyroneGit/CapMachine
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Compare commits

merge into: TyroneGit:HASCO_KR26001_Fr25002
Branches Tags
TyroneGit:main TyroneGit:HASCO_KR25009_Fr25001 TyroneGit:HASCO_KR26001_Fr25002 TyroneGit:HASCO_Simple25002 TyroneGit:嘉兴_KR26401_Fr25001 TyroneGit:HASCO_Simple25001 TyroneGit:HASCO_Simple TyroneGit:HASCO_Standard TyroneGit:KR25003 TyroneGit:SongZhi_Project TyroneGit:master
...
pull from: TyroneGit:HASCO_Simple25002
Branches Tags
TyroneGit:HASCO_KR25009_Fr25001 TyroneGit:HASCO_KR26001_Fr25002 TyroneGit:main TyroneGit:HASCO_Simple25002 TyroneGit:嘉兴_KR26401_Fr25001 TyroneGit:HASCO_Simple25001 TyroneGit:HASCO_Simple TyroneGit:HASCO_Standard TyroneGit:KR25003 TyroneGit:SongZhi_Project TyroneGit:master

1 Commits
HASCO_KR26 ... HASCO_Simp

Author SHA1 Message Date
Tyrone CT
16a7e7fdf3 取消6个物性参数计算 2026-04-07 22:29:48 +08:00
2 changed files with 17 additions and 14 deletions
Expand all files Collapse all files

3
CapMachine.Wpf/CapMachine.Wpf.csproj
View File

@@ -746,6 +746,9 @@
<None Update="Key\PublicKey.xml"> <None Update="Key\PublicKey.xml">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>
<None Update="NLog.config">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None>
<None Update="TagConfig\SysTags.json"> <None Update="TagConfig\SysTags.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory> <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
</None> </None>

28
CapMachine.Wpf/Services/PPCService.cs
View File

@@ -448,20 +448,20 @@ namespace CapMachine.Wpf.Services
// 处理 err2 // 处理 err2
} }
if (TryUpdateThermodynamicSixResults(out var thermoErr)) //if (TryUpdateThermodynamicSixResults(out var thermoErr))
{ //{
if (!string.IsNullOrWhiteSpace(thermoErr)) // if (!string.IsNullOrWhiteSpace(thermoErr))
{ // {
Logger?.Error($"六个物性结果计算警告: {thermoErr}"); // Logger?.Error($"六个物性结果计算警告: {thermoErr}");
} // }
} //}
else //else
{ //{
if (!string.IsNullOrWhiteSpace(thermoErr)) // if (!string.IsNullOrWhiteSpace(thermoErr))
{ // {
Logger?.Error($"六个物性结果计算失败: {thermoErr}"); // Logger?.Error($"六个物性结果计算失败: {thermoErr}");
} // }
} //}
} }
catch (Exception ex) catch (Exception ex)