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_QuartzJob/Models/Dt_DeviceProtocol.cs | 14 +++++++-------
1 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Models/Dt_DeviceProtocol.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Models/Dt_DeviceProtocol.cs
index b8a9e6c..84b2e9c 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Models/Dt_DeviceProtocol.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Models/Dt_DeviceProtocol.cs
@@ -37,7 +37,7 @@
/// </summary>
[ImporterHeader(IsIgnore = true)]
[ExporterHeader(IsIgnore = true)]
- [SugarColumn(IsIdentity = true, IsPrimaryKey = true, ColumnDescription = "涓婚敭")]
+ [SugarColumn(IsIdentity = true, IsNullable = true, IsPrimaryKey = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
/// <summary>
@@ -53,7 +53,7 @@
/// </summary>
[ImporterHeader(Name = "璁惧瀛愮紪鍙�")]
[ExporterHeader(DisplayName = "璁惧瀛愮紪鍙�")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璁惧瀛愮紪鍙�")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "璁惧瀛愮紪鍙�")]
public string DeviceChildCode { get; set; }
/// <summary>
@@ -61,7 +61,7 @@
/// </summary>
[ImporterHeader(Name = "鍗忚鏁版嵁鍧�")]
[ExporterHeader(DisplayName = "鍗忚鏁版嵁鍧�")]
- [SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "鍗忚鏁版嵁鍧�")]
+ [SugarColumn(IsNullable = true, Length = 10, ColumnDescription = "鍗忚鏁版嵁鍧�")]
public string DeviceProDataBlock { get; set; }
/// <summary>
@@ -69,7 +69,7 @@
/// </summary>
[ImporterHeader(Name = "鍋忕Щ閲�")]
[ExporterHeader(DisplayName = "鍋忕Щ閲�")]
- [SugarColumn(IsNullable = false, DecimalDigits = 1, ColumnDescription = "鍋忕Щ閲�")]
+ [SugarColumn(IsNullable = true, DecimalDigits = 1, ColumnDescription = "鍋忕Щ閲�")]
public decimal DeviceProOffset { get; set; }
/// <summary>
@@ -77,7 +77,7 @@
/// </summary>
[ImporterHeader(Name = "鏁版嵁绫诲瀷")]
[ExporterHeader(DisplayName = "鏁版嵁绫诲瀷")]
- [SugarColumn(IsNullable = false, Length = 10, ColumnDescription = "鏁版嵁绫诲瀷")]
+ [SugarColumn(IsNullable = true, Length = 10, ColumnDescription = "鏁版嵁绫诲瀷")]
public string DeviceProDataType { get; set; }
/// <summary>
@@ -93,7 +93,7 @@
/// </summary>
[ImporterHeader(Name = "鍙傛暟鍚嶇О")]
[ExporterHeader(DisplayName = "鍙傛暟鍚嶇О")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍙傛暟鍚嶇О")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鍙傛暟鍚嶇О")]
public string DeviceProParamName { get; set; }
/// <summary>
@@ -101,7 +101,7 @@
/// </summary>
[ImporterHeader(Name = "鍙傛暟绫诲瀷")]
[ExporterHeader(DisplayName = "鍙傛暟绫诲瀷")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "鍙傛暟绫诲瀷")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "鍙傛暟绫诲瀷")]
public string DeviceProParamType { get; set; }
/// <summary>
--
Gitblit v1.9.3