From cfea43fe783cdb99faa14f59845e41cfcda7d974 Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期四, 16 五月 2024 17:22:48 +0800
Subject: [PATCH] AGV任务删除功能,取空托任务逻辑优化,检测上料任务下发逻辑优化(AGV备料两个)
---
代码管理/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs | 21 ++++++++++++++++-----
1 files changed, 16 insertions(+), 5 deletions(-)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs"
index 6f0e255..2e3dab7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/PCS/WCS_Server/WIDESEA_Comm/StateEnum/LocationStateEnum.cs"
@@ -15,11 +15,22 @@
/// <summary>
/// 绌鸿揣浣�
/// </summary>
-<<<<<<< Updated upstream
- Empty
-=======
Empty,
- Busy
->>>>>>> Stashed changes
+ /// <summary>
+ /// 鍗犵敤
+ /// </summary>
+ Busy,
+ /// <summary>
+ /// 鍏ュ簱鍗犵敤
+ /// </summary>
+ InBusy,
+ /// <summary>
+ /// 鍑哄簱鍗犵敤
+ /// </summary>
+ OutBusy,
+ /// <summary>
+ /// 寮傚父
+ /// </summary>
+ Abnormal
}
}
--
Gitblit v1.9.3