From dd97e86db1b4a06ffa924ed84c0527265846a7eb Mon Sep 17 00:00:00 2001
From: wenjy <wenjy@mesnac.com>
Date: Tue, 16 Apr 2024 15:21:31 +0800
Subject: [PATCH] =?UTF-8?q?change=20-=20=E7=94=9F=E4=BA=A7=E7=BB=9F?=
 =?UTF-8?q?=E8=AE=A1=E9=98=9F=E5=88=97=E7=A7=BB=E9=99=A4=E6=9B=B4=E6=96=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 SlnMesnac.Business/PalletStowBusiness.cs      |  6 ++++
 SlnMesnac.Business/ProdCompletionBusiness.cs  |  6 ++++
 .../service/IRealPalletTaskService.cs         |  1 +
 SlnMesnac.WPF/Page/ProdStatisticsPage.xaml    |  4 +--
 .../ViewModel/ProdStatisticsViewModel.cs      | 31 +++++++++++++++++++
 SlnMesnac.WPF/appsettings.json                |  4 +--
 6 files changed, 48 insertions(+), 4 deletions(-)

diff --git a/SlnMesnac.Business/PalletStowBusiness.cs b/SlnMesnac.Business/PalletStowBusiness.cs
index 89122f6..3510d3c 100644
--- a/SlnMesnac.Business/PalletStowBusiness.cs
+++ b/SlnMesnac.Business/PalletStowBusiness.cs
@@ -143,5 +143,11 @@ namespace SlnMesnac.Business
                 Thread.Sleep(5000);
             }
         }
+
+        public void RemovePalletInfo(string palletCode)
+        {
+            _realPalletTaskService.RemovePalletTask(palletCode);
+            RefreshPalletTaskListEvent?.Invoke(_palletTasks);
+        }
     }
 }
diff --git a/SlnMesnac.Business/ProdCompletionBusiness.cs b/SlnMesnac.Business/ProdCompletionBusiness.cs
index c1c31a5..10a1d55 100644
--- a/SlnMesnac.Business/ProdCompletionBusiness.cs
+++ b/SlnMesnac.Business/ProdCompletionBusiness.cs
@@ -152,5 +152,11 @@ namespace SlnMesnac.Business
                 throw new InvalidOperationException($"通过条码:{barCode}提取当前序列异常:未找到匹配的数字");
             }
         }
+
+        public void RemoveBarCode(string barCode)
+        {
+            _barCodeTaskService.RemoveBarCodeTask(barCode);
+            RefreshBarCodeTaskListEvent?.Invoke(_barCodeTasks );
+        }
     }
 }
diff --git a/SlnMesnac.Repository/service/IRealPalletTaskService.cs b/SlnMesnac.Repository/service/IRealPalletTaskService.cs
index f348ade..0ae5236 100644
--- a/SlnMesnac.Repository/service/IRealPalletTaskService.cs
+++ b/SlnMesnac.Repository/service/IRealPalletTaskService.cs
@@ -11,5 +11,6 @@ namespace SlnMesnac.Repository.service
         void InsertPalletTask(RealPalletTask task);
 
         void RemovePalletTask(string palletCode);
+
     }
 }
diff --git a/SlnMesnac.WPF/Page/ProdStatisticsPage.xaml b/SlnMesnac.WPF/Page/ProdStatisticsPage.xaml
index 855d8aa..5d0c492 100644
--- a/SlnMesnac.WPF/Page/ProdStatisticsPage.xaml
+++ b/SlnMesnac.WPF/Page/ProdStatisticsPage.xaml
@@ -46,7 +46,7 @@
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
                                         <StackPanel Orientation="Horizontal">
-                                            <Button Content="删除" CommandParameter="{Binding PlanCode}" Background="Red" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="Red" BorderThickness="0" Width="45" Command="{Binding DataContext.StartProdPlanCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"/>
+                                            <Button Content="删除" CommandParameter="{Binding PalletCode}" Background="Red" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="Red" BorderThickness="0" Width="45" Command="{Binding DataContext.DeletePalletCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"/>
                                             
                                         </StackPanel>
                                     </DataTemplate>
