From 8ae1a147aefadbb255edde088e7c12535c5f02d4 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 08 十月 2025 20:35:51 +0800
Subject: [PATCH] 完善输送线和堆垛机任务处理逻辑在CommonConveyorLine_NewCW.cs`中添加版本注释和设备属性定义，增强设备连接状态检查与命令发送逻辑。 修改 CommonConveyorLine_GWJob.cs`的任务查询逻辑，确保在特定条件下不下发新任务。在CommonConveyorLine_NewCWJob.cs中实现请求入库和出库的处理逻辑，确保任务状态更新。在 RequestInbound.cs中添加出库任务和新任务的处理逻辑，增强异常处理。 在CommonStackerCrane_NewCWJob.cs中实现堆垛机任务完成事件的处理，确保状态更新和前端通知。新增设备型号修改相关常量和 DTO 类，更新服务接口和实现逻辑，确保设备型号修改请求的正确处理。修改 Dt_TaskService.cs中的任务处理逻辑，确保出库任务的库存判断和状态更新。
---
Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs | 72 ++++++++++++++++++++++++++++++++----
1 files changed, 64 insertions(+), 8 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 45e2fd8..8a4b227 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,12 +66,48 @@
/// </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>
- /// 浠诲姟绫诲瀷
+ /// 浠诲姟绫诲瀷
/// </summary>
public enum TaskInboundTypeEnum
@@ -110,6 +141,12 @@
/// </summary>
[Description("绌烘墭鐩樺叆搴�")]
InTray = 204,
+
+ /// <summary>
+ /// NG鍏ュ簱
+ /// </summary>
+ [Description("NG鍏ュ簱")]
+ InNG = 205,
}
public enum TaskOutboundTypeEnum
@@ -143,6 +180,24 @@
/// </summary>
[Description("绌烘墭鐩樺嚭搴�")]
OutTray = 104,
+
+ /// <summary>
+ /// NG鍑哄簱
+ /// </summary>
+ [Description("NG鍑哄簱")]
+ OutNG = 105,
+
+ /// <summary>
+ /// 鐩存帴鍑哄簱
+ /// </summary>
+ [Description("鐩存帴鍑哄簱")]
+ InToOut = 106,
+
+ /// <summary>
+ /// 鐏鍑哄簱
+ /// </summary>
+ [Description("鐏鍑哄簱")]
+ OutFireAlarm = 500,
}
public enum TaskRelocationTypeEnum
@@ -163,6 +218,7 @@
public enum TaskOtherTypeEnum
{
}
+
public enum TaskTypeEnum
{
/// <summary>
@@ -223,7 +279,7 @@
/// <summary>
/// 搴撳绉诲簱
/// </summary>
- RelocationOut = 302
+ RelocationOut = 302,
}
#endregion 浠诲姟绫诲瀷
--
Gitblit v1.9.3