|
|
|
@ -32,8 +32,11 @@ namespace Aucma.Core.DoorFoam.ViewModels
|
|
|
|
CollectionFoamMachine.RefreshGunDataDelegateEvent += RefreshGunData;
|
|
|
|
CollectionFoamMachine.RefreshGunDataDelegateEvent += RefreshGunData;
|
|
|
|
CollectionFoamMachine.RefreshSystemDataDelegateEvent += RefreshSystemData;
|
|
|
|
CollectionFoamMachine.RefreshSystemDataDelegateEvent += RefreshSystemData;
|
|
|
|
_boxLastShotRecordServices = App.ServiceProvider.GetService<IBoxLastShotRecordServices>();
|
|
|
|
_boxLastShotRecordServices = App.ServiceProvider.GetService<IBoxLastShotRecordServices>();
|
|
|
|
|
|
|
|
Task.Run(() =>
|
|
|
|
|
|
|
|
{
|
|
|
|
LoadData();
|
|
|
|
LoadData();
|
|
|
|
//Task.WaitAll(LoadData());
|
|
|
|
});
|
|
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
@ -216,16 +219,12 @@ namespace Aucma.Core.DoorFoam.ViewModels
|
|
|
|
|
|
|
|
|
|
|
|
try
|
|
|
|
try
|
|
|
|
{
|
|
|
|
{
|
|
|
|
var list = _boxLastShotRecordServices.QueryAsync(x => x.StationNumber == "1020").Result.OrderBy(d => d.CreateTime).Take(10);
|
|
|
|
var list = _boxLastShotRecordServices.QueryAsync(x => x.StationNumber == "1020").Result.OrderBy(d => d.CreateTime).Take(20);
|
|
|
|
if (list == null) return;
|
|
|
|
if (list == null) return;
|
|
|
|
System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
|
|
|
|
System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
|
|
|
|
{
|
|
|
|
{
|
|
|
|
LastShotRecordDataGrid.Clear();
|
|
|
|
LastShotRecordDataGrid.Clear();
|
|
|
|
|
|
|
|
int i = 1;
|
|
|
|
|
|
|
|
|
|
|
|
// var list = await _boxLastShotRecordServices.QueryAsync();
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
// list.OrderByDescending(d => d.CreateTime).Take(30);
|
|
|
|
|
|
|
|
foreach (var item in list)
|
|
|
|
foreach (var item in list)
|
|
|
|
{
|
|
|
|
{
|
|
|
|
string system = string.Empty;
|
|
|
|
string system = string.Empty;
|
|
|
|
@ -233,9 +232,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
|
|
|
|
if (item.System == "2") { system = "2系统"; }
|
|
|
|
if (item.System == "2") { system = "2系统"; }
|
|
|
|
LastShotRecordModel model = new LastShotRecordModel();
|
|
|
|
LastShotRecordModel model = new LastShotRecordModel();
|
|
|
|
|
|
|
|
|
|
|
|
model.No = LastShotRecordDataGrid.Count() + 1;
|
|
|
|
model.No = i;
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
model.System = system;
|
|
|
|
model.System = system;
|
|
|
|
model.GunHead = item.GunCode;
|
|
|
|
model.GunHead = item.GunCode;
|
|
|
|
model.PolInjectionpressure = item.PolHp;
|
|
|
|
model.PolInjectionpressure = item.PolHp;
|
|
|
|
@ -246,6 +243,7 @@ namespace Aucma.Core.DoorFoam.ViewModels
|
|
|
|
model.Createtime = item.CreateTime;
|
|
|
|
model.Createtime = item.CreateTime;
|
|
|
|
model.StationNumber = item.PourNu;
|
|
|
|
model.StationNumber = item.PourNu;
|
|
|
|
LastShotRecordDataGrid.Insert(0, model);
|
|
|
|
LastShotRecordDataGrid.Insert(0, model);
|
|
|
|
|
|
|
|
i++;
|
|
|
|
}
|
|
|
|
}
|
|
|
|
}));
|
|
|
|
}));
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
liuwf
11 months ago