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-06-23 20:17:07 +08:00
parent 919becb72f
commit 1685d76cd3
3 changed files with 44 additions and 33 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
CapMachine.Wpf/Services/MachineRtDataService.cs
View File

@@ -1366,7 +1366,7 @@ namespace CapMachine.Wpf.Services
MaxValue = 100, MaxValue = 100,
IsMeter = false, IsMeter = false,
DecimalPoint = 2, DecimalPoint = 2,
Precision = 1, Precision = 100,
Unit = "A", Unit = "A",
DataType = TagDataType.Double, DataType = TagDataType.Double,
PVModel = new QuickAttrCell() { Address = "VW270", EngValue = 0, EngValueStr = "", }, PVModel = new QuickAttrCell() { Address = "VW270", EngValue = 0, EngValueStr = "", },
@@ -1404,7 +1404,7 @@ namespace CapMachine.Wpf.Services
MaxValue = 200, MaxValue = 200,
IsMeter = false, IsMeter = false,
DecimalPoint = 2, DecimalPoint = 2,
Precision = 1, Precision = 100,
Unit = "A", Unit = "A",
DataType = TagDataType.Double, DataType = TagDataType.Double,
PVModel = new QuickAttrCell() { Address = "VW274", EngValue = 0, EngValueStr = "", }, PVModel = new QuickAttrCell() { Address = "VW274", EngValue = 0, EngValueStr = "", },

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

@@ -304,6 +304,13 @@ namespace CapMachine.Wpf.ViewModels
switch (Par) switch (Par)
{ {
case "开始": 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()) if (this.ProRuntimeService.MachineRunState1.FireStart())
{ {
@@ -348,34 +355,38 @@ namespace CapMachine.Wpf.ViewModels
break; break;
case "复位": case "复位":
//状态机 复位 用状态机的状态判断逻辑
if (this.ProRuntimeService.MachineRunState1.FireReset())
{
//程序步骤执行结束运行
ProRuntimeService.EndProRun();
//复位 一些PLC的状态写入
MachineRtDataService.SysReset();
//结束记录数据
DataRecordService.EndRecord();
//结束运行的时候，需要将压缩机的速度值设置为0 //复位 一些PLC的状态写入
switch (ConfigService.CanLinRunStateModel.CurSysSelectedCanLin) MachineRtDataService.SysReset();
{
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;
}
} ////状态机 复位 用状态机的状态判断逻辑
//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; break;
case "消音": case "消音":
@@ -529,7 +540,7 @@ namespace CapMachine.Wpf.ViewModels
if (!MeterControl.MeterName.Contains("PTC功率")) return; 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) if (par.Result == ButtonResult.OK)
{ {

4
CapMachine.Wpf/Views/ProConfigView.xaml
View File

@@ -1454,7 +1454,7 @@
ToolTip="压缩机使能" /> ToolTip="压缩机使能" />
</StackPanel> </StackPanel>
<StackPanel <!--<StackPanel
Grid.Row="1" Grid.Row="1"
Grid.Column="0" Grid.Column="0"
HorizontalAlignment="Center"> HorizontalAlignment="Center">
@@ -1467,7 +1467,7 @@
HorizontalAlignment="Center"> HorizontalAlignment="Center">
<TextBlock FontSize="12" Text="限幅编号" /> <TextBlock FontSize="12" Text="限幅编号" />
<TextBox Style="{StaticResource txtboxStyle}" Text="{Binding SelectedSlopMeterSpeed.LimitNo}" /> <TextBox Style="{StaticResource txtboxStyle}" Text="{Binding SelectedSlopMeterSpeed.LimitNo}" />
</StackPanel> </StackPanel>-->
<!--<StackPanel <!--<StackPanel
Grid.Row="1" Grid.Row="1"