Merge branch 'master' of http://60.209.125.238:13080/whm/BookingHeChuan

Myshipping.Application/Myshipping.Application.xml

@@ -3427,7 +3427,7 @@
             状态
             </summary>
         </member>
-        <member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingStatusLogDto.OpTiem">
+        <member name="P:Myshipping.Application.Service.BookingOrder.Dto.BookingStatusLogDto.OPTime">
             <summary>
             状态时间
             </summary>

Myshipping.Application/Service/BookingOrder/BookingOrderService.cs

@@ -605,7 +605,7 @@ namespace Myshipping.Application
                 bookingStatusLog.Gategory = "ship";
                 bookingStatusLog.CreatedTime = DateTime.Now;
                 bookingStatusLog.Status = item.Status;
-                bookingStatusLog.OpTiem = item.OpTiem;
+                bookingStatusLog.OpTiem = item.OPTime;
                 bookingStatusLog.MBLNO = item.MBLNO;
                 var id = await _statuslog.InsertReturnSnowflakeIdAsync(bookingStatusLog);
                 if (item.detail != null && item.detail.Count > 0)

Myshipping.Application/Service/BookingOrder/Dto/BookingStatusLogDto.cs

@@ -22,7 +22,7 @@ namespace Myshipping.Application.Service.BookingOrder.Dto
         /// <summary>
         /// 状态时间
         /// </summary>
-        public DateTime? OpTiem { get; set; }
+        public DateTime? OPTime { get; set; }
         /// <summary>
         /// 类别
         /// </summary>

Myshipping.Core/Myshipping.Core.xml

@@ -5877,13 +5877,13 @@
         </member>
         <member name="M:Myshipping.Core.Service.SysCacheService.GetAllMappingCtn">
             <summary>
-            获取公共库 船司映射
+            获取公共库 箱型映射
             </summary>
             <returns></returns>
         </member>
         <member name="M:Myshipping.Core.Service.SysCacheService.GetAllMappingCarrier">
             <summary>
-            获取公共库 箱型映射
+            获取公共库 船司映射
             </summary>
             <returns></returns>
         </member>
@@ -6533,63 +6533,165 @@
             获取船公司列表信息
             </summary>
         </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.AddCarrier(Myshipping.Core.Entity.CodeCarrier)">
+            <summary>
+            新增船公司信息
+            </summary>
+        </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.MappingCarrierList(Myshipping.Core.Service.MappingQueryDto)">
+            <summary>
+            获取船公司映射列表信息
+            </summary>
+        </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.AddOrUpdateMappingCarrier(Myshipping.Core.Entity.MappingCarrier)">
+            <summary>
+            新增编辑船公司映射信息
+            </summary>
+        </member>
         <member name="M:Myshipping.Core.Service.CommonDBService.VesselList(Myshipping.Core.Service.NameQueryDto)">
             <summary>
             获取船名列表信息
             </summary>
         </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.AddVessel(Myshipping.Core.Entity.CodeVessel)">
+            <summary>
+            新增船名信息
+            </summary>
+        </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.MappingVesselList(Myshipping.Core.Service.MappingQueryDto)">
+            <summary>
+            获取船名映射
+            </summary>
+        </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.AddOrUpdateMappingVessel(Myshipping.Core.Entity.MappingVessel)">
+            <summary>
+            新增编辑船名映射信息
+            </summary>
+        </member>
         <member name="M:Myshipping.Core.Service.CommonDBService.ForwarderList(Myshipping.Core.Service.NameQueryDto)">
             <summary>
             获取船代列表信息
             </summary>
         </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.AddForwarder(Myshipping.Core.Entity.CodeForwarder)">
+            <summary>
+            新增船代信息
+            </summary>
+        </member>
         <member name="M:Myshipping.Core.Service.CommonDBService.YardList(Myshipping.Core.Service.NameQueryDto)">
             <summary>
             获取场站列表信息
             </summary>
         </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.AddYard(Myshipping.Core.Entity.CodeYard)">
+            <summary>
+            新增场站信息
+            </summary>
+        </member>
         <member name="M:Myshipping.Core.Service.CommonDBService.PortloadList(Myshipping.Core.Service.NameQueryDto)">
             <summary>
             获取起始港信息
             </summary>
         </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.AddPortload(Myshipping.Core.Entity.CodePortLoad)">
+            <summary>
+            新增起始港信息
+            </summary>
+        </member>
         <member name="M:Myshipping.Core.Service.CommonDBService.PortList(Myshipping.Core.Service.NameQueryDto)">
             <summary>
             获取目的港信息
             </summary>
         </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.AddPort(Myshipping.Core.Entity.CodePort)">
+            <summary>
+            新增目的港信息
+            </summary>
+        </member>
         <member name="M:Myshipping.Core.Service.CommonDBService.PackageList(Myshipping.Core.Service.NameQueryDto)">
             <summary>
             获取包装信息
             </summary>
         </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.AddPackage(Myshipping.Core.Entity.CodePackage)">
