liulb
/
AUCMA_SCADA
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

change - 修改统计分析页面

Browse Source
dev
liuwf 1 year ago
parent dc6d77cdc8
commit d84f46b624
2 changed files with 41 additions and 30 deletions
Show Stats Download Patch File Download Diff File

1
Aucma.Core.ProductOffLine/ViewModels/IndexPageViewModel.cs
Unescape Escape View File

@ -41,7 +41,6 @@ namespace Aucma.Core.ProductOffLine.ViewModels
_productPlanInfoServices = App.ServiceProvider.GetService<IProductPlanInfoServices>(); _productPlanInfoServices = App.ServiceProvider.GetService<IProductPlanInfoServices>();
MvCodeHelper.ReceiveCodeEvent += ReceiveCode; MvCodeHelper.ReceiveCodeEvent += ReceiveCode;
// test(); // test();
//List<MutiDBOperate> listdatabase = Appsettings.app<MutiDBOperate>("DBS") //List<MutiDBOperate> listdatabase = Appsettings.app<MutiDBOperate>("DBS")
// .Where(i => i.Enabled).ToList(); // .Where(i => i.Enabled).ToList();

70
Aucma.Core.ProductOffLine/ViewModels/StatisticsPageViewModel.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using Aucma.Core.ProductOffLine.Models; using Admin.Core.Model;
using Aucma.Core.ProductOffLine.Models;
using CommunityToolkit.Mvvm.ComponentModel; using CommunityToolkit.Mvvm.ComponentModel;
using CommunityToolkit.Mvvm.Input; using CommunityToolkit.Mvvm.Input;
using System; using System;
@ -8,6 +9,7 @@ using System.Linq;
using System.Text; using System.Text;
using System.Threading.Tasks; using System.Threading.Tasks;
using System.Windows; using System.Windows;
using System.Windows.Documents;
namespace Aucma.Core.ProductOffLine.ViewModels namespace Aucma.Core.ProductOffLine.ViewModels
{ {
@ -54,35 +56,45 @@ namespace Aucma.Core.ProductOffLine.ViewModels
[RelayCommand] [RelayCommand]
private void ExecQuery(object obj) private void ExecQuery(object obj)
{ {
var result = (StatisticModel)obj; //List<CodeBindingRecord> list;
if (string.IsNullOrEmpty(result.BeginTime)) //var result = (StatisticModel)obj;
{ //if (string.IsNullOrEmpty(result.BeginTime) && string.IsNullOrEmpty(result.EndTime))
MessageBox.Show("开始时间不能为空！"); //{
return; // list = await _codeBindingRecordServices.QueryAllByTime(null, null);
} //}
if (string.IsNullOrEmpty(result.EndTime)) //else if (string.IsNullOrEmpty(result.BeginTime))
{ //{
MessageBox.Show("结束时间不能为空！"); // list = await _codeBindingRecordServices.QueryAllByTime(result.BeginTime, null);
return; //}
} //else if (string.IsNullOrEmpty(result.EndTime))
var beginTime = result.BeginTime; //{
var endTime = result.EndTime; // list = await _codeBindingRecordServices.QueryAllByTime(null, result.EndTime);
//}
//else
//{
// DateTime theBeginTime = Convert.ToDateTime(result.BeginTime);
// DateTime theEndTime = Convert.ToDateTime(result.EndTime);
// if (theBeginTime > theEndTime)
// {
// MessageBox.Show("结束时间要大于开始时间！");
// return;
// }
// list = await _codeBindingRecordServices.QueryAllByTime(result.BeginTime, result.EndTime);
//}
System.Windows.Application.Current.Dispatcher.Invoke((Action)(() =>
{ //if (list != null)
if (!string.IsNullOrEmpty(beginTime)) //{
{ // System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
MaterialDataGrid.Clear(); // {
MaterialDataGrid.Add(new MaterialComplateInfo() { No = 1, ProductPlanCode = "8659452123", MaterialCode = "8659452123", MaterialName = "SC-AUCMA-可口可乐，SC", PlanAmount = 50, CompleteAmount = 10 }); // MaterialDataGrid.Clear();
} // foreach (CodeBindingRecord item in list)
else // {
{ // MaterialDataGrid.Add(new ReaderInfo() { No = item.ObjId, BoxCode = item.BoxCode, BoxName = item.BoxName, ProductCode = item.ProductCode, BindingResult = item.BindingResult, RecordTime = item.RecordTime1.ToString() });
MaterialDataGrid.Clear(); // }
LoadData();
} // }));
//Datalist.Insert(0, Datalist[Datalist.Count - 1]); //}
//Datalist.RemoveAt(Datalist.Count - 1);
}));
} }
#endregion #endregion
} }

Write Preview
Loading…
Cancel
Save