结算方式、付费方式、表单设置 及修复日志查询错误

ds-wms-service/DS.Module.Core/Constants/MultiLanguageConst.cs

@@ -251,5 +251,18 @@ public static class MultiLanguageConst
     public const string CodeLaneImportNoData = "Code_Lane_Import_No_Data";
     [Description("存在已导入的航线信息")]
     public const string CodeLaneImportAlready = "Code_Lane_Import_Already";
+    
+    [Description("付费方式已存在")]
+    public const string CodeFrtExist = "Code_Frt_Exist";
+    [Description("付费方式导入无数据")]
+    public const string CodeFrtImportNoData = "Code_Frt_Import_No_Data";
+    [Description("存在已导入的付费方式")]
+    public const string CodeFrtImportAlready = "Code_Frt_Import_Already";
+    [Description("结算方式已存在")]
+    public const string CodeStlModeExist = "Code_StlMode_Exist";
+    [Description("结算方式导入无数据")]
+    public const string CodeStlModeImportNoData = "Code_StlMode_Import_No_Data";
+    [Description("存在已导入的结算方式")]
+    public const string CodeStlModeImportAlready = "Code_StlMode_Import_Already";
     #endregion
 }

ds-wms-service/DS.WMS.AdminApi/Controllers/CodeFrtController.cs

@@ -0,0 +1,63 @@
+using DS.Module.Core;
+using DS.WMS.Core.Code.Dtos;
+using DS.WMS.Core.Code.Interface;
+using DS.WMS.Core.System.Dtos;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DS.WMS.AdminApi.Controllers;
+
+/// <summary>
+/// 付费方式服务
+/// </summary>
+public class CodeFrtController : ApiController
+{
+    private readonly ICodeFrtService _invokeService;
+
+    /// <summary>
+    /// 构造函数
+    /// </summary>
+    /// <param name="invokeService"></param>
+    public CodeFrtController(ICodeFrtService invokeService)
+    {
+        _invokeService = invokeService;
+    }
+
+    /// <summary>
+    /// 列表
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("GetCodeFrtList")]
+    public DataResult<List<CodeFrtRes>> GetCodeFrtList([FromBody] PageRequest request)
+    {
+        var res = _invokeService.GetListByPage(request);
+        return res;
+    }
+
+    /// <summary>
+    /// 编辑
+    /// </summary>
+    /// <param name="model"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("EditCodeFrt")]
+    public DataResult EditCodeFrt([FromBody] CodeFrtReq model)
+    {
+        var res = _invokeService.EditCodeFrt(model);
+        return res;
+    }
+
+    /// <summary>
+    /// 详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet]
+    [Route("GetCodeFrtInfo")]
+    public DataResult<CodeFrtRes> GetCodeFrtInfo([FromQuery] string id)
+    {
+        var res = _invokeService.GetCodeFrtInfo(id);
+        return res;
+    }
+}

ds-wms-service/DS.WMS.AdminApi/Controllers/CodeStlModeController.cs

@@ -0,0 +1,63 @@
+using DS.Module.Core;
+using DS.WMS.Core.Code.Dtos;
+using DS.WMS.Core.Code.Interface;
+using DS.WMS.Core.System.Dtos;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DS.WMS.AdminApi.Controllers;
+
+/// <summary>
+/// 结算方式服务
+/// </summary>
+public class CodeStlModeController : ApiController
+{
+    private readonly ICodeStlModeService _invokeService;
+
+    /// <summary>
+    /// 构造函数
+    /// </summary>
+    /// <param name="invokeService"></param>
+    public CodeStlModeController(ICodeStlModeService invokeService)
+    {
+        _invokeService = invokeService;
+    }
+
+    /// <summary>
+    /// 列表
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("GetCodeStlModeList")]
+    public DataResult<List<CodeStlModeRes>> GetCodeStlModeList([FromBody] PageRequest request)
+    {
+        var res = _invokeService.GetListByPage(request);
+        return res;
+    }
+
+    /// <summary>
+    /// 编辑
+    /// </summary>
+    /// <param name="model"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("EditCodeStlMode")]
+    public DataResult EditCodeStlMode([FromBody] CodeStlModeReq model)
+    {
+        var res = _invokeService.EditCodeStlMode(model);
+        return res;
+    }
+
+    /// <summary>
+    /// 详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet]
+    [Route("GetCodeStlModeInfo")]
+    public DataResult<CodeStlModeRes> GetCodeStlModeInfo([FromQuery] string id)
+    {
+        var res = _invokeService.GetCodeStlModeInfo(id);
+        return res;
+    }
+}

ds-wms-service/DS.WMS.AdminApi/Controllers/CommonController.cs

@@ -228,7 +228,7 @@ public class CommonController : ApiController
     /// <returns></returns>
     [HttpGet]
     [Route("GetUserFieldSet")]
