一大堆

刘磊

2024-11-23 222d2040c2a5e958b5fbd0b7047a8e802ec14288

一大堆

 .gitignore

@@ -1357,3 +1357,160 @@
/Code Management/WMS/WIDESEA_WMSClient/src/api/http.js
/Code Management/WCS/WIDESEAWCS_Client/yarn.lock
/Code Management/WCS/WIDESEAWCS_Server/.vs/WIDESEAWCS_Server/v17/fileList.bin
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/bin/Release/net6.0
*.cs
*.json
*.cache
*.editorconfig
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/ApiEndpoints.json
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/apphost.exe
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PubTmp/Out/index.html
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PubTmp/Out/runtimes/browser-wasm/nativeassets/net6.0/e_sqlite3.a
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PubTmp/Out/runtimes/linux-arm/native/libe_sqlite3.so
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PubTmp/Out/runtimes/linux-arm/native/libSkiaSharp.so
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PubTmp/Out/runtimes/linux-arm/native/libSystem.IO.Ports.Native.so
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PubTmp/Out/runtimes/linux-arm64/native/libe_sqlite3.so
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/PubTmp/Out/runtimes/linux-arm64/native/libSkiaSharp.so
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/staticwebassets.development.json
*.so
*.dylib
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.assets.cache
*.config
*.exe
*.css
*.ico
*.js
*.jpg
*.html
/Code Management/WMS/WIDESEA_WMSClient/report_form_rollup-plugin-visualizer.html
/Code Management/WMS/WIDESEA_WMSServer/LogLibrary/obj/Release/net6.0/LogLibrary.assets.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.assets.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.assets.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.assets.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.assets.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderRepository/obj/Release/net6.0/WIDESEA_IStorageOutOrderRepository.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Release/net6.0/WIDESEA_StorageOutOrderRepository.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Release/net6.0/WIDESEA_StorageOutOrderRepository.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.assets.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/bin/Release/net6.0/WIDESEA_StorageTaskServices.deps.json
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.assets.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/bin/Release/net6.0/WIDESEA_StoragIntegrationServices.deps.json
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.assets.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/Release/net6.0/WIDESEA_Tasks.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/Release/net6.0/WIDESEA_Tasks.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/Release/net6.0/WIDESEA_Tasks.assets.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/Release/net6.0/WIDESEA_Tasks.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/runtimes/browser-wasm/nativeassets/net6.0/e_sqlite3.a
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/publish/WIDESEA_WMSServer.xml
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/apphost.exe
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/appsettings.json
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_WMSServer.deps.json
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_WMSServer.exe
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/staticwebassets/msbuild.build.WIDESEAWCS_Server.props
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/staticwebassets/msbuild.buildMultiTargeting.WIDESEAWCS_Server.props
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/staticwebassets/msbuild.buildTransitive.WIDESEAWCS_Server.props
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Release/net6.0/staticwebassets/msbuild.WIDESEAWCS_Server.Microsoft.AspNetCore.StaticWebAssets.props
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile.pubxml.user
/Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/WIDESEAWCS_Server.csproj.user
/Code Management/WMS/WIDESEA_WMSServer/LogLibrary/obj/Release/net6.0/LogLibrary.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/LogLibrary/obj/Release/net6.0/LogLibrary.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/LogLibrary/obj/Release/net6.0/LogLibrary.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.assets.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.assets.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Release/net6.0/WIDESEA_Core.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Release/net6.0/WIDESEA_Core.assets.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Release/net6.0/WIDESEA_Core.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Release/net6.0/WIDESEA_Core.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Release/net6.0/WIDESEA_Core.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Release/net6.0/WIDESEA_Core.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.assets.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Release/net6.0/WIDESEA_Core.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Release/net6.0/WIDESEA_IStorageTaskServices.assets.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Release/net6.0/WIDESEA_IStorageTaskServices.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Release/net6.0/WIDESEA_IStorageTaskServices.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Release/net6.0/WIDESEA_IStorageTaskServices.csproj.FileListAbsolute.txt
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Release/net6.0/WIDESEA_IStorageTaskServices.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/WIDESEA_StorageBasicServices.csproj
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/runtimes/browser-wasm/nativeassets/net6.0/e_sqlite3.a
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/bin/Release/net6.0/WIDESEA_WMSServer.xml
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_WMSServer.xml
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/staticwebassets.build.json
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/staticwebassets.pack.json
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/staticwebassets.publish.json
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.AssemblyInfo.cs
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.AssemblyInfoInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.assets.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.csproj.AssemblyReference.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.csproj.CoreCompileInputs.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.GeneratedMSBuildEditorConfig.editorconfig
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.genruntimeconfig.cache
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.xml
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile.pubxml.user
/Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj.user

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_BasicInfoService/Partial/Method.cs

@@ -14,5 +14,11 @@
            //todo： ä½¿ç”¨ç¼“存储存
            return BaseDal.QueryData(x => x.stationPLC == DeviceCode).ToList();
        }

        public Dt_StationManager GetStationInfoByChildCode(string ChildCode, string area)
        {
            return BaseDal.QueryFirst(x => x.stationChildCode == ChildCode && x.stationArea == area);
        }

    }
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/Const/SysConfigKeyConst.cs

@@ -13,6 +13,8 @@
        /// </summary>
        public const string WMSIP_BASE = "WMSIPBASE";

        public const string WCSIP_BASE = "WCSIPAddress";

        /// <summary>
        /// è¯·æ±‚任务
        /// </summary>
@@ -43,5 +45,11 @@
        /// ç©ºæ‰˜ç›˜å®žç›˜å‡ºåº“任务
        /// </summary>
        public const string RequestTrayOutTask = "RequestTrayOutTask";


        public const string RequestInTask = "RequestInTask";


        public const string RequestFlow = "RequestFlow";
    }
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Common/TaskEnum/TaskTypeEnum.cs

@@ -77,6 +77,12 @@
        /// </summary>
        [Description("空托盘出库")]
        OutNG = 105,

        /// <summary>
        /// ç›´æŽ¥å‡ºåº“
        /// </summary>
        [Description("直接出库")]
        InToOut = 106,
    }

    public enum TaskRelocationTypeEnum

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_IBasicInfoService/IDt_StationManagerService.cs

@@ -24,6 +24,20 @@
{
    public interface IDt_StationManagerService : IService<Dt_StationManager>
    {
        /// <summary>
        /// æ ¹æ®PLC设备获取当前设备下的所有站台
        /// </summary>
        /// <param name="DeviceCode"></param>
        /// <returns></returns>
        List<Dt_StationManager> GetAllStationByDeviceCode(string DeviceCode);


        /// <summary>
        /// æ ¹æ®å­è®¾å¤‡ç¼–号和区域 èŽ·å–站台
        /// </summary>
        /// <param name="ChildCode"></param>
        /// <param name="area"></param>
        /// <returns></returns>
        Dt_StationManager GetStationInfoByChildCode(string ChildCode, string area);
    }
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_ITaskInfoService/ITaskService.cs

@@ -58,12 +58,36 @@
        WebResponseContent ReceiveWMSTask([NotNull] List<WMSTaskDTO> taskDTOs);

        /// <summary>
        /// æŽ¥æ”¶WMS任务信息
        /// </summary>
        /// <param name="taskDTOs">WMS任务对象集合</param>
        /// <returns>返回处理结果</returns>
        WebResponseContent ReceiveByWMSTask([NotNull] WMSTaskDTO taskDTOs);

        /// <summary>
        /// æ ¹æ®æ‰˜ç›˜å·ã€èµ·å§‹åœ°å€å‘WMS请求任务
        /// </summary>
        /// <param name="palletCode">托盘号</param>
        /// <param name="sourceAddress">起始地址</param>
        /// <returns></returns>
        Task<WebResponseContent> RequestWMSTask(string palletCode, string sourceAddress);


        /// <summary>
        /// æ ¹æ®æ‰˜ç›˜å·ã€èµ·å§‹åœ°å€å‘WMS请求任务
        /// </summary>
        /// <param name="palletCode">托盘号</param>
        /// <param name="sourceAddress">起始地址</param>
        /// <returns></returns>
        Task<WebResponseContent> RequestTask(string palletCode, string EquiCodeMOM, string Roadways, string area,string currentChildeCode);

        /// <summary>
        /// æ ¹æ®æ‰˜ç›˜å·ã€ç«™å°å‘WMS请求任务
        /// </summary>
        /// <param name="palletCode">托盘号</param>
        /// <param name="sourceAddress">起始地址</param>
        /// <returns></returns>
        Task<WebResponseContent> RequestTask(string palletCode, Dt_StationManager stationManager);

        /// <summary>
        /// æ ¹æ®è®¾å¤‡ç¼–号、当前地址查询输送线未执行的任务
@@ -196,6 +220,8 @@
        /// <returns>返回处理结果</returns>
        WebResponseContent StackCraneTaskCompleted(int taskNum);

        WebResponseContent StackCraneTaskCompletedByStation(int taskNum);

        /// <summary>
        /// æ¢å¤æŒ‚起任务
        /// </summary>
@@ -209,5 +235,13 @@
        /// <param name="taskNum">任务号</param>
        /// <returns>返回处理结果</returns>
        WebResponseContent RollbackTaskStatusToLast(int taskNum);

        /// <summary>
        /// 
        /// </summary>
        /// <param name="palletCode"></param>
        /// <param name="Roadway"></param>
        /// <returns></returns>
        Dt_Task QueryTaskByPalletCode(string palletCode, string Roadway);
    }
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Model/Models/BasicInfo/Dt_StationManager.cs

@@ -38,7 +38,7 @@
        public int stationID { get; set; }

        /// <summary>
        /// ä»»åŠ¡å·
        /// ç«™å°ç±»åž‹
        /// </summary>
        [ImporterHeader(Name = "站台类型")]
        [ExporterHeader(DisplayName = "站台类型")]
@@ -92,5 +92,13 @@
        [ExporterHeader(DisplayName = "坐标地址")]
        [SugarColumn(IsNullable = false, Length = 20, ColumnDescription = "坐标地址")]
        public string stationLocation { get; set; }

        /// <summary>
        /// MOM设备编号
        /// </summary>
        [ImporterHeader(Name = "MOM设备编号")]
        [ExporterHeader(DisplayName = "MOM设备编号")]
        [SugarColumn(IsNullable = false, ColumnDescription = "MOM设备编号")]
        public string stationEquipMOM { get; set; }
    }
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/ConveyorLine/CommonConveyorLine_After.cs

@@ -288,6 +288,14 @@
            return devicePro == null ? throw new Exception() : Communicator.ReadAsObj(devicePro.DeviceProAddress, devicePro.DeviceDataType);
        }

        //public bool IsOccupied(string deviceChildCode)
        //{
        //    if (Communicator.IsConnected)
        //    {
                
        //    }
        //}

        /// <summary>
        ///
        /// </summary>
