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

修改MSK API的台账

Browse Source
usertest
jianghaiqing 4 months ago
parent 9ef643eb1d
commit a8740e1702
9 changed files with 94 additions and 65 deletions
Show Stats Download Patch File Download Diff File

2
ds-wms-service/DS.WMS.Core/Op/Dtos/SpaceBooking/BookingDeliveryRecordPageDto.cs → ds-wms-service/DS.WMS.Core/Op/Dtos/SpaceBooking/SpaceBookingPageDto.cs
Unescape Escape View File

@ -9,7 +9,7 @@ namespace DS.WMS.Core.Op.Dtos
/// <summary>
/// 预订舱台账
/// </summary>
public class BookingDeliveryRecordPageDto
public class SpaceBookingPageDto
{
/// <summary>
/// ID

95
ds-wms-service/DS.WMS.Core/Op/Entity/BookingSlot/BookingSlotBase.cs
Unescape Escape View File

@ -258,120 +258,99 @@ namespace DS.WMS.Core.Op.Entity
/// <summary>
/// 预甩回执
/// </summary>
[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; }
/// <summary>
/// 舱位变更回执
/// BC变更回执
/// </summary>
[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; }
/// <summary>
/// 舱位取消回执
/// BC取消回执
/// </summary>
[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; }
/// <summary>
/// 目的港卸船未提货回执
/// </summary>
[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; }
/// <summary>
/// 订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱
/// </summary>
[SugarColumn(ColumnName = "BOOKING_SLOT_TYPE")]
[Description("订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱")]
public string BookingSlotType { get; set; }
/// <summary>
/// 订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱
/// 目的港提箱未还空箱回执
/// </summary>
[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; }
/// <summary>
/// 目的港提箱未还空箱回执
/// 订舱方式 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱
/// </summary>
[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; }
/// <summary>
/// 租户名称
/// 订舱方式名称 CONTRACT_ORDER-合约订舱；SPOT_ORDER-SPOT订舱
/// </summary>
[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; }
/// <summary>
/// 舱位来源 EMAIL-邮件导入 MANUAL-手工
/// </summary>
[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; }
/// <summary>
/// 是否Cancellation
/// </summary>
[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;
/// <summary>
/// Cancellation时间
/// </summary>
[SugarColumn(ColumnName = "CANCELLATION_DATE")]
[Description("Cancellation时间")]
public DateTime? CANCELLATION_DATE { get; set; }
[SqlSugar.SugarColumn(ColumnDescription = "Cancellation时间", IsNullable = true)]
public Nullable<DateTime> CANCELLATION_DATE { get; set; }
/// <summary>
/// 客户样单截止日期
/// </summary>
[SugarColumn(ColumnName = "CUSTOM_SI_CUT_DATE")]
[Description("客户样单截止日期")]
public DateTime? CUSTOM_SI_CUT_DATE { get; set; }
[SqlSugar.SugarColumn(ColumnDescription = "客户样单截止日期", IsNullable = true)]
public Nullable<DateTime> CustomSICutDate { get; set; }
/// <summary>
/// 备注
/// </summary>
[Description("备注")]
public string REMARK { get; set; }
[SqlSugar.SugarColumn(ColumnDescription = "备注", Length = 500, IsNullable = true)]
public string Remark { get; set; }
/// <summary>
/// 计费日期
/// </summary>
[Description("计费日期")]
public DateTime? PRICE_CALCULATION_DATE { get; set; }
[SqlSugar.SugarColumn(ColumnDescription = "计费日期", IsNullable = true)]
public Nullable<DateTime> PriceCalculationDate { get; set; }
/// <summary>
/// 系统平台代码
/// </summary>
[Description("系统平台代码")]
public string SYSTEM_CODE { get; set; }
[SqlSugar.SugarColumn(ColumnDescription = "系统平台代码", Length = 50, IsNullable = true)]
public string SystemCode { get; set; }
/// <summary>
/// 系统平台名称
/// </summary>
[Description("系统平台名称")]
public string SYSTEM_NAME { get; set; }
[SqlSugar.SugarColumn(ColumnDescription = "系统平台名称", Length = 50, IsNullable = true)]
public string SystemName { get; set; }
/// <summary>
/// 船公司航次
/// </summary>
[Description("船公司航次")]
public string CARRIER_VOYNO { get; set; }
[SqlSugar.SugarColumn(ColumnDescription = "船公司航次", Length = 30, IsNullable = true)]
public string CarrierVoyno { get; set; }
/// <summary>
/// 拆票或合票标记 1-拆票 2-合票

2
ds-wms-service/DS.WMS.Core/Op/Interface/SpaceBooking/ISpaceBookingMSKAPIService.cs
Unescape Escape View File

@ -46,7 +46,7 @@ namespace DS.WMS.Core.Op.Interface
/// </summary>
/// <param name="QuerySearch">查询条件</param>
/// <returns>返回台账列表</returns>
//Task<DataResult<List<BookingDeliveryRecordPageDto>>> GetPageAsync(PageRequest QuerySearch);
Task<DataResult<List<SpaceBookingPageDto>>> GetPageAsync(PageRequest QuerySearch);
/// <summary>
/// 获取马士基API订舱详情

19
ds-wms-service/DS.WMS.Core/Op/Method/SpaceBooking/SpaceBookingMSKAPIService.cs
Unescape Escape View File

@ -2147,5 +2147,24 @@ namespace DS.WMS.Core.Op.Method
return DataResult<MSKSPOTBookingInitDto>.Success(dto);
}
#endregion
#region 马士基API订舱台账
/// <summary>
/// 马士基API订舱台账
/// </summary>
/// <param name="QuerySearch">查询条件</param>
/// <returns>返回台账列表</returns>
public async Task<DataResult<List<SpaceBookingPageDto>>> GetPageAsync(PageRequest QuerySearch)
{
var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
//序列化查询条件
var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(QuerySearch.QueryCondition);
var data = tenantDb.Queryable<SpaceBookingOrder>()
.Where(whereList)
.Select<SpaceBookingPageDto>().ToQueryPage(QuerySearch.PageCondition);
return data;
}
#endregion
}
}