+            <summary>
+            新增包装信息
+            </summary>
+        </member>
         <member name="M:Myshipping.Core.Service.CommonDBService.ServiceList(Myshipping.Core.Service.NameQueryDto)">
             <summary>
             获取运输条款信息
             </summary>
         </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.AddService(Myshipping.Core.Entity.CodeService)">
+            <summary>
+            新增运输条款
+            </summary>
+        </member>
         <member name="M:Myshipping.Core.Service.CommonDBService.CtnList(Myshipping.Core.Service.NameQueryDto)">
             <summary>
             获取箱型信息
             </summary>
         </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.AddCtn(Myshipping.Core.Entity.CodeCtn)">
+            <summary>
+            新增箱型
+            </summary>
+        </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.MappingCtnList(Myshipping.Core.Service.MappingQueryDto)">
+            <summary>
+            获取箱型映射列表信息
+            </summary>
+        </member>
+        <member name="M:Myshipping.Core.Service.CommonDBService.AddOrUpdateMappingCtn(Myshipping.Core.Entity.MappingCtn)">
+            <summary>
+            新增编辑船公司映射信息
+            </summary>
+        </member>
         <member name="M:Myshipping.Core.Service.CommonDBService.FrtList(Myshipping.Core.Service.NameQueryDto)">
             <summary>
             付费方式
             </summary>
         </member>
+        <member name="P:Myshipping.Core.Service.MappingQueryDto.Module">
+            <summary>
+            模块
+            </summary>
+        </member>
+        <member name="P:Myshipping.Core.Service.MappingQueryDto.MapCode">
+            <summary>
+            映射代码
+            </summary>
+        </member>
+        <member name="P:Myshipping.Core.Service.MappingQueryDto.MapName">
+            <summary>
+            映射名称
+            </summary>
+        </member>
         <member name="M:Myshipping.Core.Service.ICommonDBService.GetAllCarrier">
             <summary>
             获取船公司
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingCarrier">
+            <summary>
+            获取船公司映射
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Myshipping.Core.Service.ICommonDBService.GetAllVessel">
             <summary>
             获取船名
             </summary>
             <returns></returns>
         </member>
+        <member name="M:Myshipping.Core.Service.ICommonDBService.GetAllMappingVessel">
+            <summary>
+            获取船名映射
+            </summary>
+            <returns></returns>
+        </member>
         <member name="M:Myshipping.Core.Service.ICommonDBService.GetAllForwarder">
             <summary>
             获取船代
@@ -8185,7 +8287,7 @@
             </summary>
             <returns></returns>
         </member>
-        <member name="M:Myshipping.Core.Service.DjyTenantParamService.Get(System.String)">
+        <member name="M:Myshipping.Core.Service.DjyTenantParamService.List(System.String)">
             <summary>
             获取租户参数类别
             </summary>

Myshipping.Core/Service/Cache/ISysCacheService.cs

@@ -41,6 +41,7 @@ public interface ISysCacheService
     /// <returns></returns>
     Task<List<CodeCarrier>> GetAllCodeCarrier();
 
+
     /// <summary>
     /// 获取公共库 船名
     /// </summary>

Myshipping.Core/Service/Cache/SysCacheService.cs

@@ -383,7 +383,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     }
 
     /// <summary>
-    /// 获取公共库 船司映射
+    /// 获取公共库 箱型映射
     /// </summary>
     /// <returns></returns>
     public Task<List<MappingCtn>> GetAllMappingCtn()
@@ -392,7 +392,7 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     }
 
     /// <summary>
-    /// 获取公共库 箱型映射
+    /// 获取公共库 船司映射
     /// </summary>
     /// <returns></returns>
     public Task<List<MappingCarrier>> GetAllMappingCarrier()
@@ -610,5 +610,6 @@ public class SysCacheService : ISysCacheService, IDynamicApiController, ISinglet
     {
         return _cache.SetAsync(CommonConst.CACHE_KEY_DJY_EDI_SETTING, list);
     }
+   
     #endregion
 }

Myshipping.Core/Service/CommonDB/CommonDBService.cs

@@ -1,12 +1,9 @@
-
+using Furion.DependencyInjection;
-
-using Furion.DependencyInjection;
 using Furion.DynamicApiController;
 using Furion.FriendlyException;
 using Myshipping.Core.Entity;
 using Mapster;
 using Microsoft.AspNetCore.Mvc;
-
 using SqlSugar;
 using System.Linq;
 using System.Threading.Tasks;
@@ -14,7 +11,6 @@ using System.Collections.Generic;
 using System;
 
 namespace Myshipping.Core.Service;
-
 /// <summary>
 /// 公共库
 /// </summary>
