From 457b75b642a1fdaa7158e5b047cabc5d7ae16333 Mon Sep 17 00:00:00 2001
From: xxyy <cathay_xy@163.com>
Date: 星期一, 10 三月 2025 10:10:13 +0800
Subject: [PATCH] 修复和优化 Dt_TaskService.cs 中的任务请求逻辑
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs | 241 ++++++++++++++++++++++++++++++++++++++----------
1 files changed, 191 insertions(+), 50 deletions(-)
diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs
index 53c1de3..8c0f2a0 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs
@@ -1,9 +1,4 @@
-锘縰sing System;
-using System.Collections.Generic;
-using System.ComponentModel;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+锘縰sing System.ComponentModel;
namespace WIDESEA_Core.Enums
{
@@ -71,13 +66,153 @@
/// </summary>
[Description("鏃犺揣绂佺敤")]
FreeDisable = 4,
+
+ /// <summary>
+ /// 棰勫垎閰�
+ /// </summary>
+ [Description("棰勫垎閰�")]
+ Distribute = 5,
+ }
+
+ public enum LocationState
+ {
+ /// <summary>
+ /// 鍏佽
+ /// </summary>
+ [Description("鍏佽")]
+ Allow = 1,
+
+ /// <summary>
+ /// 涓嶅厑璁�
+ /// </summary>
+ [Description("涓嶅厑璁�")]
+ NotAllow = 2
+ }
+
+ public enum LocationType
+ {
+ /// <summary>
+ /// 鍗曟繁璐т綅
+ /// </summary>
+ [Description("鍗曟繁璐т綅")]
+ Single = 1,
+
+ /// <summary>
+ /// 鍙屾繁璐т綅
+ /// </summary>
+ [Description("鍙屾繁璐т綅")]
+ Double = 2
}
#region 浠诲姟绫诲瀷
/// <summary>
- /// 浠诲姟绫诲瀷 100 鍑哄簱;鐩樼偣鍑哄簱 101; 102 鍒嗘嫞鍑哄簱;103 璐ㄦ鍑哄簱;200 鍏ュ簱;鐩樼偣鍏ュ簱 201;鍒嗘嫞鍏ュ簱 202;璐ㄦ鍏ュ簱 203;绉诲簱 300;搴撳唴绉诲簱 301;搴撳绉诲簱 302
+ /// 浠诲姟绫诲瀷
/// </summary>
+
+ public enum TaskInboundTypeEnum
+ {
+ /// <summary>
+ /// 鍏ュ簱
+ /// </summary>
+ [Description("鍏ュ簱")]
+ Inbound = 200,
+
+ /// <summary>
+ /// 鐩樼偣鍏ュ簱
+ /// </summary>
+ [Description("鐩樼偣鍏ュ簱")]
+ InInventory = 201,
+
+ /// <summary>
+ /// 鍒嗘嫞鍏ュ簱
+ /// </summary>
+ [Description("鍒嗘嫞鍏ュ簱")]
+ InPick = 202,
+
+ /// <summary>
+ /// 璐ㄦ鍏ュ簱
+ /// </summary>
+ [Description("璐ㄦ鍏ュ簱")]
+ InQuality = 203,
+
+ /// <summary>
+ /// 绌烘墭鐩樺叆搴�
+ /// </summary>
+ [Description("绌烘墭鐩樺叆搴�")]
+ InTray = 204,
+
+ /// <summary>
+ /// NG鍏ュ簱
+ /// </summary>
+ [Description("NG鍏ュ簱")]
+ InNG = 205,
+ }
+
+ public enum TaskOutboundTypeEnum
+ {
+ /// <summary>
+ /// 鍑哄簱
+ /// </summary>
+ [Description("鍑哄簱")]
+ Outbound = 100,
+
+ /// <summary>
+ /// 鐩樼偣鍑哄簱
+ /// </summary>
+ [Description("鐩樼偣鍑哄簱")]
+ OutInventory = 101,
+
+ /// <summary>
+ /// 鍒嗘嫞鍑哄簱
+ /// </summary>
+ [Description("鍒嗘嫞鍑哄簱")]
+ OutPick = 102,
+
+ /// <summary>
+ /// 璐ㄦ鍑哄簱
+ /// </summary>
+ [Description("璐ㄦ鍑哄簱")]
+ OutQuality = 103,
+
+ /// <summary>
+ /// 绌烘墭鐩樺嚭搴�
+ /// </summary>
+ [Description("绌烘墭鐩樺嚭搴�")]
+ OutTray = 104,
+
+ /// <summary>
+ /// NG鍑哄簱
+ /// </summary>
+ [Description("NG鍑哄簱")]
+ OutNG = 105,
+
+ /// <summary>
+ /// 鐩存帴鍑哄簱
+ /// </summary>
+ [Description("鐩存帴鍑哄簱")]
+ InToOut = 106,
+ }
+
+ public enum TaskRelocationTypeEnum
+ {
+ /// <summary>
+ /// 搴撳唴绉诲簱
+ /// </summary>
+ [Description("搴撳唴绉诲簱")]
+ Relocation = 300,
+
+ /// <summary>
+ /// 搴撳绉诲簱
+ /// </summary>
+ [Description("搴撳绉诲簱")]
+ RelocationIn = 301
+ }
+
+ public enum TaskOtherTypeEnum
+ {
+ }
+
public enum TaskTypeEnum
{
/// <summary>
@@ -148,7 +283,7 @@
/// <summary>
/// 鍏ュ簱浠诲姟鐘舵�� 200 鏂板缓鍏ュ簱浠诲姟 锛� 210 AGV鍏ュ簱鎵ц涓紝 215 AGV鍏ュ簱瀹屾垚锛� 220杈撻�佺嚎鍏ュ簱鎵ц涓紝 225 杈撻�佺嚎鍏ュ簱瀹屾垚锛� 230 鍫嗗灈鏈哄叆搴撴墽琛屼腑锛� 235 鍫嗗灈鏈哄叆搴撳畬鎴愶紝290 鍏ュ簱浠诲姟鍙栨秷锛�298 鍏ュ簱浠诲姟瀹屾垚锛�299 鍏ュ簱浠诲姟寮傚父,300 鏂板缓绉诲簱搴撲换鍔�
/// </summary>
- public enum InTaskStatusEnum
+ public enum TaskInStatusEnum
{
/// <summary>
/// 鏂板缓鍏ュ簱浠诲姟
@@ -156,17 +291,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>
/// 杈撻�佺嚎鍏ュ簱鎵ц涓�
@@ -177,7 +312,7 @@
/// <summary>
/// 杈撻�佺嚎鍏ュ簱瀹屾垚
/// </summary>
- [Description("杈撻�佺嚎鍏ュ簱瀹屾垚")]
+ [Description("杈撻�佺嚎杈撻�佸畬鎴�")]
Line_InFinish = 225,
/// <summary>
@@ -199,6 +334,12 @@
InFinish = 290,
/// <summary>
+ /// 鍏ュ簱浠诲姟鎸傝捣
+ /// </summary>
+ [Description("鍏ュ簱浠诲姟鎸傝捣")]
+ InPending = 297,
+
+ /// <summary>
/// 鍏ュ簱浠诲姟鍙栨秷
/// </summary>
[Description("鍏ュ簱浠诲姟鍙栨秷")]
@@ -209,12 +350,6 @@
/// </summary>
[Description("鍏ュ簱浠诲姟寮傚父")]
InException = 299,
-
- /// <summary>
- /// 鏂板缓绉诲簱搴撲换鍔�
- /// </summary>
- [Description("鏂板缓绉诲簱搴撲换鍔�")]
- RelocationNew = 300
}
#endregion 鍏ュ簱浠诲姟鐘舵��
@@ -222,67 +357,73 @@
/// <summary>
/// 鍑哄簱浠诲姟鐘舵�� 100 鏂板缓鍑哄簱浠诲姟锛� 110 AGV鍑哄簱鎵ц涓紝 115 AGV鍑哄簱瀹屾垚锛� 120杈撻�佺嚎鍑哄簱鎵ц涓紝 125 杈撻�佺嚎鍑哄簱瀹屾垚锛� 130 鍫嗗灈鏈哄嚭搴撴墽琛屼腑锛� 135 鍫嗗灈鏈哄嚭搴撳畬鎴愶紝190 鍑哄簱浠诲姟鍙栨秷锛�198 鍑哄簱浠诲姟瀹屾垚锛�199 鍑哄簱浠诲姟寮傚父
/// </summary>
- public enum OutTaskStatusEnum
+ public enum TaskOutStatusEnum
{
/// <summary>
- /// 鏂板缓浠诲姟
+ /// 鏂板缓鍑哄簱浠诲姟
/// </summary>
+ [Description("鏂板缓鍑哄簱浠诲姟")]
OutNew = 100,
/// <summary>
- /// AGV鎵ц涓�
+ /// 鍫嗗灈鏈哄嚭搴撴墽琛屼腑
/// </summary>
- AGV_OutExecuting = 110,
+ [Description("鍫嗗灈鏈哄嚭搴撴墽琛屼腑")]
+ SC_OutExecuting = 110,
/// <summary>
- /// AGV鍑哄簱瀹屾垚
+ /// 鍫嗗灈鏈哄嚭搴撳畬鎴�
/// </summary>
- AGV_OutFinish = 115,
+ [Description("鍫嗗灈鏈哄嚭搴撳畬鎴�")]
+ SC_OutFinish = 115,
/// <summary>
/// 杈撻�佺嚎鍑哄簱鎵ц涓�
/// </summary>
+ [Description("杈撻�佺嚎鍑哄簱鎵ц涓�")]
Line_OutExecuting = 120,
/// <summary>
/// 杈撻�佺嚎鍑哄簱瀹屾垚
/// </summary>
+ [Description("杈撻�佺嚎杈撻�佸畬鎴�")]
Line_OutFinish = 125,
- /// <summary>
- /// 鍫嗗灈鏈哄嚭搴撴墽琛屼腑
- /// </summary>
- SC_OutExecuting = 130,
+ ///// <summary>
+ ///// AGV鍑哄簱鎵ц涓�
+ ///// </summary>
+ //[Description("AGV鍑哄簱鎵ц涓�")]
+ //AGV_OutExecuting = 130,
- /// <summary>
- /// 鍫嗗灈鏈哄嚭搴撳畬鎴�
- /// </summary>
- SC_OutFinish = 135,
-
- /// <summary>
- /// 绉诲簱浠诲姟鎵ц涓�
- /// </summary>
- SC_RelocationExecuting = 140,
-
- /// <summary>
- /// 绉诲簱浠诲姟鎵ц涓�
- /// </summary>
- SC_RelocationFinish = 145,
+ ///// <summary>
+ ///// AGV鍑哄簱瀹屾垚
+ ///// </summary>
+ //[Description("AGV鎼繍瀹屾垚")]
+ //AGV_OutFinish = 135,
/// <summary>
/// 鍑哄簱浠诲姟瀹屾垚
/// </summary>
+ [Description("鍑哄簱浠诲姟瀹屾垚")]
OutFinish = 190,
+
+ /// <summary>
+ /// 鍑哄簱浠诲姟鎸傝捣
+ /// </summary>
+ [Description("鍑哄簱浠诲姟鎸傝捣")]
+ OutPending = 197,
/// <summary>
/// 鍑哄簱浠诲姟鍙栨秷
/// </summary>
+ [Description("鍑哄簱浠诲姟鍙栨秷")]
OutCancel = 198,
/// <summary>
/// 鍑哄簱浠诲姟寮傚父
/// </summary>
- OutException = 199
+ [Description("鍑哄簱浠诲姟寮傚父")]
+ OutException = 199,
}
/// <summary>
--
Gitblit v1.9.3