@@ -298,18 +306,19 @@
        {
            if (Communicator.IsConnected)
            {
                List<DeviceProDTO> devicePros = _deviceProDTOs.Where(x => x.DeviceProParamType == ConveyorLineStatus.IsOccupied.ToString()).ToList();
                List<DeviceProDTO> devicePros = _deviceProDTOs.Where(x => x.DeviceChildCode == deviceChildCode && x.DeviceProParamName == "InteractiveSignal").ToList();
                if (devicePros.Count == 0)
                {
                    //todo åè®®ä¿¡æ¯æœªèŽ·å–到时抛出异常
                    throw new Exception();
                }

                for (int i = 0; i < devicePros.Count; i++)
                {
                    object readStatus = Communicator.ReadAsObj(devicePros[i].DeviceProAddress, devicePros[i].DeviceDataType);
                    //todo åè®®æ˜Žç»†ä¿¡æ¯æœªèŽ·å–到时抛出异常
                    DeviceProtocolDetailDTO? deviceProtocolDetail = _deviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == devicePros[i].DeviceProParamName) ?? throw new Exception();
                    deviceProtocolDetail = _deviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == devicePros[i].DeviceProParamType && x.ProtocalDetailValue.Equals(readStatus.ToString()));
                    deviceProtocolDetail = _deviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == "InteractiveSignal" && x.ProtocalDetailValue.Equals(readStatus.ToString()));
                    if (deviceProtocolDetail != null)
                    {
                        return true;

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_QuartzJob/Service/DeviceProtocolService.cs

@@ -80,9 +80,9 @@
            return base.AddData(saveModel);
        }

        //public WebResponseContent InsertProtocol_Line(int PLCid,string ChildCode,)
        //public WebResponseContent InsertProtocol_Line(int PLCid, string ChildCode,decimal ProOffsetStart)
        //{

        //    Type type = typeof();
        //}
    }
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Controllers/Task/TaskController.cs

@@ -25,6 +25,13 @@
            return Service.ReceiveWMSTask(taskDTOs);
        }

        [HttpPost, Route("ReceiveByWMSTask"), AllowAnonymous]
        public WebResponseContent ReceiveByWMSTask([FromBody] WMSTaskDTO taskDTOs)
        {
            return Service.ReceiveByWMSTask(taskDTOs);
        }


        [HttpPost, HttpGet, Route("UpdateTaskExceptionMessage")]
        public WebResponseContent UpdateTaskExceptionMessage(int taskNum, string message)
        {

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Filter/CustomProfile.cs

@@ -22,7 +22,7 @@
            CreateMap<Dt_DeviceInfo,DeviceInfoDTO>();
            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,ConveyorLineTaskCommand_After>().ForMember(a => a.ConveyorLineTargetAddress, b => b.MapFrom(b => b.NextAddress)).ForMember(a => a.ConveyorLineBarcode, b => b.MapFrom(b => b.PalletCode)).ForMember(a => a.ConveyorLineTaskNum, b => b.MapFrom(b => b.TaskNum));
            CreateMap<Dt_Task,ConveyorLineTaskCommand_After>().ForMember(a => a.ConveyorLineBarcode, b => b.MapFrom(b => b.PalletCode)).ForMember(a => a.ConveyorLineTaskNum, b => b.MapFrom(b => b.TaskNum));
        }
    }
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/obj/Debug/net6.0/ApiEndpoints.json

ÎļþÒÑɾ³ý

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/Partial/TaskService.cs

@@ -1,13 +1,305 @@
using System;
using HslCommunication;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
using WIDESEAWCS_Common;
using WIDESEAWCS_Core.Helper;
using WIDESEAWCS_Core;
using WIDESEAWCS_DTO.TaskInfo;
using System.Diagnostics.CodeAnalysis;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Model.Models;
using WIDESEAWCS_QuartzJob.Models;

namespace WIDESEAWCS_TaskInfoService
{
    public partial class TaskService
    {

        /// <summary>
        /// æ ¹æ®æ‰˜ç›˜å·ã€èµ·å§‹åœ°å€å‘WMS请求任务
        /// </summary>
        /// <param name="palletCode">托盘号</param>
        /// <param name="sourceAddress">起始地址</param>
        /// <returns></returns>
        public async Task<WebResponseContent> RequestTask(string palletCode, string EquiCodeMOM, string Roadways, string area, string CurrentChildCode)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                var hasTask = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
                if (hasTask != null)
                {
                    return content.Error("当前托盘存在任务");
                }

                var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
                var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
                var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.RequestInTask)?.ConfigValue;
                if (wmsBase == null || requestTask == null)
                {
                    throw new InvalidOperationException("WMS IP æœªé…ç½®");
                }
                var wmsIpAddrss = wmsBase + requestTask;

                var result = await HttpHelper.PostAsync(wmsIpAddrss, new { palletCode = palletCode, EquiCodeMOM = EquiCodeMOM, Roadways = Roadways, area = area, Position = CurrentChildCode }.ToJsonString());
                content = JsonConvert.DeserializeObject<WebResponseContent>(result);

                if (!content.Status)
                {
                    // wms失败返回去NG口任务


                    return content;
                }

                var task = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
                return ReceiveByWMSTask(task);
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }

        /// <summary>
        /// æ ¹æ®æ‰˜ç›˜å·ã€ç«™å°å‘WMS请求任务
        /// </summary>
        /// <param name="palletCode">托盘号</param>
        /// <param name="sourceAddress">起始地址</param>
        /// <returns></returns>
        public async Task<WebResponseContent> RequestTask(string palletCode, Dt_StationManager stationManager)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                var hasTask = await BaseDal.QueryFirstAsync(x => x.PalletCode == palletCode);
                if (hasTask != null)
                {
                    return content.Error("当前托盘存在任务");
                }

                var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
                var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
                var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.RequestInTask)?.ConfigValue;
                if (wmsBase == null || requestTask == null)
                {
                    throw new InvalidOperationException("WMS IP æœªé…ç½®");
                }
                var wmsIpAddrss = wmsBase + requestTask;

                var result = await HttpHelper.PostAsync(wmsIpAddrss, new { palletCode = palletCode, EquiCodeMOM = stationManager.stationEquipMOM, Roadways = stationManager.Roadway, area = stationManager.stationArea, Position = stationManager.stationChildCode }.ToJsonString());
                content = JsonConvert.DeserializeObject<WebResponseContent>(result);

                if (!content.Status)
                {
                    // wms失败返回去NG口任务


                    return content;
                }

                var task = JsonConvert.DeserializeObject<WMSTaskDTO>(content.Data.ToString());
                return ReceiveByWMSTask(task);
            }
            catch (Exception ex)
            {
                return WebResponseContent.Instance.Error(ex.Message);
            }
        }

        /// <summary>
        /// æŽ¥æ”¶WMS任务信息
        /// </summary>
        /// <param name="taskDTOs">WMS任务对象集合</param>
        /// <returns>返回处理结果</returns>
        public WebResponseContent ReceiveByWMSTask([NotNull] WMSTaskDTO taskDTO)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                if (BaseDal.QueryFirst(x => x.TaskNum == taskDTO.TaskNum || x.PalletCode == taskDTO.PalletCode) != null)
                {
                    return content.OK();
                }
                Dt_Task task = _mapper.Map<Dt_Task>(taskDTO);
                task.Creater = "WMS";

                if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup)
                {
                    var stationinfo = _stationManagerRepository.QueryFirst(x => x.stationLocation == taskDTO.TargetAddress && x.Roadway == taskDTO.RoadWay);
                    task.TaskState = (int)TaskOutStatusEnum.OutNew;
                    task.CurrentAddress = taskDTO.RoadWay;
                    task.NextAddress = stationinfo.stationChildCode;
                    task.SourceAddress = taskDTO.SourceAddress;
                    task.TargetAddress = taskDTO.TargetAddress;
                }
                else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup)
                {
                    var stationinfo = _stationManagerRepository.QueryFirst(x => x.stationLocation == taskDTO.SourceAddress && x.Roadway == taskDTO.RoadWay);
                    task.TaskState = (int)TaskInStatusEnum.Line_InFinish;
                    task.SourceAddress = taskDTO.SourceAddress;
                    task.CurrentAddress = stationinfo.stationChildCode;
                    task.NextAddress = stationinfo.stationChildCode;
                    task.TargetAddress = taskDTO.TargetAddress;
                }
                BaseDal.AddData(task);

                _taskExecuteDetailService.AddTaskExecuteDetail(task.WMSId, "接收WMS任务");

                content = WebResponseContent.Instance.OK("成功");
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error($"任务接收错误,错误信息:{ex.Message}");
            }
            return content;
        }


        /// <summary>
        /// æŽ¥æ”¶WMS任务信息
        /// </summary>
        /// <param name="taskDTOs">WMS任务对象集合</param>
        /// <returns>返回处理结果</returns>
        public async Task<WebResponseContent> RequestFlow(Dt_StationManager stationManager)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
                var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
                var requestTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.RequestFlow)?.ConfigValue;
                if (wmsBase == null || requestTask == null)
                {
                    throw new InvalidOperationException("WMS IP æœªé…ç½®");
                }
                var wmsIpAddrss = wmsBase + requestTask;

                var result = await HttpHelper.PostAsync(wmsIpAddrss, new {  EquiCodeMOM = stationManager.stationEquipMOM, Roadways = stationManager.Roadway, area = stationManager.stationArea, Position = stationManager.stationChildCode }.ToJsonString());
                content = JsonConvert.DeserializeObject<WebResponseContent>(result);

                if (!content.Status)
                {

                    return content;
                }
                Dt_StationManager dt_Station = content.Data as Dt_StationManager;
                //dt_Station.
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error($"任务接收错误,错误信息:{ex.Message}");
            }
            return content;
        }

        /// <summary>
        /// æ ¹æ®æ‰˜ç›˜å·å’Œè®¾å¤‡å·æŸ¥è¯¢å…¥åº“任务
        /// </summary>
        /// <param name="taskNum">任务号</param>
        /// <param name="currentAddress">当前地址</param>
        /// <returns></returns>
        public Dt_Task QueryTaskByPalletCode(string palletCode, string Roadway)
        {
            return BaseDal.QueryFirst(x => x.PalletCode == palletCode && x.Roadway == Roadway, TaskOrderBy);
        }

        ///// <summary>
        ///// æ ¹æ®è®¾å¤‡ç¼–号、当前地址查询输送线未执行的任务
        ///// </summary>
        ///// <param name="deviceNo">设备编号</param>
        ///// <param name="currentAddress">当前地址</param>
        ///// <returns></returns>
        //public Dt_Task QueryConveyorLineTask(string deviceNo, string currentAddress)
        //{
        //    return BaseDal.QueryFirst(x => (TaskInboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskInStatusEnum.InNew || TaskOutboundTypes.Contains(x.TaskType) && x.TaskState == (int)TaskOutStatusEnum.SC_OutFinish) && x.CurrentAddress == currentAddress, TaskOrderBy);
        //}

        /// ä»»åŠ¡å®Œæˆ
        /// </summary>
        /// <param name="taskNum">任务编号</param>
        /// <returns>返回处理结果</returns>
        public WebResponseContent StackCraneTaskCompletedByStation(int taskNum)
        {
            WebResponseContent content = new WebResponseContent();
            try
            {
                var task = BaseDal.QueryFirst(x => x.TaskNum == taskNum);
                if (task == null) return WebResponseContent.Instance.Error($"未找到该任务信息,任务号:【{taskNum}】");

                //if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OutbondGroup && task.TaskState == (int)TaskOutStatusEnum.SC_OutExecuting)
                //{
                //    //todo 

                //}
                //else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.InboundGroup && task.TaskState == (int)TaskInStatusEnum.SC_InExecuting)
                //{
                //    //todo åŒæ­¥åˆ°WMS

                //    BaseDal.DeleteData(task);

                //}
                //else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.RelocationGroup)
                //{
                //    //todo è°ƒç”¨WMS移库完成
                //}
                //else if (task.TaskType.GetTaskTypeGroup() == TaskTypeGroup.OtherGroup)
                //{
                //}
                //else
                //{
                //    throw new Exception($"任务类型错误,未找到该任务类型,任务号:【{taskNum}】,任务类型:【{task.TaskType}】");
                //}


                #region WMS同步任务完成
                var keys = new Dictionary<string, object>()
                {
                    {"taskNum", taskNum}
                };
                // èŽ·å–WMSip地址
                var config = _sys_ConfigService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
                var wmsBase = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.WMSIP_BASE)?.ConfigValue;
                var completeTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.CompleteTask)?.ConfigValue;
                if (wmsBase == null || completeTask == null)
                {
                    throw new InvalidOperationException("WMS IP æœªé…ç½®");
                }
                var wmsIpAddress = wmsBase + completeTask;

                var result = HttpHelper.GetAsync(wmsIpAddress, keys).Result;
                content = JsonConvert.DeserializeObject<WebResponseContent>(result);
                #endregion

                if (content.Status)
                {
                    task.TaskState = (int)TaskOutStatusEnum.OutFinish;
                    BaseDal.DeleteData(task);
                }

                #region  æ›´æ–°ä»»åŠ¡çŠ¶æ€

                //var updateTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.UpdateTask)?.ConfigValue;
                //if (wmsBase == null || updateTask == null)
                //{
                //    throw new InvalidOperationException("WMS IP æœªé…ç½®");
                //}
                //wmsIpAddress = wmsBase + updateTask;

                //result = HttpHelper.PostAsync(wmsIpAddress, new { TaskNum = task.TaskNum, TaskState = task.TaskState }.ToJsonString()).Result;
                //content = JsonConvert.DeserializeObject<WebResponseContent>(result);
                #endregion
                //content = WebResponseContent.Instance.OK();
            }
            catch (Exception ex)
            {
                content = WebResponseContent.Instance.Error($"任务完成异常,任务号:【{taskNum}】");
            }
            return content;
        }
    }
}

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_TaskInfoService/TaskService.cs

