From 6614be8c7eb806d6db88ae953998016d58e49165 Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期一, 02 三月 2026 09:46:51 +0800
Subject: [PATCH] 优化任务取消
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskStatusEnum.cs | 96 +++++++++++++++++++++++++++++++++++++++++++----
1 files changed, 87 insertions(+), 9 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskStatusEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskStatusEnum.cs"
index 08711e7..ea02830 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskStatusEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskStatusEnum.cs"
@@ -1,7 +1,9 @@
锘縰sing System;
using System.Collections.Generic;
using System.ComponentModel;
+using System.ComponentModel.DataAnnotations;
using System.Linq;
+using System.Reflection;
using System.Text;
using System.Threading.Tasks;
@@ -41,7 +43,7 @@
/// <summary>
/// 鍫嗗灈鏈哄叆搴撳畬鎴�
/// </summary>
- [Description("鍫嗗灈鏈哄嚭搴撳畬鎴�")]
+ [Description("鍫嗗灈鏈哄叆搴撳畬鎴�")]
SC_OutFinish = 245,
/// <summary>
@@ -54,13 +56,19 @@
/// 鍏ュ簱浠诲姟鍙栨秷
/// </summary>
[Description("鍏ュ簱浠诲姟鍙栨秷")]
- InCancel = 298,
+ InCancel = 297,
/// <summary>
- /// 鍏ュ簱浠诲姟寮傚父
+ /// 杈撻�佺嚎鍏ュ簱寮傚父
/// </summary>
- [Description("鍏ュ簱浠诲姟寮傚父")]
- InException = 299,
+ [Description("杈撻�佺嚎鍏ュ簱寮傚父")]
+ InPLCException = 298,
+
+ /// <summary>
+ /// 鍫嗗灈鏈哄叆搴撳紓甯�
+ /// </summary>
+ [Description("鍫嗗灈鏈哄叆搴撳紓甯�")]
+ InSCException = 299,
}
@@ -73,6 +81,12 @@
/// </summary>
public enum OutTaskStatusEnum
{
+ /// <summary>
+ /// 鍑哄簱绛夊緟涓�
+ /// </summary>
+ [Description("鍑哄簱绛夊緟涓�")]
+ OutWait = 99,
+
/// <summary>
/// 鏂板缓鍑哄簱浠诲姟
/// </summary>
@@ -113,13 +127,19 @@
/// 鍑哄簱浠诲姟鍙栨秷
/// </summary>
[Description("鍑哄簱浠诲姟鍙栨秷")]
- OutCancel = 198,
+ OutCancel = 197,
/// <summary>
- /// 鍑哄簱浠诲姟寮傚父
+ /// 杈撻�佺嚎鍏ュ簱寮傚父
/// </summary>
- [Description("鍑哄簱浠诲姟寮傚父")]
- OutException = 199
+ [Description("杈撻�佺嚎鍏ュ簱寮傚父")]
+ OutPLCException = 298,
+
+ /// <summary>
+ /// 鍫嗗灈鏈哄叆搴撳紓甯�
+ /// </summary>
+ [Description("鍫嗗灈鏈哄叆搴撳紓甯�")]
+ OutSCException = 299,
}
#endregion
@@ -144,7 +164,65 @@
/// </summary>
[Description("绉诲簱浠诲姟瀹屾垚")]
RelocationFinish = 310,
+
+ /// <summary>
+ /// 绉诲簱浠诲姟寮傚父
+ /// </summary>
+ [Description("绉诲簱浠诲姟寮傚父")]
+ RelocationException = 330,
}
#endregion
+ public enum MesOutTaskStatusEnum
+ {
+ /// <summary>
+ /// 鍑哄簱寮�濮�
+ /// </summary>
+ [Display(Name = "鍑哄簱寮�濮�")]
+ Start = 1,
+
+ /// <summary>
+ /// 鍑哄簱瀹屾垚
+ /// </summary>
+ [Display(Name = "鍑哄簱瀹屾垚")]
+ Outstore = 2,
+ /// <summary>
+ /// 鍒拌揪鐩殑鍦�
+ /// </summary>
+ [Display(Name = "鍒拌揪鐩殑鍦�")]
+ Finish = 3,
+ /// <summary>
+ /// 鎵ц澶辫触
+ /// </summary>
+ [Display(Name = "鎵ц澶辫触")]
+ Error = 4
+ }
+ public enum MesInTaskStatusEnum
+ {
+ /// <summary>
+ /// 鍏ュ簱寮�濮�
+ /// </summary>
+ [Display(Name = "鍏ュ簱寮�濮�")]
+ Start = 1,
+
+ /// <summary>
+ /// 鍏ュ簱瀹屾垚
+ /// </summary>
+ [Display(Name = "鍏ュ簱瀹屾垚")]
+ Finish = 2,
+ /// <summary>
+ /// 鎵ц澶辫触
+ /// </summary>
+ [Display(Name = "鎵ц澶辫触")]
+ Error = 3
+ }
+ public static class EnumExtensions
+ {
+ public static string GetDescription(this Enum value)
+ {
+ var field = value.GetType().GetField(value.ToString());
+ var attribute = field?.GetCustomAttribute<DescriptionAttribute>();
+ return attribute?.Description ?? value.ToString();
+ }
+ }
}
\ No newline at end of file
--
Gitblit v1.9.3