From 695571c6009ecbc12e7d4a4fb147df7967a1260e Mon Sep 17 00:00:00 2001
From: wangxinhui <wangxinhui@hnkhzn.com>
Date: 星期一, 07 七月 2025 20:21:19 +0800
Subject: [PATCH] Merge branch 'master' of http://115.159.85.185:8098/r/MeiRuiAn/HuaiAn

---
 代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs |   18 +++++++++++++++++-
 1 files changed, 17 insertions(+), 1 deletions(-)

diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs"
index f414325..5764332 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs"
@@ -65,7 +65,11 @@
         /// </summary>
         [Description("AGV寰呮墽琛�")]
         AGV_Execute = 300,
-
+        /// <summary>
+        /// AGV鍙栬揣涓�
+        /// </summary>
+        [Description("AGV鍙栬揣涓�")]
+        AGV_Takeing =305,
         /// <summary>
         /// AGV鎵ц涓�
         /// </summary>
@@ -90,6 +94,12 @@
         AGV_Finish = 330,
 
         /// <summary>
+        /// AGV鍙栬揣鍐欏叆寮傚父
+        /// </summary>
+        [Description("AGV鍙栬揣鍐欏叆寮傚父")]
+        AGV_TakeError = 335,
+
+        /// <summary>
         /// 浠诲姟瀹屾垚
         /// </summary>
         [Description("浠诲姟瀹屾垚")]
@@ -102,6 +112,12 @@
         Pending = 970,
 
         /// <summary>
+        /// Mes鍑哄簱鎸傝捣
+        /// </summary>
+        [Description("Mes鍑哄簱鎸傝捣")]
+        MesPending = 975,
+
+        /// <summary>
         /// 浠诲姟鍙栨秷
         /// </summary>
         [Description("浠诲姟鍙栨秷")]

--
Gitblit v1.9.3