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/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln |   79 +++++++++++++++++++++++++++++++++++++++
 1 files changed, 79 insertions(+), 0 deletions(-)

diff --git a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln
index a102da3..0c16bc8 100644
--- a/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln
+++ b/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer.sln
@@ -69,6 +69,21 @@
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WIDESEA_StorageTaskServices", "WIDESEA_StorageTaskServices\WIDESEA_StorageTaskServices.csproj", "{9912BD12-4CF7-4A91-8203-47C9C125004C}"
 EndProject
+Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{9BA96018-EF8A-4D84-8E72-DA697FA5EAF8}"
+	ProjectSection(SolutionItems) = preProject
+		.editorconfig = .editorconfig
+	EndProjectSection
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_StoragIntegrationServices", "WIDESEA_StoragIntegrationServices\WIDESEA_StoragIntegrationServices.csproj", "{55326F38-372A-4606-B7FB-8C01BBAEC4FC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_IStoragIntegrationServices", "WIDESEA_IStoragIntegrationServices\WIDESEA_IStoragIntegrationServices.csproj", "{94D572FA-810E-4897-B673-AF988FD4019E}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_Cache", "WIDESEA_Cache\WIDESEA_Cache.csproj", "{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_StoragIntegrationRepository", "WIDESEA_StoragIntegrationRepository\WIDESEA_StoragIntegrationRepository.csproj", "{B317068F-39F2-4E0E-9980-4C4A037C47BF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "WIDESEA_IStoragIntegrationRepository", "WIDESEA_IStoragIntegrationRepository\WIDESEA_IStoragIntegrationRepository.csproj", "{5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -403,6 +418,66 @@
 		{9912BD12-4CF7-4A91-8203-47C9C125004C}.Release|Any CPU.Build.0 = Release|Any CPU
 		{9912BD12-4CF7-4A91-8203-47C9C125004C}.Release|x86.ActiveCfg = Release|Any CPU
 		{9912BD12-4CF7-4A91-8203-47C9C125004C}.Release|x86.Build.0 = Release|Any CPU
+		{55326F38-372A-4606-B7FB-8C01BBAEC4FC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{55326F38-372A-4606-B7FB-8C01BBAEC4FC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{55326F38-372A-4606-B7FB-8C01BBAEC4FC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{55326F38-372A-4606-B7FB-8C01BBAEC4FC}.Debug|x86.Build.0 = Debug|Any CPU
+		{55326F38-372A-4606-B7FB-8C01BBAEC4FC}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
+		{55326F38-372A-4606-B7FB-8C01BBAEC4FC}.Dev|Any CPU.Build.0 = Debug|Any CPU
+		{55326F38-372A-4606-B7FB-8C01BBAEC4FC}.Dev|x86.ActiveCfg = Debug|Any CPU
+		{55326F38-372A-4606-B7FB-8C01BBAEC4FC}.Dev|x86.Build.0 = Debug|Any CPU
+		{55326F38-372A-4606-B7FB-8C01BBAEC4FC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{55326F38-372A-4606-B7FB-8C01BBAEC4FC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{55326F38-372A-4606-B7FB-8C01BBAEC4FC}.Release|x86.ActiveCfg = Release|Any CPU
+		{55326F38-372A-4606-B7FB-8C01BBAEC4FC}.Release|x86.Build.0 = Release|Any CPU
+		{94D572FA-810E-4897-B673-AF988FD4019E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{94D572FA-810E-4897-B673-AF988FD4019E}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{94D572FA-810E-4897-B673-AF988FD4019E}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{94D572FA-810E-4897-B673-AF988FD4019E}.Debug|x86.Build.0 = Debug|Any CPU
+		{94D572FA-810E-4897-B673-AF988FD4019E}.Dev|Any CPU.ActiveCfg = Debug|Any CPU
+		{94D572FA-810E-4897-B673-AF988FD4019E}.Dev|Any CPU.Build.0 = Debug|Any CPU
+		{94D572FA-810E-4897-B673-AF988FD4019E}.Dev|x86.ActiveCfg = Debug|Any CPU
+		{94D572FA-810E-4897-B673-AF988FD4019E}.Dev|x86.Build.0 = Debug|Any CPU
+		{94D572FA-810E-4897-B673-AF988FD4019E}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{94D572FA-810E-4897-B673-AF988FD4019E}.Release|Any CPU.Build.0 = Release|Any CPU
+		{94D572FA-810E-4897-B673-AF988FD4019E}.Release|x86.ActiveCfg = Release|Any CPU
+		{94D572FA-810E-4897-B673-AF988FD4019E}.Release|x86.Build.0 = Release|Any CPU
+		{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}.Debug|x86.Build.0 = Debug|Any CPU
+		{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}.Dev|Any CPU.ActiveCfg = Release|Any CPU
+		{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}.Dev|Any CPU.Build.0 = Release|Any CPU
+		{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}.Dev|x86.ActiveCfg = Release|Any CPU
+		{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}.Dev|x86.Build.0 = Release|Any CPU
+		{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}.Release|Any CPU.Build.0 = Release|Any CPU
+		{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}.Release|x86.ActiveCfg = Release|Any CPU
+		{461A73BF-9FC7-4BFE-9BEB-2AE686CBFEEC}.Release|x86.Build.0 = Release|Any CPU
+		{B317068F-39F2-4E0E-9980-4C4A037C47BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{B317068F-39F2-4E0E-9980-4C4A037C47BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{B317068F-39F2-4E0E-9980-4C4A037C47BF}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{B317068F-39F2-4E0E-9980-4C4A037C47BF}.Debug|x86.Build.0 = Debug|Any CPU
+		{B317068F-39F2-4E0E-9980-4C4A037C47BF}.Dev|Any CPU.ActiveCfg = Release|Any CPU
+		{B317068F-39F2-4E0E-9980-4C4A037C47BF}.Dev|Any CPU.Build.0 = Release|Any CPU
+		{B317068F-39F2-4E0E-9980-4C4A037C47BF}.Dev|x86.ActiveCfg = Release|Any CPU
+		{B317068F-39F2-4E0E-9980-4C4A037C47BF}.Dev|x86.Build.0 = Release|Any CPU
+		{B317068F-39F2-4E0E-9980-4C4A037C47BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{B317068F-39F2-4E0E-9980-4C4A037C47BF}.Release|Any CPU.Build.0 = Release|Any CPU
+		{B317068F-39F2-4E0E-9980-4C4A037C47BF}.Release|x86.ActiveCfg = Release|Any CPU
+		{B317068F-39F2-4E0E-9980-4C4A037C47BF}.Release|x86.Build.0 = Release|Any CPU
+		{5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Debug|x86.ActiveCfg = Debug|Any CPU
+		{5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Debug|x86.Build.0 = Debug|Any CPU
+		{5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Dev|Any CPU.ActiveCfg = Release|Any CPU
+		{5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Dev|Any CPU.Build.0 = Release|Any CPU
+		{5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Dev|x86.ActiveCfg = Release|Any CPU
+		{5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Dev|x86.Build.0 = Release|Any CPU
+		{5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Release|Any CPU.Build.0 = Release|Any CPU
+		{5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Release|x86.ActiveCfg = Release|Any CPU
+		{5BBF8BD2-3334-4793-87BF-48E1AC4CFD05}.Release|x86.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -432,6 +507,10 @@
 		{986CA639-B3B4-4D4F-B12B-3D8FBA48B2B1} = {A73C1AFF-FF92-4825-B607-2E908077EBA4}
 		{4BDE58B2-5B2E-480B-932F-D63C2A7D557C} = {8498AA9D-CDC4-4FD2-81AE-DE6AD78F75ED}
 		{9912BD12-4CF7-4A91-8203-47C9C125004C} = {8498AA9D-CDC4-4FD2-81AE-DE6AD78F75ED}
+		{55326F38-372A-4606-B7FB-8C01BBAEC4FC} = {8498AA9D-CDC4-4FD2-81AE-DE6AD78F75ED}
+		{94D572FA-810E-4897-B673-AF988FD4019E} = {A73C1AFF-FF92-4825-B607-2E908077EBA4}
+		{B317068F-39F2-4E0E-9980-4C4A037C47BF} = {798C4C07-A3B2-47AD-A69C-922D5217B5CA}
+		{5BBF8BD2-3334-4793-87BF-48E1AC4CFD05} = {B131DEBD-A555-490B-B448-46425298E427}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {599A7267-7402-4143-84AE-9B407FC2BB69}

--
Gitblit v1.9.3