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

9
CapMachine.Wpf/App.xaml.cs
View File

@@ -133,10 +133,13 @@ namespace CapMachine.Wpf
containerRegistry.RegisterSingleton<CanFdDriveService>();
containerRegistry.RegisterSingleton<LinDriveService>();
containerRegistry.RegisterSingleton<ZlgCanDriveService>();
containerRegistry.RegisterSingleton<ZlgLinDriveService>();
containerRegistry.RegisterSingleton<MachineRtDataService>();
containerRegistry.RegisterSingleton<DataRecordService>();
containerRegistry.RegisterSingleton<HighSpeedDataService>();
//containerRegistry.RegisterSingleton<PPCService>();
containerRegistry.RegisterSingleton<PPCService>();
containerRegistry.RegisterSingleton<SysRunService>();
containerRegistry.RegisterSingleton<ComActionService>();
@@ -187,6 +190,8 @@ namespace CapMachine.Wpf
containerRegistry.RegisterForNavigation<CANConfigView, CANConfigViewModel>();
containerRegistry.RegisterForNavigation<CANFDConfigView, CANFDConfigViewModel>();
containerRegistry.RegisterForNavigation<LINConfigView, LinConfigViewModel>();
containerRegistry.RegisterForNavigation<ZlgCanDriveConfigView, ZlgCanDriveConfigViewModel>();
containerRegistry.RegisterForNavigation<ZlgLinDriveConfigView, ZlgLinDriveConfigViewModel>();
//注册Dialog视图时绑定VM
@@ -200,13 +205,17 @@ namespace CapMachine.Wpf
containerRegistry.RegisterDialog<DialogExpInfoView, DialogExpInfoViewModel>();
containerRegistry.RegisterDialog<DialogUserView, DialogUserViewModel>();
containerRegistry.RegisterDialog<DialogCanRwConfigView, DialogCanRwConfigViewModel>();
containerRegistry.RegisterDialog<DialogZlgCanLinRwConfigView, DialogZlgCanLinRwConfigViewModel>();
containerRegistry.RegisterDialog<DialogCanLinConfigCreateView, DialogCanLinConfigCreateViewModel>();
containerRegistry.RegisterDialog<DialogPIDConfigView, DialogPIDConfigViewModel>();
containerRegistry.RegisterDialog<DialogLimitConfigView, DialogLimitConfigViewModel>();
containerRegistry.RegisterDialog<DialogSuperHeatCoolConfigView, DialogSuperHeatCoolConfigViewModel>();
containerRegistry.RegisterDialog<DialogLogicRuleView, DialogLogicRuleViewModel>();
containerRegistry.RegisterDialog<DialogCanLinConfigImExportView, DialogCanLinConfigImExportViewModel>();
containerRegistry.RegisterDialog<DialogCANFdSchConfigView, DialogCANFdSchConfigViewModel>();
containerRegistry.RegisterDialog<DialogCANSchConfigView, DialogCANSchConfigViewModel>();
containerRegistry.RegisterDialog<DialogZlgCANSchConfigView, DialogZlgCANSchConfigViewModel>();
containerRegistry.RegisterDialog<DialogZlgCANFDSchConfigView, DialogZlgCANFDSchConfigViewModel>();
containerRegistry.RegisterDialog<DialogLINSchConfigView, DialogLINSchConfigViewModel>();
containerRegistry.RegisterDialog<SplashScreenView, SplashScreenViewModel>();

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

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

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)