@@ -5,6 +5,8 @@
using SqlSugar;
using System.Diagnostics.CodeAnalysis;
using System.Threading.Tasks;
using WIDESEAWCS_BasicInfoRepository;
using WIDESEAWCS_BasicInfoService;
using WIDESEAWCS_Common;
using WIDESEAWCS_Common.TaskEnum;
using WIDESEAWCS_Core;
@@ -28,6 +30,8 @@
        private readonly ITaskExecuteDetailRepository _taskExecuteDetailRepository;
        private readonly ISys_ConfigService _sys_ConfigService;
        private readonly IMapper _mapper;
        private readonly IDt_StationManagerService _stationManagerService;
        private readonly IDt_StationManagerRepository _stationManagerRepository;

        private Dictionary<string, OrderByType> _taskOrderBy = new()
        {
@@ -42,13 +46,15 @@

        public List<int> TaskOutboundTypes => typeof(TaskOutboundTypeEnum).GetEnumIndexList();

        public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ISys_ConfigService sys_ConfigService) : base(BaseDal)
        public TaskService(ITaskRepository BaseDal, IRouterService routerService, ITaskExecuteDetailService taskExecuteDetailService, ITaskExecuteDetailRepository taskExecuteDetailRepository, IMapper mapper, ISys_ConfigService sys_ConfigService, IDt_StationManagerService stationManagerService, IDt_StationManagerRepository stationManagerRepository) : base(BaseDal)
        {
            _routerService = routerService;
            _taskExecuteDetailService = taskExecuteDetailService;
            _taskExecuteDetailRepository = taskExecuteDetailRepository;
            _mapper = mapper;
            _sys_ConfigService = sys_ConfigService;
            _stationManagerService = stationManagerService;
            _stationManagerRepository = stationManagerRepository;
        }

        /// <summary>
@@ -585,7 +591,7 @@

                #region  æ›´æ–°ä»»åŠ¡çŠ¶æ€

                var updateTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.CompleteTask)?.ConfigValue;
                var updateTask = config.FirstOrDefault(x => x.ConfigKey == SysConfigKeyConst.UpdateTask)?.ConfigValue;
                if (wmsBase == null || updateTask == null)
                {
                    throw new InvalidOperationException("WMS IP æœªé…ç½®");

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/CommonConveyorLine_AfterJob.cs

@@ -54,7 +54,7 @@
        private readonly IMapper _mapper;
        private readonly IDt_StationManagerService _stationManagerService;

        public CommonConveyorLine_AfterJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository,IDt_StationManagerService stationManagerService)
        public CommonConveyorLine_AfterJob(ITaskService taskService, ITaskExecuteDetailService taskExecuteDetailService, IRouterService routerService, IMapper mapper, ITaskRepository taskRepository, IDt_StationManagerService stationManagerService)
        {
            _taskService = taskService;
            _taskExecuteDetailService = taskExecuteDetailService;
@@ -72,13 +72,9 @@
                if (conveyorLine != null)
                {
                    List<Dt_StationManager> stationManagers = _stationManagerService.GetAllStationByDeviceCode(conveyorLine.DeviceCode);
                    List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode);
                    //List<Task> tasks = new List<Task>();
                    foreach (string childDeviceCode in childDeviceCodes)
                    foreach (var station in stationManagers)
                    {
                        ConveyorLineTaskCommand_After command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand_After>(childDeviceCode);

                        if (command.ConveyorLineBarcode.Trim().Contains("\0")) command.ConveyorLineBarcode = "";
                        ConveyorLineTaskCommand_After command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand_After>(station.stationChildCode);

                        DeviceProtocolDetailDTO? deviceProtocolDetails = conveyorLine.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(ConveyorLineTaskCommand_After.InteractiveSignal) && x.ProtocalDetailValue == command.InteractiveSignal.ToString());
                        if (deviceProtocolDetails != null)
@@ -86,16 +82,35 @@
                            MethodInfo? method = GetType().GetMethod(deviceProtocolDetails.ProtocolDetailType);
                            if (method != null)
                            {
                                method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode });
                                method.Invoke(this, new object[] { conveyorLine, command, station });
                            }
                        }
                    }
                    //Task.WaitAll(tasks.ToArray());

                    #region è·¯ç”±æ–¹å¼
                    //List<string> childDeviceCodes = _routerService.QueryAllPositions(conveyorLine.DeviceCode);
                    //foreach (string childDeviceCode in childDeviceCodes)
                    //{
                    //    ConveyorLineTaskCommand_After command = conveyorLine.ReadCustomer<ConveyorLineTaskCommand_After>(childDeviceCode);

                    //    if (command.ConveyorLineBarcode.Trim().Contains("\0")) command.ConveyorLineBarcode = "";

                    //    DeviceProtocolDetailDTO? deviceProtocolDetails = conveyorLine.DeviceProtocolDetailDTOs.FirstOrDefault(x => x.DeviceProParamName == nameof(ConveyorLineTaskCommand_After.InteractiveSignal) && x.ProtocalDetailValue == command.InteractiveSignal.ToString());
                    //    if (deviceProtocolDetails != null)
                    //    {
                    //        MethodInfo? method = GetType().GetMethod(deviceProtocolDetails.ProtocolDetailType);
                    //        if (method != null)
                    //        {
                    //            method.Invoke(this, new object[] { conveyorLine, command, childDeviceCode });
                    //        }
                    //    }
                    //} 
                    #endregion
                }
            }
            catch (Exception ex)
            {
                Console.Out.WriteLine(nameof(CommonConveyorLineJob) + ":" + ex.ToString());
                Console.Out.WriteLine(nameof(CommonConveyorLine_AfterJob) + ":" + ex.ToString());
            }
            finally
            {
@@ -111,82 +126,66 @@
        /// <param name="conveyorLine">输送线实例对象</param>
        /// <param name="command">读取的请求信息</param>
        /// <param name="childDeviceCode">子设备编号</param>
        public void RequestInbound(CommonConveyorLine_After conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode)
        public void RequestInbound(CommonConveyorLine_After conveyorLine, ConveyorLineTaskCommand_After command, Dt_StationManager stationInfo)
        {

            var taskNew = _taskService.QueryCraneConveyorLineTask(command.ConveyorLineTaskNum.ObjToInt(), childDeviceCode);
            var taskNew = _taskService.QueryTaskByPalletCode(command.ConveyorLineBarcode, stationInfo.Roadway);
            if (taskNew == null)
            {
                string barcode = command.ConveyorLineBarcode.TrimEnd();
                if (_taskService.RequestWMSTask(command.ConveyorLineBarcode, childDeviceCode).Result.Status)
                if (_taskService.RequestTask(command.ConveyorLineBarcode, stationInfo).Result.Status)
                {
                    Dt_Task task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
                    Dt_Task task = _taskService.QueryTaskByPalletCode(command.ConveyorLineBarcode, stationInfo.Roadway);
                    if (task != null)
                    {
                        ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
                        //ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
                        //taskCommand.InteractiveSignal = command.InteractiveSignal;
                        taskCommand.ResponState = 1;
                        taskCommand.ConveyorLineTaskNum = task.TaskNum;
                        taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(task.NextAddress);
                        conveyorLine.SendCommand(taskCommand, childDeviceCode);

                        //taskCommand.ResponState = 1;
                        //taskCommand.ConveyorLineTaskNum = task.TaskNum;
                        //taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(task.NextAddress);
                        conveyorLine.SetValue(ConveyorLineDBName_After.ResponState, 1, stationInfo.stationChildCode);
                        //conveyorLine.SetValue(ConveyorLineDBName_After.ConveyorLineTargetAddress, 1, task.NextAddress);
                        //ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);

                        _taskService.UpdateTaskStatusToNext(task);
                    }
                }
            }

            var inTask = _taskService.QueryExecutingConveyorLineTask(command.ConveyorLineTaskNum.ObjToInt(), childDeviceCode);
            if (inTask != null)
            {
                ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(inTask);
                //taskCommand.InteractiveSignal = command.InteractiveSignal;
                taskCommand.ResponState = 1;
                conveyorLine.SendCommand(taskCommand, childDeviceCode);

                _taskService.UpdateTaskStatusToNext(inTask);
            }
        }

        /// <summary>
        /// è¾“送线入库完成
        /// è¾“送线请求入库
        /// </summary>
        /// <param name="conveyorLine">输送线实例对象</param>
        /// <param name="command">读取的请求信息</param>
        /// <param name="childDeviceCode">子设备编号</param>
        /// <param name="ProtocalDetailValue">线体当前bool读取偏移地址</param>
        public void ConveyorLineInFinish(CommonConveyorLine_After conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode)
        {
            Dt_Task task = _taskService.QueryExecutingConveyorLineTask(command.ConveyorLineTaskNum, childDeviceCode);
            if (task != null && task.TaskState != (int)TaskInStatusEnum.Line_InFinish)
            {
                //ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);
        //public void RequestInbound(CommonConveyorLine_After conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode)
        //{
        //    var stationInfo = _stationManagerService.GetStationInfoByChildCode(childDeviceCode);
        //    if (stationInfo != null)
        //    {
        //        //_taskService.r
        //    }
        //    var taskNew = _taskService.QueryCraneConveyorLineTask(command.ConveyorLineTaskNum.ObjToInt(), childDeviceCode);
        //    if (taskNew == null)
        //    {
        //        string barcode = command.ConveyorLineBarcode.TrimEnd();
        //        if (_taskService.RequestWMSTask(command.ConveyorLineBarcode, childDeviceCode).Result.Status)
        //        {
        //            Dt_Task task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
        //            if (task != null)
        //            {
        //                ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
        //                //taskCommand.InteractiveSignal = command.InteractiveSignal;
        //                taskCommand.ResponState = 1;
        //                taskCommand.ConveyorLineTaskNum = task.TaskNum;
        //                taskCommand.ConveyorLineTargetAddress = Convert.ToInt16(task.NextAddress);
        //                conveyorLine.SendCommand(taskCommand, childDeviceCode);

                //conveyorLine.SetValue(ConveyorLineDBName.WriteInteractiveSignal, 0, childDeviceCode);
                WebResponseContent content = _taskService.UpdateTaskStatusToNext(task);
                Console.Out.WriteLine(content.Serialize());
            }
        }
        //                //ConveyorLineSendFinish(conveyorLine, childDeviceCode, ProtocalDetailValue, true);

        /// <summary>
        /// è¾“送线请求出信息
        /// </summary>
        /// <param name="conveyorLine">输送线实例对象</param>
        /// <param name="command">读取的请求信息</param>
        /// <param name="childDeviceCode">子设备编号</param>
        public void RequestOutbound(CommonConveyorLine_After conveyorLine, ConveyorLineTaskCommand_After command, string childDeviceCode)
        {
            Dt_Task task = _taskService.QueryConveyorLineTask(conveyorLine.DeviceCode, childDeviceCode);
            if (task != null)
            {
                // ConveyorLineTaskCommand_After taskCommand = _mapper.Map<ConveyorLineTaskCommand_After>(task);
                //taskCommand.InteractiveSignal = command.InteractiveSignal;
                // conveyorLine.SendCommand(taskCommand, childDeviceCode);
        //                _taskService.UpdateTaskStatusToNext(task);
        //            }
        //        }
        //    }
        //}

                _taskService.UpdateTaskStatusToNext(task);
            }
        }
    }
}
#endregion

 Code Management/WCS/WIDESEAWCS_Server/WIDESEAWCS_Tasks/ConveyorLineJob_After/ConveyorLineTaskCommand_After.cs