@@ -23,7 +19,12 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
 {
 
     private readonly SqlSugarRepository<CodeCarrier> _codeCarrierRep;
+    private readonly SqlSugarRepository<MappingCarrier> _mappingCarrierRep;
+
     private readonly SqlSugarRepository<CodeVessel> _codeVesselRep;
+    private readonly SqlSugarRepository<MappingVessel> _mappingVesselRep;
+
+
     private readonly SqlSugarRepository<CodeForwarder> _codeForwarderRep;
     private readonly SqlSugarRepository<CodeYard> _codeYardRep;
     private readonly SqlSugarRepository<CodePortLoad> _codePortLoadrRep;
@@ -31,7 +32,11 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
     private readonly SqlSugarRepository<CodePackage> _codePackageRep;
     private readonly SqlSugarRepository<CodeService> _codeServiceRep;
     private readonly SqlSugarRepository<CodeCtn> _codeCtnRep;
+    private readonly SqlSugarRepository<MappingCtn> _mappingCtnRep;
+
     private readonly SqlSugarRepository<CodeFrt> _codeFrtRep;
+    private readonly SqlSugarRepository<MappingFrt> _mappingFrtRep;
+    
     private readonly ISysCacheService _sysCacheService;
 
     public CommonDBService(SqlSugarRepository<CodeCarrier> codeCarrierRep,
@@ -44,8 +49,11 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         SqlSugarRepository<CodeService> codeServiceRep,
         SqlSugarRepository<CodeCtn> codeCtnRep,
         SqlSugarRepository<CodeFrt> codeFrtRep,
-
+        SqlSugarRepository<MappingCarrier> mappingCarrierRep,
-        ISysCacheService sysCacheService)
+        SqlSugarRepository<MappingVessel> mappingVesselRep,
+        SqlSugarRepository<MappingCtn> mappingCtnRep,
+        SqlSugarRepository<MappingFrt> mappingFrtRep,
+    ISysCacheService sysCacheService)
     {
         _codeCarrierRep = codeCarrierRep;
         _codeVesselRep = codeVesselRep;
@@ -57,26 +65,81 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
         _codeServiceRep = codeServiceRep;
         _codeCtnRep = codeCtnRep;
         _codeFrtRep = codeFrtRep;
-
+        _mappingCarrierRep = mappingCarrierRep;
+        _mappingVesselRep = mappingVesselRep;
+        _mappingCtnRep = mappingCtnRep;
+        _mappingFrtRep = mappingFrtRep;
         _sysCacheService = sysCacheService;
+        
 
     }
 
+
+    #region  船公司
     /// <summary>
     /// 获取船公司列表信息
     /// </summary>
     [HttpGet("/commondb/carrierlist")]
     public async Task<dynamic> CarrierList([FromQuery] CodeCnEnQueryDto input)
     {
-        var list = await GetAllCarrier();
+        var list = await _sysCacheService.GetAllCodeCarrier();
-
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Code), x => x.Code.Contains(input.Code, System.StringComparison.CurrentCultureIgnoreCase))
             .WhereIF(!string.IsNullOrEmpty(input.CnName), x => x.Code.Contains(input.CnName))
             .WhereIF(!string.IsNullOrEmpty(input.EnName), x => x.Code.Contains(input.EnName, System.StringComparison.CurrentCultureIgnoreCase));
+        return queryList.ToList();
+    }
 
+    /// <summary>
+    /// 新增船公司信息
+    /// </summary>
+    [HttpPost("/commondb/addcarrier")]
+    public async Task AddCarrier([FromBody] CodeCarrier dto)
+    {
+        var entity = dto.Adapt<CodeCarrier>();
+        await _codeCarrierRep.InsertAsync(entity);
+        await GetAllCarrier();
+    }
+
+    /// <summary>
+    /// 获取船公司映射列表信息
+    /// </summary>
+    [HttpGet("/commondb/mappingcarrierlist")]
+    public async Task<dynamic> MappingCarrierList([FromQuery] MappingQueryDto input)
+    {
+        var list = await _sysCacheService.GetAllMappingCarrier();
+
+        var queryList = list
+            .WhereIF(!string.IsNullOrEmpty(input.Code), x => x.Code.Contains(input.Code, System.StringComparison.CurrentCultureIgnoreCase))
+              .WhereIF(!string.IsNullOrEmpty(input.MapCode), x => x.MapCode.Contains(input.MapCode, System.StringComparison.CurrentCultureIgnoreCase))
+            .WhereIF(!string.IsNullOrEmpty(input.Module), x => x.Module == input.Module)
+            .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.Code.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase));
         return queryList.ToList();
     }
 
+    /// <summary>
+    /// 新增编辑船公司映射信息
+    /// </summary>
+    [HttpPost("/commondb/addorupdatemappingcarrier")]
+    public async Task AddOrUpdateMappingCarrier([FromBody] MappingCarrier dto)
+    {
+        var entity = dto.Adapt<MappingCarrier>();
+        if (string.IsNullOrWhiteSpace(dto.GID))
+        {
+            await _mappingCarrierRep.InsertAsync(entity);
+        }
+        else
+        {
+
+            await _mappingCarrierRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+
+        }
+        await GetAllMappingCarrier();
+    }
+
+
+    #endregion
+
+    #region 船名
     /// <summary>
     /// 获取船名列表信息
     /// </summary>
@@ -89,52 +152,148 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
             return new List<CodeVessel>();
         }
 
