From a8740e17020d194cd1b2cc610fc7056489bc97be Mon Sep 17 00:00:00 2001 From: jianghaiqing Date: Mon, 15 Jul 2024 11:41:25 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E6=94=B9MSK=20API=E7=9A=84=E5=8F=B0?= =?UTF-8?q?=E8=B4=A6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...ecordPageDto.cs => SpaceBookingPageDto.cs} | 2 +- .../Op/Entity/BookingSlot/BookingSlotBase.cs | 95 ++++++++----------- .../ISpaceBookingMSKAPIService.cs | 2 +- .../SpaceBooking/SpaceBookingMSKAPIService.cs | 19 ++++ .../SpaceBookingMSKAPIController.cs | 15 ++- .../DS.WMS.OpApi/DS.WMS.OpApi.csproj | 1 + .../DS.WMS.OpApi/Logs/internal-nlog.txt | 21 ++++ ds-wms-service/DS.WMS.OpApi/Program.cs | 2 + .../PublishProfiles/FolderProfile.pubxml.user | 2 +- 9 files changed, 94 insertions(+), 65 deletions(-) rename ds-wms-service/DS.WMS.Core/Op/Dtos/SpaceBooking/{BookingDeliveryRecordPageDto.cs => SpaceBookingPageDto.cs} (99%) diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SpaceBooking/BookingDeliveryRecordPageDto.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SpaceBooking/SpaceBookingPageDto.cs similarity index 99% rename from ds-wms-service/DS.WMS.Core/Op/Dtos/SpaceBooking/BookingDeliveryRecordPageDto.cs rename to ds-wms-service/DS.WMS.Core/Op/Dtos/SpaceBooking/SpaceBookingPageDto.cs index ac6eb615..c9e88f17 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SpaceBooking/BookingDeliveryRecordPageDto.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SpaceBooking/SpaceBookingPageDto.cs @@ -9,7 +9,7 @@ namespace DS.WMS.Core.Op.Dtos /// /// 预订舱台账 /// - public class BookingDeliveryRecordPageDto + public class SpaceBookingPageDto { /// /// ID diff --git a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotBase.cs b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotBase.cs index 13722518..77a18e87 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotBase.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotBase.cs @@ -258,120 +258,99 @@ namespace DS.WMS.Core.Op.Entity /// /// 预甩回执 /// - [SugarColumn(ColumnName = "NOMINATION_RLT_STAT")] - [Description("预甩回执")] - public string NOMINATION_RLT_STAT { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "预甩回执", Length = 20, IsNullable = true)] + public string NominationRltStat { get; set; } /// - /// 舱位变更回执 + /// BC变更回执 /// - [SugarColumn(ColumnName = "AMENDMENT_RLT_STAT")] - [Description("舱位变更回执")] - public string AMENDMENT_RLT_STAT { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "BC变更回执", Length = 20, IsNullable = true)] + public string AmendmentRltStat { get; set; } /// - /// 舱位取消回执 + /// BC取消回执 /// - [SugarColumn(ColumnName = "CANCELLATION_RLT_STAT")] - [Description("舱位取消回执")] - public string CANCELLATION_RLT_STAT { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "BC取消回执", Length = 20, IsNullable = true)] + public string CancellationRltStat { get; set; } /// /// 目的港卸船未提货回执 /// - [SugarColumn(ColumnName = "DISCHARGE_FULL_RLT_STAT")] - [Description("目的港卸船未提货回执")] - public string DISCHARGE_FULL_RLT_STAT { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "目的港卸船未提货回执", Length = 20, IsNullable = true)] + public string DischargeFullRltStat { get; set; } /// - /// 订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱 - /// - [SugarColumn(ColumnName = "BOOKING_SLOT_TYPE")] - [Description("订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱")] - public string BookingSlotType { get; set; } - - /// - /// 订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱 + /// 目的港提箱未还空箱回执 /// - [SugarColumn(ColumnName = "BOOKING_SLOT_TYPE_NAME")] - [Description("订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱")] - public string BOOKING_SLOT_TYPE_NAME { get; set; } - - - + [SqlSugar.SugarColumn(ColumnDescription = "目的港提箱未还空箱回执", Length = 20, IsNullable = true)] + public string GateOutFullRltStat { get; set; } /// - /// 目的港提箱未还空箱回执 + /// 订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱 /// - [SugarColumn(ColumnName = "GATE_OUTFULL_RLT_STAT")] - [Description("目的港提箱未还空箱回执")] - public string GATE_OUTFULL_RLT_STAT { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱", Length = 20, IsNullable = true)] + public string BookingSlotType { get; set; } /// - /// 租户名称 + /// 订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱 /// - [SugarColumn(ColumnName = "TenantName")] - [Description("租户名称")] - public string TenantName { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱", Length = 40, IsNullable = true)] + public string BookingSlotTypeName { get; set; } /// /// 舱位来源 EMAIL-邮件导入 MANUAL-手工 /// - [SugarColumn(ColumnName = "SLOT_SOURCE")] - [Description("舱位来源 EMAIL-邮件导入 MANUAL-手工")] - public string SLOT_SOURCE { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "舱位来源 EMAIL-邮件导入 MANUAL-手工", Length = 20, IsNullable = true)] + public string SlotSource { get; set; } /// /// 是否Cancellation /// - [SugarColumn(ColumnName = "IS_CANCELLATION")] - [Description("是否Cancellation")] - public bool IS_CANCELLATION { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "是否Cancellation", IsNullable = true, DefaultValue = "0")] + public bool IsCancellation { get; set; } = false; /// /// Cancellation时间 /// - [SugarColumn(ColumnName = "CANCELLATION_DATE")] - [Description("Cancellation时间")] - public DateTime? CANCELLATION_DATE { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "Cancellation时间", IsNullable = true)] + public Nullable CANCELLATION_DATE { get; set; } /// /// 客户样单截止日期 /// - [SugarColumn(ColumnName = "CUSTOM_SI_CUT_DATE")] - [Description("客户样单截止日期")] - public DateTime? CUSTOM_SI_CUT_DATE { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "客户样单截止日期", IsNullable = true)] + public Nullable CustomSICutDate { get; set; } /// /// 备注 /// - [Description("备注")] - public string REMARK { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "备注", Length = 500, IsNullable = true)] + public string Remark { get; set; } /// /// 计费日期 /// - [Description("计费日期")] - public DateTime? PRICE_CALCULATION_DATE { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "计费日期", IsNullable = true)] + public Nullable PriceCalculationDate { get; set; } /// /// 系统平台代码 /// - [Description("系统平台代码")] - public string SYSTEM_CODE { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "系统平台代码", Length = 50, IsNullable = true)] + public string SystemCode { get; set; } /// /// 系统平台名称 /// - [Description("系统平台名称")] - public string SYSTEM_NAME { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "系统平台名称", Length = 50, IsNullable = true)] + public string SystemName { get; set; } /// /// 船公司航次 /// - [Description("船公司航次")] - public string CARRIER_VOYNO { get; set; } + [SqlSugar.SugarColumn(ColumnDescription = "船公司航次", Length = 30, IsNullable = true)] + public string CarrierVoyno { get; set; } /// /// 拆票或合票标记 1-拆票 2-合票 diff --git a/ds-wms-service/DS.WMS.Core/Op/Interface/SpaceBooking/ISpaceBookingMSKAPIService.cs b/ds-wms-service/DS.WMS.Core/Op/Interface/SpaceBooking/ISpaceBookingMSKAPIService.cs index 961e38d5..3369c19e 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Interface/SpaceBooking/ISpaceBookingMSKAPIService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Interface/SpaceBooking/ISpaceBookingMSKAPIService.cs @@ -46,7 +46,7 @@ namespace DS.WMS.Core.Op.Interface /// /// 查询条件 /// 返回台账列表 - //Task>> GetPageAsync(PageRequest QuerySearch); + Task>> GetPageAsync(PageRequest QuerySearch); /// /// 获取马士基API订舱详情 diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SpaceBooking/SpaceBookingMSKAPIService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SpaceBooking/SpaceBookingMSKAPIService.cs index 9f7db3c4..42af80c9 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SpaceBooking/SpaceBookingMSKAPIService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SpaceBooking/SpaceBookingMSKAPIService.cs @@ -2147,5 +2147,24 @@ namespace DS.WMS.Core.Op.Method return DataResult.Success(dto); } #endregion + + #region 马士基API订舱台账 + /// + /// 马士基API订舱台账 + /// + /// 查询条件 + /// 返回台账列表 + public async Task>> GetPageAsync(PageRequest QuerySearch) + { + var tenantDb = saasService.GetBizDbScopeById(user.TenantId); + //序列化查询条件 + var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(QuerySearch.QueryCondition); + + var data = tenantDb.Queryable() + .Where(whereList) + .Select().ToQueryPage(QuerySearch.PageCondition); + return data; + } + #endregion } } diff --git a/ds-wms-service/DS.WMS.OpApi/Controllers/SpaceBookingMSKAPIController.cs b/ds-wms-service/DS.WMS.OpApi/Controllers/SpaceBookingMSKAPIController.cs index 63588061..156f7e92 100644 --- a/ds-wms-service/DS.WMS.OpApi/Controllers/SpaceBookingMSKAPIController.cs +++ b/ds-wms-service/DS.WMS.OpApi/Controllers/SpaceBookingMSKAPIController.cs @@ -74,12 +74,19 @@ namespace DS.WMS.OpApi.Controllers } #endregion + #region 查询台账 /// - /// 马士基API订舱台账 + /// 查询台账 /// - /// 查询条件 - /// 返回台账列表 - //Task>> GetPageAsync(PageRequest QuerySearch); + /// + /// 返回台账结果 + [HttpPost] + [Route("GetPageAsync")] + public async Task>> GetPageAsync([FromBody] PageRequest querySearch) + { + return await _spaceBookingMSKAPIService.GetPageAsync(querySearch); + } + #endregion #region 获取马士基API订舱详情 /// 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 e89fa938..36f5284d 100644 --- a/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj +++ b/ds-wms-service/DS.WMS.OpApi/DS.WMS.OpApi.csproj @@ -18,6 +18,7 @@ + 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 02b259c5..44310d6a 100644 --- a/ds-wms-service/DS.WMS.OpApi/Logs/internal-nlog.txt +++ b/ds-wms-service/DS.WMS.OpApi/Logs/internal-nlog.txt @@ -306,3 +306,24 @@ 2024-07-08 15:05:25.8638 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution-pro\ds-wms-service\DS.WMS.OpApi\bin\Debug\net8.0\nlog.config 2024-07-08 15:05:25.8734 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile 2024-07-08 15:05:25.8856 Info Configuration initialized. +2024-07-15 11:10:14.6807 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-07-15 11:10:14.6807 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-07-15 11:10:14.7001 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-07-15 11:10:14.7121 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-15 11:10:14.7121 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-15 11:10:14.7121 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-07-15 11:10:14.7323 Info Configuration initialized. +2024-07-15 11:20:19.8072 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-07-15 11:20:19.8072 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-07-15 11:20:19.8202 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-07-15 11:20:19.8202 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-15 11:20:19.8381 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-15 11:20:19.8381 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-07-15 11:20:19.8381 Info Configuration initialized. +2024-07-15 11:24:31.7763 Info Registered target NLog.Targets.FileTarget(Name=allfile) +2024-07-15 11:24:31.7763 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web) +2024-07-15 11:24:31.7928 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console) +2024-07-15 11:24:31.7928 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-15 11:24:31.8141 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-15 11:24:31.8141 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile +2024-07-15 11:24:31.8243 Info Configuration initialized. diff --git a/ds-wms-service/DS.WMS.OpApi/Program.cs b/ds-wms-service/DS.WMS.OpApi/Program.cs index 004b74c3..c7be932f 100644 --- a/ds-wms-service/DS.WMS.OpApi/Program.cs +++ b/ds-wms-service/DS.WMS.OpApi/Program.cs @@ -15,6 +15,7 @@ using NLog.Web; using Swashbuckle.AspNetCore.SwaggerUI; using DS.Module.PrintModule; using DS.Module.DjyRulesEngine; +using DS.Module.RedisModule; var builder = WebApplication.CreateBuilder(args); var environment = builder.Environment.EnvironmentName; @@ -43,6 +44,7 @@ builder.Services.AddSaasDbInstall();// builder.Services.AddMultiLanguageInstall();//Է builder.Services.AddDjyModuleInstall();//Djy builder.Services.AddRuleEngineModuleInstall();//DjyУ +builder.Services.AddRedisModuleInstall();//redis // builder.Services.AddEndpointsApiExplorer(); // builder.Services.AddSwaggerGen(); diff --git a/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user b/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user index 66814777..1962674f 100644 --- a/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user +++ b/ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user @@ -6,7 +6,7 @@ <_PublishTargetUrl>D:\Code\PublishCopy\ds8-opapi - True|2024-07-15T02:13:28.1415352Z||;True|2024-07-08T14:33:12.6884426+08:00||;True|2024-07-08T09:56:58.4995696+08:00||; + True|2024-07-15T02:20:03.3925876Z||;True|2024-07-15T10:13:28.1415352+08:00||;True|2024-07-08T14:33:12.6884426+08:00||;True|2024-07-08T09:56:58.4995696+08:00||; \ No newline at end of file