diff --git a/SlnMesnac.WPF/Page/ManualDeliveryWindow.xaml b/SlnMesnac.WPF/Page/ManualDeliveryWindow.xaml
index 7cbe0be..6e278ee 100644
--- a/SlnMesnac.WPF/Page/ManualDeliveryWindow.xaml
+++ b/SlnMesnac.WPF/Page/ManualDeliveryWindow.xaml
@@ -31,6 +31,8 @@
+
+
diff --git a/SlnMesnac.WPF/ViewModel/AgvAndTaskViewModel.cs b/SlnMesnac.WPF/ViewModel/AgvAndTaskViewModel.cs
index a87023f..b447799 100644
--- a/SlnMesnac.WPF/ViewModel/AgvAndTaskViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/AgvAndTaskViewModel.cs
@@ -4,6 +4,7 @@ using Microsoft.Extensions.DependencyInjection;
using SlnMesnac.Business;
using SlnMesnac.Model.domain;
using SlnMesnac.Model.dto;
+using SlnMesnac.WPF.MessageTips;
using SqlSugar;
using System;
using System.Collections.Generic;
@@ -134,21 +135,24 @@ namespace SlnMesnac.WPF.ViewModel
///
private async Task RefreshWcsTaskDataGrid()
{
- List agvList = await sqlSugarClient.AsTenant().GetConnection("mes").Queryable().Where(x => x.NextPointId == 8 || x.NextPointId==9).ToListAsync();
- await App.Current.Dispatcher.BeginInvoke((Action)(() =>
+ try
{
- WcsTaskDataGrid.Clear();
- foreach (var agv in agvList)
+ List agvList = await sqlSugarClient.AsTenant().GetConnection("mes").Queryable().Where(x => x.NextPointId == 8 || x.NextPointId == 9).ToListAsync();
+ await App.Current.Dispatcher.BeginInvoke((Action)(() =>
{
- WcsTaskDataGrid.Add(agv);
- }
- }));
+ WcsTaskDataGrid.Clear();
+ foreach (var agv in agvList)
+ {
+ WcsTaskDataGrid.Add(agv);
+ }
+ }));
+ }catch(Exception ex)
+ {
+ Msg.MsgShow($"刷新AGV状态信息异常{ex.Message}", 2, 3);
+ }
}
-
-
-
-
+
}
}
diff --git a/SlnMesnac.WPF/ViewModel/ManualDeliveryViewModel.cs b/SlnMesnac.WPF/ViewModel/ManualDeliveryViewModel.cs
index db3139d..9c899b5 100644
--- a/SlnMesnac.WPF/ViewModel/ManualDeliveryViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/ManualDeliveryViewModel.cs
@@ -2,6 +2,7 @@
using GalaSoft.MvvmLight.Command;
using Microsoft.Extensions.DependencyInjection;
using SlnMesnac.Business;
+using SlnMesnac.Config;
using SlnMesnac.Model.domain;
using SlnMesnac.Model.dto;
using SlnMesnac.Model.enums;
@@ -47,7 +48,7 @@ namespace SlnMesnac.WPF.ViewModel
private readonly IWmsRawPreferredOutService? wmsRawPreferredOutService;
private readonly ISqlSugarClient? sqlSugarClient;
-
+ private readonly DebugConfig debugConfig = DebugConfig.Instance;
public ManualDeliveryViewModel()
{
wmsRawPreferredOutService = App.ServiceProvider.GetService();
@@ -58,6 +59,7 @@ namespace SlnMesnac.WPF.ViewModel
// ConfirmCommand = new RelayCommand