From b7da1f32d5d9997378b5ac535593a3f6144af46b Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 15 十月 2025 17:15:38 +0800
Subject: [PATCH] 新增AGV与堆垛机移库判断及缓存优化
---
项目代码/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs | 172 +++++++++++++++++++++++++++++++++++++-------------------
1 files changed, 113 insertions(+), 59 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs"
index af2230f..3f4d1ae 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskStatusEnum.cs"
@@ -28,58 +28,28 @@
AGV_InFinish = 215,
/// <summary>
- /// AGV绛夊緟鍙栬揣
- /// </summary>
- [Description("鎻愬崌鏈虹瓑寰匒GV鏀捐揣")]
- Elevator_AGVWaitPut = 220,
-
- /// <summary>
- /// 鎻愬崌鏈哄叆搴撴墽琛屼腑
- /// </summary>
- [Description("鎻愬崌鏈哄叆搴撴墽琛屼腑")]
- Elevator_InExecuting = 225,
-
- /// <summary>
- /// 鎻愬崌鏈哄叆搴撳畬鎴�
- /// </summary>
- [Description("鎻愬崌鏈哄叆搴撳畬鎴�")]
- Elevator_InFinish = 230,
-
- /// <summary>
- /// AGV绛夊緟鍙栬揣
- /// </summary>
- [Description("鎻愬崌鏈虹瓑寰匒GV鍙栬揣")]
- Elevator_AGVWaitPickUp = 235,
-
- /// <summary>
- /// AGV绛夊緟鍙栬揣
- /// </summary>
- [Description("杈撻�佺嚎绛夊緟AGV鍙栬揣")]
- Line_AGVWaitPickUp = 240,
-
- /// <summary>
/// 杈撻�佺嚎鍏ュ簱鎵ц涓�
/// </summary>
[Description("杈撻�佺嚎鍏ュ簱鎵ц涓�")]
- Line_InExecuting = 240,
+ Line_InExecuting = 220,
/// <summary>
/// 杈撻�佺嚎鍏ュ簱瀹屾垚
/// </summary>
[Description("杈撻�佺嚎鍏ュ簱瀹屾垚")]
- Line_InFinish = 245,
+ Line_InFinish = 225,
/// <summary>
/// 鍫嗗灈鏈哄叆搴撴墽琛屼腑
/// </summary>
[Description("鍫嗗灈鏈哄叆搴撴墽琛屼腑")]
- SC_InExecuting = 250,
+ SC_InExecuting = 230,
/// <summary>
/// 鍫嗗灈鏈哄叆搴撳畬鎴�
/// </summary>
[Description("鍫嗗灈鏈哄叆搴撳畬鎴�")]
- SC_InFinish = 255,
+ SC_InFinish = 235,
/// <summary>
/// 鍏ュ簱浠诲姟瀹屾垚
@@ -138,41 +108,18 @@
[Description("杈撻�佺嚎鍑哄簱瀹屾垚")]
Line_OutFinish = 125,
- /// <summary>
- /// 杈撻�佺嚎绛夊緟AGV鍙栬揣
- /// </summary>
- [Description("杈撻�佺嚎绛夊緟AGV鍙栬揣")]
- Line_AGVWaitPickUp = 130,
/// <summary>
/// AGV鍑哄簱鎵ц涓�
/// </summary>
[Description("AGV鍑哄簱鎵ц涓�")]
- AGV_OutExecuting = 135,
+ AGV_OutExecuting = 130,
/// <summary>
/// AGV鍑哄簱瀹屾垚
/// </summary>
[Description("AGV鎼繍瀹屾垚")]
- AGV_OutFinish = 140,
-
- /// <summary>
- /// 鎻愬崌鏈烘墽琛屼腑
- /// </summary>
- [Description("鎻愬崌鏈烘墽琛屼腑")]
- Elevator_OutExecuting = 145,
-
- /// <summary>
- /// 鎻愬崌鏈哄畬鎴�
- /// </summary>
- [Description("鎻愬崌鏈哄嚭搴撳畬鎴�")]
- Elevator_OutFinish = 150,
-
- /// <summary>
- /// AGV绛夊緟鍙栬揣
- /// </summary>
- [Description("鎻愬崌鏈虹瓑寰匒GV鍙栬揣")]
- Elevator_AGVWaitPickUp = 155,
+ AGV_OutFinish = 135,
/// <summary>
/// 鍑哄簱浠诲姟瀹屾垚
@@ -243,4 +190,111 @@
[Description("绉诲簱浠诲姟寮傚父")]
RelocationException = 399,
}
+
+ public enum TaskAGVCarryStatusEnum
+ {
+ /// <summary>
+ /// 鏂板缓AGV鎼繍浠诲姟
+ /// </summary>
+ [Description("鏂板缓AGV鎼繍浠诲姟")]
+ CarryNew = 400,
+
+ /// <summary>
+ /// AGV鎼繍鎵ц涓�
+ /// </summary>
+ [Description("AGV鎼繍鎵ц涓�")]
+ AGV_CarryExecuting = 410,
+
+ /// <summary>
+ /// AGV鎼繍瀹屾垚
+ /// </summary>
+ [Description("AGV鎼繍瀹屾垚")]
+ AGV_CarryFinish = 415,
+
+ /// <summary>
+ /// AGV鎼繍浠诲姟瀹屾垚
+ /// </summary>
+ [Description("AGV鎼繍浠诲姟瀹屾垚")]
+ CarryFinish = 490,
+
+ /// <summary>
+ /// AGV鎼繍浠诲姟鎸傝捣
+ /// </summary>
+ [Description("AGV鎼繍浠诲姟鎸傝捣")]
+ CarryPending = 497,
+
+ /// <summary>
+ /// AGV鎼繍浠诲姟鍙栨秷
+ /// </summary>
+ [Description("AGV鎼繍浠诲姟鍙栨秷")]
+ CarryCancel = 498,
+
+ /// <summary>
+ /// AGV鎼繍浠诲姟寮傚父
+ /// </summary>
+ [Description("AGV鎼繍浠诲姟寮傚父")]
+ CarryException = 499,
+ }
+ public enum TaskAcrossFloorStatusEnum
+ {
+ /// <summary>
+ /// 鏂板缓璺ㄦゼ灞備换鍔�
+ /// </summary>
+ [Description("鏂板缓璺ㄦゼ灞備换鍔�")]
+ CarryNew = 500,
+
+ /// <summary>
+ /// 璺ㄦゼ灞傛惉杩�1
+ /// </summary>
+ [Description("璺ㄦゼ灞傛惉杩�1")]
+ FirstCarry = 510,
+
+ /// <summary>
+ /// 涓�妤兼惉杩愬畬鎴�
+ /// </summary>
+ [Description("璺ㄦゼ灞傛惉杩�1瀹屾垚")]
+ FirstCarryFinish = 515,
+
+ /// <summary>
+ /// 璺ㄦゼ灞傛惉杩�2
+ /// </summary>
+ [Description("璺ㄦゼ灞傛惉杩�2")]
+ SecondCarry = 520,
+
+ /// <summary>
+ /// 璺ㄦゼ灞傜粓鐐规墽琛�
+ /// </summary>
+ [Description("璺ㄦゼ灞傜粓鐐规墽琛�")]
+ EndAddressExecuting = 525,
+
+ /// <summary>
+ /// 璺ㄦゼ灞傛惉杩�2瀹屾垚
+ /// </summary>
+ [Description("璺ㄦゼ灞傛惉杩�2瀹屾垚")]
+ SecondCarryFinish = 530,
+
+ /// <summary>
+ /// 璺ㄦゼ灞備换鍔″畬鎴�
+ /// </summary>
+ [Description("璺ㄦゼ灞備换鍔″畬鎴�")]
+ CarryFinish = 590,
+
+ /// <summary>
+ /// 璺ㄦゼ灞備换鍔℃寕璧�
+ /// </summary>
+ [Description("璺ㄦゼ灞備换鍔℃寕璧�")]
+ CarryPending = 597,
+
+ /// <summary>
+ /// 璺ㄦゼ灞備换鍔″彇娑�
+ /// </summary>
+ [Description("璺ㄦゼ灞備换鍔″彇娑�")]
+ CarryCancel = 598,
+
+ /// <summary>
+ /// AGV鎼繍浠诲姟寮傚父
+ /// </summary>
+ [Description("AGV鎼繍浠诲姟寮傚父")]
+ CarryException = 599,
+ }
}
--
Gitblit v1.9.3