From b91ba72fe5912b7ebc3b2b7f535ed7247f73bf7d Mon Sep 17 00:00:00 2001
From: liuwf <wenfaliu@163.com>
Date: Fri, 11 Oct 2024 18:23:33 +0800
Subject: [PATCH] =?UTF-8?q?add-=E6=B7=BB=E5=8A=A0=E6=8A=95=E6=96=99?=
 =?UTF-8?q?=E6=A8=A1=E5=BC=8F=E5=88=87=E6=8D=A2=E6=8C=89=E9=92=AE?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.WPF/Page/ManualDeliveryWindow.xaml  |  2 ++
 .../ViewModel/AgvAndTaskViewModel.cs          | 26 +++++++++++--------
 .../ViewModel/ManualDeliveryViewModel.cs      | 17 +++++++++++-
 3 files changed, 33 insertions(+), 12 deletions(-)

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 @@
                         <Label Content="选择库位" FontSize="20"  VerticalAlignment="Center" Foreground="White"  />
                         <TextBox x:Name="queryParam" FontSize="20" BorderThickness="3" Text="" Width="100" HorizontalAlignment="Left" VerticalContentAlignment="Center" Style="{StaticResource TextBoxStyle}" Foreground="White"/>
                         <Button Content="手动投料" FontSize="16" Style="{StaticResource BUTTON_AGREE}"  Width="100" Height="35" Background="LimeGreen" BorderBrush="#007DFA" Margin="10,0,10,0" Command="{Binding QueryStringCommand}" CommandParameter="{Binding Text, ElementName=queryParam}" />
+
+                        <Button Content="投料模式切换" FontSize="20" Foreground="White"  Width="150" Height="35" Background="#ffa200" BorderBrush="#007DFA" Margin="200,0,10,0" Command="{Binding ChangeModeCommand}"  />
                     </WrapPanel>
 
                     <Border Grid.Row="1" BorderBrush="White" BorderThickness="1,1,0,1" CornerRadius="5">
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
         /// <param name="palletTasks"></param>
         private async Task RefreshWcsTaskDataGrid()
         {
-            List<WcsTask> agvList = await sqlSugarClient.AsTenant().GetConnection("mes").Queryable<WcsTask>().Where(x => x.NextPointId == 8 || x.NextPointId==9).ToListAsync();
-            await App.Current.Dispatcher.BeginInvoke((Action)(() =>
+            try
             {
-                WcsTaskDataGrid.Clear();
-                foreach (var agv in agvList)
+                List<WcsTask> agvList = await sqlSugarClient.AsTenant().GetConnection("mes").Queryable<WcsTask>().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<IWmsRawPreferredOutService>();
@@ -58,6 +59,7 @@ namespace SlnMesnac.WPF.ViewModel
 
             //  ConfirmCommand = new RelayCommand<object>(Confirm);
             DeleteCommand = new RelayCommand<object>(Delete);
+            ChangeModeCommand = new RelayCommand<object>(ChangeMode);
         }
 
         private void Init()
@@ -105,7 +107,12 @@ namespace SlnMesnac.WPF.ViewModel
         #region 事件定义
         public RelayCommand<string> QueryStringCommand { get; set; }
 
+        
 
+        /// <summary>
+        /// 投料模式切换
+        /// </summary>
+        public RelayCommand<object> ChangeModeCommand { get; set; }
 
         /// <summary>
         /// 关闭事件
@@ -275,5 +282,13 @@ namespace SlnMesnac.WPF.ViewModel
                 Init();
             }
         }
+   
+    
+        private void ChangeMode(object parameter)
+        {
+            debugConfig.ProductMode = debugConfig.ProductMode=="1"?"2":"1";
+        }
+
+
     }
 }