diff --git a/Aucma.Scada.Business/InStoreBusiness.cs b/Aucma.Scada.Business/InStoreBusiness.cs
index f31bef0a..42141102 100644
--- a/Aucma.Scada.Business/InStoreBusiness.cs
+++ b/Aucma.Scada.Business/InStoreBusiness.cs
@@ -666,6 +666,26 @@ namespace Aucma.Scada.Business
return infos;
}
+ ///
+ /// 通过任务编号删除任务
+ ///
+ /// 任务删除后是否需要还原库存,如果出库完成后减少库存则不需要
+ ///
+ ///
+ ///
+ ///
+ 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 日志输出
///
/// 日志输出,界面刷新同时记录文件
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll
index 66a1b97b..272b4076 100644
Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.dll differ
diff --git a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb
index e990fdd4..302a509b 100644
Binary files a/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.Business/bin/Debug/Aucma.Scada.Business.pdb differ
diff --git a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
index 407a0deb..034358e1 100644
--- a/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
+++ b/Aucma.Scada.UI/Page/InStoreInfo/InStoreInfoControl.xaml
@@ -267,6 +267,16 @@
+
+
+
+
+
+
+
+
+
+
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll
index 66a1b97b..272b4076 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.dll differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb
index e990fdd4..302a509b 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.Business.pdb differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe
index 3b2b5933..dc0f642a 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.exe differ
diff --git a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb
index 24fdf0e9..2712aec3 100644
Binary files a/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb and b/Aucma.Scada.UI/bin/Debug/Aucma.Scada.UI.pdb differ
diff --git a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs b/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
index 372a0c8b..20e295bd 100644
--- a/Aucma.Scada.UI/viewModel/InStoreInfo/InStoreInfoViewModel.cs
+++ b/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
public RelayCommand ResetCommand { get; set; }
+
+ ///
+ /// 删除
+ ///
+ public RelayCommand