From a8be8f9371b6fc03b66d212b2902d08f93b087dd Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期三, 02 七月 2025 13:55:55 +0800
Subject: [PATCH] 新增任务查询方法并优化逻辑在 `ITaskService.cs` 中添加了新的 `QueryExecutingConveyorLineTask` 方法，支持根据托盘号和下一地址查询任务，同时调整了原有方法的参数以保留旧功能。在 `TaskService.cs` 中新增重载方法，允许根据下一地址和条形码查询任务。在 `CommonConveyorLine_GWJob.cs` 中更新了 `ConveyorLineOutFinish` 方法，简化了任务查询逻辑并删除了多余的注释代码。同时，增加了对 `taskNext` 的处理逻辑，确保在任务未找到时的相应处理，并更新在途数据的逻辑，提升数据一致性和准确性。
---
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