@@ -39,7 +39,7 @@
    //}

    public class ConveyorLineTaskCommand_After : DeviceCommand
    {
    { 

        public short ConveyorLineTargetAddress { get; set; }
        public int ConveyorLineTaskNum { get; set; }

 Code Management/WMS/WIDESEA_WMSClient/report_form_rollup-plugin-visualizer.html

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSClient/src/views/widesea_wms/basicinfo/Dt_LocationInfo.vue

@@ -29,7 +29,7 @@
                { "title": "货位状态", "field": "locationStatus", "type": "select", dataKey: "LocationState", data: [] }, 
            ]
        ]);
        const searchFormFields = ref({ "LocationID": "" });
        const searchFormFields = ref({ "LocationID": "",roadWayNO:"" });
        const searchFormOptions = ref([
            [
                { "title": "货位编号", "field": "locationCode", type: "text" },
@@ -52,7 +52,7 @@
        { field: 'enalbeStatus', title: '是否禁用', type: 'int', width: 75, align: 'left', bind: { key: "EnalbeStatus", data: [] }}, 
        // { field: 'isLocked', title: '是否锁定', type: 'bool', width: 110, align: 'left', bind: { key: "IsLocked", data: [] } },
        { field: 'locationDesc', title: '货位描述', type: 'string', width: 110, align: 'left', hidden: true },
        { field: 'remark', title: '备注', type: 'string', width: 110, align: 'left' },
        { field: 'remark', title: '检测柜允许', type: 'string', width: 110, align: 'left' ,bind: { key: "AllowStatus", data: [] }},
        { field: 'creater', title: '创建人', type: 'string', sort: true, width: 110, align: 'left' },
        { field: 'createDate', title: '创建时间', type: 'datetime', sort: true, width: 150, align: 'left', sort: true },
        { field: 'modifier', title: '修改人', type: 'string', sort: true, width: 100, align: 'left' },

 Code Management/WMS/WIDESEA_WMSServer/LogLibrary/obj/Release/net6.0/LogLibrary.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/LogLibrary/obj/Release/net6.0/LogLibrary.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/LogLibrary/obj/Release/net6.0/LogLibrary.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/LogLibrary/obj/Release/net6.0/LogLibrary.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessServices/obj/Release/net6.0/WIDESEA_BusinessServices.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_BusinessesRepository/obj/Release/net6.0/WIDESEA_BusinessesRepository.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Common/obj/Release/net6.0/WIDESEA_Common.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs

@@ -24,7 +24,7 @@
        /// <summary>
        /// IP接口地址
        /// </summary>
        public const string CONFIG_SYS_IPAddress = "CONFIG_SYS_IPAddress";
        public const string CONFIG_SYS_IPAddress = "SYS_IPAddress";

        /// <summary>
        /// MOM接口地址
@@ -120,5 +120,10 @@
        /// æ•´ç›˜ç”µèŠ¯è§£ç»‘
        /// </summary>
        public const string TrayUnbind = "TrayUnbind";

        /// <summary>
        /// è¯·æ±‚WCS任务
        /// </summary>
        public const string ReceiveByWMSTask = "ReceiveByWMSTask";
    }
}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Enums/ManageEnum.cs

@@ -164,6 +164,12 @@
        /// </summary>
        [Description("NG出库")]
        OutNG =105,

        /// <summary>
        /// ç›´æŽ¥å‡ºåº“
        /// </summary>
        [Description("直接出库")]
        InToOut = 106,
    }

    public enum TaskRelocationTypeEnum

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/Filter/ApiAuthorizeFilter.cs

@@ -36,36 +36,36 @@
        /// <param name="context"></param>
        public void OnAuthorization(AuthorizationFilterContext context)
        {
            if (!App.HostEnvironment.IsProduction() || context.HttpContext.Request.Path.Value == loginPath || context.HttpContext.Request.Path.Value == vierificationCodePath)
            //if (!App.HostEnvironment.IsProduction() || context.HttpContext.Request.Path.Value == loginPath || context.HttpContext.Request.Path.Value == vierificationCodePath)
            //{
            if (context.ActionDescriptor.EndpointMetadata.Any(item => item is IAllowAnonymous))
            {
                if (context.ActionDescriptor.EndpointMetadata.Any(item => item is IAllowAnonymous))
                {
                    //如果使用了固定Token不过期，直接对token的合法性及token是否存在进行验证
                    //if (context.Filters
                    //   .Where(item => item is IFixedTokenFilter)
                    //   .FirstOrDefault() is IFixedTokenFilter tokenFilter)
                    //{
                    //    tokenFilter.OnAuthorization(context);
                    //    return;
                    //}
                    //匿名并传入了token，需要将用户的ID缓存起来，保证UserHelper里能正确获取到用户信息
                    if (!context.HttpContext.User.Identity.IsAuthenticated
                        && !string.IsNullOrEmpty(context.HttpContext.Request.Headers[AppSecret.TokenHeaderName]))
                    {
                        context.AddIdentity();
                    }
                    return;
                }
            }
            else
            {
                //如果使用了固定Token不过期，直接对token的合法性及token是否存在进行验证
                //if (context.Filters
                //   .Where(item => item is IFixedTokenFilter)
                //   .FirstOrDefault() is IFixedTokenFilter tokenFilter)
                //{
                //    tokenFilter.OnAuthorization(context);
                //    return;
                //}
                //匿名并传入了token，需要将用户的ID缓存起来，保证UserHelper里能正确获取到用户信息
                if (!context.HttpContext.User.Identity.IsAuthenticated
                        || !context.HttpContext.Request.Headers.ContainsKey(AppSecret.TokenHeaderName))
                    && !string.IsNullOrEmpty(context.HttpContext.Request.Headers[AppSecret.TokenHeaderName]))
                {
                    context.Unauthorized("未授权");
                    return;
                    context.AddIdentity();
                }
                return;
            }
            //}
            //else
            //{
            //    if (!context.HttpContext.User.Identity.IsAuthenticated
            //            || !context.HttpContext.Request.Headers.ContainsKey(AppSecret.TokenHeaderName))
            //    {
            //        context.Unauthorized("未授权");
            //        return;
            //    }
            //}

            DateTime expDate = context.HttpContext.User.Claims.Where(x => x.Type == JwtRegisteredClaimNames.Exp)
                .Select(x => x.Value).FirstOrDefault().GetTimeSpmpToDate();

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Release/net6.0/WIDESEA_Core.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Release/net6.0/WIDESEA_Core.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Release/net6.0/WIDESEA_Core.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Release/net6.0/WIDESEA_Core.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Release/net6.0/WIDESEA_Core.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Release/net6.0/WIDESEA_Core.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Core/obj/Release/net6.0/WIDESEA_Core.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/Basic/RequestTaskDto.cs

@@ -23,11 +23,15 @@
    public string RequestType { get; set; } = string.Empty;

    public string EquiCodeMOM { get; set; }

    public string Roadways { get; set; }

    public int area { get; set; }
}