-    public DataResult<SysUserFieldSet> GetUserFieldSet([FromQuery] string permissionId)
+    public DataResult<SysFieldSet> GetUserFieldSet([FromQuery] string permissionId)
     {
         var res = _invokeService.GetUserFieldSet(permissionId);
         return res;

ds-wms-service/DS.WMS.Core/Code/Dtos/CodeFrtReq.cs

@@ -0,0 +1,52 @@
+using DS.Module.Core;
+using FluentValidation;
+
+namespace DS.WMS.Core.Code.Dtos;
+
+/// <summary>
+/// 付费方式请求实体
+/// </summary>
+public class CodeFrtReq
+{
+    /// <summary>
+    /// 主键Id
+    /// </summary>
+    public long Id { get; set; }
+  
+    /// <summary>
+    /// 付费方式-英文名称
+    /// </summary>
+    public string FrtName { get; set; }= "";
+    /// <summary>
+    /// 中文名称
+    /// </summary>
+    public string CnName { get; set; }= "";
+    
+    /// <summary>
+    /// EDI代码
+    /// </summary>
+    public string EdiCode { get; set; } = "";
+    /// <summary>
+    /// 状态 0 启用 1 禁用
+    /// </summary>
+    public StatusEnum? Status { get; set; } = StatusEnum.Enable;
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Note { get; set; } = "";
+}
+
+/// <summary>
+/// 验证
+/// </summary>
+public class CodeFrtReqValidator : AbstractValidator<CodeFrtReq>
+{
+    /// <summary>
+    /// 构造函数
+    /// </summary>
+    public CodeFrtReqValidator()
+    {
+        this.RuleFor(o => o.FrtName)
+            .NotEmpty().WithName("付费方式-英文名称");
+    }
+}

ds-wms-service/DS.WMS.Core/Code/Dtos/CodeFrtRes.cs

@@ -0,0 +1,39 @@
+using DS.Module.Core;
+
+namespace DS.WMS.Core.Code.Dtos;
+
+/// <summary>
+/// 结算方式信息返回 
+/// </summary>
+public class CodeVesselRes
+{
+    /// <summary>
+    /// 主键Id
+    /// </summary>
+    public long Id { get; set; } 
+    /// <summary>
+    /// 付费方式-英文名称
+    /// </summary>
+    public string FrtName { get; set; }
+    /// <summary>
+    /// 中文名称
+    /// </summary>
+    public string CnName { get; set; }
+    
+    /// <summary>
+    /// EDI代码
+    /// </summary>
+    public string EdiCode { get; set; } 
+    /// <summary>
+    /// 状态 0 启用 1 禁用
+    /// </summary>
+    public StatusEnum? Status { get; set; } = StatusEnum.Enable;
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Note { get; set; } = "";
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime CreateTime { get; set; }
+}

ds-wms-service/DS.WMS.Core/Code/Dtos/CodeStlModeReq.cs

@@ -0,0 +1,57 @@
+using DS.Module.Core;
+using FluentValidation;
+
+namespace DS.WMS.Core.Code.Dtos;
+
+/// <summary>
+/// 结算方式请求实体
+/// </summary>
+public class CodeStlModeReq
+{
+    /// <summary>
+    /// 主键Id
+    /// </summary>
+    public long Id { get; set; }
+    /// <summary>
+    /// 结算方式唯一代码
+    /// </summary>
+    public string StlCode { get; set; } = "";
+    /// <summary>
+    /// 结算方式名称
+    /// </summary>
+    public string StlName { get; set; } = "";
+
+    /// <summary>
+    /// 英文名称
+    /// </summary>
+    public string EnName { get; set; } = "";
+    /// <summary>
+    /// 财务软件代码
+    /// </summary>
+    public string FinanceSoftCode { get; set; } = "";
+    /// <summary>
+    /// 状态 0 启用 1 禁用
+    /// </summary>
+    public StatusEnum? Status { get; set; } = StatusEnum.Enable;
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Note { get; set; } = "";
+}
+
+/// <summary>
+/// 验证
+/// </summary>
+public class CodeStlModeReqValidator : AbstractValidator<CodeStlModeReq>
+{
+    /// <summary>
+    /// 构造函数
+    /// </summary>
+    public CodeStlModeReqValidator()
+    {
+        this.RuleFor(o => o.StlCode)
+            .NotEmpty().WithName("结算方式唯一代码");
+        this.RuleFor(o => o.StlName)
+            .NotEmpty().WithName("结算方式名称");
+    }
+}

ds-wms-service/DS.WMS.Core/Code/Dtos/CodeStlModeRes.cs

@@ -0,0 +1,42 @@
+using DS.Module.Core;
+
+namespace DS.WMS.Core.Code.Dtos;
+
+/// <summary>
+/// 结算方式返回 
+/// </summary>
+public class CodeStlModeRes
+{
+    /// <summary>
+    /// 主键Id
+    /// </summary>
+    public long Id { get; set; } 
+    /// <summary>
+    /// 结算方式唯一代码
+    /// </summary>
+    public string StlCode { get; set; }
+    /// <summary>
+    /// 结算方式名称
+    /// </summary>
+    public string StlName { get; set; }
+    /// <summary>
+    /// 英文名称
+    /// </summary>
+    public string EnName { get; set; }
+    /// <summary>
+    /// 财务软件代码
+    /// </summary>
+    public string FinanceSoftCode { get; set; }
+    /// <summary>
+    /// 状态 0 启用 1 禁用
+    /// </summary>
+    public StatusEnum? Status { get; set; } = StatusEnum.Enable;
+    /// <summary>
+    /// 备注
+    /// </summary>
+    public string Note { get; set; } = "";
+    /// <summary>
+    /// 创建时间
+    /// </summary>
+    public DateTime CreateTime { get; set; }
+}

ds-wms-service/DS.WMS.Core/Code/Dtos/CodeVesselRes.cs

@@ -3,9 +3,9 @@ using DS.Module.Core;
 namespace DS.WMS.Core.Code.Dtos;
 
 /// <summary>
-/// 船名信息返回 
+/// 付费方式返回 
 /// </summary>
-public class CodeVesselRes
+public class CodeFrtRes
 {
     /// <summary>
     /// 主键Id
@@ -14,7 +14,7 @@ public class CodeVesselRes
     /// <summary>
     /// 船名
     /// </summary>
-    public string VesselName { get; set; } = "";
+    public string FrtName { get; set; } = "";
     /// <summary>
     /// 中文说明
     /// </summary>

ds-wms-service/DS.WMS.Core/Code/Entity/CodeFrt.cs

@@ -0,0 +1,34 @@
+using DS.Module.Core;
+using DS.Module.Core.Data;
+using SqlSugar;
+
+namespace DS.WMS.Core.Code.Entity;
+/// <summary>
+/// 付费方式表
+/// </summary>
+[SqlSugar.SugarTable("op_code_frt","付费方式表")]
+public class CodeFrt: BaseModel<long>
+{
+    /// <summary>
+    /// 付费方式-英文名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "付费方式-英文名称", Length = 100)]
+    public string FrtName { get; set; }
+    /// <summary>
+    /// 中文名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "中文名称", Length = 50)]
+    public string CnName { get; set; }
+    
+    /// <summary>
+    /// EDI代码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "EDI代码", Length = 5)]
+    public string EdiCode { get; set; } 
+    
+    /// <summary>
+    /// 状态 0启用 1禁用
+    /// </summary>
+    [SugarColumn(ColumnDescription = "状态",DefaultValue = "0")]
+    public StatusEnum? Status { get; set; } = StatusEnum.Enable;
+}

ds-wms-service/DS.WMS.Core/Code/Entity/CodeStlMode.cs

@@ -0,0 +1,39 @@
+using DS.Module.Core;
+using DS.Module.Core.Data;
+using SqlSugar;
+
+namespace DS.WMS.Core.Code.Entity;
+/// <summary>
+/// 结算方式表
+/// </summary>
+// ReSharper disable once StringLiteralTypo
+[SqlSugar.SugarTable("op_code_stlmode","结算方式表")]
+public class CodeStlMode: BaseModel<long>
+{
+    /// <summary>
+    /// 结算方式唯一代码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "结算方式唯一代码", Length = 10)]
+    public string StlCode { get; set; }
+    /// <summary>
+    /// 结算方式名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "结算方式名称", Length = 30)]
+    public string StlName { get; set; }
+    /// <summary>
+    /// 英文名称
+    /// </summary>
+    [SugarColumn(ColumnDescription = "英文名称", Length = 100)]
+    public string EnName { get; set; }
+    /// <summary>
+    /// 财务软件代码
+    /// </summary>
+    [SugarColumn(ColumnDescription = "财务软件代码", Length = 30)]
+    public string FinanceSoftCode { get; set; }
+     
+    /// <summary>
+    /// 状态 0启用 1禁用
+    /// </summary>
+    [SugarColumn(ColumnDescription = "状态",DefaultValue = "0")]
+    public StatusEnum? Status { get; set; } = StatusEnum.Enable;
+}

ds-wms-service/DS.WMS.Core/Code/Interface/ICodeFrtService.cs

@@ -0,0 +1,70 @@
+using DS.Module.Core;
+using DS.Module.Core.Data;
+using DS.WMS.Core.Code.Dtos;
+
+namespace DS.WMS.Core.Code.Interface;
+
+public interface ICodeFrtService
+{
+    /// <summary>
+    /// 列表
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    DataResult<List<CodeFrtRes>> GetListByPage(PageRequest request);
+    
+    
+    /// <summary>
+    /// 编辑
+    /// </summary>
+    /// <param name="req"></param>
+    /// <returns></returns>
+    DataResult EditCodeFrt(CodeFrtReq req);
+    
+    /// <summary>
+    /// 获取详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    DataResult<CodeFrtRes> GetCodeFrtInfo(string id);
+    /// <summary>
+    /// 列表
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    DataResult<List<CodeFrtRes>> GetClientListByPage(PageRequest request);
+    /// <summary>
+    /// 编辑-客户端
+    /// </summary>
+    /// <param name="req"></param>
+    /// <returns></returns>
+    DataResult EditClientCodeFrt(CodeFrtReq req);
+    /// <summary>
+    /// 获取详情 -客户端
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public DataResult<CodeFrtRes> GetClientCodeFrtInfo(string id);
+    
+    
+    
+    /// <summary>
+    /// 获取付费方式列表-基础库
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    DataResult<List<CodeFrtRes>> GetCodeFrtList(PageRequest request);
+    /// <summary>
+    /// 导入付费方式列表
+    /// </summary>
+    /// <param name="req"></param>
+    /// <returns></returns>
+    DataResult ImportCodeFrt(IdModel req);
+
+    /// <summary>
+    /// 获取当前租户已有的付费方式
+    /// </summary>
+    /// <returns></returns>
+    public DataResult<List<string>> GetExistCodeFrtList();
+     
+}

ds-wms-service/DS.WMS.Core/Code/Interface/ICodeStlModeService.cs

@@ -0,0 +1,70 @@
+using DS.Module.Core;
+using DS.Module.Core.Data;
+using DS.WMS.Core.Code.Dtos;
+
+namespace DS.WMS.Core.Code.Interface;
+
+public interface ICodeStlModeService
+{
+    /// <summary>
+    /// 列表
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    DataResult<List<CodeStlModeRes>> GetListByPage(PageRequest request);
+    
+    
+    /// <summary>
+    /// 编辑
+    /// </summary>
+    /// <param name="req"></param>
+    /// <returns></returns>
+    DataResult EditCodeStlMode(CodeStlModeReq req);
+    
+    /// <summary>
+    /// 获取详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    DataResult<CodeStlModeRes> GetCodeStlModeInfo(string id);
+    /// <summary>
+    /// 列表
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    DataResult<List<CodeStlModeRes>> GetClientListByPage(PageRequest request);
+    /// <summary>
+    /// 编辑-客户端
+    /// </summary>
+    /// <param name="req"></param>
+    /// <returns></returns>
+    DataResult EditClientCodeStlMode(CodeStlModeReq req);
+    /// <summary>
+    /// 获取详情 -客户端
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    public DataResult<CodeStlModeRes> GetClientCodeStlModeInfo(string id);
+    
+    
+    
+    /// <summary>
+    /// 获取结算方式列表-基础库
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    DataResult<List<CodeStlModeRes>> GetCodeStlModeList(PageRequest request);
+    /// <summary>
+    /// 导入结算方式列表
+    /// </summary>
+    /// <param name="req"></param>
+    /// <returns></returns>
+    DataResult ImportCodeStlMode(IdModel req);
+
+    /// <summary>
+    /// 获取当前租户已有的结算方式
+    /// </summary>
+    /// <returns></returns>
+    public DataResult<List<string>> GetExistCodeStlModeList();
+     
+}

ds-wms-service/DS.WMS.Core/Code/Method/CodeFrtService.cs

@@ -0,0 +1,169 @@
+using DS.Module.Core;
+using DS.Module.Core.Data;
+using DS.Module.Core.Extensions;
+using DS.Module.SqlSugar;
+using DS.Module.UserModule;
+using DS.WMS.Core.Code.Dtos;
+using DS.WMS.Core.Code.Entity;
+using DS.WMS.Core.Code.Interface;
+using Mapster;
+using Microsoft.Extensions.DependencyInjection;
+using SqlSugar;
+
+namespace DS.WMS.Core.Code.Method;
+
+public class CodeFrtService:ICodeFrtService
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly ISqlSugarClient db;
+    private readonly IUser user;
+    private readonly ISaasDbService saasService;
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="serviceProvider"></param>
+    public CodeFrtService(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+        db = _serviceProvider.GetRequiredService<ISqlSugarClient>();
+        user = _serviceProvider.GetRequiredService<IUser>();
+        saasService = _serviceProvider.GetRequiredService<ISaasDbService>();
+    }
+    
+    public DataResult<List<CodeFrtRes>> GetListByPage(PageRequest request)
+    {
+        //序列化查询条件
+        var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
+        var data = db.Queryable<CodeFrt>()
+            .Where(whereList)
+            .Select<CodeFrtRes>().ToQueryPage(request.PageCondition);
+        return data;
+    }
+
+    public DataResult EditCodeFrt(CodeFrtReq req)
+    {
+        if (req.Id == 0)
+        {
+
+            if (db.Queryable<CodeFrt>().Where(x=>x.FrtName == req.FrtName.Trim()).Any())
+            {
+                return DataResult.Failed("付费方式已存在!",MultiLanguageConst.CodeFrtExist);
+            }
+             
+            var data = req.Adapt<CodeFrt>();
+
+            var entity = db.Insertable(data).ExecuteReturnEntity();
+
+            return DataResult.Successed("添加成功!", entity.Id,MultiLanguageConst.DataCreateSuccess);
+        }
+        else
+        {
+            var info = db.Queryable<CodeFrt>().Where(x => x.Id == req.Id).First();
+
+            info = req.Adapt(info);
+
+            db.Updateable(info).IgnoreColumns(ignoreAllNullColumns: true).EnableDiffLogEvent().ExecuteCommand();
+            return DataResult.Successed("更新成功!",MultiLanguageConst.DataUpdateSuccess);
+        }
+    }
+
+    public DataResult<CodeFrtRes> GetCodeFrtInfo(string id)
+    {
+        var data = db.Queryable<CodeFrt>()
+            .Where(a => a.Id == long.Parse(id))
+            .Select<CodeFrtRes>()
+            .First();
+        return DataResult<CodeFrtRes>.Success(data,MultiLanguageConst.DataQuerySuccess);
+    }
+
+    public DataResult<List<CodeFrtRes>> GetClientListByPage(PageRequest request)
+    {
+        var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+        //序列化查询条件
+        var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
+        var data = tenantDb.Queryable<CodeFrt>()
+            .Where(whereList)
+            .Select<CodeFrtRes>().ToQueryPage(request.PageCondition);
+        return data;
+    }
+
+    public DataResult EditClientCodeFrt(CodeFrtReq req)
+    {
+        var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+        if (req.Id == 0)
+        {
+
+            if (tenantDb.Queryable<CodeFrt>().Where(x=>x.FrtName == req.FrtName.Trim()).Any())
+            {
+                return DataResult.Failed("付费方式已存在!",MultiLanguageConst.CodeFrtExist);
+            }
+             
+            var data = req.Adapt<CodeFrt>();
+
+            var entity = tenantDb.Insertable(data).EnableDiffLogEvent().ExecuteReturnEntity();
+
+            return DataResult.Successed("添加成功!", entity.Id,MultiLanguageConst.DataCreateSuccess);
+        }
+        else
+        {
+            var info = tenantDb.Queryable<CodeFrt>().Where(x => x.Id == req.Id).First();
+
+            info = req.Adapt(info);
+
+            tenantDb.Updateable(info).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
+            return DataResult.Successed("更新成功!",MultiLanguageConst.DataUpdateSuccess);
+        }
+    }
+
+    public DataResult<CodeFrtRes> GetClientCodeFrtInfo(string id)
+    {
+        var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+        var data = tenantDb.Queryable<CodeFrt>()
+            .Where(a => a.Id == long.Parse(id))
+            .Select<CodeFrtRes>()
+            .First();
+        return DataResult<CodeFrtRes>.Success(data,MultiLanguageConst.DataQuerySuccess);
+    }
+
+    public DataResult<List<CodeFrtRes>> GetCodeFrtList(PageRequest request)
+    {
+        //序列化查询条件
+        var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
+        var data = db.Queryable<CodeFrt>().Where(a=>a.Status == StatusEnum.Enable)
+            .Where(whereList)
+            .Select<CodeFrtRes>().ToQueryPage(request.PageCondition);
+        return data;
+    }
+
+    public DataResult ImportCodeFrt(IdModel req)
+    {
+        var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+        var list = db.Queryable<CodeFrt>().Where(x =>req.Ids.Contains(x.Id) ).ToList();
+        if (list.Count == 0)
+        {
+            return DataResult.Failed("付费方式导入无数据!",MultiLanguageConst.CodeFrtImportNoData);
+        }
+
+        if (tenantDb.Queryable<CodeFrt>().Where(x =>req.Ids.Contains(x.Id) ).Any())
+        {
+            return DataResult.Failed("存在已导入的付费方式!",MultiLanguageConst.CodeFrtImportAlready);
+        }
+         
+        tenantDb.Insertable(list).ExecuteCommand();
+        return DataResult.Successed("引入成功!",MultiLanguageConst.DataImportSuccess);
+    }
+    
+    /// <summary>
+    /// 获取当前租户已有的船名
+    /// </summary>
+    /// <returns></returns>
+    public DataResult<List<string>> GetExistCodeFrtList()
+    {
+        var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+        var data = tenantDb.Queryable<CodeFrt>()
+            .Select(n=>n.Id.ToString())
+            .ToList();
+        return DataResult<List<string>>.Success(data);
+    }
+
+}

ds-wms-service/DS.WMS.Core/Code/Method/CodeStlModeService.cs

@@ -0,0 +1,169 @@
+using DS.Module.Core;
+using DS.Module.Core.Data;
+using DS.Module.Core.Extensions;
+using DS.Module.SqlSugar;
+using DS.Module.UserModule;
+using DS.WMS.Core.Code.Dtos;
+using DS.WMS.Core.Code.Entity;
+using DS.WMS.Core.Code.Interface;
+using Mapster;
+using Microsoft.Extensions.DependencyInjection;
+using SqlSugar;
+
+namespace DS.WMS.Core.Code.Method;
+
+public class CodeStlModeService:ICodeStlModeService
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly ISqlSugarClient db;
+    private readonly IUser user;
+    private readonly ISaasDbService saasService;
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="serviceProvider"></param>
+    public CodeStlModeService(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+        db = _serviceProvider.GetRequiredService<ISqlSugarClient>();
+        user = _serviceProvider.GetRequiredService<IUser>();
+        saasService = _serviceProvider.GetRequiredService<ISaasDbService>();
+    }
+    
+    public DataResult<List<CodeStlModeRes>> GetListByPage(PageRequest request)
+    {
+        //序列化查询条件
+        var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
+        var data = db.Queryable<CodeStlMode>()
+            .Where(whereList)
+            .Select<CodeStlModeRes>().ToQueryPage(request.PageCondition);
+        return data;
+    }
+
+    public DataResult EditCodeStlMode(CodeStlModeReq req)
+    {
+        if (req.Id == 0)
+        {
+
+            if (db.Queryable<CodeStlMode>().Where(x=>x.StlCode == req.StlCode.Trim()).Any())
+            {
+                return DataResult.Failed("结算方式已存在!",MultiLanguageConst.CodeStlModeExist);
+            }
+             
+            var data = req.Adapt<CodeStlMode>();
+
+            var entity = db.Insertable(data).ExecuteReturnEntity();
+
+            return DataResult.Successed("添加成功!", entity.Id,MultiLanguageConst.DataCreateSuccess);
+        }
+        else
+        {
+            var info = db.Queryable<CodeStlMode>().Where(x => x.Id == req.Id).First();
+
+            info = req.Adapt(info);
+
+            db.Updateable(info).IgnoreColumns(ignoreAllNullColumns: true).EnableDiffLogEvent().ExecuteCommand();
+            return DataResult.Successed("更新成功!",MultiLanguageConst.DataUpdateSuccess);
+        }
+    }
+
+    public DataResult<CodeStlModeRes> GetCodeStlModeInfo(string id)
+    {
+        var data = db.Queryable<CodeStlMode>()
+            .Where(a => a.Id == long.Parse(id))
+            .Select<CodeStlModeRes>()
+            .First();
+        return DataResult<CodeStlModeRes>.Success(data,MultiLanguageConst.DataQuerySuccess);
+    }
+
+    public DataResult<List<CodeStlModeRes>> GetClientListByPage(PageRequest request)
+    {
+        var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+        //序列化查询条件
+        var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
+        var data = tenantDb.Queryable<CodeStlMode>()
+            .Where(whereList)
+            .Select<CodeStlModeRes>().ToQueryPage(request.PageCondition);
+        return data;
+    }
+
+    public DataResult EditClientCodeStlMode(CodeStlModeReq req)
+    {
+        var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+        if (req.Id == 0)
+        {
+
+            if (tenantDb.Queryable<CodeStlMode>().Where(x=>x.StlCode == req.StlCode.Trim()).Any())
+            {
+                return DataResult.Failed("结算方式已存在!",MultiLanguageConst.CodeStlModeExist);
+            }
+             
+            var data = req.Adapt<CodeStlMode>();
+
+            var entity = tenantDb.Insertable(data).EnableDiffLogEvent().ExecuteReturnEntity();
+
+            return DataResult.Successed("添加成功!", entity.Id,MultiLanguageConst.DataCreateSuccess);
+        }
+        else
+        {
+            var info = tenantDb.Queryable<CodeStlMode>().Where(x => x.Id == req.Id).First();
+
+            info = req.Adapt(info);
+
+            tenantDb.Updateable(info).IgnoreColumns(ignoreAllNullColumns: true).ExecuteCommand();
+            return DataResult.Successed("更新成功!",MultiLanguageConst.DataUpdateSuccess);
+        }
+    }
+
+    public DataResult<CodeStlModeRes> GetClientCodeStlModeInfo(string id)
+    {
+        var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+        var data = tenantDb.Queryable<CodeStlMode>()
+            .Where(a => a.Id == long.Parse(id))
+            .Select<CodeStlModeRes>()
+            .First();
+        return DataResult<CodeStlModeRes>.Success(data,MultiLanguageConst.DataQuerySuccess);
+    }
+
+    public DataResult<List<CodeStlModeRes>> GetCodeStlModeList(PageRequest request)
+    {
+        //序列化查询条件
+        var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
+        var data = db.Queryable<CodeStlMode>().Where(a=>a.Status == StatusEnum.Enable)
+            .Where(whereList)
+            .Select<CodeStlModeRes>().ToQueryPage(request.PageCondition);
+        return data;
+    }
+
+    public DataResult ImportCodeStlMode(IdModel req)
+    {
+        var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+        var list = db.Queryable<CodeStlMode>().Where(x =>req.Ids.Contains(x.Id) ).ToList();
+        if (list.Count == 0)
+        {
+            return DataResult.Failed("结算方式导入无数据!",MultiLanguageConst.CodeStlModeImportNoData);
+        }
+
+        if (tenantDb.Queryable<CodeStlMode>().Where(x =>req.Ids.Contains(x.Id) ).Any())
+        {
+            return DataResult.Failed("存在已导入的结算方式!",MultiLanguageConst.CodeStlModeImportAlready);
+        }
+         
+        tenantDb.Insertable(list).ExecuteCommand();
+        return DataResult.Successed("引入成功!",MultiLanguageConst.DataImportSuccess);
+    }
+    
+    /// <summary>
+    /// 获取当前租户已有的船名
+    /// </summary>
+    /// <returns></returns>
+    public DataResult<List<string>> GetExistCodeStlModeList()
+    {
+        var tenantDb = saasService.GetBizDbScopeById(user.TenantId);
+        var data = tenantDb.Queryable<CodeStlMode>()
+            .Select(n=>n.Id.ToString())
+            .ToList();
+        return DataResult<List<string>>.Success(data);
+    }
+
+}