-        List<CodeVessel> list = await GetAllVessel();
+        List<CodeVessel> list = await _sysCacheService.GetAllCodeVessel();
 
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.Name.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase));
 
         return queryList.ToList();
     }
 
+
+    /// <summary>
+    /// 新增船名信息
+    /// </summary>
+    [HttpPost("/commondb/addvessel")]
+    public async Task AddVessel([FromBody] CodeVessel dto)
+    {
+        var entity = dto.Adapt<CodeVessel>();
+        await _codeVesselRep.InsertAsync(entity);
+        await GetAllVessel();
+    }
+
+    /// <summary>
+    /// 获取船名映射
+    /// </summary>
+    [HttpGet("/commondb/mappingvessellist")]
+    public async Task<dynamic> MappingVesselList([FromQuery] MappingQueryDto input)
+    {
+        //数量太多，不允许查询全部
+        if (string.IsNullOrEmpty(input.Module) || input.Module.Length < 1)
+        {
+            return new List<MappingVessel>();
+        }
+
+        List<MappingVessel> list = await _sysCacheService.GetAllMappingVessel();
+
+        var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Module), x => x.Module == input.Module)
+            .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.Name.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase));
+
+        return queryList.ToList();
+    }
+
+    /// <summary>
+    /// 新增编辑船名映射信息
+    /// </summary>
+    [HttpPost("/commondb/addorupdatevessel")]
+    public async Task AddOrUpdateMappingVessel([FromBody] MappingVessel dto)
+    {
+        var entity = dto.Adapt<MappingVessel>();
+        if (string.IsNullOrWhiteSpace(dto.GID))
+        {
+            await _mappingVesselRep.InsertAsync(entity);
+        }
+        else
+        {
+
+            await _mappingVesselRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+
+        }
+        await GetAllMappingVessel();
+    }
+
+    #endregion
+
+
+    #region 船代
     /// <summary>
     /// 获取船代列表信息
     /// </summary>
     [HttpGet("/commondb/forwarderlist")]
     public async Task<dynamic> ForwarderList([FromQuery] NameQueryDto input)
     {
-        List<CodeForwarder> list = await GetAllForwarder();
+        List<CodeForwarder> list = await _sysCacheService.GetAllCodeForwarder();
 
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.Name.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase));
 
         return queryList.ToList();
     }
 
+    /// <summary>
+    /// 新增船代信息
+    /// </summary>
+    [HttpPost("/commondb/addforwarder")]
+    public async Task AddForwarder([FromBody] CodeForwarder dto)
+    {
+        var entity = dto.Adapt<CodeForwarder>();
+        await _codeForwarderRep.InsertAsync(entity);
+        await GetAllForwarder();
+    }
+    #endregion
+
+
+    #region 场站
+
     /// <summary>
     /// 获取场站列表信息
     /// </summary>
     [HttpGet("/commondb/yardlist")]
     public async Task<dynamic> YardList([FromQuery] NameQueryDto input)
     {
-        List<CodeYard> list = await GetAllYard();
+        List<CodeYard> list = await _sysCacheService.GetAllCodeYard();
 
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.Name.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase));
 
         return queryList.ToList();
     }
+    /// <summary>
+    /// 新增场站信息
+    /// </summary>
+    [HttpPost("/commondb/addyard")]
+    public async Task AddYard([FromBody] CodeYard dto)
+    {
+        var entity = dto.Adapt<CodeYard>();
+        await _codeYardRep.InsertAsync(entity);
+        await GetAllYard();
+    }
+    #endregion
 
+
+    #region 起始港
     /// <summary>
     /// 获取起始港信息
     /// </summary>
     [HttpGet("/commondb/portloadlist")]
     public async Task<dynamic> PortloadList([FromQuery] NameQueryDto input)
     {
-        List<CodePortLoad> list = await GetAllPortload();
+        List<CodePortLoad> list = await _sysCacheService.GetAllCodePortLoad();
 
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.CnName.Contains(input.Name) || x.EnName.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase));
 
         return queryList.ToList();
     }
+    /// <summary>
+    /// 新增起始港信息
+    /// </summary>
+    [HttpPost("/commondb/addportload")]
+    public async Task AddPortload([FromBody] CodePortLoad dto)
+    {
+        var entity = dto.Adapt<CodePortLoad>();
+        await _codePortLoadrRep.InsertAsync(entity);
+        await GetAllPortload();
+    }
+    #endregion
 
+    #region  目的港
     /// <summary>
     /// 获取目的港信息
     /// </summary>
@@ -147,227 +306,345 @@ public class CommonDBService : ICommonDBService, IDynamicApiController, ITransie
             return new List<CodePortLoad>();
         }
 
-        List<CodePort> list = await GetAllPort();
+        List<CodePort> list = await _sysCacheService.GetAllCodePort();
 
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.CnName.Contains(input.Name) || x.EnName.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase));
 
         return queryList.ToList();
     }
 