public class RequestOutTaskDto
{
    public string   Position { get; set; }
    public string Position { get; set; }
    public int Tag { get; set; }
    public string AreaCdoe { get; set; }
    public List<string> Roadways { get; set; }

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Release/net6.0/WIDESEA_DTO.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Release/net6.0/WIDESEA_DTO.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Release/net6.0/WIDESEA_DTO.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Release/net6.0/WIDESEA_DTO.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Release/net6.0/WIDESEA_DTO.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Release/net6.0/WIDESEA_DTO.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_DTO/obj/Release/net6.0/WIDESEA_DTO.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Release/net6.0/WIDESEA_IBusinessServices.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Release/net6.0/WIDESEA_IBusinessServices.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Release/net6.0/WIDESEA_IBusinessServices.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Release/net6.0/WIDESEA_IBusinessServices.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Release/net6.0/WIDESEA_IBusinessServices.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Release/net6.0/WIDESEA_IBusinessServices.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessServices/obj/Release/net6.0/WIDESEA_IBusinessServices.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Release/net6.0/WIDESEA_IBusinessesRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Release/net6.0/WIDESEA_IBusinessesRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Release/net6.0/WIDESEA_IBusinessesRepository.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Release/net6.0/WIDESEA_IBusinessesRepository.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Release/net6.0/WIDESEA_IBusinessesRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Release/net6.0/WIDESEA_IBusinessesRepository.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IBusinessesRepository/obj/Release/net6.0/WIDESEA_IBusinessesRepository.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IRepository/obj/Release/net6.0/WIDESEA_IRepository.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IServices/obj/Release/net6.0/WIDESEA_IServices.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Release/net6.0/WIDESEA_IStoragIntegrationServices.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Release/net6.0/WIDESEA_IStoragIntegrationServices.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Release/net6.0/WIDESEA_IStoragIntegrationServices.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Release/net6.0/WIDESEA_IStoragIntegrationServices.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Release/net6.0/WIDESEA_IStoragIntegrationServices.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Release/net6.0/WIDESEA_IStoragIntegrationServices.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationServices/obj/Release/net6.0/WIDESEA_IStoragIntegrationServices.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicRepository/obj/Release/net6.0/WIDESEA_IStorageBasicRepository.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageBasicService/obj/Release/net6.0/WIDESEA_IStorageBasicServices.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderRepository/obj/Release/net6.0/WIDESEA_IStorageOutOrderRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderRepository/obj/Release/net6.0/WIDESEA_IStorageOutOrderRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderRepository/obj/Release/net6.0/WIDESEA_IStorageOutOrderRepository.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderRepository/obj/Release/net6.0/WIDESEA_IStorageOutOrderRepository.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderRepository/obj/Release/net6.0/WIDESEA_IStorageOutOrderRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderRepository/obj/Release/net6.0/WIDESEA_IStorageOutOrderRepository.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderRepository/obj/Release/net6.0/WIDESEA_IStorageOutOrderRepository.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/obj/Release/net6.0/WIDESEA_IStorageOutOrderServices.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/obj/Release/net6.0/WIDESEA_IStorageOutOrderServices.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/obj/Release/net6.0/WIDESEA_IStorageOutOrderServices.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/obj/Release/net6.0/WIDESEA_IStorageOutOrderServices.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/obj/Release/net6.0/WIDESEA_IStorageOutOrderServices.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/obj/Release/net6.0/WIDESEA_IStorageOutOrderServices.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageOutOrderService/obj/Release/net6.0/WIDESEA_IStorageOutOrderServices.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/obj/Release/net6.0/WIDESEA_IStorageTaskRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/obj/Release/net6.0/WIDESEA_IStorageTaskRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/obj/Release/net6.0/WIDESEA_IStorageTaskRepository.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/obj/Release/net6.0/WIDESEA_IStorageTaskRepository.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/obj/Release/net6.0/WIDESEA_IStorageTaskRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/obj/Release/net6.0/WIDESEA_IStorageTaskRepository.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskRepository/obj/Release/net6.0/WIDESEA_IStorageTaskRepository.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/Task/IDt_TaskService.cs

@@ -134,6 +134,16 @@
    Task<WebResponseContent> RequestTaskAsync(RequestTaskDto input);

    /// <summary>
    /// è¯·æ±‚任务巷道
    /// </summary>
    /// <param name="position"></param>
    /// <param name="areaCode"></param>
    /// <param name="palletCode"></param>
    /// <param name="type"></param>
    /// <returns></returns>
    Task<WebResponseContent> RequestInTask(RequestTaskDto input);

    /// <summary>
    /// è¯·æ±‚任务货位
    /// </summary>
    /// <param name="input"></param>

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Release/net6.0/WIDESEA_IStorageTaskServices.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Release/net6.0/WIDESEA_IStorageTaskServices.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Release/net6.0/WIDESEA_IStorageTaskServices.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Release/net6.0/WIDESEA_IStorageTaskServices.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Release/net6.0/WIDESEA_IStorageTaskServices.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Release/net6.0/WIDESEA_IStorageTaskServices.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_IStorageTaskService/obj/Release/net6.0/WIDESEA_IStorageTaskServices.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/Models/BasicModel/DtLocationInfo.cs

@@ -79,7 +79,7 @@
    public int EnalbeStatus { get; set; }

    /// <summary>
    /// å¤‡æ³¨
    /// å¤‡æ³¨  (检测柜允许/不允许入)
    /// </summary>
    [SugarColumn(IsNullable = true, Length = 200, ColumnDescription = "备注")]
    public string Remark { get; set; }

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Release/net6.0/WIDESEA_Model.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Release/net6.0/WIDESEA_Model.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Release/net6.0/WIDESEA_Model.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Release/net6.0/WIDESEA_Model.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Release/net6.0/WIDESEA_Model.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Release/net6.0/WIDESEA_Model.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Model/obj/Release/net6.0/WIDESEA_Model.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Release/net6.0/WIDESEA_Repository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Release/net6.0/WIDESEA_Repository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Release/net6.0/WIDESEA_Repository.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Release/net6.0/WIDESEA_Repository.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Release/net6.0/WIDESEA_Repository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Release/net6.0/WIDESEA_Repository.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Repository/obj/Release/net6.0/WIDESEA_Repository.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Release/net6.0/WIDESEA_Services.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Release/net6.0/WIDESEA_Services.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Release/net6.0/WIDESEA_Services.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Release/net6.0/WIDESEA_Services.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Release/net6.0/WIDESEA_Services.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Release/net6.0/WIDESEA_Services.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Services/obj/Release/net6.0/WIDESEA_Services.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/MCSService.cs

@@ -1,4 +1,5 @@
using System;
using LogLibrary.Log;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
@@ -7,6 +8,7 @@
using WIDESEA_IStorageBasicRepository;
using WIDESEA_IStorageTaskRepository;
using WIDESEA_IStoragIntegrationServices;
using WIDESEAWCS_BasicInfoRepository;

namespace WIDESEA_StoragIntegrationServices
{
@@ -16,15 +18,16 @@
        private readonly IDt_TaskRepository _taskRepository;
        private readonly IStockInfoRepository _stockInfoRepository;
        private readonly ISys_ConfigService _configService;
        private readonly IDt_StationManagerRepository _stationManagerRepository;
        private readonly LogFactory LogFactory = new LogFactory();


        public MCSService(ILocationInfoRepository locationRepository,IDt_TaskRepository taskRepository,IStockInfoRepository stockInfoRepository, ISys_ConfigService configService)
        public MCSService(ILocationInfoRepository locationRepository,IDt_TaskRepository taskRepository,IStockInfoRepository stockInfoRepository, ISys_ConfigService configService, IDt_StationManagerRepository stationManagerRepository)
        {
            _locationRepository = locationRepository;
            _taskRepository = taskRepository;
            _stockInfoRepository = stockInfoRepository;
            _configService = configService;

            _stationManagerRepository = stationManagerRepository;
        }
    }
}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/ModifyAccessStatus.cs

@@ -34,6 +34,9 @@
                else
                    throw new Exception("货位不存在");


                LogFactory.GetLog("分容库位同步").Info(true, $"\r\r--------------------------------------");
                LogFactory.GetLog("分容库位同步）").Info(true, json);
                return content.OK();
            }
            catch (Exception ex)

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/NotifyFinishTest.cs

@@ -1,4 +1,5 @@
using Newtonsoft.Json;
using LogLibrary.Log;
using Newtonsoft.Json;
using System;
using System.Collections.Generic;
using System.Linq;
@@ -9,9 +10,11 @@
using WIDESEA_Core.Enums;
using WIDESEA_Core.Helper;
using WIDESEA_DTO;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
using WIDESEA_Model.Models;
using WIDESEA_StorageBasicRepository;
using WIDESEAWCS_Model.Models;

namespace WIDESEA_StoragIntegrationServices
{
@@ -34,6 +37,18 @@

                if (location == null) throw new Exception("未知库位");

                Dt_StationManager stationManager;
                if (result.IsNG == 1)
                {
                    stationManager = _stationManagerRepository.QueryFirst(x => x.Roadway == location.RoadwayNo && x.stationType == 4);
                }
                else
                {
                    stationManager = _stationManagerRepository.QueryFirst(x => x.Roadway == location.RoadwayNo && x.stationType == 2);
                }

                if (stationManager == null) throw new Exception("未知站台");

                int taskNum = _taskRepository.GetTaskNo().Result;

                Dt_Task task = new Dt_Task
@@ -42,44 +57,78 @@
                    Creater = "HK",
                    CurrentAddress = result.LocationID,
                    Grade = 1,
                    Dispatchertime = DateTime.Now,
                    PalletCode = result.PalletBarcode,
                    Roadway = location.RoadwayNo,
                    SourceAddress = result.LocationID,
                    TaskState = (int)TaskOutStatusEnum.OutNew,
                    TaskType = result.IsNG == 1 ? (int)TaskOutboundTypeEnum.OutNG : (int)TaskOutboundTypeEnum.Outbound,
                    TargetAddress = "",
                    TargetAddress = stationManager.stationLocation,
                    NextAddress = stationManager.stationChildCode,
                    TaskNum = taskNum, //_taskRepository.GetTaskNo().Result,
                    TaskId = 0,
                };

                WMSTaskDTO taskDTO = new WMSTaskDTO
                // å°è¯•æ·»åŠ æ–°ä»»åŠ¡
                WMSTaskDTO taskDTO = new WMSTaskDTO()
                {
                    Id = 0,
                    TaskNum = task.TaskNum.Value,
                    Grade = 1,
                    PalletCode = result.PalletBarcode,
                    RoadWay = location.RoadwayNo,
                    SourceAddress = result.LocationID,
                    TargetAddress = "",
                    TaskNum = taskNum,  //_taskRepository.GetTaskNo().Result,
                    TaskState = (int)TaskOutStatusEnum.OutNew,
                    PalletCode = task.PalletCode,
                    RoadWay = task.Roadway,
                    SourceAddress = task.SourceAddress,
                    TargetAddress = task.TargetAddress,
                    TaskState = task.TaskState.Value,
                    Id = 0,
                    TaskType = result.IsNG == 1 ? (int)TaskOutboundTypeEnum.OutNG : (int)TaskOutboundTypeEnum.Outbound,
                };

                //var respon = HttpHelper.Post("http://localhost:9291/api/Task/ReceiveTask", JsonConvert.SerializeObject(taskDTO));
                //if (respon != null)
                //{
                    
                //}
                //else
                //{
                //    throw new Exception("WCS处理失败");
                //}
                var configs = _configService.GetConfigsByCategory(CateGoryConst.CONFIG_SYS_IPAddress);
                var ipAddress = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.WCSIPAddress)?.ConfigValue;
                var ReceiveByWMSTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveByWMSTask)?.ConfigValue;
                if (ReceiveByWMSTask == null || ipAddress == null)
                {
                    throw new Exception("WMS IP æœªé…ç½®");
                }
                var wmsIpAddrss = ipAddress + ReceiveByWMSTask;

                var respon = HttpHelper.Post(wmsIpAddrss, JsonConvert.SerializeObject(taskDTO));   //http://localhost:9291/api/Task/ReceiveTask,
                if (respon != null)
                {
                    WebResponseContent respone = JsonConvert.DeserializeObject<WebResponseContent>(respon.ToString());
                    if (respone.Status)
                    {
                        var taskId = _taskRepository.AddData(task);
                    }

                    else
                    {
                        throw new Exception("WCS处理失败:" + respone.Message);
                    }
                }
                else
                {
                    throw new Exception("WCS处理失败");
                }
                //WMSTaskDTO taskDTO = new WMSTaskDTO
                //{
                //    Id = 0,
                //    Grade = 1,
                //    PalletCode = result.PalletBarcode,
                //    RoadWay = location.RoadwayNo,
                //    SourceAddress = result.LocationID,
                //    TargetAddress = task.TargetAddress,
                //    TaskNum = taskNum,  //_taskRepository.GetTaskNo().Result,
                //    TaskState = (int)TaskOutStatusEnum.OutNew,
                //};
                LogFactory.GetLog("分容测试完成通知").Info(true, $"\r\r--------------------------------------");
                LogFactory.GetLog("分容测试完成通知）").Info(true, result);
                return content.OK();
            }
            catch (Exception ex)
            {
                LogFactory.GetLog("分容测试完成通知").Info(true, $"\r\r--------------------------------------");
                LogFactory.GetLog("分容测试完成通知）").Info(true, ex.Message);
                return content.Error(ex.Message);
            }
        }

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequestChangeLocation.cs

