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/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs | 30 +++++++++++++++++++-----------
1 files changed, 19 insertions(+), 11 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs
index 889e3a0..d6e99c9 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/TaskInfo/Dt_Task.cs
@@ -42,7 +42,7 @@
/// </summary>
[ImporterHeader(Name = "浠诲姟鍙�")]
[ExporterHeader(DisplayName = "浠诲姟鍙�")]
- [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟鍙�")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟鍙�")]
public int TaskNum { get; set; }
/// <summary>
@@ -50,7 +50,7 @@
/// </summary>
[ImporterHeader(Name = "鎵樼洏缂栧彿")]
[ExporterHeader(DisplayName = "鎵樼洏缂栧彿")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵樼洏缂栧彿")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎵樼洏缂栧彿")]
public string PalletCode { get; set; }
/// <summary>
@@ -58,7 +58,7 @@
/// </summary>
[ImporterHeader(Name = "宸烽亾鍙�")]
[ExporterHeader(DisplayName = "宸烽亾鍙�")]
- [SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "宸烽亾鍙�")]
+ [SugarColumn(IsNullable = true, Length = 10, ColumnDescription = "宸烽亾鍙�")]
public string Roadway { get; set; }
/// <summary>
@@ -66,7 +66,7 @@
/// </summary>
[ImporterHeader(Name = "浠诲姟绫诲瀷")]
[ExporterHeader(DisplayName = "浠诲姟绫诲瀷")]
- [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟绫诲瀷")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟绫诲瀷")]
public int TaskType { get; set; }
/// <summary>
@@ -74,7 +74,7 @@
/// </summary>
[ImporterHeader(Name = "浠诲姟鐘舵��")]
[ExporterHeader(DisplayName = "浠诲姟鐘舵��")]
- [SugarColumn(IsNullable = false, ColumnDescription = "浠诲姟鐘舵��")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浠诲姟鐘舵��")]
public int TaskState { get; set; }
/// <summary>
@@ -82,7 +82,7 @@
/// </summary>
[ImporterHeader(Name = "璧峰鍦板潃")]
[ExporterHeader(DisplayName = "璧峰鍦板潃")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璧峰鍦板潃")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "璧峰鍦板潃")]
public string SourceAddress { get; set; }
/// <summary>
@@ -90,7 +90,7 @@
/// </summary>
[ImporterHeader(Name = "鐩爣鍦板潃")]
[ExporterHeader(DisplayName = "鐩爣鍦板潃")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "鐩爣鍦板潃")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "鐩爣鍦板潃")]
public string TargetAddress { get; set; }
/// <summary>
@@ -98,7 +98,7 @@
/// </summary>
[ImporterHeader(Name = "褰撳墠浣嶇疆")]
[ExporterHeader(DisplayName = "褰撳墠浣嶇疆")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "褰撳墠浣嶇疆")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "褰撳墠浣嶇疆")]
public string CurrentAddress { get; set; }
/// <summary>
@@ -106,7 +106,7 @@
/// </summary>
[ImporterHeader(Name = "涓嬩竴鍦板潃")]
[ExporterHeader(DisplayName = "涓嬩竴鍦板潃")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "涓嬩竴鍦板潃")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "涓嬩竴鍦板潃")]
public string NextAddress { get; set; }
/// <summary>
@@ -122,7 +122,7 @@
/// </summary>
[ImporterHeader(Name = "浼樺厛绾�")]
[ExporterHeader(DisplayName = "浼樺厛绾�")]
- [SugarColumn(IsNullable = false, ColumnDescription = "浼樺厛绾�")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "浼樺厛绾�")]
public int Grade { get; set; }
/// <summary>
@@ -130,7 +130,7 @@
/// </summary>
[ImporterHeader(Name = "WMS浠诲姟涓婚敭")]
[ExporterHeader(DisplayName = "WMS浠诲姟涓婚敭")]
- [SugarColumn(IsNullable = false, ColumnDescription = "WMS浠诲姟涓婚敭")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "WMS浠诲姟涓婚敭")]
public int WMSId { get; set; }
/// <summary>
@@ -148,5 +148,13 @@
[ExporterHeader(DisplayName = "澶囨敞")]
[SugarColumn(IsNullable = true, Length = 255, ColumnDescription = "澶囨敞")]
public string Remark { get; set; }
+
+ /// <summary>
+ /// 鎵樼洏浜х嚎
+ /// </summary>
+ [ImporterHeader(Name = "鎵樼洏浜х嚎")]
+ [ExporterHeader(DisplayName = "鎵樼洏浜х嚎")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "鎵樼洏浜х嚎")]
+ public string ProductionLine { get; set; }
}
}
--
Gitblit v1.9.3