+
+    /// <summary>
+    /// 新增目的港信息
+    /// </summary>
+    [HttpPost("/commondb/addport")]
+    public async Task AddPort([FromBody] CodePort dto)
+    {
+        var entity = dto.Adapt<CodePort>();
+        await _codePortRep.InsertAsync(entity);
+        await GetAllPort();
+    }
+
+
+    #endregion
+
+    #region  包装
     /// <summary>
     /// 获取包装信息
     /// </summary>
     [HttpGet("/commondb/package")]
     public async Task<dynamic> PackageList([FromQuery] NameQueryDto input)
     {
-        List<CodePackage> list = await GetAllPackage();
+        List<CodePackage> list = await _sysCacheService.GetAllCodePackage();
 
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.Name.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase));
 
         return queryList.ToList();
     }
+    /// <summary>
+    /// 新增包装信息
+    /// </summary>
+    [HttpPost("/commondb/addpackage")]
+    public async Task AddPackage([FromBody] CodePackage dto)
+    {
+        var entity = dto.Adapt<CodePackage>();
+        await _codePackageRep.InsertAsync(entity);
+        await GetAllPackage();
+    }
+
+    #endregion
 
+    #region  运输条款
     /// <summary>
     /// 获取运输条款信息
     /// </summary>
     [HttpGet("/commondb/service")]
     public async Task<dynamic> ServiceList([FromQuery] NameQueryDto input)
     {
-        List<CodeService> list = await GetAllService();
+        List<CodeService> list = await _sysCacheService.GetAllCodeService();
 
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.Name.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase));
 
         return queryList.ToList();
     }
 
+    /// <summary>
+    /// 新增运输条款
+    /// </summary>
+    [HttpPost("/commondb/addservice")]
+    public async Task AddService([FromBody] CodeService dto)
+    {
+        var entity = dto.Adapt<CodeService>();
+        await _codeServiceRep.InsertAsync(entity);
+        await GetAllService();
+    }
+
+
+    #endregion
+
+    #region 箱型
     /// <summary>
     /// 获取箱型信息
     /// </summary>
     [HttpGet("/commondb/ctn")]
     public async Task<dynamic> CtnList([FromQuery] NameQueryDto input)
     {
-        List<CodeCtn> list = await GetAllCtn();
+        List<CodeCtn> list = await _sysCacheService.GetAllCodeCtn();
 
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.Name.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase));
 
         return queryList.ToList();
     }
 
+
+    /// <summary>
+    /// 新增箱型
+    /// </summary>
+    [HttpPost("/commondb/addctn")]
+    public async Task AddCtn([FromBody] CodeCtn dto)
+    {
+        var entity = dto.Adapt<CodeCtn>();
+        await _codeCtnRep.InsertAsync(entity);
+        await GetAllCtn();
+    }
+
+
+    /// <summary>
+    /// 获取箱型映射列表信息
+    /// </summary>
+    [HttpGet("/commondb/mappingctnlist")]
+    public async Task<dynamic> MappingCtnList([FromQuery] MappingQueryDto input)
+    {
+        var list = await _sysCacheService.GetAllMappingCtn();
+
+        var queryList = list
+            .WhereIF(!string.IsNullOrEmpty(input.Code), x => x.Code.Contains(input.Code, System.StringComparison.CurrentCultureIgnoreCase))
+              .WhereIF(!string.IsNullOrEmpty(input.MapCode), x => x.MapCode.Contains(input.MapCode, System.StringComparison.CurrentCultureIgnoreCase))
+            .WhereIF(!string.IsNullOrEmpty(input.Module), x => x.Module == input.Module)
+            .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.Code.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase));
+           
+        return queryList.ToList();
+    }
+
+    /// <summary>
+    /// 新增编辑箱型映射信息
+    /// </summary>
+    [HttpPost("/commondb/addmappingctn")]
+    public async Task AddOrUpdateMappingCtn([FromBody] MappingCtn dto)
+    {
+        var entity = dto.Adapt<MappingCtn>();
+        if (string.IsNullOrWhiteSpace(dto.GID))
+        {
+            await _mappingCtnRep.InsertAsync(entity);
+        }
+        else
+        {
+
+            await _mappingCtnRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
+
+        }
+        await GetAllMappingCtn();
+    }
+
+
+    #endregion
+
+    #region  付费方式
     /// <summary>
     /// 付费方式
     /// </summary>
     [HttpGet("/commondb/frt")]
     public async Task<dynamic> FrtList([FromQuery] NameQueryDto input)
     {
-        List<CodeFrt> list = await GetAllFrt();
+        List<CodeFrt> list = await _sysCacheService.GetAllCodeFrt();
 
         var queryList = list.WhereIF(!string.IsNullOrEmpty(input.Name), x => x.CnName.Contains(input.Name) || x.EnName.Contains(input.Name, System.StringComparison.CurrentCultureIgnoreCase));
 
         return queryList.ToList();
     }
 
