From a95c4e748b01da8bea6ba0f8e6af9c281bc582d7 Mon Sep 17 00:00:00 2001
From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com>
Date: 星期二, 29 七月 2025 09:22:13 +0800
Subject: [PATCH] 优化日志格式并增强库存查询逻辑在 CommonConveyorLineJob.cs和CommonConveyorLine_GWJob.cs文件中，修改了日志输出格式，添加了时间戳以提高可读性和可追溯性。部分代码中的ToJsonString()方法被替换为 Serialize()方法，以统一序列化方式。与此同时，在 Dt_TaskService.cs文件中增加了库存信息查询逻辑，以确保出库时能够正确处理库存条件，增强系统的健壮性。
---
Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Models/Dt_DeviceInfo.cs | 16 ++++++++--------
1 files changed, 8 insertions(+), 8 deletions(-)
diff --git a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Models/Dt_DeviceInfo.cs b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Models/Dt_DeviceInfo.cs
index 25b4625..783732e 100644
--- a/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Models/Dt_DeviceInfo.cs
+++ b/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Models/Dt_DeviceInfo.cs
@@ -37,7 +37,7 @@
/// </summary>
[ImporterHeader(IsIgnore = true)]
[ExporterHeader(DisplayName = "涓婚敭")]
- [SugarColumn(IsIdentity = true, IsPrimaryKey = true, ColumnDescription = "涓婚敭")]
+ [SugarColumn(IsIdentity = true, IsNullable = true, IsPrimaryKey = true, ColumnDescription = "涓婚敭")]
public int Id { get; set; }
/// <summary>
@@ -45,7 +45,7 @@
/// </summary>
[ImporterHeader(Name = "璁惧缂栧彿")]
[ExporterHeader(DisplayName = "璁惧缂栧彿")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璁惧缂栧彿")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "璁惧缂栧彿")]
public string DeviceCode { get; set; }
/// <summary>
@@ -53,7 +53,7 @@
/// </summary>
[ImporterHeader(Name = "璁惧鍚嶇О")]
[ExporterHeader(DisplayName = "璁惧鍚嶇О")]
- [SugarColumn(IsNullable = false, Length = 50, ColumnDescription = "璁惧鍚嶇О")]
+ [SugarColumn(IsNullable = true, Length = 50, ColumnDescription = "璁惧鍚嶇О")]
public string DeviceName { get; set; }
/// <summary>
@@ -61,7 +61,7 @@
/// </summary>
[ImporterHeader(Name = "璁惧绫诲瀷")]
[ExporterHeader(DisplayName = "璁惧绫诲瀷")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璁惧绫诲瀷")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "璁惧绫诲瀷")]
public string DeviceType { get; set; }
/// <summary>
@@ -69,7 +69,7 @@
/// </summary>
[ImporterHeader(Name = "璁惧鐘舵��")]
[ExporterHeader(DisplayName = "璁惧鐘舵��")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璁惧鐘舵��")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "璁惧鐘舵��")]
public string DeviceStatus { get; set; }
/// <summary>
@@ -77,7 +77,7 @@
/// </summary>
[ImporterHeader(Name = "璁惧IP")]
[ExporterHeader(DisplayName = "璁惧IP")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "璁惧IP")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "璁惧IP")]
public string DeviceIp { get; set; }
/// <summary>
@@ -85,7 +85,7 @@
/// </summary>
[ImporterHeader(Name = "璁惧绔彛")]
[ExporterHeader(DisplayName = "璁惧绔彛")]
- [SugarColumn(IsNullable = false, ColumnDescription = "璁惧绔彛")]
+ [SugarColumn(IsNullable = true, ColumnDescription = "璁惧绔彛")]
public int DevicePort { get; set; }
/// <summary>
@@ -93,7 +93,7 @@
/// </summary>
[ImporterHeader(Name = "PLC绫诲瀷")]
[ExporterHeader(DisplayName = "PLC绫诲瀷")]
- [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "PLC绫诲瀷")]
+ [SugarColumn(IsNullable = true, Length = 20, ColumnDescription = "PLC绫诲瀷")]
public string DevicePlcType { get; set; }
/// <summary>
--
Gitblit v1.9.3