diff --git a/CapMachine.Wpf/Services/MachineRtDataService.cs b/CapMachine.Wpf/Services/MachineRtDataService.cs index 5fc7c04..5fb422b 100644 --- a/CapMachine.Wpf/Services/MachineRtDataService.cs +++ b/CapMachine.Wpf/Services/MachineRtDataService.cs @@ -1366,7 +1366,7 @@ namespace CapMachine.Wpf.Services MaxValue = 100, IsMeter = false, DecimalPoint = 2, - Precision = 1, + Precision = 100, Unit = "A", DataType = TagDataType.Double, PVModel = new QuickAttrCell() { Address = "VW270", EngValue = 0, EngValueStr = "", }, @@ -1404,7 +1404,7 @@ namespace CapMachine.Wpf.Services MaxValue = 200, IsMeter = false, DecimalPoint = 2, - Precision = 1, + Precision = 100, Unit = "A", DataType = TagDataType.Double, PVModel = new QuickAttrCell() { Address = "VW274", EngValue = 0, EngValueStr = "", }, diff --git a/CapMachine.Wpf/ViewModels/MonitorViewModel.cs b/CapMachine.Wpf/ViewModels/MonitorViewModel.cs index 510df44..744fd10 100644 --- a/CapMachine.Wpf/ViewModels/MonitorViewModel.cs +++ b/CapMachine.Wpf/ViewModels/MonitorViewModel.cs @@ -69,7 +69,7 @@ namespace CapMachine.Wpf.ViewModels TxvFrPressP3Tag = TagManager.DicTags.GetValueOrDefault("阀前压力P3[BarA]"); TxvFrTempT3Tag = TagManager.DicTags.GetValueOrDefault("阀前温度T3[℃]"); SubcoolingTag = TagManager.DicTags.GetValueOrDefault("过冷度[K]"); - + ComCapBusVolTag = TagManager.DicTags.GetValueOrDefault("通讯母线电压[V]"); ComCapBusCurTag = TagManager.DicTags.GetValueOrDefault("通讯母线电流[A]"); @@ -304,6 +304,13 @@ namespace CapMachine.Wpf.ViewModels switch (Par) { case "开始": + + //查看是否处于自动的状态,否则无法开始 + if (ListHandSwitchData.FindFirst(a=>a.Name== "自动")!=null && ListHandSwitchData.FindFirst(a => a.Name == "自动").State==false) + { + System.Windows.MessageBox.Show("需要在【自动】的情况下进行开始操作"); + return; + } //状态机运行 用状态机的状态判断逻辑 if (this.ProRuntimeService.MachineRunState1.FireStart()) { @@ -348,34 +355,38 @@ namespace CapMachine.Wpf.ViewModels break; case "复位": - //状态机 复位 用状态机的状态判断逻辑 - if (this.ProRuntimeService.MachineRunState1.FireReset()) - { - //程序步骤执行结束运行 - ProRuntimeService.EndProRun(); - //复位 一些PLC的状态写入 - MachineRtDataService.SysReset(); - //结束记录数据 - 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; - } + //复位 一些PLC的状态写入 + MachineRtDataService.SysReset(); - } + ////状态机 复位 用状态机的状态判断逻辑 + //if (this.ProRuntimeService.MachineRunState1.FireReset()) + //{ + // //程序步骤执行结束运行 + // ProRuntimeService.EndProRun(); + // //复位 一些PLC的状态写入 + // MachineRtDataService.SysReset(); + // //结束记录数据 + // 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 "消音": @@ -527,9 +538,9 @@ namespace CapMachine.Wpf.ViewModels var MeterControl = (Meter)Par; //Console.WriteLine($"{MeterControl.MeterName}-{MeterControl.AutoHandState}"); if (!MeterControl.MeterName.Contains("PTC功率")) return; - + //弹窗 - DialogService.ShowDialog("DialogMeterExdView", new DialogParameters() { { "MeterCmdMsg", new MeterCmdMsg() {Name= MeterControl.MeterName,Par="SV2" } } }, (par) => + DialogService.ShowDialog("DialogMeterExdView", new DialogParameters() { { "MeterCmdMsg", new MeterCmdMsg() { Name = MeterControl.MeterName, Par = "SV2" } } }, (par) => { if (par.Result == ButtonResult.OK) { diff --git a/CapMachine.Wpf/Views/ProConfigView.xaml b/CapMachine.Wpf/Views/ProConfigView.xaml index 1af64fe..8f5fa07 100644 --- a/CapMachine.Wpf/Views/ProConfigView.xaml +++ b/CapMachine.Wpf/Views/ProConfigView.xaml @@ -1454,7 +1454,7 @@ ToolTip="压缩机使能" /> - @@ -1467,7 +1467,7 @@ HorizontalAlignment="Center"> - + -->