-    #region 实现接口，获取公共数据并缓存
+    /// <summary>
-    [NonAction]
+    /// 新增付费方式
-    public async Task<List<CodeCarrier>> GetAllCarrier()
+    /// </summary>
+    [HttpPost("/commondb/addfrt")]
+    public async Task AddFrt([FromBody] CodeFrt dto)
     {
-        var list = await _sysCacheService.GetAllCodeCarrier();
+        var entity = dto.Adapt<CodeFrt>();
-        if (list != null && list.Count > 0)
+        await _codeFrtRep.InsertAsync(entity);
+        await GetAllFrt();
+    }
+
+
+    /// <summary>
+    /// 获取付费映射列表信息
+    /// </summary>
+    [HttpGet("/commondb/mappingfrtlist")]
+    public async Task<dynamic> MappingFrtList([FromQuery] MappingQueryDto input)
+    {
+        var list = await _sysCacheService.GetAllMappingFrt();
+
+        var queryList = list
+            .WhereIF(!string.IsNullOrEmpty(input.Code), x => x.Code.Contains(input.Code, System.StringComparison.CurrentCultureIgnoreCase))
+              .WhereIF(!string.IsNullOrEmpty(input.MapCode), x => x.MapCode.Contains(input.MapCode, System.StringComparison.CurrentCultureIgnoreCase))
+            .WhereIF(!string.IsNullOrEmpty(input.Module), x => x.Module == input.Module)
+            .WhereIF(!string.IsNullOrEmpty(input.MapName), x => x.Code.Contains(input.MapName, System.StringComparison.CurrentCultureIgnoreCase));
+
+        return queryList.ToList();
+    }
+    /// <summary>
+    /// 新增编辑付费映射信息
+    /// </summary>
+    [HttpPost("/commondb/addmappingfrt")]
+    public async Task AddOrUpdateMappingFrt([FromBody] MappingFrt dto)
+    {
+        var entity = dto.Adapt<MappingFrt>();
+        if (string.IsNullOrWhiteSpace(dto.GID))
         {
-            return list;
+            await _mappingFrtRep.InsertAsync(entity);
         }
         else
         {
-            list = await _codeCarrierRep.ToListAsync();
+            await _mappingFrtRep.AsUpdateable(entity).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommandAsync();
-            await _sysCacheService.SetAllCodeCarrier(list);
-            return list;
         }
+        await GetAllMappingFrt();
+    }
+    #endregion 
+
+
+
+
+    #region 实现接口，获取公共数据并缓存
+    [NonAction]
+    public async Task<List<CodeCarrier>> GetAllCarrier()
+    {
+        var list = await _codeCarrierRep.ToListAsync();
+        await _sysCacheService.SetAllCodeCarrier(list);
+        return list;
+    }
+
+
+    [NonAction]
+    public async Task<List<MappingCarrier>> GetAllMappingCarrier()
+    {
+
+        var list = await _mappingCarrierRep.ToListAsync();
+        await _sysCacheService.SetAllMappingCarrier(list);
+        return list;
+
     }
 
     [NonAction]
     public async Task<List<CodeVessel>> GetAllVessel()
     {
-        var list = await _sysCacheService.GetAllCodeVessel();
+        var list = await _codeVesselRep.ToListAsync();
-        if (list != null && list.Count > 0)
+        await _sysCacheService.SetAllCodeVessel(list);
-        {
+        return list;
-            return list;
+    }
-        }
+
-        else
+    [NonAction]
-        {
+    public async Task<List<MappingVessel>> GetAllMappingVessel()
-            list = await _codeVesselRep.ToListAsync();
+    {
-            await _sysCacheService.SetAllCodeVessel(list);
+
-            return list;
+        var list = await _mappingVesselRep.ToListAsync();
-        }
+        await _sysCacheService.SetAllMappingVessel(list);
+        return list;
+
     }
 
     [NonAction]
     public async Task<List<CodeForwarder>> GetAllForwarder()
     {
-        var list = await _sysCacheService.GetAllCodeForwarder();
+        var list = await _codeForwarderRep.ToListAsync();
-        if (list != null && list.Count > 0)
+        await _sysCacheService.SetAllCodeForwarder(list);
-        {
+        return list;
-            return list;
-        }
-        else
-        {
-            list = await _codeForwarderRep.ToListAsync();
-            await _sysCacheService.SetAllCodeForwarder(list);
-            return list;
-        }
     }
 
     [NonAction]
     public async Task<List<CodeYard>> GetAllYard()
     {
-        var list = await _sysCacheService.GetAllCodeYard();
+
-        if (list != null && list.Count > 0)
+        var list = await _codeYardRep.ToListAsync();
-        {
+        await _sysCacheService.SetAllCodeYard(list);
-            return list;
+        return list;
-        }
+
-        else
-        {
-            list = await _codeYardRep.ToListAsync();
-            await _sysCacheService.SetAllCodeYard(list);
-            return list;
-        }
     }
 
     [NonAction]
     public async Task<List<CodePortLoad>> GetAllPortload()
     {
-        var list = await _sysCacheService.GetAllCodePortLoad();
+
-        if (list != null && list.Count > 0)
+        var list = await _codePortLoadrRep.ToListAsync();
-        {
+        await _sysCacheService.SetAllCodePortLoad(list);
-            return list;
+        return list;
-        }
+
-        else
-        {
-            list = await _codePortLoadrRep.ToListAsync();
-            await _sysCacheService.SetAllCodePortLoad(list);
-            return list;
-        }
     }
 
     [NonAction]
     public async Task<List<CodePort>> GetAllPort()
     {
-        var list = await _sysCacheService.GetAllCodePort();
+
-        if (list != null && list.Count > 0)
+        var list = await _codePortRep.ToListAsync();
-        {
+        await _sysCacheService.SetAllCodePort(list);
-            return list;
+        return list;
-        }
+
-        else
-        {
-            list = await _codePortRep.ToListAsync();
-            await _sysCacheService.SetAllCodePort(list);
-            return list;
-        }
     }
 
     [NonAction]
     public async Task<List<CodePackage>> GetAllPackage()
     {
-        var list = await _sysCacheService.GetAllCodePackage();
+
-        if (list != null && list.Count > 0)
+        var list = await _codePackageRep.ToListAsync();
-        {
+        await _sysCacheService.SetAllCodePackage(list);
-            return list;
+        return list;
-        }
+
-        else
-        {
-            list = await _codePackageRep.ToListAsync();
-            await _sysCacheService.SetAllCodePackage(list);
-            return list;
-        }
     }
 
     [NonAction]
     public async Task<List<CodeService>> GetAllService()
     {
-        var list = await _sysCacheService.GetAllCodeService();
+
-        if (list != null && list.Count > 0)
+        var list = await _codeServiceRep.ToListAsync();
-        {
+        await _sysCacheService.SetAllCodeService(list);
-            return list;
+        return list;
-        }
+
-        else
-        {
-            list = await _codeServiceRep.ToListAsync();
-            await _sysCacheService.SetAllCodeService(list);
-            return list;
-        }
     }
 
     [NonAction]
     public async Task<List<CodeCtn>> GetAllCtn()
     {
 
-        var list = await _sysCacheService.GetAllCodeCtn();
+        var list = await _codeCtnRep.ToListAsync();
-        if (list != null && list.Count > 0)
+        await _sysCacheService.SetAllCodeCtn(list);
-        {
+        return list;
-            return list;
+
-        }
-        else
-        {
-            list = await _codeCtnRep.ToListAsync();
-            await _sysCacheService.SetAllCodeCtn(list);
-            return list;
-        }
     }
