From 40f71192f067a48fff730a52fa8f47a1b69ba59d Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期一, 13 十月 2025 17:28:00 +0800
Subject: [PATCH] 支持跨楼层与AGV搬运任务，优化货位管理新增跨楼层与AGV搬运任务相关页面、API及服务逻辑，支持任务状态更新与多任务类型处理。 更新货位管理功能，支持批量创建货位及批量记录货位状态变动。 重构任务状态更新逻辑，增强事务处理能力，优化代码结构。 调整页面配置与文档布局，新增常量与枚举以支持新功能。 修复部分任务状态处理中的潜在问题。
---
项目代码/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs | 191 +++++++++++++++++++++++++++++++++++++++--------
1 files changed, 157 insertions(+), 34 deletions(-)
diff --git "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs" "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs"
index e009bfb..09846c1 100644
--- "a/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs"
+++ "b/\351\241\271\347\233\256\344\273\243\347\240\201/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs"
@@ -220,7 +220,22 @@
public enum TaskOtherTypeEnum
{
}
-
+ public enum TaskAGVCarryTypeEnum
+ {
+ /// <summary>
+ /// AGV鎼繍
+ /// </summary>
+ [Description("AGV鎼繍")]
+ Carry = 400
+ }
+ public enum TaskAcrossFloorTypeEnum
+ {
+ /// <summary>
+ /// 璺ㄦゼ灞傛惉杩�
+ /// </summary>
+ [Description("璺ㄦゼ灞傛惉杩�")]
+ AcrossFloorCarry = 500
+ }
public enum TaskTypeEnum
{
/// <summary>
@@ -286,11 +301,7 @@
#endregion 浠诲姟绫诲瀷
- #region 鍏ュ簱浠诲姟鐘舵��
-
- /// <summary>
- /// 鍏ュ簱浠诲姟鐘舵�� 200 鏂板缓鍏ュ簱浠诲姟 锛� 210 AGV鍏ュ簱鎵ц涓紝 215 AGV鍏ュ簱瀹屾垚锛� 220杈撻�佺嚎鍏ュ簱鎵ц涓紝 225 杈撻�佺嚎鍏ュ簱瀹屾垚锛� 230 鍫嗗灈鏈哄叆搴撴墽琛屼腑锛� 235 鍫嗗灈鏈哄叆搴撳畬鎴愶紝290 鍏ュ簱浠诲姟鍙栨秷锛�298 鍏ュ簱浠诲姟瀹屾垚锛�299 鍏ュ簱浠诲姟寮傚父,300 鏂板缓绉诲簱搴撲换鍔�
- /// </summary>
+ #region 鍏ュ簱鐘舵��
public enum TaskInStatusEnum
{
/// <summary>
@@ -299,17 +310,17 @@
[Description("鏂板缓鍏ュ簱浠诲姟")]
InNew = 200,
- ///// <summary>
- ///// AGV鍏ュ簱鎵ц涓�
- ///// </summary>
- //[Description("AGV鍏ュ簱鎵ц涓�")]
- //AGV_InExecuting = 210,
+ /// <summary>
+ /// AGV鍏ュ簱鎵ц涓�
+ /// </summary>
+ [Description("AGV鍏ュ簱鎵ц涓�")]
+ AGV_InExecuting = 210,
- ///// <summary>
- ///// AGV鍏ュ簱瀹屾垚
- ///// </summary>
- //[Description("AGV鎼繍瀹屾垚")]
- //AGV_InFinish = 215,
+ /// <summary>
+ /// AGV鍏ュ簱瀹屾垚
+ /// </summary>
+ [Description("AGV鎼繍瀹屾垚")]
+ AGV_InFinish = 215,
/// <summary>
/// 杈撻�佺嚎鍏ュ簱鎵ц涓�
@@ -320,7 +331,7 @@
/// <summary>
/// 杈撻�佺嚎鍏ュ簱瀹屾垚
/// </summary>
- [Description("杈撻�佺嚎杈撻�佸畬鎴�")]
+ [Description("杈撻�佺嚎鍏ュ簱瀹屾垚")]
Line_InFinish = 225,
/// <summary>
@@ -360,12 +371,9 @@
InException = 299,
}
- #endregion 鍏ュ簱浠诲姟鐘舵��
+ #endregion
- #region 鍑哄簱浠诲姟鐘舵��
- /// <summary>
- /// 鍑哄簱浠诲姟鐘舵�� 100 鏂板缓鍑哄簱浠诲姟锛� 110 AGV鍑哄簱鎵ц涓紝 115 AGV鍑哄簱瀹屾垚锛� 120杈撻�佺嚎鍑哄簱鎵ц涓紝 125 杈撻�佺嚎鍑哄簱瀹屾垚锛� 130 鍫嗗灈鏈哄嚭搴撴墽琛屼腑锛� 135 鍫嗗灈鏈哄嚭搴撳畬鎴愶紝190 鍑哄簱浠诲姟鍙栨秷锛�198 鍑哄簱浠诲姟瀹屾垚锛�199 鍑哄簱浠诲姟寮傚父
- /// </summary>
+ #region 鍑哄簱鐘舵��
public enum TaskOutStatusEnum
{
/// <summary>
@@ -395,20 +403,21 @@
/// <summary>
/// 杈撻�佺嚎鍑哄簱瀹屾垚
/// </summary>
- [Description("杈撻�佺嚎杈撻�佸畬鎴�")]
+ [Description("杈撻�佺嚎鍑哄簱瀹屾垚")]
Line_OutFinish = 125,
- ///// <summary>
- ///// AGV鍑哄簱鎵ц涓�
- ///// </summary>
- //[Description("AGV鍑哄簱鎵ц涓�")]
- //AGV_OutExecuting = 130,
- ///// <summary>
- ///// AGV鍑哄簱瀹屾垚
- ///// </summary>
- //[Description("AGV鎼繍瀹屾垚")]
- //AGV_OutFinish = 135,
+ /// <summary>
+ /// AGV鍑哄簱鎵ц涓�
+ /// </summary>
+ [Description("AGV鍑哄簱鎵ц涓�")]
+ AGV_OutExecuting = 130,
+
+ /// <summary>
+ /// AGV鍑哄簱瀹屾垚
+ /// </summary>
+ [Description("AGV鎼繍瀹屾垚")]
+ AGV_OutFinish = 135,
/// <summary>
/// 鍑哄簱浠诲姟瀹屾垚
@@ -437,7 +446,7 @@
#endregion
- #region 绉诲簱浠诲姟鐘舵��
+ #region 绉诲簱鐘舵��
public enum TaskRelocationStatusEnum
{
/// <summary>
@@ -485,6 +494,120 @@
#endregion
+ #region AGV鎼繍鐘舵��
+ 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,
+ }
+
+ #endregion
+
+ #region 璺ㄦゼ灞傛惉杩愮姸鎬�
+ 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,
+ }
+
+ #endregion
+
#region 鍘熷鍗曟嵁鍚屾鐘舵��
/// <summary>
--
Gitblit v1.9.3