From 39368ecce1a87b67057d050ed913ab3ccb6bb3fd Mon Sep 17 00:00:00 2001
From: dengjunjie <dengjunjie@hnkhzn.com>
Date: 星期一, 14 十月 2024 15:31:36 +0800
Subject: [PATCH] 1
---
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommandW.cs | 48 ++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.FileListAbsolute.txt | 42 ++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.FileListAbsolute.txt | 28 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.FileListAbsolute.txt | 24 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/obj/Debug/net6.0/WIDESEAWCS_Core.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.FileListAbsolute.txt | 20
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommandR.cs | 59 ++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.genruntimeconfig.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.pack.json | 20
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.FileListAbsolute.txt | 24 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/Enum/ConveyorLineStatus.cs | 8
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.FileListAbsolute.txt | 206 +++++++++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.FileListAbsolute.txt | 30 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.build.json | 43 ++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.development.json | 6
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineDBName.cs | 46 ++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs | 73 +-
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.FileListAbsolute.txt | 26 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Filter/CustomProfile.cs | 3
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.FileListAbsolute.txt | 26 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.FileListAbsolute.txt | 44 ++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.FileListAbsolute.txt | 26 +
.gitignore | 59 ++
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.FileListAbsolute.txt | 28 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.AssemblyReference.cache | 0
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.FileListAbsolute.txt | 22 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.FileListAbsolute.txt | 24 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.FileListAbsolute.txt | 28 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs | 1
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/obj/Debug/net6.0/WIDESEAWCS_Core.AssemblyInfo.cs | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.FileListAbsolute.txt | 34 +
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Extensions/SqlsugarSetup.cs | 6
/dev/null | 38 -
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.CoreCompileInputs.cache | 4
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.AssemblyInfoInputs.cache | 2
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.csproj.FileListAbsolute.txt | 20
代码管理/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.CoreCompileInputs.cache | 4
100 files changed, 1,092 insertions(+), 112 deletions(-)
diff --git a/.gitignore b/.gitignore
index 54354ea..8ee3199 100644
--- a/.gitignore
+++ b/.gitignore
@@ -12,3 +12,62 @@
/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/DesignTimeBuild
/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/config
/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/FileContentIndex
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/obj/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Communicator
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/obj/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/refint
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/bin/Debug/net6.0
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/ref
+/浠ｇ爜绠＄悊/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/refint
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfo.cs"
index 9fa8ca1..cfa4be4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfo.cs"
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_BasicInfoRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_BasicInfoRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_BasicInfoRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfoInputs.cache"
index 2d7ecc4..247898a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-78fb043b4fbd17a50e787c19f6106156f588d61de3527232995db3fb9888992f
+1a02ce895731f74586184a864f6a291312515066a4c6f346e6fd4d780ac8671d
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.AssemblyReference.cache"
index 339276f..ebf06a2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.CoreCompileInputs.cache"
index 3c83038..f4ebcc2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
220649c226d46cd84a4c26e02012f34135b1112f9f776790f9e68f1ff56ad0ce
+=======
+6545209ddac48a8c77b86d4711b6c31fe60145702fe763c3b8c33064953c927f
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.FileListAbsolute.txt"
index e3ccefe..fcd8d0a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_BasicInfoRepository.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.pdb
@@ -21,3 +22,28 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\obj\Debug\net6.0\refint\WIDESEAWCS_BasicInfoRepository.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\obj\Debug\net6.0\ref\WIDESEAWCS_BasicInfoRepository.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\obj\Debug\net6.0\refint\WIDESEAWCS_BasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoRepository\obj\Debug\net6.0\ref\WIDESEAWCS_BasicInfoRepository.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfo.cs"
index 65bd080..1ab12a8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfo.cs"
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_BasicInfoService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_BasicInfoService")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_BasicInfoService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfoInputs.cache"
index 867eaee..fe1416e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-539c4c2c6af92f304207d5c4dbd33f91775b6211c5be20cbed68f77593fda0d6
+19ca51e3ef0d74623e1d894df73539e6bd312a9d2a4f31ddca9c86e6c6e3dd2c
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.AssemblyReference.cache"
index 836a019..ed985f4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.CoreCompileInputs.cache"
index e62705f..47cad78 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
a544667e0713869d3edb37c78b57e6130237263e6ff8e2820ca77ea9c0106a83
+=======
+48d7515458d9a87b5f90320b2e206dce434ea3cb410dce94ae4b0c378db47761
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.FileListAbsolute.txt"
index a884f9e..967b183 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/obj/Debug/net6.0/WIDESEAWCS_BasicInfoService.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_BasicInfoService.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_BasicInfoService.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_BasicInfoService.pdb
@@ -29,3 +30,36 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\obj\Debug\net6.0\refint\WIDESEAWCS_BasicInfoService.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\obj\Debug\net6.0\WIDESEAWCS_BasicInfoService.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\obj\Debug\net6.0\ref\WIDESEAWCS_BasicInfoService.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_BasicInfoService.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_BasicInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_BasicInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_Communicator.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_QuartzJob.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_QuartzJob.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_Communicator.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\obj\Debug\net6.0\WIDESEAWCS_BasicInfoService.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\obj\Debug\net6.0\WIDESEAWCS_BasicInfoService.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\obj\Debug\net6.0\WIDESEAWCS_BasicInfoService.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\obj\Debug\net6.0\WIDESEAWCS_BasicInfoService.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\obj\Debug\net6.0\WIDESEAWCS_BasicInfoService.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\obj\Debug\net6.0\WIDESEAWCS_BasicInfoService.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\obj\Debug\net6.0\WIDESEAWCS_BasicInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\obj\Debug\net6.0\refint\WIDESEAWCS_BasicInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\obj\Debug\net6.0\WIDESEAWCS_BasicInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_BasicInfoService\obj\Debug\net6.0\ref\WIDESEAWCS_BasicInfoService.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Extensions/SqlsugarSetup.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Extensions/SqlsugarSetup.cs"
index a115f0e..2357478 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Extensions/SqlsugarSetup.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Extensions/SqlsugarSetup.cs"
@@ -52,9 +52,9 @@
{
MiniProfiler.Current.CustomTiming("SQL锛�", GetParas(p) + "銆怱QL璇彞銆戯細" + sql);
});
- Console.Out.WriteLine(GetParas(p));
- Console.Out.WriteLine(sql);
- Console.Out.WriteLine();
+ //Console.Out.WriteLine(GetParas(p));
+ //Console.Out.WriteLine(sql);
+ //Console.Out.WriteLine();
}
},
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/obj/Debug/net6.0/WIDESEAWCS_Core.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/obj/Debug/net6.0/WIDESEAWCS_Core.AssemblyInfo.cs"
index 5bb70ce..9ea6306 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/obj/Debug/net6.0/WIDESEAWCS_Core.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/obj/Debug/net6.0/WIDESEAWCS_Core.AssemblyInfo.cs"
@@ -15,7 +15,7 @@
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyDescriptionAttribute("鏇存柊鎺ュ彛璁块棶鎺堟潈闂")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.3.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.3+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_Core")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_Core")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.3.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/obj/Debug/net6.0/WIDESEAWCS_Core.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/obj/Debug/net6.0/WIDESEAWCS_Core.AssemblyInfoInputs.cache"
index 25bc320..484e84b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/obj/Debug/net6.0/WIDESEAWCS_Core.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/obj/Debug/net6.0/WIDESEAWCS_Core.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-2b21c9c5c78c3790bab3d1fe63bb0bd4d391a489d6576600ac0b4bac4fcc916c
+c0837e3e03bca719db464e73a6946dfd42fa8aae6011750dad1a58627b0e2502
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfo.cs"
index f11bc74..b82e569 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfo.cs"
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_DTO")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_DTO")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_DTO")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfoInputs.cache"
index c702480..944b739 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-2f740b687f5039e289ebbb18d9edd3c5457255e62467b0b79304020786c1187e
+bfdf61c905df123d8d15dad50ecb86ae9d0dc5cd7f6d4c2fd89b069d03a31853
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.AssemblyReference.cache"
index 339276f..7538548 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.CoreCompileInputs.cache"
index 678a820..0faecfc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
84d017502d0150b8a33f1221905eaac4631d48fc932480e67a7cadae7a6ed0c0
+=======
+0c4577d8fad0895b854148224c94dc12c62fb203ca1f64857b2bbd13efcccb51
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.FileListAbsolute.txt"
index cade281..75808ac 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_DTO/obj/Debug/net6.0/WIDESEAWCS_DTO.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\bin\Debug\net6.0\WIDESEAWCS_DTO.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
@@ -17,3 +18,24 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\obj\Debug\net6.0\refint\WIDESEAWCS_DTO.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\obj\Debug\net6.0\WIDESEAWCS_DTO.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\obj\Debug\net6.0\ref\WIDESEAWCS_DTO.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\bin\Debug\net6.0\WIDESEAWCS_DTO.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\obj\Debug\net6.0\WIDESEAWCS_DTO.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\obj\Debug\net6.0\WIDESEAWCS_DTO.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\obj\Debug\net6.0\WIDESEAWCS_DTO.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\obj\Debug\net6.0\WIDESEAWCS_DTO.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\obj\Debug\net6.0\WIDESEAWCS_DTO.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\obj\Debug\net6.0\WIDESEAWCS_DTO.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\obj\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\obj\Debug\net6.0\refint\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\obj\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_DTO\obj\Debug\net6.0\ref\WIDESEAWCS_DTO.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfo.cs"
index 8b6cd93..d816a54 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfo.cs"
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_IBasicInfoRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_IBasicInfoRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_IBasicInfoRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfoInputs.cache"
index 534ba8c..0d5e09c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-b011ea5d486befaee3a5f96a33c872937bfa8aa2dec3db5a97f6829331c83cd6
+8315c9a0802bfb690f1b504e1eb517b9f0c680e76aaa3447b28ff293df5df5e8
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.AssemblyReference.cache"
index 339276f..2c82176 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.CoreCompileInputs.cache"
index 0aef8d4..1c04dd8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
7c5acd0bbe1ec79233dcb7847eb2e0d45509efba64e5a3e37aeed7f344aba749
+=======
+0796296cafb68acb9a32359c0f2e59d6106bf3d48dc1be914d5efc7de8ea2ba4
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.FileListAbsolute.txt"
index 1ca6cf3..64cd9f1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoRepository/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoRepository.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.pdb
@@ -19,3 +20,26 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\obj\Debug\net6.0\refint\WIDESEAWCS_IBasicInfoRepository.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\obj\Debug\net6.0\ref\WIDESEAWCS_IBasicInfoRepository.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\obj\Debug\net6.0\refint\WIDESEAWCS_IBasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoRepository\obj\Debug\net6.0\ref\WIDESEAWCS_IBasicInfoRepository.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfo.cs"
index fea308c..df81b39 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfo.cs"
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_IBasicInfoService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_IBasicInfoService")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_IBasicInfoService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfoInputs.cache"
index a22b8a0..86404a2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-0b796ce708123ebd0f4879f4affb4434afda0eeced46d82b60270b5cfa163d17
+478ac4f1679e67b10549f12a2edc3dd87da898ad66094b8ff7fcd988c1118e35
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.AssemblyReference.cache"
index 339276f..a468f0d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.CoreCompileInputs.cache"
index 168d8d5..e2e1bf2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
1b13591bcba33f252807cdf70979c702f941f564b3bf848ac5dc6e12d98032c7
+=======
+1e23e9ea2005398da01eece7f33a6cd4c9302558c49da8c11138a91a15226429
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.FileListAbsolute.txt"
index 95684cb..f152d86 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/obj/Debug/net6.0/WIDESEAWCS_IBasicInfoService.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoService.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoService.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoService.pdb
@@ -23,3 +24,30 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\obj\Debug\net6.0\refint\WIDESEAWCS_IBasicInfoService.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoService.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\obj\Debug\net6.0\ref\WIDESEAWCS_IBasicInfoService.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoService.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoService.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoService.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoService.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoService.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoService.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoService.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\obj\Debug\net6.0\refint\WIDESEAWCS_IBasicInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\obj\Debug\net6.0\WIDESEAWCS_IBasicInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_IBasicInfoService\obj\Debug\net6.0\ref\WIDESEAWCS_IBasicInfoService.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfo.cs"
index 6379e1b..3a12074 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfo.cs"
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_ISystemRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_ISystemRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_ISystemRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfoInputs.cache"
index 518cbc8..8d91f5a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-3433b78531174a08fd65fd5fada3cdfc07a4e87934d7c47350fe713dc0adb707
+10a8774f2402def9a7e661c53d78f274a789fff1114cc48c5cb9424cf7c8f785
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.AssemblyReference.cache"
index 339276f..2c82176 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.CoreCompileInputs.cache"
index 8dc0d92..b7fa949 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
12f039c043746d00eec890619d7a51348d1e37e90474b00922760f7ae402412b
+=======
+b476eb65c494eb48257b410f8e52e456ee8d7ddd268c9d655c29b11bf0a5ed31
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.FileListAbsolute.txt"
index 3dc120e..54eefe6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemRepository/obj/Debug/net6.0/WIDESEAWCS_ISystemRepository.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\bin\Debug\net6.0\WIDESEAWCS_ISystemRepository.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\bin\Debug\net6.0\WIDESEAWCS_ISystemRepository.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\bin\Debug\net6.0\WIDESEAWCS_ISystemRepository.pdb
@@ -19,3 +20,26 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\obj\Debug\net6.0\refint\WIDESEAWCS_ISystemRepository.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\obj\Debug\net6.0\WIDESEAWCS_ISystemRepository.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\obj\Debug\net6.0\ref\WIDESEAWCS_ISystemRepository.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\bin\Debug\net6.0\WIDESEAWCS_ISystemRepository.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\bin\Debug\net6.0\WIDESEAWCS_ISystemRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\bin\Debug\net6.0\WIDESEAWCS_ISystemRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\obj\Debug\net6.0\WIDESEAWCS_ISystemRepository.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\obj\Debug\net6.0\WIDESEAWCS_ISystemRepository.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\obj\Debug\net6.0\WIDESEAWCS_ISystemRepository.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\obj\Debug\net6.0\WIDESEAWCS_ISystemRepository.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\obj\Debug\net6.0\WIDESEAWCS_ISystemRepository.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\obj\Debug\net6.0\WIDESEAWCS_ISystemRepository.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\obj\Debug\net6.0\WIDESEAWCS_ISystemRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\obj\Debug\net6.0\refint\WIDESEAWCS_ISystemRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\obj\Debug\net6.0\WIDESEAWCS_ISystemRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemRepository\obj\Debug\net6.0\ref\WIDESEAWCS_ISystemRepository.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfo.cs"
index 5285375..16f5051 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfo.cs"
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_ISystemServices")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_ISystemServices")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_ISystemServices")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfoInputs.cache"
index 5844c11..1cddf3c 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-63f33664d5112ac54dbfa73d16cb5390d21f6db8f85ff9ab4babba3823332b11
+5913c1082f24212900c49921699dd1f5fb5b04d438ff6dc8c2b983378f401b79
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.AssemblyReference.cache"
index 339276f..5442543 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.CoreCompileInputs.cache"
index ef3da1b..f1bf56b 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
2d0f5f854966b7a51244a7062fbcc20ea2307ca400cab30fdb24b35838062813
+=======
+8125cbce473e1e30727dc9dbccc44ec7893889df59a508864de38bc406d69f03
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.FileListAbsolute.txt"
index 09e28e7..8b89eb6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ISystemServices/obj/Debug/net6.0/WIDESEAWCS_ISystemServices.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_ISystemServices.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_ISystemServices.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_ISystemServices.pdb
@@ -23,3 +24,30 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\obj\Debug\net6.0\refint\WIDESEAWCS_ISystemServices.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\obj\Debug\net6.0\WIDESEAWCS_ISystemServices.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\obj\Debug\net6.0\ref\WIDESEAWCS_ISystemServices.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_ISystemServices.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_ISystemServices.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_ISystemServices.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_ISystemRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_SystemRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_SystemRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_ISystemRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\obj\Debug\net6.0\WIDESEAWCS_ISystemServices.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\obj\Debug\net6.0\WIDESEAWCS_ISystemServices.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\obj\Debug\net6.0\WIDESEAWCS_ISystemServices.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\obj\Debug\net6.0\WIDESEAWCS_ISystemServices.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\obj\Debug\net6.0\WIDESEAWCS_ISystemServices.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\obj\Debug\net6.0\WIDESEAWCS_ISystemServices.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\obj\Debug\net6.0\WIDESEAWCS_ISystemServices.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\obj\Debug\net6.0\refint\WIDESEAWCS_ISystemServices.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\obj\Debug\net6.0\WIDESEAWCS_ISystemServices.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ISystemServices\obj\Debug\net6.0\ref\WIDESEAWCS_ISystemServices.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfo.cs"
index ff6205f..a0caf13 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfo.cs"
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_ITaskInfoRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_ITaskInfoRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_ITaskInfoRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfoInputs.cache"
index 83636dd..371438e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-7e2aeed86ca3b7de4b3616b98aba0e5adb602dc3b37fe37243282a6e2d6a4545
+42a13d5d0e4bd2ad3196ce18bbe2715963d643a5a388752c0ead489d8721e19b
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.AssemblyReference.cache"
index 339276f..2c82176 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.CoreCompileInputs.cache"
index 65f5b28..944799a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
29cebb57664b3c550d67a43a5c33f9d14c840d78e676030cbd062553549e780f
+=======
+f76e3d39cf01792cb431433e724c2030b68fc2ac308f26b697983c0181435b57
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.FileListAbsolute.txt"
index 18a1316..af947b0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoRepository.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.pdb
@@ -19,3 +20,26 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\obj\Debug\net6.0\refint\WIDESEAWCS_ITaskInfoRepository.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\obj\Debug\net6.0\ref\WIDESEAWCS_ITaskInfoRepository.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\obj\Debug\net6.0\refint\WIDESEAWCS_ITaskInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoRepository\obj\Debug\net6.0\ref\WIDESEAWCS_ITaskInfoRepository.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfo.cs"
index a44e217..8a95884 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfo.cs"
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_ITaskInfoService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_ITaskInfoService")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_ITaskInfoService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfoInputs.cache"
index abf2483..f96adb5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-23e361bf633ed481105799b3c06cdd035fbf741f32b0e4e6ad8e610bb5c73c76
+e915453955b14ba1ca63ac72230af73c663342a8b15c17ea24d03e0b52126539
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.AssemblyReference.cache"
index 339276f..cd66f82 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.CoreCompileInputs.cache"
index ac5711d..734146d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
8265b64247414ca77f3a03d4418e8d96198b0ac53ab247242a470e761ad5ab79
+=======
+241c32ad8cc4d196ac958cbbb07290d17a0b62d885215cbad05bfdca1c105e61
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.FileListAbsolute.txt"
index 4f36b4f..4b7efbc 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/obj/Debug/net6.0/WIDESEAWCS_ITaskInfoService.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoService.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoService.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoService.pdb
@@ -23,3 +24,30 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\obj\Debug\net6.0\refint\WIDESEAWCS_ITaskInfoService.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoService.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\obj\Debug\net6.0\ref\WIDESEAWCS_ITaskInfoService.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoService.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoService.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoService.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoService.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoService.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoService.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoService.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\obj\Debug\net6.0\refint\WIDESEAWCS_ITaskInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\obj\Debug\net6.0\WIDESEAWCS_ITaskInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_ITaskInfoService\obj\Debug\net6.0\ref\WIDESEAWCS_ITaskInfoService.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfo.cs"
index fa5904a..b52818a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfo.cs"
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_Model")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_Model")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_Model")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfoInputs.cache"
index 3865ce4..5d63107 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-131f5d8bada5bbb235292caf19e656b91861f60dc98e270d28a7952da735f20a
+90df36418cbb1c68cb1f64b9cec9732da998d9e62cc506489778f81736454ab3
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.csproj.AssemblyReference.cache"
index 339276f..671b780 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.csproj.CoreCompileInputs.cache"
index 733841f..fec6ea5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
0a502f1acc4cc72ab3a40ca5ceca02744743b6398cedae57917dd8cb032c1e6b
+=======
+2e0ba6bda6c188d8613756f8218633b5c86fac109585393dbd0a82ebe0cf494c
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.csproj.FileListAbsolute.txt"
index 6aef621..2a0f940 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/obj/Debug/net6.0/WIDESEAWCS_Model.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\bin\Debug\net6.0\WIDESEAWCS_Model.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\bin\Debug\net6.0\WIDESEAWCS_Model.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
@@ -15,3 +16,22 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\obj\Debug\net6.0\refint\WIDESEAWCS_Model.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\obj\Debug\net6.0\WIDESEAWCS_Model.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\obj\Debug\net6.0\ref\WIDESEAWCS_Model.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\bin\Debug\net6.0\WIDESEAWCS_Model.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\obj\Debug\net6.0\WIDESEAWCS_Model.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\obj\Debug\net6.0\WIDESEAWCS_Model.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\obj\Debug\net6.0\WIDESEAWCS_Model.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\obj\Debug\net6.0\WIDESEAWCS_Model.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\obj\Debug\net6.0\WIDESEAWCS_Model.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\obj\Debug\net6.0\WIDESEAWCS_Model.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\obj\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\obj\Debug\net6.0\refint\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\obj\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Model\obj\Debug\net6.0\ref\WIDESEAWCS_Model.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/Enum/ConveyorLineStatus.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/Enum/ConveyorLineStatus.cs"
index cce64f5..fecb23e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/Enum/ConveyorLineStatus.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/Enum/ConveyorLineStatus.cs"
@@ -19,6 +19,12 @@
/// 鏄惁琚崰鐢�
/// </summary>
[Description("鏄惁琚崰鐢�")]
- IsOccupied
+ IsOccupied,
+
+ /// <summary>
+ /// 鏈夎揣寰呭懡
+ /// </summary>
+ [Description("鏈夎揣寰呭懡")]
+ Stored = 200
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.AssemblyInfo.cs"
index 99be164..124ff8e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.AssemblyInfo.cs"
@@ -15,7 +15,7 @@
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyDescriptionAttribute("璁惧绠＄悊鍙婅皟搴�")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_QuartzJob")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_QuartzJob")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.AssemblyInfoInputs.cache"
index fb05b9e..9ae1576 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-b4fe1434d044da7ffff66957ecbf0d44389158e24a38f7643d0f7a58014142be
+6ca76aa9016fad2c4eb543b47ac3680d5b042656cbe0f981f94d303eddbf7e8f
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.AssemblyReference.cache"
index 836a019..d5c09e6 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.CoreCompileInputs.cache"
index 61d73d1..e5fb47e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
39aed6ab9c83a2f7c293ebaaae1a49585351450d3492f77ae724509884b188b0
+=======
+811a45b2bce0b4ad8fd10dd1ad22d4a55eee9d73bbc7c16cfd6b0b11c20df49b
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.FileListAbsolute.txt"
index 6468655..857e555 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/obj/Debug/net6.0/WIDESEAWCS_QuartzJob.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\bin\Debug\net6.0\WIDESEAWCS_QuartzJob.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\bin\Debug\net6.0\WIDESEAWCS_QuartzJob.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\bin\Debug\net6.0\WIDESEAWCS_QuartzJob.pdb
@@ -15,3 +16,22 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\obj\Debug\net6.0\refint\WIDESEAWCS_QuartzJob.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\obj\Debug\net6.0\WIDESEAWCS_QuartzJob.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\obj\Debug\net6.0\ref\WIDESEAWCS_QuartzJob.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\bin\Debug\net6.0\WIDESEAWCS_QuartzJob.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\bin\Debug\net6.0\WIDESEAWCS_QuartzJob.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\bin\Debug\net6.0\WIDESEAWCS_QuartzJob.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\bin\Debug\net6.0\WIDESEAWCS_Communicator.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\bin\Debug\net6.0\WIDESEAWCS_Communicator.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\obj\Debug\net6.0\WIDESEAWCS_QuartzJob.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\obj\Debug\net6.0\WIDESEAWCS_QuartzJob.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\obj\Debug\net6.0\WIDESEAWCS_QuartzJob.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\obj\Debug\net6.0\WIDESEAWCS_QuartzJob.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\obj\Debug\net6.0\WIDESEAWCS_QuartzJob.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\obj\Debug\net6.0\WIDESEAWCS_QuartzJob.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\obj\Debug\net6.0\WIDESEAWCS_QuartzJob.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\obj\Debug\net6.0\refint\WIDESEAWCS_QuartzJob.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\obj\Debug\net6.0\WIDESEAWCS_QuartzJob.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_QuartzJob\obj\Debug\net6.0\ref\WIDESEAWCS_QuartzJob.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Filter/CustomProfile.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Filter/CustomProfile.cs"
index a76f5cd..515e1d0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Filter/CustomProfile.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Filter/CustomProfile.cs"
@@ -20,8 +20,9 @@
public CustomProfile()
{
CreateMap<Dt_DeviceInfo,DeviceInfoDTO>();
+ CreateMap<Dt_Task, ConveyorLineTaskCommandW>();
CreateMap<WMSTaskDTO, Dt_Task>().ForMember(a => a.WMSId, b => b.MapFrom(b => b.Id));
- CreateMap<Dt_Task, ConveyorLineTaskCommand>().ForMember(a => a.TargetAddress, b => b.MapFrom(b => b.NextAddress)).ForMember(a => a.Barcode, b => b.MapFrom(b => b.PalletCode)).ForMember(a => a.TaskNum, b => b.MapFrom(b => b.TaskNum));
+ //CreateMap<Dt_Task, ConveyorLineTaskCommandR>().ForMember(a => a.TargetAddress, b => b.MapFrom(b => b.NextAddress)).ForMember(a => a.Barcode, b => b.MapFrom(b => b.PalletCode)).ForMember(a => a.TaskNum, b => b.MapFrom(b => b.TaskNum));
}
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache"
index 836a019..61c8cc2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.CoreCompileInputs.cache"
index ddfb43b..02e602d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
91d8a6ce375c72fb75d7f3de7f1c8f77dc8332f34ca67795e2b05bdafd93ed05
+=======
+2db638ead67b27f8c1cebb0d8157aed82bc8ed3431b3f993c7f9e11488d7eb69
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.FileListAbsolute.txt"
index b413079..d6480da 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\appsettings.Development.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\appsettings.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Server.staticwebassets.runtime.json
@@ -201,3 +202,208 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\WIDESEAWCS_Server.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\WIDESEAWCS_Server.genruntimeconfig.cache
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\ref\WIDESEAWCS_Server.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\appsettings.Development.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\appsettings.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Server.staticwebassets.runtime.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Server.exe
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\index.html
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceInfo.tsv
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceProtocol.tsv
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DeviceProtocolDetail.tsv
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_DispatchInfo.tsv
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_Router.tsv
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_Task.tsv
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Dt_TaskExecuteDetail.tsv
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_Dictionary.tsv
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_DictionaryList.tsv
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_Menu.tsv
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_Role.tsv
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_RoleAuth.tsv
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\wwwroot\WIDESEAWCS_DB.DBSeed.Json\Sys_User.tsv
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Server.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Server.runtimeconfig.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Server.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Server.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Autofac.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Autofac.Extensions.DependencyInjection.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Autofac.Extras.DynamicProxy.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\AutoMapper.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Castle.Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\DynamicExpresso.Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\HslCommunication.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Magicodes.IE.Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Magicodes.IE.EPPlus.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Magicodes.IE.Excel.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.AspNetCore.Authentication.JwtBearer.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.AspNetCore.JsonPatch.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.AspNetCore.Mvc.NewtonsoftJson.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.Data.SqlClient.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.Data.Sqlite.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.Extensions.DependencyInjection.Abstractions.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.Extensions.DependencyModel.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.Identity.Client.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.IdentityModel.Abstractions.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.IdentityModel.JsonWebTokens.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.IdentityModel.Logging.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.IdentityModel.Protocols.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.IdentityModel.Protocols.OpenIdConnect.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.IdentityModel.Tokens.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.IO.RecyclableMemoryStream.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.OpenApi.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Microsoft.Win32.SystemEvents.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\MiniProfiler.AspNetCore.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\MiniProfiler.AspNetCore.Mvc.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\MiniProfiler.Shared.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\MySqlConnector.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Newtonsoft.Json.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Newtonsoft.Json.Bson.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Npgsql.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\OfficeOpenXml.Core.ExcelPackage.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Oracle.ManagedDataAccess.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Oscar.Data.SqlClient.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Quartz.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Scrutor.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\SixLabors.ImageSharp.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\SkiaSharp.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\SQLitePCLRaw.batteries_v2.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\SQLitePCLRaw.core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\SQLitePCLRaw.provider.e_sqlite3.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\SqlSugar.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\DmProvider.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Kdbndp.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Swashbuckle.AspNetCore.Filters.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Swashbuckle.AspNetCore.Filters.Abstractions.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Swashbuckle.AspNetCore.Newtonsoft.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Swashbuckle.AspNetCore.Swagger.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Swashbuckle.AspNetCore.SwaggerGen.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\Swashbuckle.AspNetCore.SwaggerUI.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\System.Configuration.ConfigurationManager.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\System.Diagnostics.DiagnosticSource.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\System.Diagnostics.PerformanceCounter.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\System.DirectoryServices.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\System.DirectoryServices.Protocols.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\System.Drawing.Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\System.IdentityModel.Tokens.Jwt.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\System.IO.Packaging.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\System.IO.Ports.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\System.Linq.Dynamic.Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\System.Runtime.Caching.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\System.Security.Cryptography.Pkcs.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\System.Security.Cryptography.ProtectedData.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\System.Security.Permissions.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\System.Windows.Extensions.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\zh-Hans\Magicodes.IE.Core.resources.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\unix\lib\netcoreapp3.1\Microsoft.Data.SqlClient.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win\lib\netcoreapp3.1\Microsoft.Data.SqlClient.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win-arm\native\Microsoft.Data.SqlClient.SNI.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win-arm64\native\Microsoft.Data.SqlClient.SNI.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win-x64\native\Microsoft.Data.SqlClient.SNI.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win-x86\native\Microsoft.Data.SqlClient.SNI.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win\lib\net6.0\Microsoft.Win32.SystemEvents.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-arm\native\libSystem.IO.Ports.Native.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-arm64\native\libSystem.IO.Ports.Native.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-x64\native\libSystem.IO.Ports.Native.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\osx-arm64\native\libSystem.IO.Ports.Native.dylib
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\osx-x64\native\libSystem.IO.Ports.Native.dylib
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-arm\native\libSkiaSharp.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-arm64\native\libSkiaSharp.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-musl-x64\native\libSkiaSharp.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-x64\native\libSkiaSharp.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\osx\native\libSkiaSharp.dylib
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win-arm64\native\libSkiaSharp.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win-x64\native\libSkiaSharp.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win-x86\native\libSkiaSharp.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\browser-wasm\nativeassets\net6.0\e_sqlite3.a
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-arm\native\libe_sqlite3.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-arm64\native\libe_sqlite3.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-armel\native\libe_sqlite3.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-mips64\native\libe_sqlite3.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-musl-arm\native\libe_sqlite3.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-musl-arm64\native\libe_sqlite3.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-musl-x64\native\libe_sqlite3.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-ppc64le\native\libe_sqlite3.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-s390x\native\libe_sqlite3.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-x64\native\libe_sqlite3.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux-x86\native\libe_sqlite3.so
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\maccatalyst-arm64\native\libe_sqlite3.dylib
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\maccatalyst-x64\native\libe_sqlite3.dylib
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\osx-arm64\native\libe_sqlite3.dylib
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\osx-x64\native\libe_sqlite3.dylib
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win-arm\native\e_sqlite3.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win-arm64\native\e_sqlite3.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win-x64\native\e_sqlite3.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win-x86\native\e_sqlite3.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win\lib\net6.0\System.Diagnostics.PerformanceCounter.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win\lib\net6.0\System.DirectoryServices.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\linux\lib\net6.0\System.DirectoryServices.Protocols.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\osx\lib\net6.0\System.DirectoryServices.Protocols.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win\lib\net6.0\System.DirectoryServices.Protocols.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\unix\lib\net6.0\System.Drawing.Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win\lib\net6.0\System.Drawing.Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\unix\lib\net6.0\System.IO.Ports.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win\lib\net6.0\System.IO.Ports.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win\lib\netstandard2.0\System.Runtime.Caching.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win\lib\net6.0\System.Security.Cryptography.Pkcs.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win\lib\net6.0\System.Security.Cryptography.ProtectedData.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\runtimes\win\lib\net6.0\System.Windows.Extensions.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_BasicInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Communicator.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_ISystemRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_ISystemServices.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_QuartzJob.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_SystemRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_SystemServices.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_TaskInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Tasks.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_QuartzJob.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_SystemServices.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_TaskInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Tasks.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_BasicInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Communicator.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_ISystemRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_ISystemServices.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_SystemRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\WIDESEAWCS_Server.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\WIDESEAWCS_Server.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\WIDESEAWCS_Server.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\WIDESEAWCS_Server.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\WIDESEAWCS_Server.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\WIDESEAWCS_Server.MvcApplicationPartsAssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\WIDESEAWCS_Server.MvcApplicationPartsAssemblyInfo.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\staticwebassets.build.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\staticwebassets.development.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\staticwebassets\msbuild.WIDESEAWCS_Server.Microsoft.AspNetCore.StaticWebAssets.props
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\staticwebassets\msbuild.build.WIDESEAWCS_Server.props
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\staticwebassets\msbuild.buildMultiTargeting.WIDESEAWCS_Server.props
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\staticwebassets\msbuild.buildTransitive.WIDESEAWCS_Server.props
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\staticwebassets.pack.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\scopedcss\bundle\WIDESEAWCS_Server.styles.css
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\WIDESEAWCS_Server.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\WIDESEAWCS_Server.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\refint\WIDESEAWCS_Server.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\WIDESEAWCS_Server.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\WIDESEAWCS_Server.genruntimeconfig.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\obj\Debug\net6.0\ref\WIDESEAWCS_Server.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.genruntimeconfig.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.genruntimeconfig.cache"
index d7114ae..c67d912 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.genruntimeconfig.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/WIDESEAWCS_Server.genruntimeconfig.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
c78a6fac196de9c8d60dae6319120b983b2543c562aae6768da769c226ffb2f5
+=======
+9143e7a68fbc37c20e50a7c29a94c5068b3c3831899bd8c808b8f3833f1f26a5
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.build.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.build.json"
index 9348bb9..d2cde2d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.build.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.build.json"
@@ -1,6 +1,10 @@
{
"Version": 1,
+<<<<<<< HEAD
"Hash": "KywYYV+qnbKmg+roTXXghKf35LFqigGGAHUqA/shU10=",
+=======
+ "Hash": "U0AJ2WC57jzR84vGY0ZpDmmcRC95tocvDGZIzAf1O5w=",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"Source": "WIDESEAWCS_Server",
"BasePath": "_content/WIDESEAWCS_Server",
"Mode": "Default",
@@ -10,17 +14,28 @@
{
"Name": "WIDESEAWCS_Server\\wwwroot",
"Source": "WIDESEAWCS_Server",
+<<<<<<< HEAD
"ContentRoot": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+=======
+ "ContentRoot": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"BasePath": "_content/WIDESEAWCS_Server",
"Pattern": "**"
}
],
"Assets": [
{
+<<<<<<< HEAD
"Identity": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\css\\style.css",
"SourceId": "WIDESEAWCS_Server",
"SourceType": "Discovered",
"ContentRoot": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+=======
+ "Identity": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\css\\style.css",
+ "SourceId": "WIDESEAWCS_Server",
+ "SourceType": "Discovered",
+ "ContentRoot": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"BasePath": "_content/WIDESEAWCS_Server",
"RelativePath": "css/style.css",
"AssetKind": "All",
@@ -36,10 +51,17 @@
"OriginalItemSpec": "wwwroot\\css\\style.css"
},
{
+<<<<<<< HEAD
"Identity": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\favicon.ico",
"SourceId": "WIDESEAWCS_Server",
"SourceType": "Discovered",
"ContentRoot": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+=======
+ "Identity": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\favicon.ico",
+ "SourceId": "WIDESEAWCS_Server",
+ "SourceType": "Discovered",
+ "ContentRoot": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"BasePath": "_content/WIDESEAWCS_Server",
"RelativePath": "favicon.ico",
"AssetKind": "All",
@@ -55,10 +77,17 @@
"OriginalItemSpec": "wwwroot\\favicon.ico"
},
{
+<<<<<<< HEAD
"Identity": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\js\\anime.min.js",
"SourceId": "WIDESEAWCS_Server",
"SourceType": "Discovered",
"ContentRoot": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+=======
+ "Identity": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\js\\anime.min.js",
+ "SourceId": "WIDESEAWCS_Server",
+ "SourceType": "Discovered",
+ "ContentRoot": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"BasePath": "_content/WIDESEAWCS_Server",
"RelativePath": "js/anime.min.js",
"AssetKind": "All",
@@ -74,10 +103,17 @@
"OriginalItemSpec": "wwwroot\\js\\anime.min.js"
},
{
+<<<<<<< HEAD
"Identity": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\logo.jpg.jpg",
"SourceId": "WIDESEAWCS_Server",
"SourceType": "Discovered",
"ContentRoot": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+=======
+ "Identity": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\logo.jpg.jpg",
+ "SourceId": "WIDESEAWCS_Server",
+ "SourceType": "Discovered",
+ "ContentRoot": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"BasePath": "_content/WIDESEAWCS_Server",
"RelativePath": "logo.jpg.jpg",
"AssetKind": "All",
@@ -93,10 +129,17 @@
"OriginalItemSpec": "wwwroot\\logo.jpg.jpg"
},
{
+<<<<<<< HEAD
"Identity": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\swg-login.html",
"SourceId": "WIDESEAWCS_Server",
"SourceType": "Discovered",
"ContentRoot": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+=======
+ "Identity": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\swg-login.html",
+ "SourceId": "WIDESEAWCS_Server",
+ "SourceType": "Discovered",
+ "ContentRoot": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"BasePath": "_content/WIDESEAWCS_Server",
"RelativePath": "swg-login.html",
"AssetKind": "All",
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.development.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.development.json"
index 769ba66..7bb4839 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.development.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.development.json"
@@ -1 +1,5 @@
-{"ContentRoots":["E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\"],"Root":{"Children":{"css":{"Children":{"style.css":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/style.css"},"Patterns":null}},"Asset":null,"Patterns":null},"favicon.ico":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"favicon.ico"},"Patterns":null},"js":{"Children":{"anime.min.js":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"js/anime.min.js"},"Patterns":null}},"Asset":null,"Patterns":null},"logo.jpg.jpg":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"logo.jpg.jpg"},"Patterns":null},"swg-login.html":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"swg-login.html"},"Patterns":null}},"Asset":null,"Patterns":[{"ContentRootIndex":0,"Pattern":"**","Depth":0}]}}
\ No newline at end of file
+<<<<<<< HEAD
+{"ContentRoots":["E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\"],"Root":{"Children":{"css":{"Children":{"style.css":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/style.css"},"Patterns":null}},"Asset":null,"Patterns":null},"favicon.ico":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"favicon.ico"},"Patterns":null},"js":{"Children":{"anime.min.js":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"js/anime.min.js"},"Patterns":null}},"Asset":null,"Patterns":null},"logo.jpg.jpg":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"logo.jpg.jpg"},"Patterns":null},"swg-login.html":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"swg-login.html"},"Patterns":null}},"Asset":null,"Patterns":[{"ContentRootIndex":0,"Pattern":"**","Depth":0}]}}
+=======
+{"ContentRoots":["E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\"],"Root":{"Children":{"css":{"Children":{"style.css":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"css/style.css"},"Patterns":null}},"Asset":null,"Patterns":null},"favicon.ico":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"favicon.ico"},"Patterns":null},"js":{"Children":{"anime.min.js":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"js/anime.min.js"},"Patterns":null}},"Asset":null,"Patterns":null},"logo.jpg.jpg":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"logo.jpg.jpg"},"Patterns":null},"swg-login.html":{"Children":null,"Asset":{"ContentRootIndex":0,"SubPath":"swg-login.html"},"Patterns":null}},"Asset":null,"Patterns":[{"ContentRootIndex":0,"Pattern":"**","Depth":0}]}}
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.pack.json" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.pack.json"
index 56590bc..bda92e8 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.pack.json"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/staticwebassets.pack.json"
@@ -1,6 +1,7 @@
{
"Files": [
{
+<<<<<<< HEAD
"Id": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\css\\style.css",
"PackagePath": "staticwebassets\\css\\style.css"
},
@@ -18,6 +19,25 @@
},
{
"Id": "E:\\椤圭洰闆哱\SanYiWuHu\\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\swg-login.html",
+=======
+ "Id": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\css\\style.css",
+ "PackagePath": "staticwebassets\\css\\style.css"
+ },
+ {
+ "Id": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\favicon.ico",
+ "PackagePath": "staticwebassets\\favicon.ico"
+ },
+ {
+ "Id": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\js\\anime.min.js",
+ "PackagePath": "staticwebassets\\js\\anime.min.js"
+ },
+ {
+ "Id": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\logo.jpg.jpg",
+ "PackagePath": "staticwebassets\\logo.jpg.jpg"
+ },
+ {
+ "Id": "E:\\椤圭洰闆哱\ChuanSuoCheKu\\浠ｇ爜绠＄悊\\WCS\\WIDESEAWCS_Server\\WIDESEAWCS_Server\\wwwroot\\swg-login.html",
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
"PackagePath": "staticwebassets\\swg-login.html"
},
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfo.cs"
index 2cc3eeb..644e546 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfo.cs"
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_SystemRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_SystemRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_SystemRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfoInputs.cache"
index 9b71779..20435be 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-235dd2f83363c071213e2f24bf079d55c78c313e89d043ec8c9bb23b536da2fc
+97e8fb3c80d09e34bf7e367e347b2bc3fa20e3a7bded4e6b23d3cce8ababdf91
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.AssemblyReference.cache"
index 339276f..37b68ad 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.CoreCompileInputs.cache"
index 062be53..97b3dc4 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
009d0fd4198b70e3961d6c21ef623890064d479f5ee5a11778a071fc7e8605ba
+=======
+6f9b2e3cd21913910a1a4c4b8d22957ca55ae5fca5a496d153b20374462e8331
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.FileListAbsolute.txt"
index 6d24186..3a9656d 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemRepository/obj/Debug/net6.0/WIDESEAWCS_SystemRepository.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_SystemRepository.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_SystemRepository.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_SystemRepository.pdb
@@ -21,3 +22,28 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\obj\Debug\net6.0\refint\WIDESEAWCS_SystemRepository.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\obj\Debug\net6.0\WIDESEAWCS_SystemRepository.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\obj\Debug\net6.0\ref\WIDESEAWCS_SystemRepository.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_SystemRepository.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_SystemRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_SystemRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_ISystemRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_ISystemRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\obj\Debug\net6.0\WIDESEAWCS_SystemRepository.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\obj\Debug\net6.0\WIDESEAWCS_SystemRepository.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\obj\Debug\net6.0\WIDESEAWCS_SystemRepository.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\obj\Debug\net6.0\WIDESEAWCS_SystemRepository.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\obj\Debug\net6.0\WIDESEAWCS_SystemRepository.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\obj\Debug\net6.0\WIDESEAWCS_SystemRepository.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\obj\Debug\net6.0\WIDESEAWCS_SystemRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\obj\Debug\net6.0\refint\WIDESEAWCS_SystemRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\obj\Debug\net6.0\WIDESEAWCS_SystemRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemRepository\obj\Debug\net6.0\ref\WIDESEAWCS_SystemRepository.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfo.cs"
index bb0b4bc..ce8261e 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfo.cs"
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_SystemServices")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_SystemServices")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_SystemServices")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfoInputs.cache"
index afdd9d9..42c9cf0 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-3c4d63b9480bddeede2ae3be8288863ccedd3ba11d6f64fc77e15b947650e2b5
+29ede681c70ba4def103928cbcc7a288ad15c1c922825517bcada37e8afd60d6
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.AssemblyReference.cache"
index 339276f..59515eb 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.CoreCompileInputs.cache"
index 2fa5df4..d1f2118 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
84d38d5e1a7fdc7b9fdc0c44f384017a82dd60fa9d0a4c6af949821a72c0f15a
+=======
+0b3a2434a1811cdd86a0e283a5527ae04501bfc2884112944bdc6a765cd63abf
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.FileListAbsolute.txt"
index 23ff0d8..9b50807 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_SystemServices/obj/Debug/net6.0/WIDESEAWCS_SystemServices.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_SystemServices.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_SystemServices.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_SystemServices.pdb
@@ -25,3 +26,32 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\obj\Debug\net6.0\refint\WIDESEAWCS_SystemServices.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\obj\Debug\net6.0\WIDESEAWCS_SystemServices.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\obj\Debug\net6.0\ref\WIDESEAWCS_SystemServices.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_SystemServices.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_SystemServices.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_SystemServices.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_ISystemRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_ISystemServices.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_SystemRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_ISystemServices.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_ISystemRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\bin\Debug\net6.0\WIDESEAWCS_SystemRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\obj\Debug\net6.0\WIDESEAWCS_SystemServices.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\obj\Debug\net6.0\WIDESEAWCS_SystemServices.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\obj\Debug\net6.0\WIDESEAWCS_SystemServices.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\obj\Debug\net6.0\WIDESEAWCS_SystemServices.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\obj\Debug\net6.0\WIDESEAWCS_SystemServices.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\obj\Debug\net6.0\WIDESEAWCS_SystemServices.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\obj\Debug\net6.0\WIDESEAWCS_SystemServices.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\obj\Debug\net6.0\refint\WIDESEAWCS_SystemServices.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\obj\Debug\net6.0\WIDESEAWCS_SystemServices.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_SystemServices\obj\Debug\net6.0\ref\WIDESEAWCS_SystemServices.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfo.cs"
index 169d420..9ec3847 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfo.cs"
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_TaskInfoRepository")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_TaskInfoRepository")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_TaskInfoRepository")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfoInputs.cache"
index 522d702..c6001fd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-f9d8d954ffb52d34aaf48e9c21a03148e8dc09d0bdd9334e194f4a335df9c3bb
+7a639ca6efa7139b54a5dccc3511b66bb5a0704c42c60925fce1e0ab31380415
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.AssemblyReference.cache"
index 339276f..641b7f1 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.CoreCompileInputs.cache"
index cf51172..9a87b84 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
75498181909e36fbf081656497b9955f139fd9e336e77c4d18159d457bc7f65e
+=======
+7f502b903ae161aa56a8a1c5a1cdfe04c7d81eec3a02e0fbc406c74ee182a1be
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.FileListAbsolute.txt"
index b16fd86..d5d70ca 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoRepository/obj/Debug/net6.0/WIDESEAWCS_TaskInfoRepository.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.pdb
@@ -21,3 +22,28 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\obj\Debug\net6.0\refint\WIDESEAWCS_TaskInfoRepository.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\obj\Debug\net6.0\ref\WIDESEAWCS_TaskInfoRepository.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\obj\Debug\net6.0\refint\WIDESEAWCS_TaskInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\obj\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoRepository\obj\Debug\net6.0\ref\WIDESEAWCS_TaskInfoRepository.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
index 26e4a2f..75166cd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs"
@@ -129,6 +129,7 @@
/// <returns></returns>
public WebResponseContent RequestWMSTask(string palletCode, string sourceAddress)
{
+ if (string.IsNullOrEmpty(palletCode)) throw new Exception("鎵樼洏鍙蜂负绌�");
WebResponseContent content = new WebResponseContent();
try
{
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs"
index 9f58259..33789ed 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfo.cs"
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_TaskInfoService")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_TaskInfoService")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_TaskInfoService")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache"
index 841bebb..01850a2 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-3072915953e9359b1d09f08b739c2e05d935c3b016be343b7221c1602d49ff63
+2f0640f62053b3a42b31947fa9eb9e1016dd26283f59088b279d8ecc60807d88
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cache"
index 836a019..9ae6644 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.CoreCompileInputs.cache"
index e9488ad..e71ddd9 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
91634c6146ad44d6a4786a47771cf775f60e0339907e32d549078d46b447238f
+=======
+ac9e7d9fabd546880cf50828fbd57c855a8b7dc112916feea80eee947ac9fd5c
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.FileListAbsolute.txt"
index a5057b1..8d893d5 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/obj/Debug/net6.0/WIDESEAWCS_TaskInfoService.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_TaskInfoService.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_TaskInfoService.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_TaskInfoService.pdb
@@ -37,3 +38,44 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\obj\Debug\net6.0\refint\WIDESEAWCS_TaskInfoService.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\obj\Debug\net6.0\WIDESEAWCS_TaskInfoService.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\obj\Debug\net6.0\ref\WIDESEAWCS_TaskInfoService.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_TaskInfoService.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_TaskInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_TaskInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_BasicInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_Communicator.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_QuartzJob.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_BasicInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_Communicator.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_QuartzJob.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\bin\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\obj\Debug\net6.0\WIDESEAWCS_TaskInfoService.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\obj\Debug\net6.0\WIDESEAWCS_TaskInfoService.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\obj\Debug\net6.0\WIDESEAWCS_TaskInfoService.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\obj\Debug\net6.0\WIDESEAWCS_TaskInfoService.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\obj\Debug\net6.0\WIDESEAWCS_TaskInfoService.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\obj\Debug\net6.0\WIDESEAWCS_TaskInfoService.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\obj\Debug\net6.0\WIDESEAWCS_TaskInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\obj\Debug\net6.0\refint\WIDESEAWCS_TaskInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\obj\Debug\net6.0\WIDESEAWCS_TaskInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_TaskInfoService\obj\Debug\net6.0\ref\WIDESEAWCS_TaskInfoService.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
index d46c554..80dcab3 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/CommonConveyorLineJob.cs"
@@ -29,6 +29,7 @@
using WIDESEAWCS_ITaskInfoService;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob;
+using WIDESEAWCS_QuartzJob.ConveyorLine.Enum;
using WIDESEAWCS_QuartzJob.DTO;
using WIDESEAWCS_QuartzJob.Service;
using WIDESEAWCS_Tasks.ConveyorLineJob;
@@ -65,23 +66,29 @@
{
//Task task = Task.Run(() =>
//{
- ConveyorLineTaskCommand command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand>(childDeviceCode);
- if (command != null)
+ ConveyorLineTaskCommandR command = conveyorLine.ReadCustomer<ConveyorLineTaskCommandR>(childDeviceCode);
+ if (command != null && command.Status == (ushort)ConveyorLineStatus.Stored)
+ {
+ switch (childDeviceCode)
{
- DeviceProtocolDetailDTO? deviceProtocolDetail = conveyorLine.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.ProtocalDetailValue == command.InteractiveSignal.ToString() && x.DeviceProParamName == nameof(ConveyorLineTaskCommand.InteractiveSignal));
- if (deviceProtocolDetail != null)
- {
- MethodInfo? method = GetType().GetMethod(deviceProtocolDetail.ProtocolDetailType);
- if (method != null)
- {
- method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode });
- }
- else
- {
- //todo 鏈壘鍒版柟娉曟椂
- }
- }
+ case "102":
+ RequestInbound(conveyorLine, command, childDeviceCode);
+ break;
+ case "104":
+ ConveyorLineInFinish(conveyorLine, command, childDeviceCode);
+ break;
+ case "105":
+ RequestOutbound(conveyorLine, command, childDeviceCode);
+ break;
+ case "108":
+ ConveyorLineOutFinish(conveyorLine, command, childDeviceCode);
+ break;
+ default:
+ RequestInNextAddress(conveyorLine, command, childDeviceCode);
+ RequestOutNextAddress(conveyorLine, command, childDeviceCode);
+ break;
}
+ }
//});
//tasks.Add(task);
}
@@ -107,15 +114,15 @@
/// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
/// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
/// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
- public void RequestInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command,string childDeviceCode)
+ public void RequestInbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommandR command, string childDeviceCode)
{
if (_taskService.RequestWMSTask(command.Barcode, childDeviceCode).Status)
{
Dt_Task task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
if (task != null)
{
- ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task);
- taskCommand.InteractiveSignal = command.InteractiveSignal;
+ ConveyorLineTaskCommandW taskCommand = _mapper.Map<ConveyorLineTaskCommandW>(task);
+
conveyorLine.SendCommand(taskCommand, childDeviceCode);
_taskService.UpdateTaskStatusToNext(task);
@@ -129,18 +136,18 @@
/// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
/// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
/// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
- public void RequestInNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
+ public void RequestInNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommandR command, string childDeviceCode)
{
Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
if (task != null)
{
Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
- if (newTask != null)
- {
- ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask);
- taskCommand.InteractiveSignal = command.InteractiveSignal;
- conveyorLine.SendCommand(taskCommand, childDeviceCode);
- }
+ //if (newTask != null)
+ //{
+ // ConveyorLineTaskCommandW taskCommand = _mapper.Map<ConveyorLineTaskCommandW>(newTask);
+
+ // conveyorLine.SendCommand(taskCommand, childDeviceCode);
+ //}
}
}
@@ -150,7 +157,7 @@
/// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
/// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
/// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
- public void ConveyorLineInFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
+ public void ConveyorLineInFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommandR command, string childDeviceCode)
{
Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
if (task != null)
@@ -167,13 +174,13 @@
/// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
/// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
/// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
- public void RequestOutbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
+ public void RequestOutbound(CommonConveyorLine conveyorLine, ConveyorLineTaskCommandR command, string childDeviceCode)
{
Dt_Task task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
if (task != null)
{
- ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(task);
- taskCommand.InteractiveSignal = command.InteractiveSignal;
+ ConveyorLineTaskCommandW taskCommand = _mapper.Map<ConveyorLineTaskCommandW>(task);
+
conveyorLine.SendCommand(taskCommand, childDeviceCode);
_taskService.UpdateTaskStatusToNext(task);
@@ -186,7 +193,7 @@
/// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
/// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
/// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
- public void RequestOutNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
+ public void RequestOutNextAddress(CommonConveyorLine conveyorLine, ConveyorLineTaskCommandR command, string childDeviceCode)
{
Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
if (task != null)
@@ -194,8 +201,8 @@
Dt_Task? newTask = _taskService.UpdatePosition(task.TaskNum, task.CurrentAddress);
if (newTask != null)
{
- ConveyorLineTaskCommand taskCommand = _mapper.Map<ConveyorLineTaskCommand>(newTask);
- taskCommand.InteractiveSignal = command.InteractiveSignal;
+ ConveyorLineTaskCommandW taskCommand = _mapper.Map<ConveyorLineTaskCommandW>(newTask);
+
conveyorLine.SendCommand(taskCommand, childDeviceCode);
}
}
@@ -207,7 +214,7 @@
/// <param name="conveyorLine">杈撻�佺嚎瀹炰緥瀵硅薄</param>
/// <param name="command">璇诲彇鐨勮姹備俊鎭�</param>
/// <param name="childDeviceCode">瀛愯澶囩紪鍙�</param>
- public void ConveyorLineOutFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommand command, string childDeviceCode)
+ public void ConveyorLineOutFinish(CommonConveyorLine conveyorLine, ConveyorLineTaskCommandR command, string childDeviceCode)
{
Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.TaskNum, childDeviceCode);
if (task != null)
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineDBName.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineDBName.cs"
index 9ab2c8e..de664c7 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineDBName.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineDBName.cs"
@@ -25,16 +25,62 @@
{
public enum ConveyorLineDBName
{
+
InteractiveSignal,
+ /// <summary>
+ /// 瀹瑰櫒鏉＄爜
+ /// </summary>
ConveyorLineBarcode,
+ /// <summary>
+ /// 閲嶉噺
+ /// </summary>
+ ConveyorLineWeight,
+ /// <summary>
+ /// 瑙勬牸
+ /// </summary>
+ ConveyorLineSpec,
+ /// <summary>
+ /// 璧峰鍦板潃
+ /// </summary>
+ ConveyorLineOriginAddress,
+ /// <summary>
+ /// 鐩殑鍦板潃
+ /// </summary>
ConveyorLineTargetAddress,
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
ConveyorLineTaskNum,
+ /// <summary>
+ /// 鎵樼洏绫诲瀷
+ /// </summary>
ConveyorLineTrayType,
+ /// <summary>
+ /// 杈撻�佺嚎鐘舵��
+ /// </summary>
+ ConveyorLineStatus,
+
WriteInteractiveSignal,
+ /// <summary>
+ /// 瀹瑰櫒鏉＄爜
+ /// </summary>
WriteConveyorLineBarcode,
+ /// <summary>
+ /// 璧峰鍦板潃
+ /// </summary>
+ WriteConveyorLineOriginAddress,
+ /// <summary>
+ /// 鐩殑鍦板潃
+ /// </summary>
WriteConveyorLineTargetAddress,
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
WriteConveyorLineTaskNum,
+ /// <summary>
+ /// 鎵樼洏绫诲瀷
+ /// </summary>
WriteConveyorLineTrayType
}
}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
deleted file mode 100644
index ac1c79d..0000000
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommand.cs"
+++ /dev/null
@@ -1,38 +0,0 @@
-锘�#region << 鐗� 鏈� 娉� 閲� >>
-/*----------------------------------------------------------------
- * 鍛藉悕绌洪棿锛歐IDESEAWCS_Tasks.ConveyorLineJob
- * 鍒涘缓鑰咃細鑳＄搴�
- * 鍒涘缓鏃堕棿锛�2024/8/2 16:13:36
- * 鐗堟湰锛歏1.0.0
- * 鎻忚堪锛�
- *
- * ----------------------------------------------------------------
- * 淇敼浜猴細
- * 淇敼鏃堕棿锛�
- * 鐗堟湰锛歏1.0.1
- * 淇敼璇存槑锛�
- *
- *----------------------------------------------------------------*/
-#endregion << 鐗� 鏈� 娉� 閲� >>
-
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
-using WIDESEAWCS_QuartzJob.DeviceBase;
-
-namespace WIDESEAWCS_Tasks.ConveyorLineJob
-{
- public class ConveyorLineTaskCommand : DeviceCommand
- {
- public ushort InteractiveSignal { get; set; }
-
- [DataLength(25)]
- public string Barcode { get; set; }
-
- public int TargetAddress { get; set; }
-
- public int TaskNum { get; set; }
- }
-}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommandR.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommandR.cs"
new file mode 100644
index 0000000..7de13c7
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommandR.cs"
@@ -0,0 +1,59 @@
+锘�#region << 鐗� 鏈� 娉� 閲� >>
+/*----------------------------------------------------------------
+ * 鍛藉悕绌洪棿锛歐IDESEAWCS_Tasks.ConveyorLineJob
+ * 鍒涘缓鑰咃細鑳＄搴�
+ * 鍒涘缓鏃堕棿锛�2024/8/2 16:13:36
+ * 鐗堟湰锛歏1.0.0
+ * 鎻忚堪锛�
+ *
+ * ----------------------------------------------------------------
+ * 淇敼浜猴細
+ * 淇敼鏃堕棿锛�
+ * 鐗堟湰锛歏1.0.1
+ * 淇敼璇存槑锛�
+ *
+ *----------------------------------------------------------------*/
+#endregion << 鐗� 鏈� 娉� 閲� >>
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEAWCS_QuartzJob.DeviceBase;
+
+namespace WIDESEAWCS_Tasks.ConveyorLineJob
+{
+ public class ConveyorLineTaskCommandR : DeviceCommand
+ {
+ /// <summary>
+ /// 杈撻�佺嚎鐘舵��
+ /// </summary>
+ public ushort Status { get; set; }
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ public int TaskNum { get; set; }
+ /// <summary>
+ /// 鎵樼洏鍙�
+ /// </summary>
+ [DataLength(16)]
+ public string Barcode { get; set; }
+ /// <summary>
+ /// 璧峰鍦板潃
+ /// </summary>
+ public short CurrentAddress { get; set; }
+ /// <summary>
+ /// 鐩殑鍦板潃
+ /// </summary>
+ public short NextAddress { get; set; }
+ /// <summary>
+ /// 閲嶉噺
+ /// </summary>
+ public ushort Weight { get; set; }
+ /// <summary>
+ /// 璐х墿瑙勬牸
+ /// </summary>
+ public int Spec { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommandW.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommandW.cs"
new file mode 100644
index 0000000..f4bf6d7
--- /dev/null
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob/ConveyorLineTaskCommandW.cs"
@@ -0,0 +1,48 @@
+锘�#region << 鐗� 鏈� 娉� 閲� >>
+/*----------------------------------------------------------------
+ * 鍛藉悕绌洪棿锛歐IDESEAWCS_Tasks.ConveyorLineJob
+ * 鍒涘缓鑰咃細鑳＄搴�
+ * 鍒涘缓鏃堕棿锛�2024/8/2 16:13:36
+ * 鐗堟湰锛歏1.0.0
+ * 鎻忚堪锛�
+ *
+ * ----------------------------------------------------------------
+ * 淇敼浜猴細
+ * 淇敼鏃堕棿锛�
+ * 鐗堟湰锛歏1.0.1
+ * 淇敼璇存槑锛�
+ *
+ *----------------------------------------------------------------*/
+#endregion << 鐗� 鏈� 娉� 閲� >>
+
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using WIDESEAWCS_QuartzJob.DeviceBase;
+
+namespace WIDESEAWCS_Tasks.ConveyorLineJob
+{
+ public class ConveyorLineTaskCommandW : DeviceCommand
+ {
+ /// <summary>
+ /// 浠诲姟鍙�
+ /// </summary>
+ public int TaskNum { get; set; }
+
+ /// <summary>
+ /// 瀹瑰櫒鏉＄爜
+ /// </summary>
+ [DataLength(16)]
+ public string PalletCode { get; set; }
+ /// <summary>
+ /// 璧峰鍦板潃
+ /// </summary>
+ public short CurrentAddress { get; set; }
+ /// <summary>
+ /// 鐩殑鍦板潃
+ /// </summary>
+ public short NextAddress { get; set; }
+ }
+}
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
index 03b649d..73e7638 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/StackerCraneJob/CommonStackerCraneJob.cs"
@@ -42,7 +42,7 @@
CommonStackerCrane commonStackerCrane = (CommonStackerCrane)context.JobDetail.JobDataMap.Get("JobParams");
if (commonStackerCrane != null)
{
- Console.Out.WriteLine(commonStackerCrane.DeviceName);
+ //Console.Out.WriteLine(commonStackerCrane.DeviceName);
if (!commonStackerCrane.IsEventSubscribed)
{
commonStackerCrane.StackerCraneTaskCompletedEventHandler += CommonStackerCrane_StackerCraneTaskCompletedEventHandler;//璁㈤槄浠诲姟瀹屾垚浜嬩欢
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfo.cs" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfo.cs"
index 95c33a6..4fec57a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfo.cs"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfo.cs"
@@ -14,7 +14,7 @@
[assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEAWCS_Tasks")]
[assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")]
[assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")]
-[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0")]
+[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a69e77a76599e133961e9ff1921773a131577d17")]
[assembly: System.Reflection.AssemblyProductAttribute("WIDESEAWCS_Tasks")]
[assembly: System.Reflection.AssemblyTitleAttribute("WIDESEAWCS_Tasks")]
[assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")]
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfoInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfoInputs.cache"
index 106ec57..91d0bca 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfoInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.AssemblyInfoInputs.cache"
@@ -1 +1 @@
-39a3bb642acc0086c0dbff8faa7a99e829b46a518cfa480d4f7f86c7e3fb6948
+5a8ece2279b2c9f3dc8c4d8ee2ade809db00d7fd6342bc68909101d2b00db85d
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache"
index 836a019..b05ed4a 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.AssemblyReference.cache"
Binary files differ
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.CoreCompileInputs.cache" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.CoreCompileInputs.cache"
index f0bc41e..7238e57 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.CoreCompileInputs.cache"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.CoreCompileInputs.cache"
@@ -1 +1,5 @@
+<<<<<<< HEAD
cd4e1c2a88b65cbe4767ce93eb91e925bd682e7bf78cb20c368c394c7327c2e0
+=======
+8281f3fac6f7ad21a0db343cff8c59f9f5481f1cebfed9c09a9ba1f6b21edb01
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
diff --git "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.FileListAbsolute.txt" "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.FileListAbsolute.txt"
index c0f08c9..0ced8cd 100644
--- "a/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.FileListAbsolute.txt"
+++ "b/\344\273\243\347\240\201\347\256\241\347\220\206/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/obj/Debug/net6.0/WIDESEAWCS_Tasks.csproj.FileListAbsolute.txt"
@@ -1,3 +1,4 @@
+<<<<<<< HEAD
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_Tasks.deps.json
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_Tasks.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_Tasks.pdb
@@ -39,3 +40,46 @@
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\obj\Debug\net6.0\refint\WIDESEAWCS_Tasks.dll
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\obj\Debug\net6.0\WIDESEAWCS_Tasks.pdb
E:\椤圭洰闆哱SanYiWuHu\ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\obj\Debug\net6.0\ref\WIDESEAWCS_Tasks.dll
+=======
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_Tasks.deps.json
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_Tasks.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_Tasks.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_BasicInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_Common.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_Communicator.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_Core.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_DTO.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_Model.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_QuartzJob.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_TaskInfoService.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_QuartzJob.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_TaskInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_BasicInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_BasicInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_Common.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_Communicator.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_Core.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_DTO.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_IBasicInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_ITaskInfoService.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_Model.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\bin\Debug\net6.0\WIDESEAWCS_TaskInfoRepository.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\obj\Debug\net6.0\WIDESEAWCS_Tasks.csproj.AssemblyReference.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\obj\Debug\net6.0\WIDESEAWCS_Tasks.GeneratedMSBuildEditorConfig.editorconfig
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\obj\Debug\net6.0\WIDESEAWCS_Tasks.AssemblyInfoInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\obj\Debug\net6.0\WIDESEAWCS_Tasks.AssemblyInfo.cs
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\obj\Debug\net6.0\WIDESEAWCS_Tasks.csproj.CoreCompileInputs.cache
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\obj\Debug\net6.0\WIDESEAWCS_Tasks.csproj.CopyComplete
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\obj\Debug\net6.0\WIDESEAWCS_Tasks.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\obj\Debug\net6.0\refint\WIDESEAWCS_Tasks.dll
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\obj\Debug\net6.0\WIDESEAWCS_Tasks.pdb
+E:\椤圭洰闆哱ChuanSuoCheKu\浠ｇ爜绠＄悊\WCS\WIDESEAWCS_Server\WIDESEAWCS_Tasks\obj\Debug\net6.0\ref\WIDESEAWCS_Tasks.dll
+>>>>>>> 5a35ada0577d0891fe9de3130334663303e79843
--
Gitblit v1.9.3