@@ -24,9 +24,12 @@
                if (string.IsNullOrEmpty(json.ToString())) throw new Exception("上传参数为空");

                var result = JsonConvert.DeserializeObject<RequestReMove>(json.ToString());
                ;
                if (result.MoveType == 5) Console.WriteLine($"分容检测柜火警触发:库位{result.LocationID}");



                LogFactory.GetLog("分容移库申请").Info(true, $"\r\r--------------------------------------");
                LogFactory.GetLog("分容移库申请）").Info(true, result);
                return content.OK();
            }
            catch (Exception ex)

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/MCS/Partial/RequsetCellInfo.cs

@@ -29,6 +29,8 @@
                //todo
                if (info != null)
                {
                    LogFactory.GetLog("分容获取库位托盘").Info(true, $"\r\r--------------------------------------");
                    LogFactory.GetLog("分容获取库位托盘）").Info(true, result);
                    return new { code = 1, palletBarcode = info.PalletCode };
                }
                else

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/bin/Release/net6.0/WIDESEA_StoragIntegrationServices.deps.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationServices/obj/Release/net6.0/WIDESEA_StoragIntegrationServices.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Release/net6.0/WIDESEA_StorageBasicRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Release/net6.0/WIDESEA_StorageBasicRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Release/net6.0/WIDESEA_StorageBasicRepository.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Release/net6.0/WIDESEA_StorageBasicRepository.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Release/net6.0/WIDESEA_StorageBasicRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Release/net6.0/WIDESEA_StorageBasicRepository.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicRepository/obj/Release/net6.0/WIDESEA_StorageBasicRepository.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/WIDESEA_StorageBasicServices.csproj

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/bin/Release/net6.0/WIDESEA_StorageBasicServices.deps.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/obj/Release/net6.0/WIDESEA_StorageBasicServices.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/obj/Release/net6.0/WIDESEA_StorageBasicServices.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/obj/Release/net6.0/WIDESEA_StorageBasicServices.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/obj/Release/net6.0/WIDESEA_StorageBasicServices.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/obj/Release/net6.0/WIDESEA_StorageBasicServices.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/obj/Release/net6.0/WIDESEA_StorageBasicServices.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageBasicServices/obj/Release/net6.0/WIDESEA_StorageBasicServices.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Release/net6.0/WIDESEA_StorageOutOrderRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Release/net6.0/WIDESEA_StorageOutOrderRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Release/net6.0/WIDESEA_StorageOutOrderRepository.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Release/net6.0/WIDESEA_StorageOutOrderRepository.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Release/net6.0/WIDESEA_StorageOutOrderRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Release/net6.0/WIDESEA_StorageOutOrderRepository.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderRepository/obj/Release/net6.0/WIDESEA_StorageOutOrderRepository.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageOutOrderServices/obj/Release/net6.0/WIDESEA_StorageOutOrderServices.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskRepository/obj/Release/net6.0/WIDESEA_StorageTaskRepository.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService - ¸´ÖÆ.cs

@@ -1182,6 +1182,11 @@
        {
            return await Db.Queryable<Dt_Task>().Where(x => x.TaskNum == taskNum).FirstAsync();
        }

        public Task<WebResponseContent> RequestInTask(RequestTaskDto input)
        {
            throw new NotImplementedException();
        }
        #endregion
    }
}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Dt_TaskService.cs

@@ -10,6 +10,7 @@
using WIDESEA_StorageBasicRepository;
using WIDESEA_StorageTaskRepository;
using WIDESEA_StoragIntegrationServices;
using WIDESEAWCS_BasicInfoRepository;

namespace WIDESEA_StorageOutTaskServices;

@@ -36,6 +37,7 @@
    private readonly IDt_AreaInfoRepository _areaInfoRepository; //区域
    private readonly IAgingInOrOutInputService _agingInOrOutInputService; //静置\陈化
    private readonly IProductionRepository _productionRepository; //生产
    private readonly IDt_StationManagerRepository _stationManagerRepository;

    public Dt_TaskService(IDt_TaskRepository BaseDal,
                                IUnitOfWorkManage unitOfWorkManage,
@@ -57,7 +59,8 @@
                                IDt_AreaInfoRepository areaInfoRepository,
                                IAgingInOrOutInputService agingInOrOutInputService,
                                IStockInfoDetailRepository stockInfoDetailRepository,
                                IProductionRepository productionRepository) : base(BaseDal)
                                IProductionRepository productionRepository,
                                IDt_StationManagerRepository stationManagerRepository) : base(BaseDal)
    {
        _unitOfWorkManage = unitOfWorkManage;
        _outOrderRepository = outOrderRepository;
@@ -79,6 +82,7 @@
        _agingInOrOutInputService = agingInOrOutInputService;
        _stockInfoDetailRepository = stockInfoDetailRepository;
        _productionRepository = productionRepository;
        _stationManagerRepository = stationManagerRepository;
    }

    #region å¤–部接口方法
@@ -96,10 +100,12 @@
                //var process = await SqlSugarHelper.Db.Queryable<Dt_EquipmentProcess>()
                //    .FirstAsync(x => x.EquipmentName == task.Roadway);
                //var info = JsonConvert.DeserializeObject<ResponseEqptRunDto>(process.ProcessValue);

                var agingOutputDto = MapToAgingOutputDto(stock);
                content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
                ValidateResponse(content);
                if (!task.Roadway.Contains("FR"))  //非分容库区均上报MOM出入站
                {
                    var agingOutputDto = MapToAgingOutputDto(stock);
                    content = await _agingInOrOutInputService.GetOCVOutputAsync(agingOutputDto);
                    ValidateResponse(content);
                }
            }

            // æ›´æ–°åº“存状态和任务状态
@@ -352,26 +358,27 @@
            LocationId = loation.Id,
            StockInfoDetails = boxDetail,
        };

        // å¤„理请求参数
        AgingInputDto agingInputDto = new AgingInputDto()
        if (!task.Roadway.Contains("FR")) //非分容库区均上报MOM出入站
        {
            SerialNos = boxing.BoxingInfoDetails
                .Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
                .ToList(),
            TrayBarcode = task.PalletCode,
            OpFlag = 1,
            EquipmentCode = area.Spare2,
            Software = area.Spare3
        };
        var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;
        var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());
        stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
        stock.SpecialParameterDuration = respone.SpecialParameterDuration;
        //2024å¹´11月16日：新增字段计算应出库时间
        stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));
        stock.ProductionLine = respone.ProductionLine;

            // å¤„理请求参数
            AgingInputDto agingInputDto = new AgingInputDto()
            {
                SerialNos = boxing.BoxingInfoDetails
                    .Select(item => new SerialNoInDto { SerialNo = item.SerialNumber, PositionNo = item.OrderNo })
                    .ToList(),
                TrayBarcode = task.PalletCode,
                OpFlag = 1,
                EquipmentCode = area.Spare2,
                Software = area.Spare3
            };
            var result = _agingInOrOutInputService.GetOCVInputAsync(agingInputDto).Result;
            var respone = JsonConvert.DeserializeObject<ResponeAgingInputDto>(result.Data.ToString());
            stock.LinedProcessFeedbackTime = respone.LinedProcessFeedbackTime;
            stock.SpecialParameterDuration = respone.SpecialParameterDuration;
            //2024å¹´11月16日：新增字段计算应出库时间
            stock.OutboundTime = Convert.ToDateTime(respone.LinedProcessFeedbackTime).AddHours(Convert.ToDouble(respone.SpecialParameterDuration));
            stock.ProductionLine = respone.ProductionLine;
        }
        // è®°å½•æ—¥å¿—
        LogFactory.GetLog("任务完成").InfoFormat(true, "入库任务完成", $"货位地址：{task.TargetAddress},修改后货位数据：{locationInf}");

@@ -403,6 +410,11 @@
        }
        LogFactory.GetLog("任务完成").InfoFormat(true, "验证任务是否存在", JsonConvert.SerializeObject(task));

        if(task.TaskType == (int)TaskOutboundTypeEnum.InToOut)
        {
           return await CompleteInToOutTaskAsync(task);
        }

        // éªŒè¯åº“存是否存在
        var stock = await _stockInfoRepository.QueryFirstNavAsync(x => x.PalletCode == task.PalletCode);


 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs

@@ -2,6 +2,8 @@
using Mapster;
using Masuit.Tools;
using Masuit.Tools.Models;
using System.Diagnostics;
using WIDESEA_DTO;
using WIDESEA_DTO.MOM;
using WIDESEA_DTO.WMS;
using WIDESEA_IStorageBasicRepository;
@@ -10,13 +12,14 @@
using WIDESEA_StorageBasicRepository;
using WIDESEA_StorageTaskRepository;
using WIDESEA_StoragIntegrationServices;
using WIDESEAWCS_Model.Models;

namespace WIDESEA_StorageOutTaskServices;

public partial class Dt_TaskService : ServiceBase<Dt_Task, IDt_TaskRepository>, IDt_TaskService
{

    //#region å‡ºåº“任务完成
    #region å‡ºåº“任务完成


    //public async Task<WebResponseContent> CompleteStackTaskAsync(Dt_Task task, DtStockInfo stock)
@@ -145,7 +148,7 @@
    //    }
    //}

