chenjingyong
/
ds8-solution-pro
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

修改舱位

Browse Source
usertest
jianghaiqing 5 months ago
parent 525c238103
commit f15307c7d3
4 changed files with 67 additions and 12 deletions
Show Stats Download Patch File Download Diff File

2
ds-wms-service/DS.WMS.OpApi/Controllers/BookingSlotServiceController.cs
Unescape Escape View File

@ -61,7 +61,7 @@ namespace DS.WMS.OpApi.Controllers
/// <param name="slotIdListInput">筛选条件2：舱位主键列表</param> /// <param name="slotIdListInput">筛选条件2：舱位主键列表</param>
/// <param name="pageInfo">筛选条件3：分页</param> /// <param name="pageInfo">筛选条件3：分页</param>
/// <returns>可用的舱位列表（含可用的箱子列表）</returns> /// <returns>可用的舱位列表（含可用的箱子列表）</returns>
[HttpPost] [HttpGet]
[Route("GetAvailableSlots")] [Route("GetAvailableSlots")]
public async Task<DataResult<List<BookingSlotBaseWithCtnDto>>> GetAvailableSlots(BookingSlotBaseDto slotInput = null, public async Task<DataResult<List<BookingSlotBaseWithCtnDto>>> GetAvailableSlots(BookingSlotBaseDto slotInput = null,
List<long> slotIdListInput = null, List<long> slotIdListInput = null,

4
ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj
Unescape Escape View File

@ -9,6 +9,10 @@
<DocumentationFile>bin\Debug\net8.0\Api.xml</DocumentationFile> <DocumentationFile>bin\Debug\net8.0\Api.xml</DocumentationFile>
</PropertyGroup> </PropertyGroup>
<ItemGroup>
<Compile Remove="Controllers\BookingSlotServiceController.cs" />
</ItemGroup>
<ItemGroup> <ItemGroup>
<ProjectReference Include="..\DS.Module.AutofacModule\DS.Module.AutofacModule.csproj" /> <ProjectReference Include="..\DS.Module.AutofacModule\DS.Module.AutofacModule.csproj" />
<ProjectReference Include="..\DS.Module.Core\DS.Module.Core.csproj" /> <ProjectReference Include="..\DS.Module.Core\DS.Module.Core.csproj" />

49
ds-wms-service/DS.WMS.OpApi/Logs/internal-nlog.txt
Unescape Escape View File

@ -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.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 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-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.

24
ds-wms-service/DS.WMS.Test/SaasTest.cs
Unescape Escape View File

@ -180,18 +180,20 @@ public class SaasTest
{ {
var tenantDb = saasService.GetBizDbScopeById("1750335377144680448"); var tenantDb = saasService.GetBizDbScopeById("1750335377144680448");
StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持 StaticConfig.CodeFirst_MySqlCollate = "utf8mb4_0900_ai_ci";//较高版本支持
//tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrder)); tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrder));
//tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderCtn)); tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderCtn));
//tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderShipSchedule)); tenantDb.CodeFirst.InitTables(typeof(SpaceBookingOrderShipSchedule));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotBase)); tenantDb.CodeFirst.InitTables(typeof(BookingSlotBase));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotCtn)); tenantDb.CodeFirst.InitTables(typeof(BookingSlotCtn));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotStock)); tenantDb.CodeFirst.InitTables(typeof(BookingSlotStock));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocation)); tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocation));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocationCtn)); tenantDb.CodeFirst.InitTables(typeof(BookingSlotAllocationCtn));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemand)); tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemand));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemandCtn)); tenantDb.CodeFirst.InitTables(typeof(BookingSlotDemandCtn));
//tenantDb.CodeFirst.InitTables(typeof(BookingSlotCompare)); tenantDb.CodeFirst.InitTables(typeof(BookingSlotCompare));
tenantDb.CodeFirst.InitTables(typeof(BookingContractNoManage)); tenantDb.CodeFirst.InitTables(typeof(BookingContractNoManage));
tenantDb.CodeFirst.InitTables(typeof(BookingLabel));
tenantDb.CodeFirst.InitTables(typeof(BookingLabelAllocation));
//tenantDb.CodeFirst.InitTables(typeof(CodeThirdParty)); //tenantDb.CodeFirst.InitTables(typeof(CodeThirdParty));
//tenantDb.CodeFirst.InitTables(typeof(CheckBillAutoDetail)); //tenantDb.CodeFirst.InitTables(typeof(CheckBillAutoDetail));

Write Preview
Loading…
Cancel
Save