From a7bd6e538027d876b3122f21c3b1d34663fb2f07 Mon Sep 17 00:00:00 2001
From: xiazhengtongxue <133085197+xiazhengtongxue@users.noreply.github.com>
Date: 星期日, 25 一月 2026 14:18:51 +0800
Subject: [PATCH] 优化前端，修复库存托盘编号重复和WCS任务重发
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Common/TaskEnum/TaskStatusEnum.cs | 249 +++++++++++++++++++++++++++++++++++--------------
1 files changed, 178 insertions(+), 71 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 fdea881..1d650bd 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,115 +1,222 @@
锘縰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;
namespace WIDESEA_Common.TaskEnum
{
+ #region 鍏ュ簱浠诲姟鐘舵��
+
/// <summary>
- /// 浠诲姟鐘舵��
+ /// 鍏ュ簱浠诲姟鐘舵��
/// </summary>
- public enum TaskStatusEnum
+ public enum InTaskStatusEnum
{
/// <summary>
- /// 鏂板缓浠诲姟
+ /// 鏂板缓鍏ュ簱浠诲姟
/// </summary>
- [Description("鏂板缓")]
- New = 100,
-
- /// <summary>
- /// 鍫嗗灈鏈哄緟鎵ц
- /// </summary>
- [Description("鍫嗗灈鏈哄緟鎵ц")]
- SC_Execute = 200,
-
- /// <summary>
- /// 鍫嗗灈鏈烘墽琛屼腑
- /// </summary>
- [Description("鍫嗗灈鏈烘墽琛屼腑")]
- SC_Executing = 210,
-
- /// <summary>
- /// 鍫嗗灈鏈哄畬鎴�
- /// </summary>
- [Description("鍫嗗灈鏈哄畬鎴�")]
- SC_Finish = 220,
-
- /// <summary>
- /// 杈撻�佺嚎寰呮墽琛�
- /// </summary>
- [Description("杈撻�佺嚎寰呮墽琛�")]
- Line_Execute = 400,
+ [Description("鏂板缓鍏ュ簱浠诲姟")]
+ InNew = 200,
/// <summary>
/// 杈撻�佺嚎鎵ц涓�
/// </summary>
[Description("杈撻�佺嚎鎵ц涓�")]
- Line_Executing = 410,
+ PLC_InExecuting = 230,
/// <summary>
/// 杈撻�佺嚎瀹屾垚
/// </summary>
[Description("杈撻�佺嚎瀹屾垚")]
- Line_Finish = 420,
+ PLC_InFinish = 235,
/// <summary>
- /// AGV寰呮墽琛�
+ /// 鍫嗗灈鏈哄叆搴撴墽琛屼腑
/// </summary>
- [Description("AGV寰呮墽琛�")]
- AGV_Execute = 300,
+ [Description("鍫嗗灈鏈哄叆搴撴墽琛屼腑")]
+ SC_IntExecuting = 240,
/// <summary>
- /// AGV鎵ц涓�
+ /// 鍫嗗灈鏈哄叆搴撳畬鎴�
/// </summary>
- [Description("AGV鎵ц涓�")]
- AGV_Executing = 310,
+ [Description("鍫嗗灈鏈哄叆搴撳畬鎴�")]
+ SC_OutFinish = 245,
/// <summary>
- /// AGV寰呯户缁墽琛�
+ /// 鍏ュ簱浠诲姟瀹屾垚
/// </summary>
- [Description("AGV寰呯户缁墽琛�")]
- AGV_WaitToExecute = 320,
- /// <summary>
- /// AGV鏀捐揣涓�
- /// </summary>
- [Description("AGV鏀捐揣涓�")]
- AGV_Puting = 325,
+ [Description("鍏ュ簱浠诲姟瀹屾垚")]
+ InFinish = 290,
/// <summary>
- /// AGV瀹屾垚
+ /// 鍏ュ簱浠诲姟鍙栨秷
/// </summary>
- [Description("AGV瀹屾垚")]
- AGV_Finish = 330,
+ [Description("鍏ュ簱浠诲姟鍙栨秷")]
+ InCancel = 297,
/// <summary>
- /// 浠诲姟瀹屾垚
+ /// 杈撻�佺嚎鍏ュ簱寮傚父
/// </summary>
- [Description("浠诲姟瀹屾垚")]
- Finish = 900,
+ [Description("杈撻�佺嚎鍏ュ簱寮傚父")]
+ InPLCException = 298,
/// <summary>
- /// 浠诲姟鎸傝捣
+ /// 鍫嗗灈鏈哄叆搴撳紓甯�
/// </summary>
- [Description("浠诲姟鎸傝捣")]
- Pending = 970,
+ [Description("鍫嗗灈鏈哄叆搴撳紓甯�")]
+ InSCException = 299,
- /// <summary>
- /// 浠诲姟鍙栨秷
- /// </summary>
- [Description("浠诲姟鍙栨秷")]
- Cancel = 980,
-
- /// <summary>
- /// 浠诲姟寮傚父
- /// </summary>
- [Description("浠诲姟寮傚父")]
- Exception = 990,
- /// <summary>
- /// 鎻愬崌鏈烘墽琛屼腑
- /// </summary>
- [Description("鎻愬崌鏈烘墽琛屼腑")]
- HT_Executing = 110,
}
-}
+
+ #endregion 鍏ュ簱浠诲姟鐘舵��
+
+
+ #region 鍑哄簱浠诲姟鐘舵��
+ /// <summary>
+ /// 鍑哄簱浠诲姟鐘舵��
+ /// </summary>
+ public enum OutTaskStatusEnum
+ {
+ /// <summary>
+ /// 鏂板缓鍑哄簱浠诲姟
+ /// </summary>
+ [Description("鏂板缓鍑哄簱浠诲姟")]
+ OutNew = 100,
+
+ /// <summary>
+ /// 鍫嗗灈鏈哄嚭搴撴墽琛屼腑
+ /// </summary>
+ [Description("鍫嗗灈鏈哄嚭搴撴墽琛屼腑")]
+ SC_OutExecuting = 110,
+
+ /// <summary>
+ /// 鍫嗗灈鏈哄嚭搴撳畬鎴�
+ /// </summary>
+ [Description("鍫嗗灈鏈哄嚭搴撳畬鎴�")]
+ SC_OutFinish = 115,
+
+ /// <summary>
+ /// 杈撻�佺嚎鎵ц涓�
+ /// </summary>
+ [Description("杈撻�佺嚎鎵ц涓�")]
+ PLC_OutExecuting = 120,
+
+ /// <summary>
+ /// 杈撻�佺嚎瀹屾垚
+ /// </summary>
+ [Description("杈撻�佺嚎瀹屾垚")]
+ PLC_OutFinish = 125,
+
+ /// <summary>
+ /// 鍑哄簱浠诲姟瀹屾垚
+ /// </summary>
+ [Description("鍑哄簱浠诲姟瀹屾垚")]
+ OutFinish = 190,
+
+ /// <summary>
+ /// 鍑哄簱浠诲姟鍙栨秷
+ /// </summary>
+ [Description("鍑哄簱浠诲姟鍙栨秷")]
+ OutCancel = 197,
+
+ /// <summary>
+ /// 杈撻�佺嚎鍏ュ簱寮傚父
+ /// </summary>
+ [Description("杈撻�佺嚎鍏ュ簱寮傚父")]
+ OutPLCException = 298,
+
+ /// <summary>
+ /// 鍫嗗灈鏈哄叆搴撳紓甯�
+ /// </summary>
+ [Description("鍫嗗灈鏈哄叆搴撳紓甯�")]
+ OutSCException = 299,
+ }
+ #endregion
+
+
+ #region 绉诲簱鐘舵��
+ public enum RelocationTaskStatusEnum
+ {
+ /// <summary>
+ /// 鏂板缓绉诲簱浠诲姟
+ /// </summary>
+ [Description("鏂板缓绉诲簱浠诲姟")]
+ RelocationNew = 300,
+
+ /// <summary>
+ /// 绉诲簱涓�
+ /// </summary>
+ [Description("绉诲簱涓�")]
+ RelocationExecuting = 315,
+
+ /// <summary>
+ /// 绉诲簱浠诲姟瀹屾垚
+ /// </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