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 a5a3237230
commit 8872ed1f22
1 changed files with 48 additions and 40 deletions
Show Stats Download Patch File Download Diff File

88
Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs
Unescape Escape View File

@ -1,4 +1,5 @@
using Admin.Core.IService;
using Admin.Core.Common;
using Admin.Core.IService;
using Aucma.Core.PrintTo.Models;
using Aucma.Core.PrintTo.Views;
using CommunityToolkit.Mvvm.ComponentModel;
@ -64,50 +65,57 @@ namespace Aucma.Core.PrintTo.ViewModels
/// 查询
/// </summary>
[RelayCommand]
private Task QueryString(string queryStr)
private async Task QueryString(string queryStr)
{
System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
try
{
if (!string.IsNullOrEmpty(queryStr))
{
Datalist.Clear();
System.Windows.Application.Current.Dispatcher.Invoke((Action)(async () =>
{
if (!string.IsNullOrEmpty(queryStr))
{
Datalist.Clear();
//Expression<Func<OrderInfo, bool>> whereExpression = x => (bool)x.DelFlag == false;
//if (queryStr.IsNotEmptyOrNull())
//{
// whereExpression = whereExpression.And(x => x.PLAN_CODE.Contains(queryStr));
//}
//Expression<Func<OrderInfo, bool>> whereExpression = x => (bool)x.DelFlag == false;
//if (queryStr.IsNotEmptyOrNull())
//{
// whereExpression = whereExpression.And(x => x.PLAN_CODE.Contains(queryStr));
//}
var list = await _baseOrderInfoServices.QueryPrintInfo();
//list.Where(d => d.MaterialName.Contains("U壳") || d.MaterialName.Contains("内胆"));
var list = await _baseOrderInfoServices.QueryPrintInfo();
//list.Where(d => d.MaterialName.Contains("U壳") || d.MaterialName.Contains("内胆"));
var orderList = list.Where(d => d.OrderCode.Contains(queryStr) || d.ProductCode.Contains(queryStr) || d.ProductName.Contains(queryStr) || d.MaterialCode.Contains(queryStr) || d.MaterialName.Contains(queryStr));
foreach (var item in orderList)
{
OrderInfo info = new OrderInfo();
info.CreatedTime = item.CreateTime;
info.OrderCode = item.OrderCode;
info.ProductCode = item.ProductCode;
info.ProductName = item.ProductName;
info.PlanAmount = item.PlanAmount;
info.CompleteAmount = item.CompleteAmount;
info.MaterialCode = item.MaterialCode;
info.MaterialName = item.MaterialName;
info.StandardAmount = item.StandardAmount;
info.ErrorNum = item.ErrorAmount;
info.LinerCodeNum = item.LinerAmount;
info.BoxCodeNum = item.BoxAmount;
Datalist.Add(info);
}
}
else
{
Datalist.Clear();
await LoadData();
}
//Datalist.Insert(0, Datalist[Datalist.Count - 1]);
//Datalist.RemoveAt(Datalist.Count - 1);
}));
var orderList = list.Where(d => d.OrderCode.Contains(queryStr) || d.ProductCode.Contains(queryStr) || d.ProductName.Contains(queryStr) || d.MaterialCode.Contains(queryStr) || d.MaterialName.Contains(queryStr));
foreach (var item in orderList)
{
OrderInfo info = new OrderInfo();
info.CreatedTime = item.CreateTime;
info.OrderCode = item.OrderCode;
info.ProductCode = item.ProductCode;
info.ProductName = item.ProductName;
info.PlanAmount = item.PlanAmount;
info.CompleteAmount = item.CompleteAmount;
info.MaterialCode = item.MaterialCode;
info.MaterialName = item.MaterialName;
info.StandardAmount = item.StandardAmount;
info.ErrorNum = item.ErrorAmount;
info.LinerCodeNum = item.LinerAmount;
info.BoxCodeNum = item.BoxAmount;
Datalist.Add(info);
}
}
else
{
Datalist.Clear();
await LoadData();
}
//Datalist.Insert(0, Datalist[Datalist.Count - 1]);
//Datalist.RemoveAt(Datalist.Count - 1);
}));
}
catch (Exception ex)
{
log.Error("QueryString方法出现异常");
}
}
#endregion

Write Preview
Loading…
Cancel
Save