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/ProcessParameters/Platform.cs | 23 ++++++++++++++++-------
1 files changed, 16 insertions(+), 7 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs
index a4ebcc0..c7391c7 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/ProcessParameters/Platform.cs
@@ -24,7 +24,7 @@
/// </summary>
[ImporterHeader(Name = "绔欏彴缂栧彿锛屽敮涓�鏍囪瘑姣忎釜绔欏彴鐨勭紪鍙�")]
[ExporterHeader(DisplayName = "绔欏彴缂栧彿锛屽敮涓�鏍囪瘑姣忎釜绔欏彴鐨勭紪鍙�")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "绔欏彴缂栧彿锛屽敮涓�鏍囪瘑姣忎釜绔欏彴鐨勭紪鍙�")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "绔欏彴缂栧彿锛屽敮涓�鏍囪瘑姣忎釜绔欏彴鐨勭紪鍙�")]
public string PlatCode { get; set; }
/// <summary>
@@ -32,7 +32,7 @@
/// </summary>
[ImporterHeader(Name = "绔欏彴鍚嶇О")]
[ExporterHeader(DisplayName = "绔欏彴鍚嶇О")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "绔欏彴鍚嶇О")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "绔欏彴鍚嶇О")]
public string PlatformName { get; set; }
/// <summary>
@@ -40,7 +40,7 @@
/// </summary>
[ImporterHeader(Name = "瀵瑰簲鍫嗗灈鏈�")]
[ExporterHeader(DisplayName = "瀵瑰簲鍫嗗灈鏈�")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "瀵瑰簲鍫嗗灈鏈�")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "瀵瑰簲鍫嗗灈鏈�")]
public string Stacker { get; set; }
/// <summary>
@@ -48,7 +48,7 @@
/// </summary>
[ImporterHeader(Name = "鎵ц鏂规硶")]
[ExporterHeader(DisplayName = "鎵ц鏂规硶")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鎵ц鏂规硶")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鎵ц鏂规硶")]
public string ExecutionMethod { get; set; }
/// <summary>
@@ -56,7 +56,7 @@
/// </summary>
[ImporterHeader(Name = "绔欏彴绫诲瀷")]
[ExporterHeader(DisplayName = "绔欏彴绫诲瀷")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "绔欏彴绫诲瀷")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "绔欏彴绫诲瀷")]
public string PlatformType { get; set; }
/// <summary>
@@ -64,8 +64,8 @@
/// </summary>
[ImporterHeader(Name = "瀵瑰簲PLC缂栧彿")]
[ExporterHeader(DisplayName = "瀵瑰簲PLC缂栧彿")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "瀵瑰簲PLC缂栧彿")]
- public string PLCCode { get; set; }
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "瀵瑰簲PLC缂栧彿")]
+ public string DeviceCode { get; set; }
/// <summary>
/// 绔欏彴浣嶇疆
@@ -99,6 +99,15 @@
[ExporterHeader(DisplayName = "鐢熶骇浜х嚎")]
[SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鐢熶骇浜х嚎")]
public string ProductionLine { get; set; }
+
+ /// <summary>
+ /// 宸烽亾
+ /// </summary>
+ [ImporterHeader(Name = "宸烽亾")]
+ [ExporterHeader(DisplayName = "宸烽亾")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "宸烽亾")]
+ public string Roadway { get; set; }
+
}
}
--
Gitblit v1.9.3