diff --git a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs index b0843ecb..eeefe3c3 100644 --- a/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs +++ b/Myshipping.Application/Service/BookingOrder/BookingOrderService.cs @@ -159,7 +159,7 @@ namespace Myshipping.Application .WhereIF(!string.IsNullOrWhiteSpace(input.HUMIDITY), u => u.HUMIDITY == input.HUMIDITY) .WhereIF(!string.IsNullOrWhiteSpace(input.TEMPMIN), u => u.TEMPMIN == input.TEMPMIN) .WhereIF(!string.IsNullOrWhiteSpace(input.TEMPMAX), u => u.TEMPMAX == input.TEMPMAX) - .WhereIF(!input.ISCONTAINERSOC, u => u.ISCONTAINERSOC == input.ISCONTAINERSOC) + .WhereIF(input.ISCONTAINERSOC!=null, u => u.ISCONTAINERSOC == input.ISCONTAINERSOC) .WhereIF(!string.IsNullOrWhiteSpace(input.SOREMARK), u => u.SOREMARK.Contains(input.SOREMARK)) .WhereIF(!string.IsNullOrWhiteSpace(input.SIREMARK), u => u.SIREMARK.Contains(input.SIREMARK)) .WhereIF(!string.IsNullOrWhiteSpace(input.YARDREMARK), u => u.YARDREMARK.Contains(input.YARDREMARK)) @@ -196,7 +196,7 @@ namespace Myshipping.Application .WhereIF(!string.IsNullOrWhiteSpace(input.CUSTSERVICEID), u => u.CUSTSERVICEID == input.CUSTSERVICEID) .WhereIF(!string.IsNullOrWhiteSpace(input.CUSTSERVICE), u => u.CUSTSERVICE.Contains(input.CUSTSERVICE)) .WhereIF(!string.IsNullOrWhiteSpace(input.CUSTOMERNAME), u => u.CUSTOMERNAME.Contains(input.CUSTOMERNAME)) - .WhereIF(input.CUSTOMERID != 0, u => u.CUSTOMERID == input.CUSTOMERID) + .WhereIF(input.CUSTOMERID !=null, u => u.CUSTOMERID == input.CUSTOMERID) .WhereIF(!string.IsNullOrWhiteSpace(input.FORWARDER), u => u.FORWARDER.Contains(input.FORWARDER)) .WhereIF(!string.IsNullOrWhiteSpace(input.CUSTSERVICE), u => u.CUSTSERVICE == input.CUSTSERVICE) .WhereIF(!string.IsNullOrWhiteSpace(input.CUSTOMERNAME), u => u.CUSTOMERNAME == input.CUSTOMERNAME) diff --git a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderInput.cs b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderInput.cs index dcd41022..94558f84 100644 --- a/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderInput.cs +++ b/Myshipping.Application/Service/BookingOrder/Dto/BookingOrderInput.cs @@ -368,7 +368,7 @@ namespace Myshipping.Application /// /// 是否SOC箱 /// - public virtual bool ISCONTAINERSOC { get; set; } + public virtual bool? ISCONTAINERSOC { get; set; } /// /// SO备注 @@ -623,7 +623,7 @@ namespace Myshipping.Application /// /// 客户ID /// - public virtual long CUSTOMERID { get; set; } + public virtual long? CUSTOMERID { get; set; } /// /// 订舱代理ID diff --git a/Myshipping.Core/Const/CommonConst.cs b/Myshipping.Core/Const/CommonConst.cs index 18d61c9b..e0210c43 100644 --- a/Myshipping.Core/Const/CommonConst.cs +++ b/Myshipping.Core/Const/CommonConst.cs @@ -119,6 +119,23 @@ public class CommonConst /// 场站映射 /// public const string CACHE_KEY_COMMON_DB_MAPPING_YARD = "CommonDbMappingYard"; + /// + /// 起始港映射 + /// + public const string CACHE_KEY_COMMON_DB_MAPPING_PORTLOAD = "CommonDbMappingPortLoad"; + + /// + /// 目的港映射 + /// + public const string CACHE_KEY_COMMON_DB_MAPPING_PORT = "CommonDbMappingPort"; + /// + /// 包装映射 + /// + public const string CACHE_KEY_COMMON_DB_MAPPING_PACKAGE = "CommonDbMappingPackage"; + /// + /// 包装映射 + /// + public const string CACHE_KEY_COMMON_DB_MAPPING_SERVICE = "CommonDbMappingService"; /// /// 字典映射 diff --git a/Myshipping.Core/Entity/CommonDB/CodeCarrier.cs b/Myshipping.Core/Entity/CommonDB/CodeCarrier.cs index a61cb880..42b4fd66 100644 --- a/Myshipping.Core/Entity/CommonDB/CodeCarrier.cs +++ b/Myshipping.Core/Entity/CommonDB/CodeCarrier.cs @@ -76,4 +76,10 @@ namespace Myshipping.Core.Entity public string Remark { get; set; } } + + + + + + } diff --git a/Myshipping.Core/Entity/CommonDB/CodePackage.cs b/Myshipping.Core/Entity/CommonDB/CodePackage.cs index b06cd6e2..07b765d1 100644 --- a/Myshipping.Core/Entity/CommonDB/CodePackage.cs +++ b/Myshipping.Core/Entity/CommonDB/CodePackage.cs @@ -40,4 +40,40 @@ namespace Myshipping.Core.Entity } + + + [SugarTable("MappingPackage")] + [Description("包装映射")] + public class MappingPackage : CommonDbEntity + { + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 船司代码 + /// + public string CarrierCode { get; set; } + + /// + /// 模块 + /// + public string Module { get; set; } + + /// + /// 映射代码 + /// + public string MapCode { get; set; } + + /// + /// 映射名称 + /// + public string MapName { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + } } diff --git a/Myshipping.Core/Entity/CommonDB/CodePort.cs b/Myshipping.Core/Entity/CommonDB/CodePort.cs index 5d648373..e3a444b2 100644 --- a/Myshipping.Core/Entity/CommonDB/CodePort.cs +++ b/Myshipping.Core/Entity/CommonDB/CodePort.cs @@ -66,4 +66,40 @@ namespace Myshipping.Core.Entity } + + + [SugarTable("MappingPort")] + [Description("起运港映射")] + public class MappingPort : CommonDbEntity + { + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 船司代码 + /// + public string CarrierCode { get; set; } + + /// + /// 模块 + /// + public string Module { get; set; } + + /// + /// 映射代码 + /// + public string MapCode { get; set; } + + /// + /// 映射名称 + /// + public string MapName { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + } } diff --git a/Myshipping.Core/Entity/CommonDB/CodePortLoad.cs b/Myshipping.Core/Entity/CommonDB/CodePortLoad.cs index 72dcaad3..fc7dbbed 100644 --- a/Myshipping.Core/Entity/CommonDB/CodePortLoad.cs +++ b/Myshipping.Core/Entity/CommonDB/CodePortLoad.cs @@ -41,8 +41,42 @@ namespace Myshipping.Core.Entity /// 备注 /// public string Remark { get; set; } + } + + + [SugarTable("MappingPortLoad")] + [Description("起运港映射")] + public class MappingPortLoad : CommonDbEntity + { + /// + /// 代码 + /// + public string Code { get; set; } + /// + /// 船司代码 + /// + public string CarrierCode { get; set; } + /// + /// 模块 + /// + public string Module { get; set; } + + /// + /// 映射代码 + /// + public string MapCode { get; set; } + + /// + /// 映射名称 + /// + public string MapName { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } } } diff --git a/Myshipping.Core/Entity/CommonDB/CodeService.cs b/Myshipping.Core/Entity/CommonDB/CodeService.cs index 3689a1ac..ac7d0e77 100644 --- a/Myshipping.Core/Entity/CommonDB/CodeService.cs +++ b/Myshipping.Core/Entity/CommonDB/CodeService.cs @@ -39,5 +39,44 @@ namespace Myshipping.Core.Entity + } + + + [SugarTable("MappingService")] + [Description("运输方式")] + public class MappingService : CommonDbEntity + { + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 船司代码 + /// + public string CarrierCode { get; set; } + + /// + /// 模块 + /// + public string Module { get; set; } + + /// + /// 映射代码 + /// + public string MapCode { get; set; } + + /// + /// 映射名称 + /// + public string MapName { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + + } } diff --git a/Myshipping.Core/Myshipping.Core.xml b/Myshipping.Core/Myshipping.Core.xml index d121ee34..673c5660 100644 --- a/Myshipping.Core/Myshipping.Core.xml +++ b/Myshipping.Core/Myshipping.Core.xml @@ -657,6 +657,26 @@ 场站映射 + + + 起始港映射 + + + + + 目的港映射 + + + + + 包装映射 + + + + + 包装映射 + + 字典映射 @@ -1027,6 +1047,36 @@ 备注 + + + 代码 + + + + + 船司代码 + + + + + 模块 + + + + + 映射代码 + + + + + 映射名称 + + + + + 备注 + + 代码 @@ -1077,6 +1127,36 @@ 备注 + + + 代码 + + + + + 船司代码 + + + + + 模块 + + + + + 映射代码 + + + + + 映射名称 + + + + + 备注 + + 代码 @@ -1107,6 +1187,36 @@ 备注 + + + 代码 + + + + + 船司代码 + + + + + 模块 + + + + + 映射代码 + + + + + 映射名称 + + + + + 备注 + + 代码 @@ -1162,6 +1272,36 @@ 备注 + + + 代码 + + + + + 船司代码 + + + + + 模块 + + + + + 映射代码 + + + + + 映射名称 + + + + + 备注 + + 名称 @@ -5584,6 +5724,54 @@ + + + 设置公共库 起始港映射 + + + + + + 获取公共库 起始港映射 + + + + + + 获取公共库 目的港映射 + + + + + + 设置公共库 目的港映射 + + + + + + 设置公共库 包装映射 + + + + + + 获取公共库 包装映射 + + + + + + 获取公共库 运输条款映射 + + + + + + 设置公共库 运输条款映射 + + + 获取租户参数 @@ -5883,7 +6071,7 @@ - 获取公共库 船名映射 + 获取公共库 场站映射 @@ -5977,6 +6165,54 @@ + + + 设置公共库 起始港映射 + + + + + + 获取公共库 起始港映射 + + + + + + 获取公共库 目的港映射 + + + + + + 设置公共库 目的港映射 + + + + + + 设置公共库 包装映射 + + + + + + 获取公共库 包装映射 + + + + + + 获取公共库 运输条款映射 + + + + + + 设置公共库 运输条款映射 + + + 获取租户参数 @@ -6527,7 +6763,7 @@ 获取船公司列表信息 - + 新增船公司信息 @@ -6537,7 +6773,7 @@ 获取船公司映射列表信息 - + 新增编辑船公司映射信息 @@ -6547,7 +6783,7 @@ 获取船名列表信息 - + 新增船名信息 @@ -6557,7 +6793,7 @@ 获取船名映射 - + 新增编辑船名映射信息 @@ -6567,7 +6803,7 @@ 获取船代列表信息 - + 新增船代信息 @@ -6577,7 +6813,7 @@ 获取场站列表信息 - + 新增场站信息 @@ -6587,7 +6823,7 @@ 获取场站映射 - + 新增编辑场站映射信息 @@ -6597,47 +6833,87 @@ 获取起始港信息 - + 新增起始港信息 + + + 获取起始港映射 + + + + + 新增编辑起始港映射信息 + + 获取目的港信息 - + 新增目的港信息 + + + 获取目的港映射 + + + + + 新增编辑目的港映射信息 + + 获取包装信息 - + 新增包装信息 + + + 获取包装映射 + + + + + 新增编辑包装映射信息 + + 获取运输条款信息 - + 新增运输条款 + + + 获取运输条款映射 + + + + + 新增编辑运输条款映射信息 + + 获取箱型信息 - + 新增箱型 @@ -6647,7 +6923,7 @@ 获取箱型映射列表信息 - + 新增编辑箱型映射信息 @@ -6657,7 +6933,7 @@ 付费方式 - + 新增付费方式 @@ -6667,99 +6943,684 @@ 获取付费映射列表信息 - + 新增编辑付费映射信息 - + - 模块 + 代码 - + - 映射代码 + 英文名称 - + - 映射名称 + 中文名称 - + - 获取船公司 + EDI代码 - - + - 获取船公司映射 + 描述 - - + - 获取船名 + 备注 - - + - 获取船名映射 + 代码 - - + - 获取船代 + 尺寸 - - + - 获取场站 + 名称 - - + - 获取场站映射 + EDI代码 - - + - 获取起始港 + 描述 - - + - 获取目的港 + 备注 - - + - 获取包装 + 代码 - - + - 获取运输方式 + 名称 - - + - 获取箱型 + 描述 - - + + + 备注 + + + + + 代码 + + + + + 英文名称 + + + + + 中文名称 + + + + + 描述 + + + + + 备注 + + + + + 代码 + + + + + 名称 + + + + + EDI代码 + + + + + 描述 + + + + + 备注 + + + + + 代码 + + + + + 英文名称 + + + + + 中文名称 + + + + + 航线 + + + + + 国家 + + + + + 国家代码 + + + + + 全名 + + + + + 描述 + + + + + EDI代码 + + + + + 备注 + + + + + 代码 + + + + + 英文名称 + + + + + 中文名称 + + + + + 描述 + + + + + EDI代码 + + + + + 备注 + + + + + 代码 + + + + + 名称 + + + + + EDI代码 + + + + + 描述 + + + + + 备注 + + + + + 名称 + + + + + EDI代码 + + + + + 描述 + + + + + 备注 + + + + + 创建时间 + + + + + 修改时间 + + + + + 创建人 + + + + + 修改人 + + + + + 代码 + + + + + 名称 + + + + + 描述 + + + + + 备注 + + + + + 业务id + + + + + 代码 + + + + + 模块 + + + + + 映射代码 + + + + + 映射名称 + + + + + 备注 + + + + + 业务id + + + + + 代码 + + + + + 船司代码 + + + + + 模块 + + + + + 映射代码 + + + + + 映射名称 + + + + + 备注 + + + + + 业务id + + + + + 代码 + + + + + 船司代码 + + + + + 模块 + + + + + 映射代码 + + + + + 映射名称 + + + + + 备注 + + + + + 业务id + + + + + 代码 + + + + + 船司代码 + + + + + 模块 + + + + + 映射代码 + + + + + 映射名称 + + + + + 备注 + + + + + 业务id + + + + + 代码 + + + + + 船司代码 + + + + + 模块 + + + + + 映射代码 + + + + + 映射名称 + + + + + 备注 + + + + + 业务id + + + + + 代码 + + + + + 船司代码 + + + + + 模块 + + + + + 映射代码 + + + + + 映射名称 + + + + + 备注 + + + + + 业务id + + + + + 代码 + + + + + 船司代码 + + + + + 模块 + + + + + 映射代码 + + + + + 映射名称 + + + + + 备注 + + + + + 名称 + + + + + 模块 + + + + + 映射名称 + + + + + 备注 + + + + + 业务id + + + + + 代码 + + + + + 模块 + + + + + 映射代码 + + + + + 映射名称 + + + + + 备注 + + + + + 模块 + + + + + 映射代码 + + + + + 映射名称 + + + + + 获取船公司 + + + + + + 获取船公司映射 + + + + + + 获取船名 + + + + + + 获取船名映射 + + + + + + 获取船代 + + + + + + 获取场站 + + + + + + 获取场站映射 + + + + + + 获取起始港 + + + + + + 获取目的港 + + + + + + 获取包装 + + + + + + 获取运输方式 + + + + + + 获取箱型 + + + + 获取箱型映射 @@ -6776,6 +7637,26 @@ 付费方式映射 + + + 起始港映射 + + + + + 目的港映射 + + + + + 包装映射 + + + + + 运输服务映射 + + 获取库表信息 diff --git a/Myshipping.Core/Service/Auth/AuthService.cs b/Myshipping.Core/Service/Auth/AuthService.cs index 5c501b27..23a7ba3b 100644 --- a/Myshipping.Core/Service/Auth/AuthService.cs +++ b/Myshipping.Core/Service/Auth/AuthService.cs @@ -94,7 +94,7 @@ public class AuthService : IAuthService, IDynamicApiController, ITransient {ClaimConst.CLAINM_SUPERADMIN, user.AdminType}, { ClaimConst.CLAINM_TENANT_TYPE, tenant.TenantType }, { ClaimConst.CLAINM_TENANT_NAME, tenant.Name }, - { ClaimConst.DjyUserId, user.DjyUserId }, + { ClaimConst.DjyUserId, user.DjyUserId }, }); // 设置Swagger自动登录 diff --git a/Myshipping.Core/Service/Cache/ISysCacheService.cs b/Myshipping.Core/Service/Cache/ISysCacheService.cs index 9362cd72..fab152ab 100644 --- a/Myshipping.Core/Service/Cache/ISysCacheService.cs +++ b/Myshipping.Core/Service/Cache/ISysCacheService.cs @@ -214,6 +214,50 @@ public interface ISysCacheService /// /// Task SetAllMappingYard(List list); + + /// + /// 设置公共库 起始港映射 + /// + /// + Task SetAllMappingPortLoad(List list); + + /// + /// 获取公共库 起始港映射 + /// + /// + Task> GetAllMappingPortLoad(); + /// + /// 获取公共库 目的港映射 + /// + /// + Task> GetAllMappingPort(); + + /// + /// 设置公共库 目的港映射 + /// + /// + Task SetAllMappingPort(List list); + /// + /// 设置公共库 包装映射 + /// + /// + Task SetAllMappingPackage(List list); + + /// + /// 获取公共库 包装映射 + /// + /// + Task> GetAllMappingPackage(); + /// + /// 获取公共库 运输条款映射 + /// + /// + Task> GetAllMappingService(); + /// + /// 设置公共库 运输条款映射 + /// + /// + Task SetAllMappingService(List list); #endregion #region DJY diff --git a/Myshipping.Core/Service/Cache/SysCacheService.cs b/Myshipping.Core/Service/Cache/SysCacheService.cs index 91dd987c..6f81f816 100644 --- a/Myshipping.Core/Service/Cache/SysCacheService.cs +++ b/Myshipping.Core/Service/Cache/SysCacheService.cs @@ -419,7 +419,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet } /// - /// 获取公共库 船名映射 + /// 获取公共库 场站映射 /// /// public Task> GetAllMappingYard() @@ -562,8 +562,71 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet { return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_YARD, list); } + /// + /// 设置公共库 起始港映射 + /// + /// + public Task SetAllMappingPortLoad(List list) + { + return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_PORTLOAD, list); + } + /// + /// 获取公共库 起始港映射 + /// + /// + public Task> GetAllMappingPortLoad() + { + return _cache.GetAsync>(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_PORTLOAD); + } + /// + /// 获取公共库 目的港映射 + /// + /// + public Task> GetAllMappingPort() + { + return _cache.GetAsync>(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_PORT); + } + /// + /// 设置公共库 目的港映射 + /// + /// + public Task SetAllMappingPort(List list) + { + return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_PORT, list); + } + /// + /// 设置公共库 包装映射 + /// + /// + public Task SetAllMappingPackage(List list) + { + return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_PACKAGE, list); + } + /// + /// 获取公共库 包装映射 + /// + /// + public Task> GetAllMappingPackage() + { + return _cache.GetAsync>(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_PACKAGE); + } + /// + /// 获取公共库 运输条款映射 + /// + /// + public Task> GetAllMappingService() + { + return _cache.GetAsync>(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_SERVICE); + } /// + /// 设置公共库 运输条款映射 + /// + /// + public Task SetAllMappingService(List list) + { + return _cache.SetAsync(CommonConst.CACHE_KEY_COMMON_DB_MAPPING_SERVICE, list); + } #endregion #region DJY diff --git a/Myshipping.Core/Service/CommonDB/CommonDBService.cs b/Myshipping.Core/Service/CommonDB/CommonDBService.cs index f96a5ec2..2727724e 100644 --- a/Myshipping.Core/Service/CommonDB/CommonDBService.cs +++ b/Myshipping.Core/Service/CommonDB/CommonDBService.cs @@ -9,6 +9,7 @@ using System.Linq; using System.Threading.Tasks; using System.Collections.Generic; using System; +using Myshipping.Core.Service.CommonDB.Dto; namespace Myshipping.Core.Service; /// @@ -33,6 +34,10 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie private readonly SqlSugarRepository _mappingCtnRep; private readonly SqlSugarRepository _codeFrtRep; private readonly SqlSugarRepository _mappingFrtRep; + private readonly SqlSugarRepository _mappingPortLoadRep; + private readonly SqlSugarRepository _mappingPortRep; + private readonly SqlSugarRepository _mappingPackageRep; + private readonly SqlSugarRepository _mappingServiceRep; private readonly ISysCacheService _sysCacheService; public CommonDBService(SqlSugarRepository codeCarrierRep, @@ -50,6 +55,10 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie SqlSugarRepository mappingCtnRep, SqlSugarRepository mappingFrtRep, SqlSugarRepository mappingYardRep, + SqlSugarRepository mappingPortLoadRep, + SqlSugarRepository mappingPortRep, + SqlSugarRepository mappingPackageRep, + SqlSugarRepository mappingServiceRep, ISysCacheService sysCacheService) { _codeCarrierRep = codeCarrierRep; @@ -68,8 +77,10 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie _mappingFrtRep = mappingFrtRep; _mappingYardRep = mappingYardRep; _sysCacheService = sysCacheService; - - + _mappingPortLoadRep = mappingPortLoadRep; + _mappingPortRep = mappingPortRep; + _mappingPackageRep = mappingPackageRep; + _mappingServiceRep = mappingServiceRep; } @@ -91,12 +102,15 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// 新增船公司信息 /// [HttpPost("/commondb/addcarrier")] - public async Task AddCarrier([FromBody] CodeCarrier dto) + public async Task AddCarrier([FromBody] CodeCarrierDto dto) { var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; await _codeCarrierRep.InsertAsync(entity); await GetAllCarrier(); + } /// @@ -119,17 +133,20 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// 新增编辑船公司映射信息 /// [HttpPost("/commondb/addorupdatemappingcarrier")] - public async Task AddOrUpdateMappingCarrier([FromBody] MappingCarrier dto) + public async Task AddOrUpdateMappingCarrier([FromBody] MappingCarrierDto dto) { var entity = dto.Adapt(); if (string.IsNullOrWhiteSpace(dto.GID)) { entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser =UserManager.DjyUserId; await _mappingCarrierRep.InsertAsync(entity); } else { - + entity.ModifyTime = DateTime.Now; + entity.ModifyUser = UserManager.DjyUserId; await _mappingCarrierRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); } @@ -163,10 +180,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// 新增船名信息 /// [HttpPost("/commondb/addvessel")] - public async Task AddVessel([FromBody] CodeVessel dto) + public async Task AddVessel([FromBody] CodeVesselDto dto) { var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; await _codeVesselRep.InsertAsync(entity); await GetAllVessel(); } @@ -195,17 +214,20 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// 新增编辑船名映射信息 /// [HttpPost("/commondb/addorupdatevessel")] - public async Task AddOrUpdateMappingVessel([FromBody] MappingVessel dto) + public async Task AddOrUpdateMappingVessel([FromBody] MappingVesselDto dto) { var entity = dto.Adapt(); if (string.IsNullOrWhiteSpace(dto.GID)) { entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; await _mappingVesselRep.InsertAsync(entity); } else { - + entity.ModifyTime = DateTime.Now; + entity.ModifyUser = UserManager.DjyUserId; await _mappingVesselRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); } @@ -232,10 +254,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// 新增船代信息 /// [HttpPost("/commondb/addforwarder")] - public async Task AddForwarder([FromBody] CodeForwarder dto) + public async Task AddForwarder([FromBody] CodeForwarderDto dto) { var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; await _codeForwarderRep.InsertAsync(entity); await GetAllForwarder(); } @@ -259,10 +283,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// 新增场站信息 /// [HttpPost("/commondb/addyard")] - public async Task AddYard([FromBody] CodeYard dto) + public async Task AddYard([FromBody] CodeYardDto dto) { var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; await _codeYardRep.InsertAsync(entity); await GetAllYard(); } @@ -291,16 +317,20 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// 新增编辑场站映射信息 /// [HttpPost("/commondb/addorupdatemappingyard")] - public async Task AddOrUpdateMappingYard([FromBody] MappingYard dto) + public async Task AddOrUpdateMappingYard([FromBody] MappingYardDto dto) { var entity = dto.Adapt(); if (string.IsNullOrWhiteSpace(dto.GID)) { entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; await _mappingYardRep.InsertAsync(entity); } else { + entity.ModifyTime = DateTime.Now; + entity.ModifyUser = UserManager.DjyUserId; await _mappingYardRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); } await GetAllMappingYard(); @@ -328,13 +358,62 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// 新增起始港信息 /// [HttpPost("/commondb/addportload")] - public async Task AddPortload([FromBody] CodePortLoad dto) + public async Task AddPortload([FromBody] CodePortLoadDto dto) { var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; await _codePortLoadrRep.InsertAsync(entity); await GetAllPortload(); } + + + /// + /// 获取起始港映射 + /// + [HttpGet("/commondb/mappingportloadlist")] + public async Task PortloadList([FromQuery] MappingQueryDto input) + { + //数量太多，不允许查询全部 + if (string.IsNullOrEmpty(input.Module) || input.Module.Length < 1) + { + return new List(); + } + + List list = await _sysCacheService.GetAllMappingPortLoad(); + + var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Module), x => x.Module == input.Module) + .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.MapName.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase)); + + return queryList.ToList(); + } + + /// + /// 新增编辑起始港映射信息 + /// + [HttpPost("/commondb/addorupdatemappingportload")] + public async Task AddOrUpdatePortload([FromBody] MappingPortLoadDto dto) + { + var entity = dto.Adapt(); + if (string.IsNullOrWhiteSpace(dto.GID)) + { + entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; + await _mappingPortLoadRep.InsertAsync(entity); + } + else + { + entity.ModifyTime = DateTime.Now; + entity.ModifyUser = UserManager.DjyUserId; + await _mappingPortLoadRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + } + await GetAllMappingPortLoad(); + } + + + #endregion #region 目的港 @@ -362,14 +441,57 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// 新增目的港信息 /// [HttpPost("/commondb/addport")] - public async Task AddPort([FromBody] CodePort dto) + public async Task AddPort([FromBody] CodePortDto dto) { var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; await _codePortRep.InsertAsync(entity); await GetAllPort(); } + /// + /// 获取目的港映射 + /// + [HttpGet("/commondb/mappingportlist")] + public async Task PortList([FromQuery] MappingQueryDto input) + { + //数量太多，不允许查询全部 + if (string.IsNullOrEmpty(input.Module) || input.Module.Length < 1) + { + return new List(); + } + + List list = await _sysCacheService.GetAllMappingPort(); + + var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Module), x => x.Module == input.Module) + .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.MapName.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase)); + return queryList.ToList(); + } + + /// + /// 新增编辑目的港映射信息 + /// + [HttpPost("/commondb/addorupdatemappingport")] + public async Task AddOrUpdatePort([FromBody] MappingPortDto dto) + { + var entity = dto.Adapt(); + if (string.IsNullOrWhiteSpace(dto.GID)) + { + entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; + await _mappingPortRep.InsertAsync(entity); + } + else + { + entity.ModifyTime = DateTime.Now; + entity.ModifyUser = UserManager.DjyUserId; + await _mappingPortRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + } + await GetAllMappingPort(); + } #endregion @@ -390,7 +512,7 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// 新增包装信息 /// [HttpPost("/commondb/addpackage")] - public async Task AddPackage([FromBody] CodePackage dto) + public async Task AddPackage([FromBody] CodePackageDto dto) { var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); @@ -398,6 +520,49 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie await GetAllPackage(); } + + /// + /// 获取包装映射 + /// + [HttpGet("/commondb/mappingpackage")] + public async Task MappingPackageList([FromQuery] MappingQueryDto input) + { + //数量太多，不允许查询全部 + if (string.IsNullOrEmpty(input.Module) || input.Module.Length < 1) + { + return new List(); + } + + List list = await _sysCacheService.GetAllMappingPackage(); + + var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Module), x => x.Module == input.Module) + .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.MapName.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase)); + + return queryList.ToList(); + } + + /// + /// 新增编辑包装映射信息 + /// + [HttpPost("/commondb/addorupdatemappingpackage")] + public async Task AddOrUpdateMappingPackage([FromBody] MappingPackageDto dto) + { + var entity = dto.Adapt(); + if (string.IsNullOrWhiteSpace(dto.GID)) + { + entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; + await _mappingPackageRep.InsertAsync(entity); + } + else + { + entity.ModifyTime = DateTime.Now; + entity.ModifyUser = UserManager.DjyUserId; + await _mappingPackageRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + } + await GetAllMappingPackage(); + } #endregion #region 运输条款 @@ -418,14 +583,58 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// 新增运输条款 /// [HttpPost("/commondb/addservice")] - public async Task AddService([FromBody] CodeService dto) + public async Task AddService([FromBody] CodeServiceDto dto) { var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; await _codeServiceRep.InsertAsync(entity); await GetAllService(); } + /// + /// 获取运输条款映射 + /// + [HttpGet("/commondb/mappingservice")] + public async Task MappingServiceList([FromQuery] MappingQueryDto input) + { + //数量太多，不允许查询全部 + if (string.IsNullOrEmpty(input.Module) || input.Module.Length < 1) + { + return new List(); + } + + List list = await _sysCacheService.GetAllMappingService(); + + var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Module), x => x.Module == input.Module) + .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.MapName.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase)); + + return queryList.ToList(); + } + + /// + /// 新增编辑运输条款映射信息 + /// + [HttpPost("/commondb/addorupdatemappingservice")] + public async Task AddOrUpdateMappingService([FromBody] MappingServiceDto dto) + { + var entity = dto.Adapt(); + if (string.IsNullOrWhiteSpace(dto.GID)) + { + entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; + await _mappingServiceRep.InsertAsync(entity); + } + else + { + entity.ModifyTime = DateTime.Now; + entity.ModifyUser = UserManager.DjyUserId; + await _mappingServiceRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); + } + await GetAllMappingService(); + } #endregion @@ -448,9 +657,11 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// 新增箱型 /// [HttpPost("/commondb/addctn")] - public async Task AddCtn([FromBody] CodeCtn dto) + public async Task AddCtn([FromBody] CodeCtnDto dto) { var entity = dto.Adapt(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; entity.GID = Guid.NewGuid().ToString(); await _codeCtnRep.InsertAsync(entity); await GetAllCtn(); @@ -478,17 +689,20 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// 新增编辑箱型映射信息 /// [HttpPost("/commondb/addmappingctn")] - public async Task AddOrUpdateMappingCtn([FromBody] MappingCtn dto) + public async Task AddOrUpdateMappingCtn([FromBody] MappingCtnDto dto) { var entity = dto.Adapt(); if (string.IsNullOrWhiteSpace(dto.GID)) { entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; await _mappingCtnRep.InsertAsync(entity); } else { - + entity.ModifyTime = DateTime.Now; + entity.ModifyUser = UserManager.DjyUserId; await _mappingCtnRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); } @@ -516,10 +730,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// 新增付费方式 /// [HttpPost("/commondb/addfrt")] - public async Task AddFrt([FromBody] CodeFrt dto) + public async Task AddFrt([FromBody] CodeFrtDto dto) { var entity = dto.Adapt(); entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; await _codeFrtRep.InsertAsync(entity); await GetAllFrt(); } @@ -545,16 +761,20 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie /// 新增编辑付费映射信息 /// [HttpPost("/commondb/addmappingfrt")] - public async Task AddOrUpdateMappingFrt([FromBody] MappingFrt dto) + public async Task AddOrUpdateMappingFrt([FromBody] MappingFrtDto dto) { var entity = dto.Adapt(); if (string.IsNullOrWhiteSpace(dto.GID)) { entity.GID = Guid.NewGuid().ToString(); + entity.CreateTime = DateTime.Now; + entity.CreateUser = UserManager.DjyUserId; await _mappingFrtRep.InsertAsync(entity); } else { + entity.ModifyTime = DateTime.Now; + entity.ModifyUser = UserManager.DjyUserId; await _mappingFrtRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync(); } await GetAllMappingFrt(); @@ -701,6 +921,45 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie return list; } + + + [NonAction] + public async Task> GetAllMappingPortLoad() + { + + var list = await _mappingPortLoadRep.ToListAsync(); + await _sysCacheService.SetAllMappingPortLoad(list); + return list; + + } + + [NonAction] + public async Task> GetAllMappingPort() + { + + var list = await _mappingPortRep.ToListAsync(); + await _sysCacheService.SetAllMappingPort(list); + return list; + + } + [NonAction] + public async Task> GetAllMappingPackage() + { + + var list = await _mappingPackageRep.ToListAsync(); + await _sysCacheService.SetAllMappingPackage(list); + return list; + + } + [NonAction] + public async Task> GetAllMappingService() + { + + var list = await _mappingServiceRep.ToListAsync(); + await _sysCacheService.SetAllMappingService(list); + return list; + + } #endregion } diff --git a/Myshipping.Core/Service/CommonDB/Dto/CodeCarrierDto.cs b/Myshipping.Core/Service/CommonDB/Dto/CodeCarrierDto.cs new file mode 100644 index 00000000..9447bd91 --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/CodeCarrierDto.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class CodeCarrierDto + { + + + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 英文名称 + /// + public string EnName { get; set; } + + /// + /// 中文名称 + /// + public string CnName { get; set; } + + /// + /// EDI代码 + /// + public string EdiCode { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + + + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/CodeCtnDto.cs b/Myshipping.Core/Service/CommonDB/Dto/CodeCtnDto.cs new file mode 100644 index 00000000..5c838cbe --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/CodeCtnDto.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class CodeCtnDto + { + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 尺寸 + /// + public int? Size { get; set; } + + /// + /// 名称 + /// + public string Name { get; set; } + + /// + /// EDI代码 + /// + public string EdiCode { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + + + + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/CodeForwarderDto.cs b/Myshipping.Core/Service/CommonDB/Dto/CodeForwarderDto.cs new file mode 100644 index 00000000..77f066d1 --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/CodeForwarderDto.cs @@ -0,0 +1,34 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class CodeForwarderDto + { + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 名称 + /// + public string Name { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + + + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/CodeFrtDto.cs b/Myshipping.Core/Service/CommonDB/Dto/CodeFrtDto.cs new file mode 100644 index 00000000..30905b54 --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/CodeFrtDto.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class CodeFrtDto + { + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 英文名称 + /// + public string EnName { get; set; } + + /// + /// 中文名称 + /// + public string CnName { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + + + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/CodePackageDto.cs b/Myshipping.Core/Service/CommonDB/Dto/CodePackageDto.cs new file mode 100644 index 00000000..a6726fb4 --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/CodePackageDto.cs @@ -0,0 +1,39 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class CodePackageDto + { + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 名称 + /// + public string Name { get; set; } + + /// + /// EDI代码 + /// + public string EdiCode { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + + + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/CodePortDto.cs b/Myshipping.Core/Service/CommonDB/Dto/CodePortDto.cs new file mode 100644 index 00000000..da4c3d95 --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/CodePortDto.cs @@ -0,0 +1,65 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class CodePortDto + { + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 英文名称 + /// + public string EnName { get; set; } + + /// + /// 中文名称 + /// + public string CnName { get; set; } + + /// + /// 航线 + /// + public string ShippingRoute { get; set; } + + /// + /// 国家 + /// + public string Country { get; set; } + + /// + /// 国家代码 + /// + public string CountryCode { get; set; } + + /// + /// 全名 + /// + public string FullName { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// EDI代码 + /// + public string EdiCode { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + + + + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/CodePortLoadDto.cs b/Myshipping.Core/Service/CommonDB/Dto/CodePortLoadDto.cs new file mode 100644 index 00000000..51aee100 --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/CodePortLoadDto.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class CodePortLoadDto + { + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 英文名称 + /// + public string EnName { get; set; } + + /// + /// 中文名称 + /// + public string CnName { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// EDI代码 + /// + public string EdiCode { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/CodeServiceDto.cs b/Myshipping.Core/Service/CommonDB/Dto/CodeServiceDto.cs new file mode 100644 index 00000000..58a86948 --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/CodeServiceDto.cs @@ -0,0 +1,36 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class CodeServiceDto + { /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 名称 + /// + public string Name { get; set; } + + /// + /// EDI代码 + /// + public string EdiCode { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/CodeVesselDto.cs b/Myshipping.Core/Service/CommonDB/Dto/CodeVesselDto.cs new file mode 100644 index 00000000..2ac3160e --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/CodeVesselDto.cs @@ -0,0 +1,53 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class CodeVesselDto + { + /// + /// 名称 + /// + public string Name { get; set; } + + /// + /// EDI代码 + /// + public string EdiCode { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + /// + /// 创建时间 + /// + public DateTime CreateTime { get; set; } + + /// + /// 修改时间 + /// + public DateTime? ModifyTime { get; set; } + + /// + /// 创建人 + /// + public string CreateUser { get; set; } + + /// + /// 修改人 + /// + public string ModifyUser { get; set; } + + + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/CodeYardDto.cs b/Myshipping.Core/Service/CommonDB/Dto/CodeYardDto.cs new file mode 100644 index 00000000..deeb6a08 --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/CodeYardDto.cs @@ -0,0 +1,32 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class CodeYardDto + { + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 名称 + /// + public string Name { get; set; } + + /// + /// 描述 + /// + public string Description { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/MappingCarrierDto.cs b/Myshipping.Core/Service/CommonDB/Dto/MappingCarrierDto.cs new file mode 100644 index 00000000..7f68eb63 --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/MappingCarrierDto.cs @@ -0,0 +1,42 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class MappingCarrierDto + { + + /// + /// 业务id + /// + public string GID { get; set; } + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 模块 + /// + public string Module { get; set; } + + /// + /// 映射代码 + /// + public string MapCode { get; set; } + + /// + /// 映射名称 + /// + public string MapName { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/MappingCtnDto.cs b/Myshipping.Core/Service/CommonDB/Dto/MappingCtnDto.cs new file mode 100644 index 00000000..9ef8d084 --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/MappingCtnDto.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class MappingCtnDto + { + /// + /// 业务id + /// + public string GID { get; set; } + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 船司代码 + /// + public string CarrierCode { get; set; } + + /// + /// 模块 + /// + public string Module { get; set; } + + /// + /// 映射代码 + /// + public string MapCode { get; set; } + + /// + /// 映射名称 + /// + public string MapName { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/MappingFrtDto.cs b/Myshipping.Core/Service/CommonDB/Dto/MappingFrtDto.cs new file mode 100644 index 00000000..944ee31d --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/MappingFrtDto.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class MappingFrtDto + { + /// + /// 业务id + /// + public string GID { get; set; } + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 船司代码 + /// + public string CarrierCode { get; set; } + + /// + /// 模块 + /// + public string Module { get; set; } + + /// + /// 映射代码 + /// + public string MapCode { get; set; } + + /// + /// 映射名称 + /// + public string MapName { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/MappingPackageDto.cs b/Myshipping.Core/Service/CommonDB/Dto/MappingPackageDto.cs new file mode 100644 index 00000000..6e73e3c1 --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/MappingPackageDto.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class MappingServiceDto + { + /// + /// 业务id + /// + public string GID { get; set; } + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 船司代码 + /// + public string CarrierCode { get; set; } + + /// + /// 模块 + /// + public string Module { get; set; } + + /// + /// 映射代码 + /// + public string MapCode { get; set; } + + /// + /// 映射名称 + /// + public string MapName { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/MappingPortDto.cs b/Myshipping.Core/Service/CommonDB/Dto/MappingPortDto.cs new file mode 100644 index 00000000..098d2479 --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/MappingPortDto.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class MappingPortDto + { + /// + ///业务id + /// + public string GID { get; set; } + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 船司代码 + /// + public string CarrierCode { get; set; } + + /// + /// 模块 + /// + public string Module { get; set; } + + /// + /// 映射代码 + /// + public string MapCode { get; set; } + + /// + /// 映射名称 + /// + public string MapName { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/MappingPortLoadDto.cs b/Myshipping.Core/Service/CommonDB/Dto/MappingPortLoadDto.cs new file mode 100644 index 00000000..97e716ea --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/MappingPortLoadDto.cs @@ -0,0 +1,46 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class MappingPortLoadDto + { + + /// + /// 业务id + /// + public string GID { get; set; } + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 船司代码 + /// + public string CarrierCode { get; set; } + + /// + /// 模块 + /// + public string Module { get; set; } + + /// + /// 映射代码 + /// + public string MapCode { get; set; } + + /// + /// 映射名称 + /// + public string MapName { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/MappingServiceDto.cs b/Myshipping.Core/Service/CommonDB/Dto/MappingServiceDto.cs new file mode 100644 index 00000000..0226f9ec --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/MappingServiceDto.cs @@ -0,0 +1,45 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class MappingPackageDto + { + /// + /// 业务id + /// + public string GID { get; set; } + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 船司代码 + /// + public string CarrierCode { get; set; } + + /// + /// 模块 + /// + public string Module { get; set; } + + /// + /// 映射代码 + /// + public string MapCode { get; set; } + + /// + /// 映射名称 + /// + public string MapName { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/MappingVesselDto.cs b/Myshipping.Core/Service/CommonDB/Dto/MappingVesselDto.cs new file mode 100644 index 00000000..c7a6e40a --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/MappingVesselDto.cs @@ -0,0 +1,33 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class MappingVesselDto + { + public string GID { get; set; } + /// + /// 名称 + /// + public string Name { get; set; } + + /// + /// 模块 + /// + public string Module { get; set; } + + /// + /// 映射名称 + /// + public string MapName { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + } +} diff --git a/Myshipping.Core/Service/CommonDB/Dto/MappingYardDto.cs b/Myshipping.Core/Service/CommonDB/Dto/MappingYardDto.cs new file mode 100644 index 00000000..01a694d6 --- /dev/null +++ b/Myshipping.Core/Service/CommonDB/Dto/MappingYardDto.cs @@ -0,0 +1,41 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; + +namespace Myshipping.Core.Service.CommonDB.Dto +{ + public class MappingYardDto + { + /// + /// 业务id + /// + public string GID { get; set; } + /// + /// 代码 + /// + public string Code { get; set; } + + /// + /// 模块 + /// + public string Module { get; set; } + + /// + /// 映射代码 + /// + public string MapCode { get; set; } + + /// + /// 映射名称 + /// + public string MapName { get; set; } + + /// + /// 备注 + /// + public string Remark { get; set; } + + } +} diff --git a/Myshipping.Core/Service/CommonDB/ICommonDBService.cs b/Myshipping.Core/Service/CommonDB/ICommonDBService.cs index 5cf68df8..1364bb2a 100644 --- a/Myshipping.Core/Service/CommonDB/ICommonDBService.cs +++ b/Myshipping.Core/Service/CommonDB/ICommonDBService.cs @@ -95,4 +95,23 @@ public interface ICommonDBService /// 付费方式映射 /// Task> GetAllMappingFrt(); + + + /// + /// 起始港映射 + /// + Task> GetAllMappingPortLoad(); + + /// + /// 目的港映射 + /// + Task> GetAllMappingPort(); + /// + /// 包装映射 + /// + Task> GetAllMappingPackage(); + /// + /// 运输服务映射 + /// + Task> GetAllMappingService(); } diff --git a/Myshipping.Web.Core/Startup.cs b/Myshipping.Web.Core/Startup.cs index 0777e248..a953057c 100644 --- a/Myshipping.Web.Core/Startup.cs +++ b/Myshipping.Web.Core/Startup.cs @@ -168,6 +168,15 @@ public class Startup : AppStartup //付费方式映射 App.GetService().GetAllMappingFrt(); + //起始港映射 + App.GetService().GetAllMappingPortLoad(); + //目的港映射 + App.GetService().GetAllMappingPort(); + + //包装映射 + App.GetService().GetAllMappingPackage(); + //运输服务映射 + App.GetService().GetAllMappingService(); #endregion }