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-01-21 18:35:00 +08:00
parent 914a8b3dbc
commit 0bbe361ab7
23 changed files with 536 additions and 101 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
CapMachine.Wpf/ViewModels/CANConfigViewModel.cs
View File

@@ -827,8 +827,13 @@ namespace CapMachine.Wpf.ViewModels
{
//打开连接
CanDriveService.ToomossCanDrive.StartCanDrive();
//系统使用了CAN
ConfigService.CanLinRunStateModel.CurSysSelectedCanLin = CanLinEnum.Can;
//成功后状态显示
if (CanDriveService.ToomossCanDrive.OpenState)
{
//系统使用了CAN
ConfigService.CanLinRunStateModel.CurSysSelectedCanLin = CanLinEnum.Can;
}
//CAN DBC配置 有DBC配置的话，则直接加载DBC信息
if (!string.IsNullOrEmpty(SelectCanLinConfigPro.CANConfigExd.DbcPath))
{

14
CapMachine.Wpf/ViewModels/DialogEditProViewModel.cs
View File

@@ -22,6 +22,16 @@ namespace CapMachine.Wpf.ViewModels
set { name = value; RaisePropertyChanged(); }
}
private int _ProRepeat;
/// <summary>
/// 程序的循环次数
/// </summary>
public int ProRepeat
{
get { return _ProRepeat; }
set { _ProRepeat = value; RaisePropertyChanged(); }
}
private DelegateCommand saveCmd;
/// <summary>
/// 保存命令
@@ -56,7 +66,8 @@ namespace CapMachine.Wpf.ViewModels
DialogParameters pars = new DialogParameters
{
{ "Name", Name }
{ "Name", Name },
{ "ProRepeat", ProRepeat }
};
RaiseRequestClose(new DialogResult(ButtonResult.OK, pars));
@@ -97,6 +108,7 @@ namespace CapMachine.Wpf.ViewModels
public override void OnDialogOpened(IDialogParameters parameters)
{
Name = parameters.GetValue<string>("Name");
ProRepeat= parameters.GetValue<int>("ProRepeat");
}
}

4
CapMachine.Wpf/ViewModels/FooterViewModel.cs
View File

@@ -15,12 +15,12 @@ namespace CapMachine.Wpf.ViewModels
DataRecordService = dataRecordService;
ConfigService = configService;
MachineRtDataService = machineRtDataService;
SysService = sysService;
SysRunService = sysService;
}
public DataRecordService DataRecordService { get; }
public ConfigService ConfigService { get; }
public MachineRtDataService MachineRtDataService { get; }
public SysRunService SysService { get; }
public SysRunService SysRunService { get; }
}
}

9
CapMachine.Wpf/ViewModels/LinConfigViewModel.cs
View File

