change - 生产统计队列移除更新

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);
+        }
     }
 }

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 );
+        }
     }
 }

SlnMesnac.Repository/service/IRealPalletTaskService.cs

@@ -11,5 +11,6 @@ namespace SlnMesnac.Repository.service
         void InsertPalletTask(RealPalletTask task);
 
         void RemovePalletTask(string palletCode);
+
     }
 }

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>

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);
+        }
     }
 }

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"