@@ -89,7 +89,7 @@ Foreground="#FFFFFF" >
                                 <DataGridTemplateColumn.CellTemplate>
                                     <DataTemplate>
                                         <StackPanel Orientation="Horizontal">
-                                            <Button Content="删除" CommandParameter="{Binding PlanCode}" Background="Red" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="Red" BorderThickness="0" Width="45" Command="{Binding DataContext.StartProdPlanCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"/>
+                                            <Button Content="删除" CommandParameter="{Binding BarCode}" Background="Red" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="Red" BorderThickness="0" Width="45" Command="{Binding DataContext.DeleteBarCodeCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}"/>
 
                                         </StackPanel>
                                     </DataTemplate>
diff --git a/SlnMesnac.WPF/ViewModel/ProdStatisticsViewModel.cs b/SlnMesnac.WPF/ViewModel/ProdStatisticsViewModel.cs
index 05eebb1..2f7be61 100644
--- a/SlnMesnac.WPF/ViewModel/ProdStatisticsViewModel.cs
+++ b/SlnMesnac.WPF/ViewModel/ProdStatisticsViewModel.cs
@@ -1,4 +1,5 @@
 using GalaSoft.MvvmLight;
+using GalaSoft.MvvmLight.Command;
 using Microsoft.Extensions.DependencyInjection;
 using SlnMesnac.Business;
 using SlnMesnac.Model.domain;
@@ -46,6 +47,10 @@ namespace SlnMesnac.WPF.ViewModel
             _palletStowBusiness = App.ServiceProvider.GetService<PalletStowBusiness>();
             _prodCompletionBusiness = App.ServiceProvider.GetService<ProdCompletionBusiness>();
 
+            DeletePalletCommand = new RelayCommand<string>(DeletePallet);
+
+            DeleteBarCodeCommand = new RelayCommand<string> (DeleteBarCode);
+
             var palletTask = App.ServiceProvider.GetService<List<RealPalletTask>>();
 
             RefreshPalletTaskDataGrid(palletTask);
@@ -84,6 +89,14 @@ namespace SlnMesnac.WPF.ViewModel
         }
         #endregion
 
+        #region 事件定义
+
+        public RelayCommand<string> DeletePalletCommand { get;set; }
+
+        public RelayCommand<string> DeleteBarCodeCommand { get; set; }
+
+        #endregion
+
         /// <summary>
         /// 刷新托盘队列信息
         /// </summary>
@@ -109,5 +122,23 @@ namespace SlnMesnac.WPF.ViewModel
                 BarCodeTaskDataGrid.Add(task);
             }
         }
+
+        /// <summary>
+        /// 移除托盘队列信息
+        /// </summary>
+        /// <param name="palletCode"></param>
+        private void DeletePallet(string palletCode)
+        {
+            _palletStowBusiness.RemovePalletInfo(palletCode);
+        }
+
+        /// <summary>
+        /// 移除小包条码队列信息
+        /// </summary>
+        /// <param name="barCode"></param>
+        private void DeleteBarCode(string barCode)
+        {
+            _prodCompletionBusiness.RemoveBarCode(barCode);
+        }
     }
 }
diff --git a/SlnMesnac.WPF/appsettings.json b/SlnMesnac.WPF/appsettings.json
index bbe54da..b41a915 100644
--- a/SlnMesnac.WPF/appsettings.json
+++ b/SlnMesnac.WPF/appsettings.json
@@ -39,7 +39,7 @@
         "plcIp": "127.0.0.1",
         "plcPort": 102,
         "plcKey": "plc",
-        "isFlage": true
+        "isFlage": false
       },
       {
         "configId": 2, //MES信号处理
@@ -56,7 +56,7 @@
         "equipIp": "127.0.0.1",
         "equipPort": 6000,
         "equipKey": "test",
-        "isFlage": true
+        "isFlage": false
       }
     ],
     //"redisConfig": "175.27.215.92:6379,password=redis@2023"