    //#endregion å‡ºåº“任务完成
    #endregion å‡ºåº“任务完成

    #region ç§»åº“任务完成

@@ -374,7 +377,7 @@
                        PalletCode = task.PalletCode,
                        RoadWay = task.Roadway,
                        SourceAddress = task.SourceAddress,
                        TargetAddress = task.Roadway,
                        TargetAddress = task.TargetAddress,
                        TaskState = task.TaskState.Value,
                        Id = 0,
                        TaskType = task.TaskType,
@@ -384,6 +387,201 @@
            }

            // åˆ›å»ºä¸€ä¸ªTrayCellsStatusDto对象，并赋值
            //TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
            //{
            //    Software = "WMS",
            //    TrayBarcode = input.PalletCode,
            //    //EquipmentCode = "EQ_CWJZ01"
            //    EquipmentCode = input.EquiCodeMOM
            //};

            //// è°ƒç”¨GetTrayCellStatusAsync方法，获取整盘电芯
            //content = await GetTrayCellStatusAsync(trayCells);
            //// å¦‚果状态为false，则返回content
            //if (!content.Status) return content;

            //// æ·»åŠ ç»„盘信息
            //// å°†content.Data转换为ResultTrayCellsStatus对象
            //var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
            //if (result.SerialNos.Count <= 0)
            //    return content.Error(result.MOMMessage);

            //Console.WriteLine(result);
            //// TODO èŽ·å–本地料框属性与整盘电芯属性获取的值进行对比，如果一致则继续，否则返回错误信息
            ////var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));
            ////if (productions.Count <= 0)
            ////    return content.Error("料框属性不存在");

            //// è°ƒç”¨CreateBoxingInfo方法，创建组盘信息

            //var boxing = await CreateBoxingInfo(result, input.PalletCode);
            //if (boxing == null) return content.Error("组盘失败");

            //// è°ƒç”¨GetProcessApplyAsync方法，获取工艺路线
            //ProcessApplyDto process = await GetProcessApplyAsync(input, result);

            //// å¦‚æžœprocess为null，则返回content
            //if (process == null) return content;

            //// è°ƒç”¨_processApplyService.GetProcessApplyAsync方法，获取工艺申请
            //content = await _processApplyService.GetProcessApplyAsync(process);

            //// å¦‚果状态为false，则返回null
            //if (!content.Status) return content.Error("工艺申请失败");

            ////// è°ƒç”¨GetProcessResponseAsync方法，获取工艺响应
            ////var processResponse = await GetProcessResponseAsync(process, input.Position);
            // è°ƒç”¨CreateNewTask方法，创建新任务
            content = await CreateNewTask(input);
            //if (content.Status)
            //{
            //    var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
            //}
        }
        catch (Exception err)
        {
            // å¦‚果发生异常，则调用content.Error方法，记录错误信息，并输出错误信息
            content.Error(err.Message);
            Console.WriteLine(err.Message);
        }
        // è¿”回content
        return content;
    }

    /// <summary>
    /// 
    /// </summary>
    /// <param name="input">请求参数</param>
    /// <param name="flag">实框空框标识</param>
    /// <returns></returns>
    private async Task<WebResponseContent> CreateNewTask(RequestTaskDto input)
    {
        WebResponseContent content = new WebResponseContent();

        //DtLocationInfo locationInfo = await RequestLocation(input);

        //if (locationInfo == null) throw new Exception("库位已满");

        var stationinfo = _stationManagerRepository.QueryFirst(x => x.stationChildCode == input.Position);

        if (stationinfo == null) throw new Exception("未知站台");


        var task = await CreateNewTaskByStation(input, stationinfo);

        // åˆ›å»ºæ–°ä»»åŠ¡å®žä¾‹
        //var task = new Dt_Task
        //{
        //    CurrentAddress = input.Position,
        //    Grade = 1,
        //    Roadway = input.Roadways,
        //    TargetAddress = locationInfo.LocationCode,
        //    Dispatchertime = DateTime.Now,
        //    MaterialNo = "",
        //    NextAddress = input.Roadways,
        //    OrderNo = null,
        //    PalletCode = input.PalletCode,
        //    SourceAddress = stationinfo.stationLocation,
        //    TaskState = (int)TaskInStatusEnum.Line_InFinish,
        //    TaskType = (int)TaskInboundTypeEnum.Inbound,
        //    TaskNum = await BaseDal.GetTaskNo(),
        //    Creater = "Systeam"
        //};

        // å°è¯•æ·»åŠ æ–°ä»»åŠ¡
        var taskId = await BaseDal.AddDataAsync(task);
        bool isResult = taskId > 0;
        if (isResult)
        {
            // åˆ›å»ºWMS任务
            WMSTaskDTO taskDTO = new WMSTaskDTO()
            {
                TaskNum = task.TaskNum.Value,
                Grade = 1,
                PalletCode = task.PalletCode,
                RoadWay = task.Roadway,
                SourceAddress = task.SourceAddress,
                TargetAddress = task.TargetAddress,
                TaskState = task.TaskState.Value,
                Id = 0,
                TaskType = task.TaskType,
            };
            content.OK(data: taskDTO);
        }
        else
            content.Error("添加任务失败");
        return content;
    }

    /// <summary>
    /// æ ¹æ®è¯·æ±‚参数和站台 åšä¸åŒä»»åŠ¡å¤„理
    /// </summary>
    /// <param name="input"></param>
    /// <param name="stationManager"></param>
    /// <returns></returns>
    /// <exception cref="Exception"></exception>
    private async Task<Dt_Task> CreateNewTaskByStation(RequestTaskDto input, Dt_StationManager stationManager)
    {
        Dt_Task task = null;
        switch (stationManager.stationType)
        {
            case 6:
            case 1:
                task = await CreateInTaskAsync(input, stationManager); break;
            //case 2:
            //case 3:  //异常排出给WCS处理
            //case 4:
            case 5:
                task = await CreateInToOutTaskAsync(input, stationManager); break;

            default:
                throw new Exception("位置站台类型");
        }
        return task;
    }

    #region ç›´æŽ¥å‡ºåº“任务
    private async Task<Dt_Task> CreateInToOutTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
    {
        if (stationManager.stationType != 5) throw new Exception("错误的调取");

        var targetStation = _stationManagerRepository.QueryFirst(x => x.stationPLC == stationManager.stationPLC && x.Roadway == stationManager.Roadway && x.stationType == 2);

        var task = new Dt_Task
        {
            CurrentAddress = input.Position,
            Grade = 1,
            Roadway = input.Roadways,
            TargetAddress = targetStation.stationLocation,
            Dispatchertime = DateTime.Now,
            MaterialNo = "",
            NextAddress = input.Roadways,
            OrderNo = null,
            PalletCode = input.PalletCode,
            SourceAddress = stationManager.stationLocation,
            TaskState = (int)TaskInStatusEnum.Line_InFinish,
            TaskType = (int)TaskOutboundTypeEnum.InToOut,
            TaskNum = await BaseDal.GetTaskNo(),
            Creater = "Systeam"
        };

        return task;
    }
    #endregion


    #region å…¥åº“任务
    private async Task<Dt_Task> CreateInTaskAsync(RequestTaskDto input, Dt_StationManager stationManager)
    {
        if (stationManager.stationType != 1 && stationManager.stationType != 6) throw new Exception("错误的调取");

        DtLocationInfo locationInfo = await RequestLocation(input);

        if (locationInfo == null) throw new Exception("库位已满");

        if (stationManager.stationType == 1)
        {
            // åˆ›å»ºä¸€ä¸ªTrayCellsStatusDto对象，并赋值
            TrayCellsStatusDto trayCells = new TrayCellsStatusDto()
            {
                Software = "WMS",
@@ -392,62 +590,105 @@
                EquipmentCode = input.EquiCodeMOM
            };

            // è°ƒç”¨GetTrayCellStatusAsync方法，获取整盘电芯
            content = await GetTrayCellStatusAsync(trayCells);
            // å¦‚果状态为false，则返回content
            if (!content.Status) return content;
            //// è°ƒç”¨GetTrayCellStatusAsync方法，获取整盘电芯
            //content = await GetTrayCellStatusAsync(trayCells);
            //// å¦‚果状态为false，则返回content
            //if (!content.Status) return content;

            // æ·»åŠ ç»„盘信息
            // å°†content.Data转换为ResultTrayCellsStatus对象
            var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
            if (result.SerialNos.Count <= 0)
                return content.Error(result.MOMMessage);
            //// æ·»åŠ ç»„盘信息
            //// å°†content.Data转换为ResultTrayCellsStatus对象
            //var result = JsonConvert.DeserializeObject<ResultTrayCellsStatus>(content.Data.ToString());
            //if (result.SerialNos.Count <= 0)
            //    return content.Error(result.MOMMessage);

            Console.WriteLine(result);
            // TODO èŽ·å–本地料框属性与整盘电芯属性获取的值进行对比，如果一致则继续，否则返回错误信息
            //var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));
            //if (productions.Count <= 0)
            //    return content.Error("料框属性不存在");
            //Console.WriteLine(result);
            //// TODO èŽ·å–本地料框属性与整盘电芯属性获取的值进行对比，如果一致则继续，否则返回错误信息
            ////var productions = await _productionRepository.QueryDataAsync(x => result.TrayBarcodePropertys.Select(x => x.TrayBarcodeProperty).ToList().Contains(x.TrayBarcodeProperty));
            ////if (productions.Count <= 0)
            ////    return content.Error("料框属性不存在");

            // è°ƒç”¨CreateBoxingInfo方法，创建组盘信息
            //// è°ƒç”¨CreateBoxingInfo方法，创建组盘信息

            var boxing = await CreateBoxingInfo(result, input.PalletCode);
            if (boxing == null) return content.Error("组盘失败");
            //var boxing = await CreateBoxingInfo(result, input.PalletCode);
            //if (boxing == null) return content.Error("组盘失败");

            // è°ƒç”¨GetProcessApplyAsync方法，获取工艺路线
            ProcessApplyDto process = await GetProcessApplyAsync(input, result);
            //// è°ƒç”¨GetProcessApplyAsync方法，获取工艺路线
            //ProcessApplyDto process = await GetProcessApplyAsync(input, result);

            // å¦‚æžœprocess为null，则返回content
            if (process == null) return content;
            //// å¦‚æžœprocess为null，则返回content
            //if (process == null) return content;

            // è°ƒç”¨_processApplyService.GetProcessApplyAsync方法，获取工艺申请
            content = await _processApplyService.GetProcessApplyAsync(process);
            //// è°ƒç”¨_processApplyService.GetProcessApplyAsync方法，获取工艺申请
            //content = await _processApplyService.GetProcessApplyAsync(process);

            // å¦‚果状态为false，则返回null
            if (!content.Status) return content.Error("工艺申请失败");
            //// å¦‚果状态为false，则返回null
            //if (!content.Status) return content.Error("工艺申请失败");

            //// è°ƒç”¨GetProcessResponseAsync方法，获取工艺响应
            //var processResponse = await GetProcessResponseAsync(process, input.Position);
            ////// è°ƒç”¨GetProcessResponseAsync方法，获取工艺响应
            ////var processResponse = await GetProcessResponseAsync(process, input.Position);
        }

            List<string> strings = input.Position == "1088" ? new List<string>() { "CHSC01" } : new List<string>() { "JZSC01" };
            // è°ƒç”¨CreateNewTask方法，创建新任务
            content = await CreateNewTask(input, strings);
            if (content.Status)
        var task = new Dt_Task
        {
            CurrentAddress = input.Position,
            Grade = 1,
            Roadway = input.Roadways,
            TargetAddress = locationInfo.LocationCode,
            Dispatchertime = DateTime.Now,
            MaterialNo = "",
            NextAddress = input.Roadways,
            OrderNo = null,
            PalletCode = input.PalletCode,
            SourceAddress = stationManager.stationLocation,
            TaskState = (int)TaskInStatusEnum.Line_InFinish,
            TaskType = stationManager.stationType == 1 ? (int)TaskInboundTypeEnum.Inbound : (int)TaskInboundTypeEnum.InTray,
            TaskNum = await BaseDal.GetTaskNo(),
            Creater = "Systeam"
        };

        locationInfo.LocationStatus = (int)LocationEnum.FreeDisable;
        await UpdateLocationAsync(locationInfo);

        return task;
    }
    #endregion

    #region åº“位分配
    /// <summary>
    /// 
    /// </summary>
    /// <param name="requestTask">请求参数</param>
    /// <returns></returns>
    private async Task<DtLocationInfo> RequestLocation(RequestTaskDto requestTask)
    {
        #region èŽ·å–货位
        try
        {
            List<DtLocationInfo> locations;
            if (requestTask.Roadways.Contains("FR"))
            {
                var isBox = await _boxingInfoRepository.AddDataNavAsync(boxing);
                locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 2 && x.Remark == "1");
            }
            else
            {
                locations = await _locationRepository.QueryDataAsync(x => x.LocationStatus == (int)LocationEnum.Free && x.RoadwayNo == requestTask.Roadways && x.EnalbeStatus == 1 && x.LocationType == 1);
            }

            if (locations == null)
            {
                return null;
            }

            return locations.OrderBy(x => x.Layer).ThenBy(x => x.Column).ThenBy(x => x.Row).FirstOrDefault();
        }
        catch (Exception err)
        {
            // å¦‚果发生异常，则调用content.Error方法，记录错误信息，并输出错误信息
            content.Error(err.Message);
            Console.WriteLine(err.Message);
            Console.WriteLine(err.Message.ToString());
            return null;
        }

        // è¿”回content
        return content;
    }

        #endregion èŽ·å–货位
    } 
    #endregion

    // èŽ·å–工艺申请
    private async Task<ProcessApplyDto> GetProcessApplyAsync(RequestTaskDto input, ResultTrayCellsStatus content)