+    [NonAction]
+    public async Task<List<MappingCtn>> GetAllMappingCtn()
+    {
 
+        var list = await _mappingCtnRep.ToListAsync();
+        await _sysCacheService.SetAllMappingCtn(list);
+        return list;
+
+    }
     [NonAction]
     public async Task<List<CodeFrt>> GetAllFrt()
     {
-        var list = await _sysCacheService.GetAllCodeFrt();
+       
-        if (list != null && list.Count > 0)
+        var list = await _codeFrtRep.ToListAsync();
-        {
+        await _sysCacheService.SetAllCodeFrt(list);
-            return list;
+        return list;
-        }
+        
-        else
-        {
-            list = await _codeFrtRep.ToListAsync();
-            await _sysCacheService.SetAllCodeFrt(list);
-            return list;
-        }
     }
+    [NonAction]
+    public async Task<List<MappingFrt>> GetAllMappingFrt()
+    {
+
+        var list = await _mappingFrtRep.ToListAsync();
+        await _sysCacheService.SetAllMappingFrt(list);
+        return list;
 
+    }
     #endregion
 
 

Myshipping.Core/Service/CommonDB/Dto/QueryDto.cs

@@ -19,4 +19,24 @@ namespace Myshipping.Core.Service
     {
         public string Name { get; set; }
     }
+
+    public class MappingQueryDto
+    {
+        public string Code { get; set; }
+
+        /// <summary>
+        /// 模块
+        /// </summary>
+        public string Module { get; set; }
+
+        /// <summary>
+        /// 映射代码
+        /// </summary>
+        public string MapCode { get; set; }
+
+        /// <summary>
+        /// 映射名称
+        /// </summary>
+        public string MapName { get; set; }
+    }
 }

Myshipping.Core/Service/CommonDB/ICommonDBService.cs

@@ -13,12 +13,23 @@ public interface ICommonDBService
     /// <returns></returns>
     Task<List<CodeCarrier>> GetAllCarrier();
 
+    /// <summary>
+    /// 获取船公司映射
+    /// </summary>
+    /// <returns></returns>
+    Task<List<MappingCarrier>> GetAllMappingCarrier();
     /// <summary>
     /// 获取船名
     /// </summary>
     /// <returns></returns>
     Task<List<CodeVessel>> GetAllVessel();
 
+
+    /// <summary>
+    /// 获取船名映射
+    /// </summary>
+    /// <returns></returns>
+    Task<List<MappingVessel>> GetAllMappingVessel();
     /// <summary>
     /// 获取船代
     /// </summary>
@@ -61,4 +72,21 @@ public interface ICommonDBService
     /// <returns></returns>
     Task<List<CodeCtn>> GetAllCtn();
 
