diff --git a/ds-wms-service/DS.WMS.Core/Code/Interface/IFormSetService.cs b/ds-wms-service/DS.WMS.Core/Code/Interface/IFormSetService.cs index fd9b06f9..4baa0116 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Interface/IFormSetService.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Interface/IFormSetService.cs @@ -48,5 +48,11 @@ public interface IFormSetService /// public DataResult BatchDelFormSet(IdModel req); + /// + /// 根据权限模块获取表单设置列表 + /// + /// + /// + public Task>> GetFormSetListByModule(string permissionId); } \ No newline at end of file diff --git a/ds-wms-service/DS.WMS.Core/Code/Method/CodeFormSetService.cs b/ds-wms-service/DS.WMS.Core/Code/Method/CodeFormSetService.cs index 358a256e..f9ce759d 100644 --- a/ds-wms-service/DS.WMS.Core/Code/Method/CodeFormSetService.cs +++ b/ds-wms-service/DS.WMS.Core/Code/Method/CodeFormSetService.cs @@ -118,7 +118,21 @@ public class CodeFormSetService : IFormSetService .First(); return DataResult.Success(data, MultiLanguageConst.DataQuerySuccess); } + /// + /// 根据权限模块获取表单设置列表 + /// + /// + /// + public async Task>> GetFormSetListByModule(string permissionId) + { + var tenantDb = saasService.GetBizDbScopeById(user.TenantId); + var data = await tenantDb.Queryable() + .Where(x => x.PermissionId == long.Parse(permissionId) && x.Status == StatusEnum.Enable) + .Select() + .ToListAsync(); + return await Task.FromResult(DataResult>.Success(data, MultiLanguageConst.DataQuerySuccess)); + } public DataResult BatchDelFormSet(IdModel req) { diff --git a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs index 2a82354e..3c3dc7f1 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Dtos/SeaExportRes.cs @@ -31,10 +31,10 @@ public class SeaExportRes /// public OpBusinessYardRes? YardInfo { get; set; } - /// - /// 表单设置 - /// - public List? FormSetList { get; set; } + ///// + ///// 表单设置 + ///// + //public List? FormSetList { get; set; } /// /// 业务日志 diff --git a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs index 7c714865..206c6e7a 100644 --- a/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs +++ b/ds-wms-service/DS.WMS.Core/Op/Method/SeaExportService.cs @@ -547,7 +547,7 @@ public partial class SeaExportService : ISeaExportService it.CtnInfo = tenantDb.Queryable().Where(x => x.BSNO == it.Id.ToString()).Select().ToList(); it.CtnPriceInfo = tenantDb.Queryable().Where(x => x.BusinessId == it.Id).Select().ToList(); - it.FormSetList = tenantDb.Queryable().Where(x => x.PermissionName == "海运出口-详情").Select().ToList(); + //it.FormSetList = tenantDb.Queryable().Where(x => x.PermissionName == "海运出口-详情").Select().ToList(); it.BusinessLogList = tenantDb.Queryable().Where(x => x.BusinessId == it.Id).Select().ToList(); diff --git a/ds-wms-service/DS.WMS.MainApi/Controllers/FormSetController.cs b/ds-wms-service/DS.WMS.MainApi/Controllers/FormSetController.cs index 94b62fe9..84dbec03 100644 --- a/ds-wms-service/DS.WMS.MainApi/Controllers/FormSetController.cs +++ b/ds-wms-service/DS.WMS.MainApi/Controllers/FormSetController.cs @@ -75,6 +75,19 @@ public class FormSetController : ApiController var res = _invokeService.GetFormSetInfoByModule(permissionId, formNo); return res; } + + /// + /// 按模块获取表单设置列表 + /// + /// 权限模块id + /// + [HttpGet] + [Route("GetFormSetListByModule")] + public async Task>> GetFormSetListByModule([FromQuery] string permissionId) + { + var res = await _invokeService.GetFormSetListByModule(permissionId); + return res; + } /// /// 批量删除 ///