15
ds-wms-service/DS.WMS.OpApi/Controllers/SpaceBookingMSKAPIController.cs
Unescape Escape View File

@ -74,12 +74,19 @@ namespace DS.WMS.OpApi.Controllers
}
#endregion
#region 查询台账
/// <summary>
/// 马士基API订舱台账
/// 查询台账
/// </summary>
/// <param name="QuerySearch">查询条件</param>
/// <returns>返回台账列表</returns>
//Task<DataResult<List<BookingDeliveryRecordPageDto>>> GetPageAsync(PageRequest QuerySearch);
/// <param name="querySearch"></param>
/// <returns>返回台账结果</returns>
[HttpPost]
[Route("GetPageAsync")]
public async Task<DataResult<List<SpaceBookingPageDto>>> GetPageAsync([FromBody] PageRequest querySearch)
{
return await _spaceBookingMSKAPIService.GetPageAsync(querySearch);
}
#endregion
#region 获取马士基API订舱详情
/// <summary>

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

@ -18,6 +18,7 @@
<ProjectReference Include="..\DS.Module.Jwt\DS.Module.Jwt.csproj" />
<ProjectReference Include="..\DS.Module.MultiLanguage\DS.Module.MultiLanguage.csproj" />
<ProjectReference Include="..\DS.Module.Nuget\DS.Module.Nuget.csproj" />
<ProjectReference Include="..\DS.Module.RedisModule\DS.Module.RedisModule.csproj" />
<ProjectReference Include="..\DS.Module.SqlSugar\DS.Module.SqlSugar.csproj" />
<ProjectReference Include="..\DS.Module.Swagger\DS.Module.Swagger.csproj" />
<ProjectReference Include="..\DS.Module.UserModule\DS.Module.UserModule.csproj" />

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

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

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

@ -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();

2
ds-wms-service/DS.WMS.OpApi/Properties/PublishProfiles/FolderProfile.pubxml.user
Unescape Escape View File

@ -6,7 +6,7 @@
<Project>
<PropertyGroup>
<_PublishTargetUrl>D:\Code\PublishCopy\ds8-opapi</_PublishTargetUrl>
<History>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||;</History>
<History>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||;</History>
<LastFailureDetails />
</PropertyGroup>
</Project>
Write Preview
Loading…
Cancel
Save