From 72390e0230b64cd43fedf0ba8e17aba097568a4a Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期四, 26 六月 2025 16:36:13 +0800 Subject: [PATCH] 1 --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs | 207 +++++++++++++++++++++++++++++++++++++-------------- 1 files changed, 149 insertions(+), 58 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs" index 60e7659..7f96974 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs" @@ -1,5 +1,6 @@ 锘縰sing System; using System.Collections.Generic; +using System.ComponentModel; using System.Linq; using System.Text; using System.Threading.Tasks; @@ -14,82 +15,98 @@ /// </summary> public enum TaskTypeEnum { - - /// <summary> /// 鍑哄簱 =100 /// </summary> + [Description("鍑哄簱")] Outbound = 100, /// <summary> /// 鐩樼偣鍑哄簱 /// </summary> + [Description("鐩樼偣鍑哄簱")] OutInventory = 101, /// <summary> /// 鍒嗘嫞鍑哄簱 /// </summary> + [Description("鍒嗘嫞鍑哄簱")] OutPick = 102, /// <summary> /// 璐ㄦ鍑哄簱 /// </summary> + [Description("璐ㄦ鍑哄簱")] OutQuality = 103, /// <summary> /// 鍑虹┖ /// </summary> + [Description("鍑虹┖")] PalletOutbound = 104, /// <summary> /// 琛ョ┖ /// </summary> + [Description("琛ョ┖")] PalletFillOutbound = 105, /// <summary> /// 鍏ュ簱 /// </summary> + [Description("鍏ュ簱")] Inbound = 200, /// <summary> /// 鐩樼偣鍏ュ簱 /// </summary> + [Description("鐩樼偣鍏ュ簱")] InInventory = 201, /// <summary> /// 鍒嗘嫞鍏ュ簱 /// </summary> + [Description("鍒嗘嫞鍏ュ簱")] InPick = 202, /// <summary> /// 璐ㄦ鍏ュ簱 /// </summary> + [Description("璐ㄦ鍏ュ簱")] InQuality = 203, /// <summary> /// 鍏ョ┖ /// </summary> + [Description("鍏ョ┖")] PalletInbound = 204, /// <summary> /// 鍥炵┖ /// </summary> + [Description("鍥炵┖")] PalletReturnInbound = 205, /// <summary> /// 绉诲簱 /// </summary> + [Description("绉诲簱")] Relocation = 300, /// <summary> /// 搴撳唴绉诲簱 /// </summary> + [Description("搴撳唴绉诲簱")] RelocationIn = 301, /// <summary> /// 搴撳绉诲簱 /// </summary> - RelocationOut = 302 + [Description("搴撳绉诲簱")] + RelocationOut = 302, + + [Description("AGV鎼繍")] + AGVCarry = 500, } #endregion 浠诲姟绫诲瀷 @@ -104,61 +121,43 @@ /// <summary> /// 鏂板缓鍏ュ簱浠诲姟 /// </summary> + [Description("鏂板缓")] InNew = 200, - - /// <summary> - /// AGV鍏ュ簱鎵ц涓� - /// </summary> - AGV_InExecuting = 210, - - /// <summary> - /// AGV鍏ュ簱瀹屾垚 - /// </summary> - AGV_InFinish = 215, - - /// <summary> - /// 杈撻�佺嚎鍏ュ簱鎵ц涓� - /// </summary> - Line_InExecuting = 220, - - /// <summary> - /// 杈撻�佺嚎鍏ュ簱瀹屾垚 - /// </summary> - Line_InFinish = 225, /// <summary> /// 鍫嗗灈鏈哄叆搴撴墽琛屼腑 /// </summary> + [Description("鍫嗗灈鏈哄叆搴撴墽琛屼腑")] SC_InExecuting = 230, /// <summary> /// 鍫嗗灈鏈哄叆搴撳畬鎴� /// </summary> + [Description("鍫嗗灈鏈哄叆搴撳畬鎴�")] SC_InFinish = 235, /// <summary> /// 鍏ュ簱浠诲姟瀹屾垚 /// </summary> + [Description("鍏ュ簱浠诲姟瀹屾垚")] InFinish = 290, /// <summary> /// 鍏ュ簱浠诲姟鍙栨秷 /// </summary> + [Description("鍏ュ簱浠诲姟鍙栨秷")] InCancel = 298, /// <summary> /// 鍏ュ簱浠诲姟寮傚父 /// </summary> + [Description("鍏ュ簱浠诲姟寮傚父")] InException = 299, - - /// <summary> - /// 鏂板缓绉诲簱搴撲换鍔� - /// </summary> - RelocationNew = 300 } #endregion 鍏ュ簱浠诲姟鐘舵�� + #region 鍑哄簱浠诲姟鐘舵�� /// <summary> /// 鍑哄簱浠诲姟鐘舵�� /// </summary> @@ -167,62 +166,154 @@ /// <summary> /// 鏂板缓浠诲姟 /// </summary> + [Description("鏂板缓")] OutNew = 100, - - /// <summary> - /// AGV鎵ц涓� - /// </summary> - AGV_OutExecuting = 110, - - /// <summary> - /// AGV鍑哄簱瀹屾垚 - /// </summary> - AGV_OutFinish = 115, - - /// <summary> - /// 杈撻�佺嚎鍑哄簱鎵ц涓� - /// </summary> - Line_OutExecuting = 120, - - /// <summary> - /// 杈撻�佺嚎鍑哄簱瀹屾垚 - /// </summary> - Line_OutFinish = 125, /// <summary> /// 鍫嗗灈鏈哄嚭搴撴墽琛屼腑 /// </summary> + [Description("鍫嗗灈鏈哄嚭搴撴墽琛屼腑")] SC_OutExecuting = 130, /// <summary> /// 鍫嗗灈鏈哄嚭搴撳畬鎴� /// </summary> + [Description("鍫嗗灈鏈哄嚭搴撳畬鎴�")] SC_OutFinish = 135, - - /// <summary> - /// 绉诲簱浠诲姟鎵ц涓� - /// </summary> - SC_RelocationExecuting = 140, - - /// <summary> - /// 绉诲簱浠诲姟鎵ц涓� - /// </summary> - SC_RelocationFinish = 145, /// <summary> /// 鍑哄簱浠诲姟瀹屾垚 /// </summary> + [Description("鍑哄簱浠诲姟瀹屾垚")] OutFinish = 190, /// <summary> /// 鍑哄簱浠诲姟鍙栨秷 /// </summary> + [Description("鍑哄簱浠诲姟鍙栨秷")] OutCancel = 198, /// <summary> /// 鍑哄簱浠诲姟寮傚父 /// </summary> + [Description("鍑哄簱浠诲姟寮傚父")] OutException = 199 } + #endregion + #region 绉诲簱浠诲姟鐘舵�� + public enum RelocationTaskStatusEnum + { + + /// <summary> + /// 鏂板缓绉诲簱浠诲姟 + /// </summary> + [Description("鏂板缓绉诲簱浠诲姟")] + RelocationNew = 300, + + /// <summary> + /// 绉诲簱浠诲姟鎵ц涓� + /// </summary> + [Description("绉诲簱浠诲姟鎵ц涓�")] + RelocationExecuting = 310, + + /// <summary> + /// 绉诲簱浠诲姟瀹屾垚 + /// </summary> + [Description("绉诲簱浠诲姟瀹屾垚")] + RelocationFinish = 320, + + /// <summary> + /// 绉诲簱浠诲姟鍙栨秷 + /// </summary> + [Description("绉诲簱浠诲姟鍙栨秷")] + RelocationCancel = 398, + + /// <summary> + /// 绉诲簱浠诲姟寮傚父 + /// </summary> + [Description("绉诲簱浠诲姟寮傚父")] + RelocationException = 399, + } + #endregion + + #region AGV浠诲姟鐘舵�� + public enum AGVTaskStatusEnum + { + #region MyRegion + ///// <summary> + ///// 鏂板缓 + ///// </summary> + //[Description("鏂板缓")] + //AGV_New = 500, + ///// <summary> + ///// AGV鎵ц涓� + ///// </summary> + //[Description("AGV鎵ц涓�")] + //AGV_Executing = 510, + ///// <summary> + ///// AGV瀹屾垚 + ///// </summary> + //[Description("AGV瀹屾垚")] + //AGV_Finish = 520, + + ///// <summary> + ///// AGV浠诲姟鍙栨秷 + ///// </summary> + //[Description("AGV浠诲姟鍙栨秷")] + //RelocationCancel = 598, + + ///// <summary> + ///// AGV浠诲姟寮傚父 + ///// </summary> + //[Description("AGV浠诲姟寮傚父")] + //RelocationException = 599, + #endregion + /// <summary> + /// 浠诲姟鍒涘缓瀹屾垚 + /// </summary> + [Description("浠诲姟鍒涘缓瀹屾垚")] + Create = 500, + /// <summary> + /// 浠诲姟鎺掗槦 + /// </summary> + [Description("浠诲姟鎺掗槦")] + Queuing = 510, + /// <summary> + /// 浠诲姟杩愯 + /// </summary> + [Description("浠诲姟杩愯")] + Running = 520, + /// <summary> + /// 鍙栬揣瀹屾垚 + /// </summary> + [Description("鍙栬揣瀹屾垚")] + DoneFetch = 530, + /// <summary> + /// 鏀捐揣瀹屾垚 + /// </summary> + [Description("鏀捐揣瀹屾垚")] + DonePut = 540, + /// <summary> + /// 浠诲姟瀹屾垚 + /// </summary> + [Description("浠诲姟瀹屾垚")] + Finish = 550, + /// <summary> + /// 浠诲姟鍙栨秷锛屽彇娑堝緟鎵ц鐨勪换鍔� + /// </summary> + [Description("浠诲姟鍙栨秷,鍙栨秷寰呮墽琛岀殑浠诲姟")] + Cancel = 598, + /// <summary> + /// 浠诲姟缁堟锛岀粓姝㈡鍦ㄦ墽琛岀殑浠诲姟 + /// </summary> + [Description("浠诲姟缁堟,缁堟姝e湪鎵ц鐨勪换鍔�")] + Terminate = 597, + /// <summary> + /// 浠诲姟寮傚父缁堟锛屼换鍔℃墽琛岃繃绋嬩腑瀛樺湪寮傚父 + /// </summary> + [Description("浠诲姟寮傚父缁堟,浠诲姟鎵ц杩囩▼涓瓨鍦ㄥ紓甯�")] + Error = 599, + } + #endregion } -- Gitblit v1.9.3