@@ -457,7 +698,7 @@
        {
            EquipmentCode = input.EquiCodeMOM,
            Software = "WMS",
            //WipOrderNo = result.BindCode,
            //WipOrderNo = result.BindCode,"
            SerialNos = content.SerialNos.Select(item => new SerialNos
            {
                SerialNo = item.SerialNo
@@ -467,59 +708,25 @@

    #endregion è¯·æ±‚任务入库

    public async Task<WebResponseContent> CompleteInToOutTaskAsync(Dt_Task task)
    {
        WebResponseContent content = new WebResponseContent();
        try
        {
            //添加历史
            var taskHty = CreateHistoricalTask(task);

            //删除任务
            BaseDal.DeleteData(task);


    #region ä»»åŠ¡çŠ¶æ€æ›´æ”¹

    /// <summary>
    /// æ›´æ–°ä»»åŠ¡çŠ¶æ€&出库解盘
    /// </summary>
    /// <param name="taskNum"></param>
    /// <param name="taskState"></param>
    /// <returns></returns>
    //public async Task<WebResponseContent> UpdateTaskStatus(int taskNum, int taskState)
    //{
    //    WebResponseContent content = new WebResponseContent();
    //    try
    //    {
    //        var task = await BaseDal.QueryFirstAsync(x => x.TaskNum == taskNum);
    //        if (task == null)
    //            return content.Error("未找到任务");

    //        if (taskState == (int)TaskOutStatusEnum.Line_OutFinish || taskState == (int)TaskOutStatusEnum.SC_OutFinish)
    //        {
    //            var taskHty = CreateHistoricalTask(task);
    //            await _unitOfWorkManage.UseTranAsync(async () =>
    //            {
    //                var asb = await BaseDal.DeleteDataByIdAsync(task.TaskId);
    //                var asbHty = await _task_HtyRepository.AddDataAsync(taskHty) > 0;
    //                if (asb && asbHty)
    //                    content.OK();
    //                else
    //                    throw new Exception();
    //            });
    //            content.OK();
    //        }
    //        else
    //        {
    //            task.TaskState = taskState;
    //            var asb = await BaseDal.UpdateDataAsync(task);
    //            if (asb)
    //                content.OK();
    //            else
    //                content.Error();
    //        }
    //    }
    //    catch (Exception ex)
    //    {
    //        content.Error(ex.Message);
    //    }
    //    return content;
    //}

    #endregion

    //private WebResponseContent CheckInTask()
            return content.OK();
        }
        catch (Exception ex)
        {
           return content.Error (ex.Message);
        }
         
        return content;
    }

}

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/bin/Release/net6.0/WIDESEA_StorageTaskServices.deps.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/obj/Release/net6.0/WIDESEA_StorageTaskServices.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/Release/net6.0/WIDESEA_Tasks.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/Release/net6.0/WIDESEA_Tasks.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/Release/net6.0/WIDESEA_Tasks.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_Tasks/obj/Release/net6.0/WIDESEA_Tasks.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/MCS/MCSController.cs

@@ -1,5 +1,7 @@
using Microsoft.AspNetCore.Http;
using AutoMapper.Configuration.Annotations;
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Mvc;
using WIDESEA_Core.BaseController;
using WIDESEA_DTO;
using WIDESEA_IStoragIntegrationServices;

@@ -10,28 +12,33 @@
public class MCSController : Controller
{
    private readonly IMCSService _MCSService;
    private readonly IHttpContextAccessor _httpContextAccessor;

    public MCSController(IMCSService MCSService) { _MCSService = MCSService; }
    public MCSController(IMCSService MCSService, IHttpContextAccessor httpContextAccessor)
    {
        _httpContextAccessor = httpContextAccessor; 
        _MCSService = MCSService;
    }

    [HttpPost("NotifyFinishTest")]
    [HttpPost, Route("NotifyFinishTest"), AllowAnonymous]
    public WebResponseContent NotifyFinishTest([FromBody] object input)
    {
        return _MCSService.NotifyFinishTest(input);
    }

    [HttpPost("RequestChangeLocation")]
    [HttpPost, Route("RequestChangeLocation"), AllowAnonymous]
    public WebResponseContent RequestChangeLocation([FromBody] object input)
    {
        return _MCSService.RequestChangeLocation(input);
    }

    [HttpPost("ModifyAccessStatus")]
    [HttpPost, Route("ModifyAccessStatus"), AllowAnonymous]
    public WebResponseContent ModifyAccessStatus([FromBody] object input)
    {
        return _MCSService.ModifyAccessStatus(input);
    }

    [HttpPost("RequestCellInfo")]
    [HttpPost, Route("RequestCellInfo"), AllowAnonymous]
    public object RequsetCellInfo([FromBody] object input)
    {
        return _MCSService.RequsetCellInfo(input);

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Controllers/TaskController.cs

@@ -28,11 +28,22 @@
    /// </summary>
    /// <param name="saveModel">任务号</param>
    /// <returns>成功或失败</returns>
    [HttpGet, Route("CompleteTaskAsync"), AllowAnonymous]
    [HttpGet, Route("CompleteTask"), AllowAnonymous]
    public async Task<WebResponseContent> CompleteTaskAsync(int taskNum)
    {
        return await _taskService.CompleteAsync(taskNum);
    }

    /// <summary>
    /// ä»»åŠ¡å®Œæˆ
    /// </summary>
    /// <param name="saveModel">任务号</param>
    /// <returns>成功或失败</returns>
    //[HttpGet, Route("CompleteTaskByStation"), AllowAnonymous]
    //public async Task<WebResponseContent> CompleteTaskByStation(int taskNum)
    //{
    //    return await _taskService.CompleteTaskByStation(taskNum);
    //}

    /// <summary>
    /// æ£€æŸ¥æ˜¯å¦éœ€è¦è¿›è¡Œç§»åº“
@@ -50,13 +61,24 @@
    /// </summary>
    /// <param name="input">请求数据</param>
    /// <returns></returns>
    [HttpPost, AllowAnonymous, Route("RequestTask")]
    [HttpPost, AllowAnonymous, Route("RequestTaskAsync")]
    public async Task<WebResponseContent> RequestTaskAsync([FromBody] RequestTaskDto input)
    {
        return await Service.RequestTaskAsync(input);
    }

    /// <summary>
    /// è¯·æ±‚任务巷道
    /// </summary>
    /// <param name="input">请求数据</param>
    /// <returns></returns>
    [HttpPost, AllowAnonymous, Route("RequestInTask")]
    public async Task<WebResponseContent> RequestInTask([FromBody] RequestTaskDto input)
    {
        return await Service.RequestInTask(input);
    }

    /// <summary>
    /// è¯·æ±‚任务货位
    /// </summary>
    /// <param name="input">请求数据</param>

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Program.cs

@@ -117,12 +117,12 @@
app.ConfigureApplication();//配置文件
app.UseApplicationSetup();//启动配置
app.UseSession();
if (app.Environment.IsDevelopment())
{
//if (app.Environment.IsDevelopment())
//{
    //todo
    //app.UseSwaggerAuthorized();
    app.UseSwaggerMiddle(() => Assembly.GetExecutingAssembly().GetManifestResourceStream("WIDESEA_WMSServer.index.html"));
}//判断是否需要打开swagger
//}//判断是否需要打开swagger

app.UseIpLimitMiddle();
app.UseApiLogMiddleware();

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/Properties/PublishProfiles/FolderProfile.pubxml.user

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj.user

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_WMSServer.deps.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_WMSServer.exe

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/WIDESEA_WMSServer.xml

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/PubTmp/Out/appsettings.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.AssemblyInfo.cs

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.AssemblyInfoInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.GeneratedMSBuildEditorConfig.editorconfig

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.assets.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.csproj.AssemblyReference.cache

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.csproj.CoreCompileInputs.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.csproj.FileListAbsolute.txt

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.genruntimeconfig.cache

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/WIDESEA_WMSServer.xml

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/apphost.exe

Binary files differ

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/staticwebassets.build.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/staticwebassets.development.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/staticwebassets.pack.json

ÎļþÒÑɾ³ý

 Code Management/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/obj/Release/net6.0/staticwebassets.publish.json

ÎļþÒÑɾ³ý