ds-wms-service/DS.WMS.Core/System/Dtos/FormSetReq.cs

@@ -0,0 +1,17 @@
+namespace DS.WMS.Core.System.Dtos;
+
+/// <summary>
+/// 租户表单设置请求实体
+/// </summary>
+public class FormSetReq
+{ 
+    /// <summary>
+    /// 权限Id
+    /// </summary>
+    public long? PermissionId { get; set; }
+    
+    /// <summary>
+    /// 字段设置
+    /// </summary>
+    public string Content { get; set; }
+}

ds-wms-service/DS.WMS.Core/System/Dtos/FormSetRes.cs

@@ -0,0 +1,17 @@
+namespace DS.WMS.Core.System.Dtos;
+
+/// <summary>
+/// 租户表单设置返回实体
+/// </summary>
+public class FormSetRes
+{ 
+    /// <summary>
+    /// 权限Id
+    /// </summary>
+    public long? PermissionId { get; set; }
+    
+    /// <summary>
+    /// 字段设置
+    /// </summary>
+    public string Content { get; set; }
+}

ds-wms-service/DS.WMS.Core/System/Entity/SysFieldSet.cs

@@ -5,8 +5,8 @@ namespace DS.WMS.Core.System.Entity;
 /// <summary>
 /// 用户字段设置
 /// </summary>
