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

更改了转换进制和下载增加0步骤的数据

Browse Source
This commit is contained in:
Tyrone CT
2025-02-07 14:42:31 +08:00
parent 851b64788d
commit 7b027a10ea
4 changed files with 21 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
CapMachine.Wpf/ProPars/ProParsHelperQuick.cs
View File

@@ -75,6 +75,9 @@ namespace CapMachine.Wpf.ProPars
CurStep++;
}
//防止上一次下载的程序多余当前的步骤，为了清空多余的步骤数据，增加一行的数据
ListPlcParsDataQuick = AddNullData(ListPlcParsDataQuick);
LoadDataToPLC(siemensS7NetStance, ListPlcParsDataQuick);
//装载地址 VW1000
@@ -147,6 +150,22 @@ namespace CapMachine.Wpf.ProPars
//siemensS7NetStance.Write();
}
/// <summary>
/// 增加一行空的数据，作为终止的执行
/// </summary>
public static List<PlcParsDataQuick> AddNullData(List<PlcParsDataQuick> plcParsDatas)
{
var NewStep = new QuickMeterStepDto()
{
};
return LoadPlcParsData(NewStep, plcParsDatas, plcParsDatas.First().Steps.Count()+1);
}
/// <summary>
/// 单步骤程序解析
/// 单步骤里面包括多个仪表参数的配置信息

BIN
CapMachine.Wpf/ReportFile/快速程序模版.xlsx
View File

Binary file not shown.

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

@@ -156,7 +156,7 @@ namespace CapMachine.Wpf.Services
TagManger.AddTag(new Tag<short>("LV[A]", "LV[A]", "LVCur", "程序", "VW15024", 100, 0, 100, "A", new ShortTagValue(), false) { DecimalPoint = 2 });
TagManger.AddTag(new Tag<short>("环境温度", "环境温度[℃]", "EnvTemp", "程序", "VW15026", 100, 0, 10, "℃", new ShortTagValue(), true) { DecimalPoint = 1 });
//TagManger.AddTag(new Tag<short>("环境湿度", "环境湿度[%]", "EnvRH", "程序", "VW15028", 100, 0, 10, "%", new ShortTagValue(), true) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("环境湿度", "环境湿度[%]", "EnvRH", "程序", "VW15028", 100, 0, 1, "%", new ShortTagValue(), true) { DecimalPoint = 0 });
TagManger.AddTag(new Tag<short>("环境湿度", "环境湿度[%]", "EnvRH", "程序", "VW15028", 100, 0, 1, "%", new ShortTagValue(), true) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("OS1温度", "OS1温度[℃]", "OS1Temp", "程序", "VW15030", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("OS2温度", "OS2温度[℃]", "OS2Temp", "程序", "VW15032", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });
TagManger.AddTag(new Tag<short>("COND2温度", "COND2温度[℃]", "Cond2Temp", "程序", "VW15034", 100, 0, 10, "℃", new ShortTagValue(), false) { DecimalPoint = 1 });

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

@@ -326,6 +326,7 @@ namespace CapMachine.Wpf.ViewModels
}
ProParsHelperQuick.GetPlcParsData(ListQuickMeterStepDto.ToList(), this.MachineRtDataService.SiemensDrive);
//下载完成的话，则标记状态
SysRunService.MachineRunState1.IsProLoad = true;
}