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_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