From 47c7125300d085d39f47af07194c6cd3c1444948 Mon Sep 17 00:00:00 2001 From: huangxiaoqiang <huangxiaoqiang@hnkhzn.com> Date: 星期三, 25 六月 2025 17:17:49 +0800 Subject: [PATCH] 修复大小写问题并更新版本信息 --- CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml.user | 2 +- CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs | 4 ++-- CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.AssemblyInfo.cs | 2 +- CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.AssemblyInfo.cs | 2 +- CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/UtilConvert.cs | 4 ++-- CodeManagement/WMS/WIDESEA_WMSClient/src/api/http.js | 4 ++-- 6 files changed, 9 insertions(+), 9 deletions(-) diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/UtilConvert.cs b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/UtilConvert.cs index 92ad304..14e83e0 100644 --- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/UtilConvert.cs +++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Core/Helper/UtilConvert.cs @@ -413,10 +413,10 @@ case HtmlElementType.Contains: linqExpression = LinqExpressionType.In; break; - case HtmlElementType.ThanOrEqual: + case HtmlElementType.thanorequal: linqExpression = LinqExpressionType.ThanOrEqual; break; - case HtmlElementType.LessOrequal: + case HtmlElementType.lessorequal: linqExpression = LinqExpressionType.LessThanOrEqual; break; case HtmlElementType.GT: diff --git a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml.user b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml.user index 9bacb85..c5a424b 100644 --- a/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml.user +++ b/CodeManagement/WCS/WIDESEAWCS_Server/WIDESEAWCS_Server/Properties/PublishProfiles/FolderProfile1.pubxml.user @@ -5,7 +5,7 @@ <Project> <PropertyGroup> <_PublishTargetUrl>E:\GET\BaiBuSanLouNew\CodeManagement\WCS\WIDESEAWCS_Server\WIDESEAWCS_Server\bin\Release\net6.0\publish\</_PublishTargetUrl> - <History>True|2025-06-13T06:06:02.3387675Z||;True|2025-06-13T12:12:05.8571668+08:00||;True|2025-06-13T11:07:21.0883921+08:00||;True|2025-06-13T10:58:41.4512589+08:00||;True|2025-06-12T16:02:45.3477017+08:00||;True|2025-06-06T09:30:09.4409029+08:00||;True|2025-06-05T14:22:11.1558952+08:00||;True|2025-06-05T14:21:15.0801810+08:00||;</History> + <History>True|2025-06-25T07:55:01.4687124Z||;True|2025-06-13T14:06:02.3387675+08:00||;True|2025-06-13T12:12:05.8571668+08:00||;True|2025-06-13T11:07:21.0883921+08:00||;True|2025-06-13T10:58:41.4512589+08:00||;True|2025-06-12T16:02:45.3477017+08:00||;True|2025-06-06T09:30:09.4409029+08:00||;True|2025-06-05T14:22:11.1558952+08:00||;True|2025-06-05T14:21:15.0801810+08:00||;</History> <LastFailureDetails /> </PropertyGroup> </Project> \ No newline at end of file diff --git a/CodeManagement/WMS/WIDESEA_WMSClient/src/api/http.js b/CodeManagement/WMS/WIDESEA_WMSClient/src/api/http.js index 11f4b7d..f4ca1d1 100644 --- a/CodeManagement/WMS/WIDESEA_WMSClient/src/api/http.js +++ b/CodeManagement/WMS/WIDESEA_WMSClient/src/api/http.js @@ -11,8 +11,8 @@ let loadingInstance let loadingStatus = false if (process.env.NODE_ENV == 'development') { - // axios.defaults.baseURL = 'http://localhost:5000/'; - axios.defaults.baseURL = 'http://192.168.65.253:5000/'; + axios.defaults.baseURL = 'http://localhost:5000/'; + // axios.defaults.baseURL = 'http://192.168.65.253:5000/'; } else if (process.env.NODE_ENV == 'debug') { axios.defaults.baseURL = 'http://192.168.65.253:5000/'; diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs index ae82614..dfe3615 100644 --- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs +++ b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_Core/Helper/UtilConvert.cs @@ -945,10 +945,10 @@ case HtmlElementType.Contains: linqExpression = LinqExpressionType.In; break; - case HtmlElementType.ThanOrEqual: + case HtmlElementType.thanorequal: linqExpression = LinqExpressionType.ThanOrEqual; break; - case HtmlElementType.LessOrequal: + case HtmlElementType.lessorequal: linqExpression = LinqExpressionType.LessThanOrEqual; break; case HtmlElementType.GT: diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.AssemblyInfo.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.AssemblyInfo.cs index 23ab86d..bb5f60b 100644 --- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_IStoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_IStoragIntegrationRepository.AssemblyInfo.cs +++ b/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+9d6f25decd9d01a85fec002ecb59ecb742fe0e70")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+12b786bdece4bde3716279ff386b58d776090bdb")] [assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_IStoragIntegrationRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_IStoragIntegrationRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] diff --git a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.AssemblyInfo.cs b/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.AssemblyInfo.cs index fcf3953..f0d3fea 100644 --- a/CodeManagement/WMS/WIDESEA_WMSServer/WIDESEA_StoragIntegrationRepository/obj/Debug/net6.0/WIDESEA_StoragIntegrationRepository.AssemblyInfo.cs +++ b/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+9d6f25decd9d01a85fec002ecb59ecb742fe0e70")] +[assembly: System.Reflection.AssemblyInformationalVersionAttribute("1.0.0+12b786bdece4bde3716279ff386b58d776090bdb")] [assembly: System.Reflection.AssemblyProductAttribute("WIDESEA_StoragIntegrationRepository")] [assembly: System.Reflection.AssemblyTitleAttribute("WIDESEA_StoragIntegrationRepository")] [assembly: System.Reflection.AssemblyVersionAttribute("1.0.0.0")] -- Gitblit v1.9.3