CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Core/Const/ConfigConst.cs
@@ -132,6 +132,7 @@ /// </summary> public const string ReceiveByWMSTask = "ReceiveByWMSTask"; /// <summary> /// 请求WCS任务 /// </summary> CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@ [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_IStoragIntegrationRepository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a4c8fa1c25d1755356afe2bfa21a66125254ce47")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d2530aa168e1f3f818bc642d05e99b74c6fffe2e")] [assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_IStoragIntegrationRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_IStoragIntegrationRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/WIDESEA_IStoragIntegrationRepository.csproj.nuget.g.props
@@ -5,18 +5,18 @@ <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool> <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile> <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot> <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders> <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders> <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle> <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.12.1</NuGetToolVersion> <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.13.2</NuGetToolVersion> </PropertyGroup> <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <SourceRoot Include="C:\Users\admin\.nuget\packages\" /> <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" /> <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" /> <SourceRoot Include="D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" /> </ItemGroup> <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.31\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.31\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props')" /> </ImportGroup> <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\admin\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server> <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\Administrator\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server> </PropertyGroup> </Project> CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.AssemblyInfo.cs
@@ -14,7 +14,7 @@ [assembly: System.Reflection.AssemblyCompanyAttribute("WIDESEA_StoragIntegrationRepository")] [assembly: System.Reflection.AssemblyConfigurationAttribute("Debug")] [assembly: System.Reflection.AssemblyFileVersionAttribute("1.0.0.0")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+a4c8fa1c25d1755356afe2bfa21a66125254ce47")] [assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+d2530aa168e1f3f818bc642d05e99b74c6fffe2e")] [assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_StoragIntegrationRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_StoragIntegrationRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/WIDESEA_StoragIntegrationRepository.csproj.nuget.g.props
@@ -5,18 +5,18 @@ <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool> <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile> <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot> <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\admin\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders> <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\Administrator\.nuget\packages\;D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders> <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle> <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.12.1</NuGetToolVersion> <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.13.2</NuGetToolVersion> </PropertyGroup> <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <SourceRoot Include="C:\Users\admin\.nuget\packages\" /> <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" /> <SourceRoot Include="C:\Users\Administrator\.nuget\packages\" /> <SourceRoot Include="D:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" /> </ItemGroup> <ImportGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <Import Project="$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.31\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props" Condition="Exists('$(NuGetPackageRoot)microsoft.entityframeworkcore\6.0.31\buildTransitive\net6.0\Microsoft.EntityFrameworkCore.props')" /> </ImportGroup> <PropertyGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' "> <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\admin\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server> <PkgMicrosoft_Extensions_ApiDescription_Server Condition=" '$(PkgMicrosoft_Extensions_ApiDescription_Server)' == '' ">C:\Users\Administrator\.nuget\packages\microsoft.extensions.apidescription.server\6.0.5</PkgMicrosoft_Extensions_ApiDescription_Server> </PropertyGroup> </Project> CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StorageTaskServices/Task/Partial/Dt_TaskService.cs
@@ -1082,37 +1082,36 @@ #region 火警出库 public WebResponseContent EmergencyTask(object obj) public WebResponseContent EmergencyTask(Object obj) { WebResponseContent content = new WebResponseContent(); var emergencyTask = new DTSEmergencyTask(); try { emergencyTask = JsonConvert.DeserializeObject<DTSEmergencyTask>(obj.ToString()); if (emergencyTask == null) throw new Exception("火警参数为空"); string[] strings = emergencyTask.LocationCode.Split("-"); string[] Roadways = strings[0].Select(x => x.ToString()).ToArray(); string Roadway = string.Empty; switch (Roadways[0]) { case "J": Roadway = "JZSC" + Roadways[1]; break; case "G": Roadway = "GWSC" + Roadways[1]; break; case "C": Roadway = "CWSC" + Roadways[1]; break; default: throw new Exception("未识别库位编码"); } string Roadway = strings[0]; //switch (Roadways[0]) //{ // case "J": // Roadway = "JZSC" + Roadways[1]; // break; // case "G": // Roadway = "GWSC" + Roadways[1]; // break; // case "C": // Roadway = "CWSC" + Roadways[1]; // break; // default: throw new Exception("未识别库位编码"); //} int Row = Convert.ToInt16(strings[1]); int Column = Convert.ToInt16(strings[2]); int Layer = Convert.ToInt16(strings[3]); if (!strings[0].Contains("SC")) throw new Exception("未知库区"); for (int i = 0; i < 2; i++) { DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.Row == Convert.ToInt16(strings[1]) && x.Column == Convert.ToInt16(strings[2]) && x.Layer == (i == 0 ? Convert.ToInt16(strings[3]) * 2 - 1 : Convert.ToInt16(strings[3]) * 2) && x.RoadwayNo == Roadway); DtLocationInfo locationInfo = _locationRepository.QueryFirst(x => x.Row == Row && x.Column == Column && x.Layer == (i == 0 ? Layer - 1 : Layer) && x.RoadwayNo == Roadway); if (locationInfo == null) { throw new Exception("未知库位"); @@ -1181,7 +1180,7 @@ 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; var ReceiveByWMSTask = configs.FirstOrDefault(x => x.ConfigKey == SysConfigConst.ReceiveTask)?.ConfigValue; if (ReceiveByWMSTask == null || ipAddress == null) { throw new Exception("WMS IP 未配置"); CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_WMSServer/WIDESEA_WMSServer.csproj.user
@@ -1,7 +1,7 @@ <?xml version="1.0" encoding="utf-8"?> <Project ToolsVersion="Current" xmlns="http://schemas.microsoft.com/developer/msbuild/2003"> <PropertyGroup> <NameOfLastUsedPublishProfile>D:\newbaibu3F\BaiBuSanLouNew\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_WMSServer\Properties\PublishProfiles\FolderProfile4.pubxml</NameOfLastUsedPublishProfile> <NameOfLastUsedPublishProfile>E:\GET\BaiBuSanLouNew\CodeManagement\WMS\WIDESEA_WMSServer\WIDESEA_WMSServer\Properties\PublishProfiles\FolderProfile5.pubxml</NameOfLastUsedPublishProfile> <Controller_SelectedScaffolderID>MvcControllerEmptyScaffolder</Controller_SelectedScaffolderID> <Controller_SelectedScaffolderCategoryPath>root/Common/MVC/Controller</Controller_SelectedScaffolderCategoryPath> </PropertyGroup>
