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
2025-07-10 18:00:31 +08:00
parent fdd321e635
commit 4e8c66aa38
17 changed files with 368 additions and 95 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
CapMachine.Wpf/ViewModels/MonitorViewModel.cs
View File

@@ -27,7 +27,8 @@ namespace CapMachine.Wpf.ViewModels
/// <param name="machineRtDataService"></param>
/// <param name="dialogService"></param>
public MonitorViewModel(ConfigService configService, IEventAggregator eventAggregator,
DataRecordService dataRecordService, SysRunService sysRunService, AlarmService alarmService, PPCService pPCService,CanDriveService canDriveService,LinDriveService linDriveService,
DataRecordService dataRecordService, SysRunService sysRunService, AlarmService alarmService, PPCService pPCService,
CanDriveService canDriveService, CanFdDriveService canFdDriveService, LinDriveService linDriveService,
MachineRtDataService machineRtDataService, IDialogService dialogService)
{
ConfigService = configService;
@@ -38,6 +39,7 @@ namespace CapMachine.Wpf.ViewModels
AlarmService = alarmService;
PPCService = pPCService;
CanDriveService = canDriveService;
CanFdDriveService = canFdDriveService;
LinDriveService = linDriveService;
MachineRtDataService = machineRtDataService;
DialogService = dialogService;
@@ -75,6 +77,7 @@ namespace CapMachine.Wpf.ViewModels
public AlarmService AlarmService { get; }
public PPCService PPCService { get; }
public CanDriveService CanDriveService { get; }
public CanFdDriveService CanFdDriveService { get; }
public LinDriveService LinDriveService { get; }
public MachineRtDataService MachineRtDataService { get; }
public IDialogService DialogService { get; }
@@ -229,6 +232,10 @@ namespace CapMachine.Wpf.ViewModels
this.SysRunServer.MachineRunState1.FireStart();
DataRecordService.StartRecord();
//清空错误状态
SysRunServer.SysErrStateInfo.ClearErr();
break;
case "结束":
MachineRtDataService.SysEnd();
@@ -244,6 +251,11 @@ namespace CapMachine.Wpf.ViewModels
CanDriveService.UpdateSpeedCmdData(0);
//itemTag.Value.EngPvValue = 0;
break;
case CanLinEnum.CANFD:
//获取PLC的SV数据 更新SV的速度值到压缩机
CanFdDriveService.UpdateSpeedCmdData(0);
//itemTag.Value.EngPvValue = 0;
break;
case CanLinEnum.Lin:
//获取PLC的SV数据 更新SV的速度值到压缩机
LinDriveService.UpdateSpeedCmdData(0);
@@ -261,6 +273,9 @@ namespace CapMachine.Wpf.ViewModels
this.SysRunServer.MachineRunState1.FireReset();
DataRecordService.EndRecord();
//清空错误状态
SysRunServer.SysErrStateInfo.ClearErr();
//结束运行的时候，需要将压缩机的速度值设置为0
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
{
@@ -269,6 +284,11 @@ namespace CapMachine.Wpf.ViewModels
CanDriveService.UpdateSpeedCmdData(0);
//itemTag.Value.EngPvValue = 0;
break;
case CanLinEnum.CANFD:
//获取PLC的SV数据 更新SV的速度值到压缩机
CanFdDriveService.UpdateSpeedCmdData(0);
//itemTag.Value.EngPvValue = 0;
break;
case CanLinEnum.Lin:
//获取PLC的SV数据 更新SV的速度值到压缩机
LinDriveService.UpdateSpeedCmdData(0);