+    /// <summary>
+    /// 获取箱型映射
+    /// </summary>
+    /// <returns></returns>
+    Task<List<MappingCtn>> GetAllMappingCtn();
+
+
+    /// <summary>
+    /// 付费方式
+    /// </summary>
+    /// <returns></returns>
+    Task<List<CodeFrt>> GetAllFrt();
+
+    /// <summary>
+    /// 付费方式映射
+    /// </summary>
+    Task<List<MappingFrt>> GetAllMappingFrt();
 }

Myshipping.Core/Service/DjyTenantParam/DjyTenantParamService.cs

@@ -9,6 +9,7 @@ using System.Threading.Tasks;
 using Microsoft.Extensions.Logging;
 using System.Collections.Generic;
 using Myshipping.Core.Entity;
+using System;
 
 namespace Myshipping.Core.Service
 {
@@ -73,10 +74,10 @@ namespace Myshipping.Core.Service
         /// 获取租户参数类别
         /// </summary>
         /// <returns></returns>
-        [HttpGet("/DJYTenantParam/get")]
+        [HttpGet("/DJYTenantParam/list")]
-        public async Task<List<DjyTenantParam>> Get(string Type)
+        public async Task<List<DjyTenantParam>> List(string Type)
         {
-            return await _rep.AsQueryable().Where(x => x.Type == Type).OrderBy(x => x.Sort).ToListAsync();
+            return await _rep.AsQueryable().WhereIF(!string.IsNullOrEmpty(Type),x => x.Type == Type).OrderBy(x => x.Sort).ToListAsync();
         }
 
         /// <summary>
@@ -86,7 +87,7 @@ namespace Myshipping.Core.Service
         [HttpGet("/DJYTenantParam/getParamItem")]
         public async Task<List<DjyTenantParamItem>> GetParamItem(string ParaCode)
         {
-            return await _itemrep.AsQueryable().Where(x => x.ParaCode == ParaCode).OrderBy(x => x.Sort).ToListAsync();
+            return await _itemrep.AsQueryable().WhereIF(!string.IsNullOrEmpty(ParaCode), x => x.ParaCode == ParaCode).OrderBy(x => x.Sort).ToListAsync();
         }
 
 
@@ -139,6 +140,9 @@ namespace Myshipping.Core.Service
         [HttpGet("/DJYTenantParam/getParamValue")]
         public async Task<List<DjyTenantParamValue>> GetParamValue(long tenantId)
         {
+            if (tenantId==0) {
+                tenantId =  Convert.ToInt64(UserManager.TENANT_ID);
+            }
             return await _valuerep.AsQueryable().Where(x => x.TenantId == tenantId).OrderBy(x => x.Sort).ToListAsync();
         }
 

Myshipping.Core/Service/DjyTenantParam/IDjyTenantParamService.cs

@@ -11,7 +11,7 @@ namespace Myshipping.Core.Service
         Task Add(AddDJYTenantParamInput input);
         Task Update(UpdateDJYTenantParamInput input);
         Task Delete(long Id);
-        Task<List<DjyTenantParam>> Get(string Type);
+        Task<List<DjyTenantParam>> List(string Type);
         Task<List<DjyTenantParamItem>> GetParamItem(string ParaCode);
         Task AddParamItem(DjyTenantParamItem input);
 

Myshipping.Web.Core/Startup.cs

@@ -112,6 +112,7 @@ public class Startup : AppStartup
             //钉钉消息
             builder.AddSubscriber<DingTalkSubscriber>();
         });
+        #region  缓存
 
         //缓存EDI数据
         App.GetService<IDjyEdiSettingService>().CacheData();
@@ -121,6 +122,50 @@ public class Startup : AppStartup
 
         //租户参数
         App.GetService<IDjyTenantParamService>().CacheData();
+
+        //船公司
+        App.GetService<ICommonDBService>().GetAllCarrier();
+
+        //船公司映射
+        App.GetService<ICommonDBService>().GetAllMappingCarrier();
+
+        //船名
+        App.GetService<ICommonDBService>().GetAllVessel();
+
+        //船名映射
+        App.GetService<ICommonDBService>().GetAllMappingVessel();
+
+        //船代
+        App.GetService<ICommonDBService>().GetAllForwarder();
+
+        //场站
+        App.GetService<ICommonDBService>().GetAllYard();
+
+        //起始港
+        App.GetService<ICommonDBService>().GetAllPortload();
+
+        //目的港
+        App.GetService<ICommonDBService>().GetAllPort();
+
+        //包装
+        App.GetService<ICommonDBService>().GetAllPackage();
+
+        //运输方式
+        App.GetService<ICommonDBService>().GetAllService();
+
+        //箱型
+        App.GetService<ICommonDBService>().GetAllCtn();
+
+        //箱型映射
+        App.GetService<ICommonDBService>().GetAllMappingCtn();
+
+        //付费方式
+        App.GetService<ICommonDBService>().GetAllFrt();
+
+        //付费方式映射
+        App.GetService<ICommonDBService>().GetAllMappingFrt();
+
+        #endregion
     }
 
     public void Configure(IApplicationBuilder app, IWebHostEnvironment env)