change - 添加入库任务删除按钮

Aucma.Scada.Business/InStoreBusiness.cs

@@ -666,6 +666,26 @@ namespace Aucma.Scada.Business
             return infos;
         }
 
+        /// <summary>
+        /// 通过任务编号删除任务
+        /// 
+        /// 任务删除后是否需要还原库存，如果出库完成后减少库存则不需要
+        /// 
+        /// </summary>
+        /// <param name="taskCode"></param>
+        /// <returns></returns>
+        public bool DeleteTaskInfoByTaskCode(string taskCode, bool isFlag)
+        {
+            bool result = false;
+            var info = _taskInfoService.GetTaskInfosByTaskCode(taskCode);
+            if (info != null && info.Count > 0)
+            {
+                RealTaskInfo taskInfo = info[0];
+                result = _taskInfoService.DeleteTaskInfoById(taskInfo.objId);
+            }
+            return result;
+        }
+
         #region 日志输出
         /// <summary>
         /// 日志输出，界面刷新同时记录文件

Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml

@@ -267,6 +267,16 @@
                         <DataGridTextColumn Binding="{Binding spaceCode}" Header="入库货道" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                         <DataGridTextColumn Binding="{Binding taskStatus,Converter={StaticResource TaskStatusConverter}}" Header="入库状态" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
                         <DataGridTextColumn Binding="{Binding createTime,StringFormat=\{0:MM月dd日 HH:mm\}}" Header="任务时间" Width="*" IsReadOnly="True"  ElementStyle="{StaticResource  DataGridTextColumnCenterSytle}"/>
+                        <DataGridTemplateColumn Header="操作" Width="*">
+                            <DataGridTemplateColumn.CellTemplate>
+                                <DataTemplate>
+                                    <StackPanel Orientation="Horizontal">
+                                        <Button Content="删除" CommandParameter="{Binding taskCode}" Background="Red" Foreground="White" Margin="10,0,0,0" Height="25" BorderBrush="Red" BorderThickness="1" Width="55" Command="{Binding DataContext.DeleteTaskInfoCommand, RelativeSource={RelativeSource Mode=FindAncestor,AncestorType=DataGrid  }}" />
+                                    </StackPanel>
+                                </DataTemplate>
+                            </DataGridTemplateColumn.CellTemplate>
+
+                        </DataGridTemplateColumn>
                     </DataGrid.Columns>
                 </DataGrid>
             </Grid>

Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs

@@ -18,6 +18,7 @@ using System.Linq;
 using System.Runtime.InteropServices;
 using System.Runtime.InteropServices.WindowsRuntime;
 using System.Threading.Tasks;
+using System.Windows;
 using System.Windows.Media;
 
 namespace Aucma.Scada.UI.viewModel.InStoreInfo
@@ -45,8 +46,6 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
 
             inStoreTaskHandle.SpaceCapacityAlarmEvent += async (storeCode, spaceName) =>
             {
-               // MessageBoxTimeoutA((IntPtr)0, $"货道预警：{spaceName}；库存即将放满请尽快清理库存，10秒后关闭提示", "告警提示", 0, 0, 10000);
-
                 AlarmMessage = $"货道预警：{spaceName}库存即将放满请尽快清理库存";
                 Task.Delay(1000*10).Wait();
                 AlarmMessage = string.Empty;
@@ -56,6 +55,8 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
 
             ResetCommand = new RelayCommand(Reset);
 
+            DeleteTaskInfoCommand = new RelayCommand<object>(obj => DeleteTaskInfo(obj));
+
             materialTypeCombox = "所有";
 
             Init();
@@ -225,6 +226,11 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
         /// 重置
         /// </summary>
         public RelayCommand ResetCommand { get; set; }
+
+        /// <summary>
+        /// 删除
+        /// </summary>
+        public RelayCommand<object> DeleteTaskInfoCommand { get; set; }
         #endregion
 
         /// <summary>
@@ -378,6 +384,33 @@ namespace Aucma.Scada.UI.viewModel.InStoreInfo
             }
 
         }
+
+        /// <summary>
+        /// 手动删除任务
+        /// </summary>
+        /// <param name="obj"></param>
+        private void DeleteTaskInfo(object obj)
+        {
+            string taskCode = obj as string;
+            
+            if(!string.IsNullOrEmpty(taskCode))
+            {
+                bool result = inStoreBusiness.DeleteTaskInfoByTaskCode(taskCode, true);
+                if(result)
+                {
+                    logHelper.Info($"手动删除任务：{taskCode}；成功");
+                    MessageBoxTimeoutA((IntPtr)0, $"手动删除任务：{taskCode}；成功，3秒后关闭提示", "提示", 0, 0, 3000);
+                }
+                else
+                {
+
+                    logHelper.Info($"手动删除任务：{taskCode}；失败");
+                    MessageBoxTimeoutA((IntPtr)0, $"手动删除任务：{taskCode}；失败，3秒后关闭提示", "提示", 0, 0, 3000);
+                }
+                Query();
+            }
+        }
+
         /// <summary>
         /// 截取逗号之间的名称
         /// </summary>