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-04-09 11:20:52 +08:00
parent eeda58d03d
commit 8bb1931184
5 changed files with 13 additions and 49 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
CapMachine.Wpf/ViewModels/DialogChartRtConfigViewModel.cs
View File

@@ -84,7 +84,7 @@ namespace CapMachine.Wpf.ViewModels
/// </summary>
private void LoadChartSourceData()
{
foreach (var item in MachineRtDataService.TagManger.DicTags)
foreach (var item in MachineRtDataService.TagManger.DicTags.OrderBy(a=>a.Value.Id))
{
ChartSrcDataListViewItems.Add(new ChartSrcData()
{

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

@@ -2324,48 +2324,13 @@ namespace CapMachine.Wpf.ViewModels
if (ProSegRunListViewItems != null && ProSegRunListViewItems.Count() > 0)
{
//当前的程序开始标记
ProParsSongZhiHelper.Start();
//ProParsSongZhiHelper.Start();
//返回的数据
List<PlcParsData> ReturnPlcParsData = new List<PlcParsData>();
ProRuntimeService.LoadProSegRun(ProSegRunListViewItems.ToList());
////var Data=FreeSql.Select<ProSegRun>(
////以每个程序为单元循环执行
//foreach (var item in ProSegRunListViewItems)
//{
// var FindData = FreeSql.Select<ProgramSeg>(item.ProgramSegId)
// .IncludeMany(a => a.ProSteps,
// then => then.IncludeMany(b => b.MeterSpeeds)
// .IncludeMany(b => b.MeterCond1Temps)
// .IncludeMany(b => b.MeterCond2Temps)
// .IncludeMany(b => b.MeterCond2Presss)
// .IncludeMany(b => b.MeterEVAPExpTemps)
// .IncludeMany(b => b.MeterExPresss)
// .IncludeMany(b => b.MeterHVVols)
// .IncludeMany(b => b.MeterInhPresss)
// .IncludeMany(b => b.MeterInhTemps)
// .IncludeMany(b => b.MeterLubePresss)
// .IncludeMany(b => b.MeterLVVols)
// .IncludeMany(b => b.MeterOCRs)
// .IncludeMany(b => b.MeterOS1Temps)
// .IncludeMany(b => b.MeterOS2Temps)
// .IncludeMany(b => b.MeterPTCEntTemps)
// .IncludeMany(b => b.MeterPTCFlows)
// .IncludeMany(b => b.MeterPTCPws)
// .IncludeMany(b => b.MeterEnvRHs)
// .IncludeMany(b => b.MeterEnvTemps)
// ).ToList().FirstOrDefault();
// if (FindData != null && FindData.ProSteps != null && FindData.ProSteps.Any())
// {
// //执行程序的步骤集合数据
// ReturnPlcParsData = ProParsSongZhiHelper.GetPlcParsData(FindData.ProSteps, FindData.ProRepeat);
// //把次数给PLC，那么此时应该是最后一个程序给PLC了
// ProParsSongZhiHelper.LoadProCycleToPlc(MachineRtDataService.SiemensDrive, FindData.ProRepeat);
// }
//}
////防止上一次下载的程序多余当前的步骤，为了清空多余的步骤数据，增加一行的数据
//ReturnPlcParsData = ProParsSongZhiHelper.AddNullData(ReturnPlcParsData);
////装载PLC地址