@@ -818,8 +818,13 @@ namespace CapMachine.Wpf.ViewModels
{
//打开连接
LinDriveService.ToomossLinDrive.StartLinDrive();
//系统使用了LIN
ConfigService.CanLinRunStateModel.CurSysSelectedCanLin = CanLinEnum.Lin;
//成功后状态显示
if (LinDriveService.ToomossLinDrive.OpenState)
{
//系统使用了LIN
ConfigService.CanLinRunStateModel.CurSysSelectedCanLin = CanLinEnum.Lin;
}
//LIN LDF配置 有LDF配置的话，则直接加载LDF信息
if (!string.IsNullOrEmpty(SelectCanLinConfigPro.LINConfigExd.LdfPath))
{

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

@@ -11,6 +11,7 @@ using Prism.Events;
using Prism.Services.Dialogs;
using System.Collections.ObjectModel;
using System.Windows.Controls.Primitives;
using static CapMachine.Wpf.Models.ComEnum;
namespace CapMachine.Wpf.ViewModels
{
@@ -26,7 +27,7 @@ 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,
DataRecordService dataRecordService, SysRunService sysRunService, AlarmService alarmService, PPCService pPCService,CanDriveService canDriveService,LinDriveService linDriveService,
MachineRtDataService machineRtDataService, IDialogService dialogService)
{
ConfigService = configService;
@@ -36,6 +37,8 @@ namespace CapMachine.Wpf.ViewModels
SysRunServer = sysRunService;
AlarmService = alarmService;
PPCService = pPCService;
CanDriveService = canDriveService;
LinDriveService = linDriveService;
MachineRtDataService = machineRtDataService;
DialogService = dialogService;
TagManager = MachineRtDataService.TagManger;
@@ -71,6 +74,8 @@ namespace CapMachine.Wpf.ViewModels
public SysRunService SysRunServer { get; }
public AlarmService AlarmService { get; }
public PPCService PPCService { get; }
public CanDriveService CanDriveService { get; }
public LinDriveService LinDriveService { get; }
public MachineRtDataService MachineRtDataService { get; }
public IDialogService DialogService { get; }
public List<ChartRtValue> ListChartRtValue { get; set; } = new List<ChartRtValue>()
@@ -230,17 +235,60 @@ namespace CapMachine.Wpf.ViewModels
this.SysRunServer.MachineRunState1.FireEnd();
DataRecordService.EndRecord();
//结束运行的时候，需要将压缩机的速度值设置为0
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
{
case CanLinEnum.Can:
//获取PLC的SV数据 更新SV的速度值到压缩机
CanDriveService.UpdateSpeedCmdData(0);
//itemTag.Value.EngPvValue = 0;
break;
case CanLinEnum.Lin:
//获取PLC的SV数据 更新SV的速度值到压缩机
LinDriveService.UpdateSpeedCmdData(0);
//itemTag.Value.EngPvValue = 0;
break;
default:
break;
}
break;
case "复位":
MachineRtDataService.SysReset();
this.SysRunServer.MachineRunState1.FireReset();
DataRecordService.EndRecord();
//结束运行的时候，需要将压缩机的速度值设置为0
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin)
{
case CanLinEnum.Can:
//获取PLC的SV数据 更新SV的速度值到压缩机
CanDriveService.UpdateSpeedCmdData(0);
//itemTag.Value.EngPvValue = 0;
break;
case CanLinEnum.Lin:
//获取PLC的SV数据 更新SV的速度值到压缩机
LinDriveService.UpdateSpeedCmdData(0);
//itemTag.Value.EngPvValue = 0;
break;
default:
break;
}
break;
case "消音":
MachineRtDataService.SysMute();
//ShowDialogExpInfo();
break;
case "暂停":
MachineRtDataService.SysPause();
//ShowDialogExpInfo();
break;
case "试验信息":

23
CapMachine.Wpf/ViewModels/ProConfigViewModel.cs
View File

@@ -389,23 +389,26 @@ namespace CapMachine.Wpf.ViewModels
}
//弹窗
DialogService.ShowDialog("DialogEditProView", new DialogParameters() { { "Name", SelectedProgramSeg.Name } }, (par) =>
DialogService.ShowDialog("DialogEditProView", new DialogParameters() { { "Name", SelectedProgramSeg.Name }, { "ProRepeat", SelectedProgramSeg.ProRepeat } }, (par) =>
{
if (par.Result == ButtonResult.OK)
{
//程序名称
var ReturnValue = par.Parameters.GetValue<string>("Name");
//查询是否重复
var count = FreeSql.Select<ProgramSeg>().Where(a => a.Name == ReturnValue).Count();
if (count > 0)
{
MessageBox.Show("名称已经存在了");
return;
}
var ReturnProRepeat = par.Parameters.GetValue<int>("ProRepeat");
////查询是否重复，可能只更改了次数，所以不再校验名称是否改变
//var count = FreeSql.Select<ProgramSeg>().Where(a => a.Name == ReturnValue).Count();
//if (count > 0)
//{
// MessageBox.Show("名称已经存在了");
// return;
//}
//开始修改
var InsertedData = FreeSql.Update<ProgramSeg>()
.Set(a => a.Name, ReturnValue)
.Set(a => a.ProRepeat, ReturnProRepeat)
.Where(a => a.Id == SelectedProgramSeg.Id)
.ExecuteUpdated();
@@ -2355,7 +2358,8 @@ namespace CapMachine.Wpf.ViewModels
{
//执行程序的步骤集合数据
ReturnPlcParsData = ProParsSongZhiHelper.GetPlcParsData(FindData.ProSteps, FindData.ProRepeat);
//把次数给PLC，那么此时应该是最后一个程序给PLC了
ProParsSongZhiHelper.LoadProCycleToPlc(MachineRtDataService.SiemensDrive, FindData.ProRepeat);
}
}
@@ -2365,6 +2369,7 @@ namespace CapMachine.Wpf.ViewModels
ReturnPlcParsData = ProParsSongZhiHelper.LoadPlcCellAddress(ReturnPlcParsData);
ProParsSongZhiHelper.LoadDataToPLC(MachineRtDataService.SiemensDrive, ReturnPlcParsData);
//下载完成的话，则标记状态
SysRunService.MachineRunState1.IsProLoad = true;
}