From f15307c7d3f8de2558b0fba9e0ad03eb59eb031f Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Thu, 18 Jul 2024 17:10:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9=E8=88=B1=E4=BD=8D?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../BookingSlotServiceController.cs | 2 +- .../DS.WMS.OpApi/DS.WMS.OpApi.csproj | 4 ++ .../DS.WMS.OpApi/Logs/internal-nlog.txt | 49 +++++++++++++++++++ ds-wms-service/DS.WMS.Test/SaasTest.cs | 24 ++++----- 4 files changed, 67 insertions(+), 12 deletions(-) diff --git a/ds-wms-service/DS.WMS.OpApi/Controllers/BookingSlotServiceController.cs b/ds-wms-service/DS.WMS.OpApi/Controllers/BookingSlotServiceController.cs index c9ec4d6a..5ba671df 100644 --- a/ds-wms-service/DS.WMS.OpApi/Controllers/BookingSlotServiceController.cs +++ b/ds-wms-service/DS.WMS.OpApi/Controllers/BookingSlotServiceController.cs @@ -61,7 +61,7 @@ namespace DS.WMS.OpApi.Controllers /// 筛选条件2：舱位主键列表 /// 筛选条件3：分页 /// 可用的舱位列表（含可用的箱子列表） - [HttpPost] + [HttpGet] [Route("GetAvailableSlots")] public async Task>> GetAvailableSlots(BookingSlotBaseDto slotInput = null, List slotIdListInput = null, diff --git a/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj b/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj index 36f5284d..58cbe4a2 100644 --- a/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj +++ b/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj @@ -9,6 +9,10 @@ bin\Debug\net8.0\Api.xml + + + + diff --git a/ds-wms-service/DS.WMS.OpApi/Logs/internal-nlog.txt b/ds-wms-service/DS.WMS.OpApi/Logs/internal-nlog.txt index c9769840..6a0adc26 100644 --- a/ds-wms-service/DS.WMS.OpApi/Logs/internal-nlog.txt +++ b/ds-wms-service/DS.WMS.OpApi/Logs/internal-nlog.txt @@ -425,3 +425,52 @@ 2024-07-17 16:10:54.4673 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config 2024-07-17 16:10:54.4752 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile 2024-07-17 16:10:54.4752 Info Configuration initialized. +2024-07-18 17:00:49.1289 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-07-18 17:00:49.1289 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-07-18 17:00:49.1289 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-07-18 17:00:49.1529 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False +2024-07-18 17:00:49.1529 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config +2024-07-18 17:00:49.1610 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-07-18 17:00:49.1610 Info Configuration initialized. +2024-07-18 17:01:32.1455 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-07-18 17:01:32.1455 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-07-18 17:01:32.1632 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-07-18 17:01:32.1632 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False +2024-07-18 17:01:32.1808 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config +2024-07-18 17:01:32.1808 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-07-18 17:01:32.1808 Info Configuration initialized. +2024-07-18 17:02:46.2601 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-07-18 17:02:46.2723 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-07-18 17:02:46.2723 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-07-18 17:02:46.2854 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False +2024-07-18 17:02:46.2854 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config +2024-07-18 17:02:46.2854 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-07-18 17:02:46.2854 Info Configuration initialized. +2024-07-18 17:03:18.4459 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-07-18 17:03:18.4613 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-07-18 17:03:18.4613 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-07-18 17:03:18.4738 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False +2024-07-18 17:03:18.4738 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config +2024-07-18 17:03:18.4738 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-07-18 17:03:18.4738 Info Configuration initialized. +2024-07-18 17:05:17.8386 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-07-18 17:05:17.8501 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-07-18 17:05:17.8501 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-07-18 17:05:17.8638 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False +2024-07-18 17:05:17.8638 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config +2024-07-18 17:05:17.8638 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-07-18 17:05:17.8638 Info Configuration initialized. +2024-07-18 17:06:53.9141 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-07-18 17:06:53.9312 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-07-18 17:06:53.9312 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-07-18 17:06:53.9482 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False +2024-07-18 17:06:53.9482 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config +2024-07-18 17:06:53.9606 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-07-18 17:06:53.9606 Info Configuration initialized. +2024-07-18 17:08:59.2073 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-07-18 17:08:59.2277 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-07-18 17:08:59.2277 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-07-18 17:08:59.2425 Info NLog, Version=5.0.0.0, Culture=neutral, PublicKeyToken=5120e14c03d0593c. File version: 5.2.8.2366. Product version: 5.2.8+f586f1341c46fa38aaaff4c641e7f0fa7e813943. GlobalAssemblyCache: False +2024-07-18 17:08:59.2425 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=E:\MyCode\Dongsheng8\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config +2024-07-18 17:08:59.2585 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-07-18 17:08:59.2585 Info Configuration initialized. diff --git a/ds-wms-service/DS.WMS.Test/SaasTest.cs b/ds-wms-service/DS.WMS.Test/SaasTest.cs index 2308ec09..a20aa044 100644 --- a/ds-wms-service/DS.WMS.Test/SaasTest.cs +++ b/ds-wms-service/DS.WMS.Test/SaasTest.cs @@ -180,18 +180,20 @@ public class SaasTest { var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 - //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrder)); - //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderCtn)); - //tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderShipSchedule)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotBase)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotCtn)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotStock)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocation)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocationCtn)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemand)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemandCtn)); - //tenantDb.CodeFirst.InitTables(typeof(BookingSlotCompare)); + tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrder)); + tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderCtn)); + tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderShipSchedule)); + tenantDb.CodeFirst.InitTables(typeof(BookingSlotBase)); + tenantDb.CodeFirst.InitTables(typeof(BookingSlotCtn)); + tenantDb.CodeFirst.InitTables(typeof(BookingSlotStock)); + tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocation)); + tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocationCtn)); + tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemand)); + tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemandCtn)); + tenantDb.CodeFirst.InitTables(typeof(BookingSlotCompare)); tenantDb.CodeFirst.InitTables(typeof(BookingContractNoManage)); + tenantDb.CodeFirst.InitTables(typeof(BookingLabel)); + tenantDb.CodeFirst.InitTables(typeof(BookingLabelAllocation)); //tenantDb.CodeFirst.InitTables(typeof(CodeThirdParty)); //tenantDb.CodeFirst.InitTables(typeof(CheckBillAutoDetail));