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

更改

Browse Source
This commit is contained in:
Tyrone CT
2026-04-09 21:56:31 +08:00
parent 532374d1c4
commit 4ec6acde8f
7 changed files with 52 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CapMachine.Wpf/Services/NavigationMenuService.cs
View File

@@ -77,7 +77,7 @@ namespace CapMachine.Wpf.Services
//}));
MenuItems.Add(new NavigationItem("", "工艺过程", "MonitorView"));
MenuItems.Add(new NavigationItem("", "CAN配置", "CANConfigView"));
//MenuItems.Add(new NavigationItem("", "CANFD配置", "CANFDConfigView"));
MenuItems.Add(new NavigationItem("", "CANFD配置", "CANFDConfigView"));
MenuItems.Add(new NavigationItem("", "LIN配置", "LINConfigView"));
//MenuItems.Add(new NavigationItem("", "ZLG CAN配置", "ZlgCanDriveConfigView"));
//MenuItems.Add(new NavigationItem("", "ZLG LIN配置", "ZlgLinDriveConfigView"));

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

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