From 7e7f17c08a0f18d83eb379ddff1689597fecefde Mon Sep 17 00:00:00 2001 From: dengjunjie <dengjunjie@hnkhzn.com> Date: 星期五, 06 六月 2025 12:16:55 +0800 Subject: [PATCH] 修改AGV站点、PDA功能优化 --- 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Enum/TaskEnum.cs | 148 +++++++++++++++++++++++++++++++++++++------------ 1 files changed, 112 insertions(+), 36 deletions(-) diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Enum/TaskEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Enum/TaskEnum.cs" index e0bf4a7..340c9e2 100644 --- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Enum/TaskEnum.cs" +++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/Enum/TaskEnum.cs" @@ -153,40 +153,11 @@ /// </summary> [Description("鍏ュ簱浠诲姟寮傚父")] InException = 299, - - /// <summary> - /// 鏂板缓绉诲簱浠诲姟 - /// </summary> - [Description("鏂板缓绉诲簱浠诲姟")] - RelocationNew = 300, - - /// <summary> - /// 绉诲簱浠诲姟瀹屾垚 - /// </summary> - [Description("绉诲簱浠诲姟瀹屾垚")] - RelocationFinish = 310, - - /// <summary> - /// 绉诲簱浠诲姟鎵ц涓� - /// </summary> - [Description("绉诲簱浠诲姟鎵ц涓�")] - RelocationExecuting = 320, - - /// <summary> - /// 绉诲簱浠诲姟鍙栨秷 - /// </summary> - [Description("绉诲簱浠诲姟鍙栨秷")] - RelocationCancel = 330, - - /// <summary> - /// 绉诲簱浠诲姟寮傚父 - /// </summary> - [Description("绉诲簱浠诲姟寮傚父")] - RelocationException = 340, } #endregion 鍏ュ簱浠诲姟鐘舵�� + #region 鍑哄簱浠诲姟鐘舵�� /// <summary> /// 鍑哄簱浠诲姟鐘舵�� /// </summary> @@ -228,16 +199,121 @@ [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 { - [Description("鏂板缓")] - AGV_New = 500, + #region MyRegion + ///// <summary> + ///// 鏂板缓 + ///// </summary> + //[Description("鏂板缓")] + //AGV_New = 500, + ///// <summary> + ///// AGV鎵ц涓� + ///// </summary> + //[Description("AGV鎵ц涓�")] + //AGV_Executing = 510, + ///// <summary> + ///// AGV瀹屾垚 + ///// </summary> + //[Description("AGV瀹屾垚")] + //AGV_Finish = 520, - [Description("鎵ц涓�")] - AGV_Executing = 510, + ///// <summary> + ///// AGV浠诲姟鍙栨秷 + ///// </summary> + //[Description("AGV浠诲姟鍙栨秷")] + //RelocationCancel = 598, - [Description("瀹屾垚")] - AGV_Finish = 520 + ///// <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