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

MachineRunState1移动到ProRuntimeService

Browse Source
This commit is contained in:
Tyrone CT
2025-03-06 12:05:41 +08:00
parent d2d39acdec
commit be7ef37b08
10 changed files with 77 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
CapMachine.Wpf/ViewModels/QuickMeterStepViewModel.cs
View File

@@ -21,13 +21,14 @@ namespace CapMachine.Wpf.ViewModels
/// 实例化函数
/// </summary>
public QuickMeterStepViewModel(IDialogService dialogService, IFreeSql freeSql, IEventAggregator eventAggregator,
IRegionManager regionManager, MachineRtDataService machineRtDataService, SysRunService sysRunService)
IRegionManager regionManager, MachineRtDataService machineRtDataService, SysRunService sysRunService,ProRuntimeService proRuntimeService)
{
FreeSql = freeSql;
EventAggregator = eventAggregator;
RegionManager = regionManager;
this.MachineRtDataService = machineRtDataService;
SysRunService = sysRunService;
ProRuntimeService = proRuntimeService;
//MachineDataService = machineDataService;
DialogService = dialogService;
@@ -77,6 +78,7 @@ namespace CapMachine.Wpf.ViewModels
public IRegionManager RegionManager { get; }
public MachineRtDataService MachineRtDataService { get; }
public SysRunService SysRunService { get; }
public ProRuntimeService ProRuntimeService { get; }
/// <summary>
/// 弹窗服务
@@ -321,14 +323,14 @@ namespace CapMachine.Wpf.ViewModels
if (MachineRtDataService.LinkState==false)
{
MessageBox.Show("当前PLC链接失败，无法下载程序，但会标记下载!", "提示", MessageBoxButton.OKCancel, MessageBoxImage.Hand);
SysRunService.MachineRunState1.IsProLoad = true;
ProRuntimeService.MachineRunState1.IsProLoad = true;
return;
}
ProParsHelperQuick.GetPlcParsData(ListQuickMeterStepDto.ToList(), this.MachineRtDataService.SiemensDrive);
//下载完成的话，则标记状态
SysRunService.MachineRunState1.IsProLoad = true;
ProRuntimeService.MachineRunState1.IsProLoad = true;
}
else
{