From c020f31a67fc5aa5644511bddff075f7ecc85234 Mon Sep 17 00:00:00 2001 From: qinchulong <qinchulong@hnkhzn.com> Date: 星期二, 27 五月 2025 15:35:27 +0800 Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/HuaYiZhongHeng/ZhongHeLiTiKu --- 代码管理/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/TaskEnum.cs | 73 ++++++++++++++++++++++++++++++------ 1 files changed, 61 insertions(+), 12 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 2ca34c9..e0bf4a7 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; @@ -17,78 +18,94 @@ /// <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> + [Description("搴撳绉诲簱")] RelocationOut = 302, + [Description("AGV鎼繍")] AGVCarry = 500, } @@ -104,36 +121,68 @@ /// <summary> /// 鏂板缓鍏ュ簱浠诲姟 /// </summary> + [Description("鏂板缓")] InNew = 200, + /// <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 + [Description("鏂板缓绉诲簱浠诲姟")] + RelocationNew = 300, + + /// <summary> + /// 绉诲簱浠诲姟瀹屾垚 + /// </summary> + [Description("绉诲簱浠诲姟瀹屾垚")] + RelocationFinish = 310, + + /// <summary> + /// 绉诲簱浠诲姟鎵ц涓� + /// </summary> + [Description("绉诲簱浠诲姟鎵ц涓�")] + RelocationExecuting = 320, + + /// <summary> + /// 绉诲簱浠诲姟鍙栨秷 + /// </summary> + [Description("绉诲簱浠诲姟鍙栨秷")] + RelocationCancel = 330, + + /// <summary> + /// 绉诲簱浠诲姟寮傚父 + /// </summary> + [Description("绉诲簱浠诲姟寮傚父")] + RelocationException = 340, } #endregion 鍏ュ簱浠诲姟鐘舵�� @@ -146,49 +195,49 @@ /// <summary> /// 鏂板缓浠诲姟 /// </summary> + [Description("鏂板缓")] OutNew = 100, + /// <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 } public enum AGVTaskStatusEnum { + [Description("鏂板缓")] AGV_New = 500, + [Description("鎵ц涓�")] AGV_Executing = 510, + [Description("瀹屾垚")] AGV_Finish = 520 } } -- Gitblit v1.9.3