From 8872ed1f22f318a7fa394e57bd3d9ad4a82efe93 Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Mon, 6 Nov 2023 17:05:19 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E4=BF=AE=E6=94=B9=E9=94=99?=
 =?UTF-8?q?=E8=AF=AF?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../ViewModels/IndexPageViewModel.cs          | 88 ++++++++++---------
 1 file changed, 48 insertions(+), 40 deletions(-)

diff --git a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs
index e4c83e8f..9ea9dedb 100644
--- a/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs
+++ b/Aucma.Core.PrintTo/ViewModels/IndexPageViewModel.cs
@@ -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