-[SqlSugar.SugarTable("sys_user_field")]
+[SqlSugar.SugarTable("sys_field_set")]
-public class SysUserFieldSet
+public class SysFieldSet
 {
     /// <summary>
     /// ID

ds-wms-service/DS.WMS.Core/System/Entity/SysFormSet.cs

@@ -0,0 +1,31 @@
+using SqlSugar;
+
+namespace DS.WMS.Core.System.Entity;
+
+/// <summary>
+/// 租户表单设置
+/// </summary>
+[SqlSugar.SugarTable("sys_tenant_form_set")]
+public class SysFormSet
+{
+    /// <summary>
+    /// ID
+    /// </summary>
+    [SugarColumn(IsPrimaryKey = true, IsIdentity = true)]
+    public int Id { get; set; }
+
+    /// <summary>
+    /// 租户id
+    /// </summary>
+    public long? TenantId { get; set; }
+
+    /// <summary>
+    /// 权限Id
+    /// </summary>
+    public long? PermissionId { get; set; }
+    
+    /// <summary>
+    /// 表单设置
+    /// </summary>
+    public string Content { get; set; }
+}

ds-wms-service/DS.WMS.Core/System/Interface/ICommonService.cs

@@ -154,7 +154,7 @@ public interface ICommonService
     /// </summary>
     /// <param name="permissionId"></param>
     /// <returns></returns>
-    public DataResult<SysUserFieldSet> GetUserFieldSet(string permissionId);
+    public DataResult<SysFieldSet> GetUserFieldSet(string permissionId);
 
 
     /// <summary>

ds-wms-service/DS.WMS.Core/System/Interface/IFormSetService.cs

@@ -0,0 +1,30 @@
+using DS.Module.Core;
+using DS.WMS.Core.System.Dtos;
+using DS.WMS.Core.System.Entity;
+
+namespace DS.WMS.Core.System.Interface;
+
+public interface IFormSetService
+{
+    /// <summary>
+    /// 列表
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    DataResult<List<FormSetRes>> GetListByPage(PageRequest request);
+    
+    
+    /// <summary>
+    /// 编辑
+    /// </summary>
+    /// <param name="model"></param>
+    /// <returns></returns>
+    DataResult EditFormSet(FormSetReq model);
+    
+    /// <summary>
+    /// 获取详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    DataResult<FormSetRes> GetFormSetInfo(string id);
+}

ds-wms-service/DS.WMS.Core/System/Method/CommonService.cs

@@ -1155,12 +1155,12 @@ public class CommonService : ICommonService
     /// </summary>
     /// <param name="permissionId"></param>
     /// <returns></returns>
-    public DataResult<SysUserFieldSet> GetUserFieldSet(string permissionId)
+    public DataResult<SysFieldSet> GetUserFieldSet(string permissionId)
     {
-        var info = db.Queryable<SysUserFieldSet>()
+        var info = db.Queryable<SysFieldSet>()
             .Where(x => x.UserId == long.Parse(user.UserId) && x.PermissionId == long.Parse(permissionId)).First();
 
-        return DataResult<SysUserFieldSet>.Success(info);
+        return DataResult<SysFieldSet>.Success(info);
     }
 
     /// <summary>
@@ -1170,12 +1170,12 @@ public class CommonService : ICommonService
     /// <returns></returns>
     public DataResult UpdateUserFieldSet(UserFieldSetUpdateReq req)
     {
-        var info = db.Queryable<SysUserFieldSet>()
+        var info = db.Queryable<SysFieldSet>()
             .Where(x => x.UserId == long.Parse(user.UserId) && x.PermissionId == req.PermissionId).First();
 
         if (info.IsNull())
         {
-            var entity = new SysUserFieldSet
+            var entity = new SysFieldSet
             {
                 UserId = long.Parse(user.UserId),
                 PermissionId = req.PermissionId,

ds-wms-service/DS.WMS.Core/System/Method/FormSetService.cs

@@ -0,0 +1,88 @@
+using DS.Module.Core;
+using DS.Module.Core.Extensions;
+using DS.Module.UserModule;
+using DS.WMS.Core.System.Dtos;
+using DS.WMS.Core.System.Entity;
+using DS.WMS.Core.System.Interface;
+using Mapster;
+using Microsoft.Extensions.DependencyInjection;
+using SqlSugar;
+
+namespace DS.WMS.Core.System.Method;
+
+public class FormSetService : IFormSetService
+{
+    private readonly IServiceProvider _serviceProvider;
+    private readonly ISqlSugarClient db;
+    private readonly IUser user;
+
+    /// <summary>
+    ///
+    /// </summary>
+    /// <param name="serviceProvider"></param>
+    public FormSetService(IServiceProvider serviceProvider)
+    {
+        _serviceProvider = serviceProvider;
+        db = _serviceProvider.GetRequiredService<ISqlSugarClient>();
+        user = _serviceProvider.GetRequiredService<IUser>();
+    }
+
+    /// <summary>
+    /// 列表
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    public DataResult<List<FormSetRes>> GetListByPage(PageRequest request)
+    {
+        //序列化查询条件
+        var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
+        var data = db.Queryable<SysFormSet>()
+            .LeftJoin<SysPermission>((a, b) => a.PermissionId == b.Id)
+            .Where(whereList)
+            .Select<FormSetRes>().ToQueryPage(request.PageCondition);
+        return data;
+    }
+    /// <summary>
+    /// 编辑
+    /// </summary>
+    /// <param name="req"></param>
+    /// <returns></returns>
+    public DataResult EditFormSet(FormSetReq req)
+    {
+        var info = db.Queryable<SysFormSet>()
+            .Where(x => x.TenantId == long.Parse(user.TenantId) && x.PermissionId == req.PermissionId).First();
+
+        if (info.IsNull())
+        {
+            var entity = new SysFormSet
+            {
+                TenantId = long.Parse(user.TenantId),
+                PermissionId = req.PermissionId,
+                Content = req.Content
+            };
+            db.Insertable(entity).ExecuteCommand();
+        }
+        else
+        {
+            info.Content = req.Content;
+            db.Updateable(info).ExecuteCommand();
+        }
+
+        return DataResult.Successed("更新成功",MultiLanguageConst.DataUpdateSuccess);
+        
+    }
+    /// <summary>
+    /// 详情
+    /// </summary>
+    /// <param name="permissionId"></param>
+    /// <returns></returns>
+    public DataResult<FormSetRes> GetFormSetInfo(string permissionId)
+    {
+        var data = db.Queryable<SysFormSet>()
+            .LeftJoin<SysPermission>((a, b) => a.PermissionId == b.Id)
+            .Where(x => x.TenantId == long.Parse(user.TenantId) && x.PermissionId == long.Parse(permissionId))
+            .Select<FormSetRes>()
+            .First();
+        return DataResult<FormSetRes>.Success(data,MultiLanguageConst.DataQuerySuccess);
+    }
+}

ds-wms-service/DS.WMS.Core/System/Method/LogAuditService.cs

@@ -1,6 +1,7 @@
 using DS.Module.Core;
 using DS.Module.Core.Extensions;
 using DS.Module.Core.Log;
+using DS.Module.SqlSugar;
 using DS.Module.UserModule;
 using DS.WMS.Core.System.Dtos;
 using DS.WMS.Core.System.Entity;
@@ -16,7 +17,7 @@ public class LogAuditService : ILogAuditService
     private readonly IServiceProvider _serviceProvider;
     private readonly ISqlSugarClient db;
     private readonly IUser user;
-
+    private readonly ISaasDbService saasService;
     /// <summary>
     ///
     /// </summary>
@@ -26,13 +27,14 @@ public class LogAuditService : ILogAuditService
         _serviceProvider = serviceProvider;
         db = _serviceProvider.GetRequiredService<ISqlSugarClient>();
         user = _serviceProvider.GetRequiredService<IUser>();
+        saasService = _serviceProvider.GetRequiredService<ISaasDbService>();
     }
 
     public DataResult<List<AuditLogRes>> GetAuditLogList(PageRequest request)
     {
         //序列化查询条件
         var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
-        var data = db.Queryable<SysLogAudit>().Filter(null,true)
+        var data = saasService.GetLogDb().Queryable<SysLogAudit>().Filter(null,true)
             .Where(whereList)
             .Select<AuditLogRes>().ToQueryPage(request.PageCondition);
         return data;
@@ -40,7 +42,7 @@ public class LogAuditService : ILogAuditService
 
     public DataResult<AuditLogRes> GetAuditLogInfo(string id)
     {
-        var data = db.Queryable<SysLogAudit>().Filter(null,true)
+        var data = saasService.GetLogDb().Queryable<SysLogAudit>().Filter(null,true)
             .Where(a => a.Id == long.Parse(id))
             .Select<AuditLogRes>()
             .First();

ds-wms-service/DS.WMS.Core/System/Method/LogExceptionService.cs

@@ -1,6 +1,7 @@
 using DS.Module.Core;
 using DS.Module.Core.Extensions;
 using DS.Module.Core.Log;
+using DS.Module.SqlSugar;
 using DS.Module.UserModule;
 using DS.WMS.Core.System.Dtos;
 using DS.WMS.Core.System.Entity;
@@ -16,7 +17,7 @@ public class LogExceptionService : ILogExceptionService
     private readonly IServiceProvider _serviceProvider;
     private readonly ISqlSugarClient db;
     private readonly IUser user;
-
+    private readonly ISaasDbService saasService;
     /// <summary>
     ///
     /// </summary>
@@ -26,13 +27,14 @@ public class LogExceptionService : ILogExceptionService
         _serviceProvider = serviceProvider;
         db = _serviceProvider.GetRequiredService<ISqlSugarClient>();
         user = _serviceProvider.GetRequiredService<IUser>();
+        saasService = _serviceProvider.GetRequiredService<ISaasDbService>();
     }
 
     public DataResult<List<ExceptionLogRes>> GetExceptionLogList(PageRequest request)
     {
         //序列化查询条件
         var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
-        var data = db.Queryable<SysLogException>().Filter(null,true)
+        var data = saasService.GetLogDb().Queryable<SysLogException>().Filter(null,true)
             .Where(whereList)
             .Select<ExceptionLogRes>().ToQueryPage(request.PageCondition);
         return data;
@@ -40,7 +42,7 @@ public class LogExceptionService : ILogExceptionService
 
     public DataResult<ExceptionLogRes> GetExceptionLogInfo(string id)
     {
-        var data = db.Queryable<SysLogException>().Filter(null,true)
+        var data = saasService.GetLogDb().Queryable<SysLogException>().Filter(null,true)
             .Where(a => a.Id == long.Parse(id))
             .Select<ExceptionLogRes>()
             .First();

ds-wms-service/DS.WMS.Core/System/Method/LogOperationService.cs

@@ -1,6 +1,7 @@
 using DS.Module.Core;
 using DS.Module.Core.Extensions;
 using DS.Module.Core.Log;
+using DS.Module.SqlSugar;
 using DS.Module.UserModule;
 using DS.WMS.Core.System.Dtos;
 using DS.WMS.Core.System.Entity;
@@ -16,7 +17,7 @@ public class LogOperationService : ILogOperationService
     private readonly IServiceProvider _serviceProvider;
     private readonly ISqlSugarClient db;
     private readonly IUser user;
-
+    private readonly ISaasDbService saasService;
     /// <summary>
     ///
     /// </summary>
@@ -26,13 +27,14 @@ public class LogOperationService : ILogOperationService
         _serviceProvider = serviceProvider;
         db = _serviceProvider.GetRequiredService<ISqlSugarClient>();
         user = _serviceProvider.GetRequiredService<IUser>();
+        saasService = _serviceProvider.GetRequiredService<ISaasDbService>();
     }
 
     public DataResult<List<OperationLogRes>> GetOperationLogList(PageRequest request)
     {
         //序列化查询条件
         var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
-        var data = db.Queryable<SysLogOperation>().Filter(null,true)
+        var data = saasService.GetLogDb().Queryable<SysLogOperation>().Filter(null,true)
             .Where(whereList)
             .Select<OperationLogRes>().ToQueryPage(request.PageCondition);
         return data;
@@ -40,7 +42,7 @@ public class LogOperationService : ILogOperationService
 
     public DataResult<OperationLogRes> GetOperationLogInfo(string id)
     {
-        var data = db.Queryable<SysLogOperation>().Filter(null,true)
+        var data = saasService.GetLogDb().Queryable<SysLogOperation>().Filter(null,true)
             .Where(a => a.Id == long.Parse(id))
             .Select<OperationLogRes>()
             .First();

ds-wms-service/DS.WMS.Core/System/Method/LogVisitService.cs

@@ -1,6 +1,7 @@
 using DS.Module.Core;
 using DS.Module.Core.Extensions;
 using DS.Module.Core.Log;
+using DS.Module.SqlSugar;
 using DS.Module.UserModule;
 using DS.WMS.Core.System.Dtos;
 using DS.WMS.Core.System.Entity;
@@ -16,7 +17,7 @@ public class LogVisitService : ILogVisitService
     private readonly IServiceProvider _serviceProvider;
     private readonly ISqlSugarClient db;
     private readonly IUser user;
-
+    private readonly ISaasDbService saasService;
     /// <summary>
     ///
     /// </summary>
@@ -26,13 +27,14 @@ public class LogVisitService : ILogVisitService
         _serviceProvider = serviceProvider;
         db = _serviceProvider.GetRequiredService<ISqlSugarClient>();
         user = _serviceProvider.GetRequiredService<IUser>();
+        saasService = _serviceProvider.GetRequiredService<ISaasDbService>();
     }
 
     public DataResult<List<VisitLogRes>> GetVisitLogList(PageRequest request)
     {
         //序列化查询条件
         var whereList = db.ConfigQuery.Context.Utilities.JsonToConditionalModels(request.QueryCondition);
-        var data = db.Queryable<SysLogVisit>().Filter(null,true)
+        var data = saasService.GetLogDb().Queryable<SysLogVisit>().Filter(null,true)
             .Where(whereList)
             .Select<VisitLogRes>().ToQueryPage(request.PageCondition);
         return data;
@@ -40,7 +42,7 @@ public class LogVisitService : ILogVisitService
 
     public DataResult<VisitLogRes> GetVisitLogInfo(string id)
     {
-        var data = db.Queryable<SysLogVisit>().Filter(null,true)
+        var data = saasService.GetLogDb().Queryable<SysLogVisit>().Filter(null,true)
             .Where(a => a.Id == long.Parse(id))
             .Select<VisitLogRes>()
             .First();

ds-wms-service/DS.WMS.MainApi/Controllers/CodeFrtController.cs

@@ -0,0 +1,100 @@
+using DS.Module.Core;
+using DS.Module.Core.Data;
+using DS.WMS.Core.Code.Dtos;
+using DS.WMS.Core.Code.Interface;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DS.WMS.MainApi.Controllers;
+
+/// <summary>
+/// 付费方式服务
+/// </summary>
+public class CodeFrtController : ApiController
+{
+    private readonly ICodeFrtService _invokeService;
+
+    /// <summary>
+    /// 构造函数
+    /// </summary>
+    /// <param name="invokeService"></param>
+    public CodeFrtController(ICodeFrtService invokeService)
+    {
+        _invokeService = invokeService;
+    }
+
+    /// <summary>
+    /// 列表
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("GetCodeFrtList")]
+    public DataResult<List<CodeFrtRes>> GetCodeFrtList([FromBody] PageRequest request)
+    {
+        var res = _invokeService.GetClientListByPage(request);
+        return res;
+    }
+
+    /// <summary>
+    /// 编辑
+    /// </summary>
+    /// <param name="model"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("EditCodeFrt")]
+    public DataResult EditCodeFrt([FromBody] CodeFrtReq model)
+    {
+        var res = _invokeService.EditClientCodeFrt(model);
+        return res;
+    }
+
+    /// <summary>
+    /// 详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet]
+    [Route("GetCodeFrtInfo")]
+    public DataResult<CodeFrtRes> GetCodeFrtInfo([FromQuery] string id)
+    {
+        var res = _invokeService.GetClientCodeFrtInfo(id);
+        return res;
+    }
+    
+    /// <summary>
+    /// 获取付费方式列表-基础库
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("GetBasicsCodeFrtList")]
+    public DataResult<List<CodeFrtRes>> GetBasicsCodeFrtList([FromBody] PageRequest request)
+    {
+        var res = _invokeService.GetCodeFrtList(request);
+        return res;
+    }
+    /// <summary>
+    /// 导入付费方式类型-基础库
+    /// </summary>
+    /// <param name="req"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("ImportCodeFrt")]
+    public DataResult ImportCodeFrt([FromBody] IdModel req)
+    {
+        var res = _invokeService.ImportCodeFrt(req);
+        return res;
+    }
+    
+    /// <summary>
+    /// 获取当前租户已有的付费方式
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet]
+    [Route("GetExistCodeFrtList")]
+    public DataResult<List<string>> GetExistCodeFrtList()
+    {
+        var res = _invokeService.GetExistCodeFrtList();
+        return res;
+    }
+}

ds-wms-service/DS.WMS.MainApi/Controllers/CodeStlModeController.cs

@@ -0,0 +1,100 @@
+using DS.Module.Core;
+using DS.Module.Core.Data;
+using DS.WMS.Core.Code.Dtos;
+using DS.WMS.Core.Code.Interface;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DS.WMS.MainApi.Controllers;
+
+/// <summary>
+/// 结算方式服务
+/// </summary>
+public class CodeStlModeController : ApiController
+{
+    private readonly ICodeStlModeService _invokeService;
+
+    /// <summary>
+    /// 构造函数
+    /// </summary>
+    /// <param name="invokeService"></param>
+    public CodeStlModeController(ICodeStlModeService invokeService)
+    {
+        _invokeService = invokeService;
+    }
+
+    /// <summary>
+    /// 列表
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("GetCodeStlModeList")]
+    public DataResult<List<CodeStlModeRes>> GetCodeStlModeList([FromBody] PageRequest request)
+    {
+        var res = _invokeService.GetClientListByPage(request);
+        return res;
+    }
+
+    /// <summary>
+    /// 编辑
+    /// </summary>
+    /// <param name="model"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("EditCodeStlMode")]
+    public DataResult EditCodeStlMode([FromBody] CodeStlModeReq model)
+    {
+        var res = _invokeService.EditClientCodeStlMode(model);
+        return res;
+    }
+
+    /// <summary>
+    /// 详情
+    /// </summary>
+    /// <param name="id"></param>
+    /// <returns></returns>
+    [HttpGet]
+    [Route("GetCodeStlModeInfo")]
+    public DataResult<CodeStlModeRes> GetCodeStlModeInfo([FromQuery] string id)
+    {
+        var res = _invokeService.GetClientCodeStlModeInfo(id);
+        return res;
+    }
+    
+    /// <summary>
+    /// 获取结算方式列表-基础库
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("GetBasicsCodeStlModeList")]
+    public DataResult<List<CodeStlModeRes>> GetBasicsCodeStlModeList([FromBody] PageRequest request)
+    {
+        var res = _invokeService.GetCodeStlModeList(request);
+        return res;
+    }
+    /// <summary>
+    /// 导入结算方式类型-基础库
+    /// </summary>
+    /// <param name="req"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("ImportCodeStlMode")]
+    public DataResult ImportCodeStlMode([FromBody] IdModel req)
+    {
+        var res = _invokeService.ImportCodeStlMode(req);
+        return res;
+    }
+    
+    /// <summary>
+    /// 获取当前租户已有的结算方式
+    /// </summary>
+    /// <returns></returns>
+    [HttpGet]
+    [Route("GetExistCodeStlModeList")]
+    public DataResult<List<string>> GetExistCodeStlModeList()
+    {
+        var res = _invokeService.GetExistCodeStlModeList();
+        return res;
+    }
+}

ds-wms-service/DS.WMS.MainApi/Controllers/CommonController.cs

@@ -318,7 +318,7 @@ public class CommonController : ApiController
     /// <returns></returns>
     [HttpGet]
     [Route("GetUserFieldSet")]
-    public DataResult<SysUserFieldSet> GetUserFieldSet([FromQuery] string permissionId)
+    public DataResult<SysFieldSet> GetUserFieldSet([FromQuery] string permissionId)
     {
         var res = _invokeService.GetUserFieldSet(permissionId);
         return res;

ds-wms-service/DS.WMS.MainApi/Controllers/FormSetController.cs

@@ -0,0 +1,62 @@
+using DS.Module.Core;
+using DS.WMS.Core.System.Dtos;
+using DS.WMS.Core.System.Interface;
+using Microsoft.AspNetCore.Mvc;
+
+namespace DS.WMS.MainApi.Controllers;
+
+/// <summary>
+/// 表单设置 模块
+/// </summary>
+public class FormSetController : ApiController
+{
+    private readonly IFormSetService _invokeService;
+
+    /// <summary>
+    /// 构造函数
+    /// </summary>
+    /// <param name="invokeService"></param>
+    public FormSetController(IFormSetService invokeService)
+    {
+        _invokeService = invokeService;
+    }
+
+    /// <summary>
+    /// 列表
+    /// </summary>
+    /// <param name="request"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("GetFormSetList")]
+    public DataResult<List<FormSetRes>> GetFormSetList([FromBody] PageRequest request)
+    {
+        var res = _invokeService.GetListByPage(request);
+        return res;
+    }
+
+    /// <summary>
+    /// 编辑
+    /// </summary>
+    /// <param name="req"></param>
+    /// <returns></returns>
+    [HttpPost]
+    [Route("EditFormSet")]
+    public DataResult EditFormSet([FromBody] FormSetReq req)
+    {
+        var res = _invokeService.EditFormSet(req);
+        return res;
+    }
+
+    /// <summary>
+    /// 详情
+    /// </summary>
+    /// <param name="permissionId">权限Id</param>
+    /// <returns></returns>
+    [HttpGet]
+    [Route("GetFormSetInfo")]
+    public DataResult<FormSetRes> GetFormSetInfo([FromQuery] string permissionId)
+    {
+        var res = _invokeService.GetFormSetInfo(permissionId);
+        return res;
+    }
+}

ds-wms-service/DS.WMS.MainApi/Logs/internal-nlog.txt

@@ -817,3 +817,10 @@
 2024-03-11 09:31:30.7954 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
 2024-03-11 09:31:30.8281 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
 2024-03-11 09:31:30.9202 Info Configuration initialized.
+2024-03-11 09:49:09.6281 Info Registered target NLog.Targets.FileTarget(Name=allfile)
+2024-03-11 09:49:09.7189 Info Registered target NLog.Targets.FileTarget(Name=ownFile-web)
+2024-03-11 09:49:09.8504 Info Registered target NLog.Targets.ColoredConsoleTarget(Name=console)
+2024-03-11 09:49:09.9075 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-03-11 09:49:09.9837 Info Validating config: TargetNames=console, ownFile-web, ConfigItems=54, FilePath=D:\Code\DS\ds8-solution\ds-wms-service\DS.WMS.MainApi\bin\Debug\net8.0\nlog.config
+2024-03-11 09:49:10.0201 Warn Unused target detected. Add a rule for this target to the configuration. TargetName: allfile
+2024-03-11 09:49:10.0928 Info Configuration initialized.