Browse Source

去没有用的权限设置

FoShanPG
44673626 3 years ago
parent
commit
a9185b588d
  1. 2
      src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissionDefinitionProvider.cs
  2. 2
      src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/SettleAccount.Application.Contracts.csproj
  3. 24
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/CarMaterialConfigs/CarMaterialConfigAppService.cs
  4. 19
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/FISes/FISAppService.cs
  5. 2
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ItemInvoicePrices/ItemInvoicePriceAppService.cs
  6. 13
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs
  7. 2
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipTHAppService.cs
  8. 20
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prebatch/PrebatchAppService.cs
  9. 2
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs
  10. 12
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementCrossReference/SettlementCrossReferenceAppService.cs
  11. 2
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementParts/SettlementPartAppService.cs
  12. 9
      src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
  13. 2
      src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/SettleAccount.Domain.Shared.csproj
  14. 2
      src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj
  15. 2
      src/Modules/SettleAccount/src/SettleAccount.HttpApi/SettleAccount.HttpApi.csproj

2
src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissionDefinitionProvider.cs

@ -19,7 +19,7 @@ namespace Win.Sfs.SettleAccount
bt_car.AddChild(SettleAccountPermissions.BT_Carlatform.Delete, L("Delete")); bt_car.AddChild(SettleAccountPermissions.BT_Carlatform.Delete, L("Delete"));
//红旗F平台导入 //红旗F平台导入
var hq_f = myGroup.AddPermission(SettleAccountPermissions.HQ_FPlatform.Default, L("HQ_MPlatform")); var hq_f = myGroup.AddPermission(SettleAccountPermissions.HQ_FPlatform.Default, L("HQ_FPlatform"));
hq_f.AddChild(SettleAccountPermissions.HQ_FPlatform.Create, L("Create")); hq_f.AddChild(SettleAccountPermissions.HQ_FPlatform.Create, L("Create"));
hq_f.AddChild(SettleAccountPermissions.HQ_FPlatform.Update, L("Update")); hq_f.AddChild(SettleAccountPermissions.HQ_FPlatform.Update, L("Update"));
hq_f.AddChild(SettleAccountPermissions.HQ_FPlatform.Delete, L("Delete")); hq_f.AddChild(SettleAccountPermissions.HQ_FPlatform.Delete, L("Delete"));

2
src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/SettleAccount.Application.Contracts.csproj

@ -5,7 +5,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RootNamespace>Win.Sfs.SettleAccount</RootNamespace> <RootNamespace>Win.Sfs.SettleAccount</RootNamespace>
<Version>1.0.23</Version> <Version>1.0.25</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup> </PropertyGroup>

24
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/CarMaterialConfigs/CarMaterialConfigAppService.cs

@ -42,7 +42,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// <summary> /// <summary>
/// 区域相关应用服务 /// 区域相关应用服务
/// </summary> /// </summary>
[Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)] //[Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
//[AllowAnonymous] //[AllowAnonymous]
[Route("api/settleaccount/CarMaterialConfig")] [Route("api/settleaccount/CarMaterialConfig")]
public class CarMaterialConfigAppService : SettleAccountApplicationBase<CarMaterialConfig>, ICarMaterialConfigAppService public class CarMaterialConfigAppService : SettleAccountApplicationBase<CarMaterialConfig>, ICarMaterialConfigAppService
@ -81,7 +81,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
[HttpPost] [HttpPost]
[Route("ExcelImport")] [Route("ExcelImport")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
[Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)] // [Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
public async Task<string> CarMaterialConfigUploadExcelImport([FromForm] IFormFileCollection files) public async Task<string> CarMaterialConfigUploadExcelImport([FromForm] IFormFileCollection files)
{ {
ExportImporter _exportImporter = new ExportImporter(); ExportImporter _exportImporter = new ExportImporter();
@ -162,7 +162,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// <returns>实体DTO</returns> /// <returns>实体DTO</returns>
[HttpGet] [HttpGet]
[Route("{id}")] [Route("{id}")]
[Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)] //[Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
virtual public async Task<CarMaterialConfigDto> GetAsync(Guid id) virtual public async Task<CarMaterialConfigDto> GetAsync(Guid id)
{ {
var result = await _repository.GetAsync(id); var result = await _repository.GetAsync(id);
@ -200,7 +200,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// <returns>实体DTO列表</returns> /// <returns>实体DTO列表</returns>
[HttpPost] [HttpPost]
[Route("list")] [Route("list")]
[Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)] //[Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
virtual public async Task<PagedResultDto<CarMaterialConfigDto>> GetListAsync(CarMaterialConfigRequestDto input) virtual public async Task<PagedResultDto<CarMaterialConfigDto>> GetListAsync(CarMaterialConfigRequestDto input)
{ {
@ -224,7 +224,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// <returns>实体总数</returns> /// <returns>实体总数</returns>
[HttpGet] [HttpGet]
[Route("count")] [Route("count")]
[Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
virtual public async Task<long> GetTotalCountAsync(Guid branchId) virtual public async Task<long> GetTotalCountAsync(Guid branchId)
{ {
return await _repository.GetCountAsync(branchId); return await _repository.GetCountAsync(branchId);
@ -236,7 +236,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// <returns>实体DTO列表</returns> /// <returns>实体DTO列表</returns>
[HttpGet] [HttpGet]
[Route("all")] [Route("all")]
[Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
virtual public async Task<ListResultDto<CarMaterialConfigDto>> GetAllAsync(Guid branchId) virtual public async Task<ListResultDto<CarMaterialConfigDto>> GetAllAsync(Guid branchId)
{ {
var entities = await _repository.GetAllAsync(branchId, true); var entities = await _repository.GetAllAsync(branchId, true);
@ -274,7 +274,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// <returns>是否导入成功</returns> /// <returns>是否导入成功</returns>
//[HttpPost] //[HttpPost]
//[Route("import")] //[Route("import")]
[Authorize(SettleAccountPermissions.CarMaterialConfigs.Create)]
//virtual public async Task<bool> ImportAsync(List<CarMaterialConfigCreateDto> dtos) //virtual public async Task<bool> ImportAsync(List<CarMaterialConfigCreateDto> dtos)
//{ //{
// var entities =ObjectMapper.Map<List<CarMaterialConfigCreateDto>, List<CarMaterialConfig>>(dtos); // var entities =ObjectMapper.Map<List<CarMaterialConfigCreateDto>, List<CarMaterialConfig>>(dtos);
@ -293,7 +293,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
[HttpPost] [HttpPost]
[Route("")] [Route("")]
[Authorize(SettleAccountPermissions.CarMaterialConfigs.Create)]
virtual public async Task<CarMaterialConfigDto> CreateAsync(CarMaterialConfigCreateDto input) virtual public async Task<CarMaterialConfigDto> CreateAsync(CarMaterialConfigCreateDto input)
{ {
var _first = _repository.Where(p =>p.CarCode==input.CarCode && p.MaterialCode==input.MaterialCode && p.Qty==input.Qty).FirstOrDefault(); var _first = _repository.Where(p =>p.CarCode==input.CarCode && p.MaterialCode==input.MaterialCode && p.Qty==input.Qty).FirstOrDefault();
@ -342,7 +342,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// <returns>实体DTO</returns> /// <returns>实体DTO</returns>
[HttpPut] [HttpPut]
[Route("{id}")] [Route("{id}")]
[Authorize(SettleAccountPermissions.CarMaterialConfigs.Update)]
virtual public async Task<CarMaterialConfigDto> UpdateAsync(Guid id, CarMaterialConfigUpdateDto input) virtual public async Task<CarMaterialConfigDto> UpdateAsync(Guid id, CarMaterialConfigUpdateDto input)
{ {
var entity = await _repository.GetAsync(id); var entity = await _repository.GetAsync(id);
@ -361,7 +361,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// <returns>无</returns> /// <returns>无</returns>
[HttpDelete] [HttpDelete]
[Route("{id}")] [Route("{id}")]
[Authorize(SettleAccountPermissions.CarMaterialConfigs.Delete)]
virtual public async Task DeleteAsync(Guid id) virtual public async Task DeleteAsync(Guid id)
{ {
var entity = await GetFromCacheAsync(id); var entity = await GetFromCacheAsync(id);
@ -376,7 +376,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// <returns>是否执行成功</returns> /// <returns>是否执行成功</returns>
[HttpPost] [HttpPost]
[Route("delete")] [Route("delete")]
[Authorize(SettleAccountPermissions.CarMaterialConfigs.Delete)]
virtual public async Task<bool> DeleteListAsync(List<Guid> ids) virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
{ {
@ -398,7 +398,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("Export")] [Route("Export")]
[Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
virtual public async Task<string> ExportAsync(CarMaterialConfigRequestDto input) virtual public async Task<string> ExportAsync(CarMaterialConfigRequestDto input)
{ {

19
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/FISes/FISAppService.cs

@ -42,7 +42,7 @@ namespace Win.Sfs.SettleAccount.FISes
/// <summary> /// <summary>
/// 区域相关应用服务 /// 区域相关应用服务
/// </summary> /// </summary>
[Authorize(SettleAccountPermissions.FISs.Default)] //[Authorize(SettleAccountPermissions.FISs.Default)]
//[AllowAnonymous] //[AllowAnonymous]
[Route("api/settleaccount/fis")] [Route("api/settleaccount/fis")]
public class FISAppService : SettleAccountApplicationBase<FIS>, IFISAppService public class FISAppService : SettleAccountApplicationBase<FIS>, IFISAppService
@ -99,7 +99,7 @@ namespace Win.Sfs.SettleAccount.FISes
[HttpPost] [HttpPost]
[Route("ExcelImport")] [Route("ExcelImport")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
[Authorize(SettleAccountPermissions.FISs.Default)]
public async Task<string> FISUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory, string model, DateTime? beginDate, DateTime? endDate) public async Task<string> FISUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory, string model, DateTime? beginDate, DateTime? endDate)
{ {
@ -280,7 +280,7 @@ namespace Win.Sfs.SettleAccount.FISes
/// <returns>实体DTO</returns> /// <returns>实体DTO</returns>
[HttpGet] [HttpGet]
[Route("{id}")] [Route("{id}")]
[Authorize(SettleAccountPermissions.FISs.Default)]
virtual public async Task<FISDto> GetAsync(Guid id) virtual public async Task<FISDto> GetAsync(Guid id)
{ {
var result = await GetFromCacheAsync(id); var result = await GetFromCacheAsync(id);
@ -375,7 +375,7 @@ namespace Win.Sfs.SettleAccount.FISes
/// <returns>实体总数</returns> /// <returns>实体总数</returns>
[HttpGet] [HttpGet]
[Route("count")] [Route("count")]
[Authorize(SettleAccountPermissions.FISs.Default)]
virtual public async Task<long> GetTotalCountAsync(Guid branchId) virtual public async Task<long> GetTotalCountAsync(Guid branchId)
{ {
return await _repository.GetCountAsync(branchId); return await _repository.GetCountAsync(branchId);
@ -387,7 +387,7 @@ namespace Win.Sfs.SettleAccount.FISes
/// <returns>实体DTO列表</returns> /// <returns>实体DTO列表</returns>
[HttpGet] [HttpGet]
[Route("all")] [Route("all")]
[Authorize(SettleAccountPermissions.FISs.Default)]
virtual public async Task<ListResultDto<FISDto>> GetAllAsync(Guid branchId) virtual public async Task<ListResultDto<FISDto>> GetAllAsync(Guid branchId)
{ {
var entities = await _repository.GetAllAsync(branchId, true); var entities = await _repository.GetAllAsync(branchId, true);
@ -407,7 +407,7 @@ namespace Win.Sfs.SettleAccount.FISes
/// <returns>无</returns> /// <returns>无</returns>
[HttpDelete] [HttpDelete]
[Route("{id}")] [Route("{id}")]
[Authorize(SettleAccountPermissions.FISs.Delete)]
virtual public async Task DeleteAsync(Guid id) virtual public async Task DeleteAsync(Guid id)
{ {
var entity = await GetFromCacheAsync(id); var entity = await GetFromCacheAsync(id);
@ -422,7 +422,7 @@ namespace Win.Sfs.SettleAccount.FISes
/// <returns>是否执行成功</returns> /// <returns>是否执行成功</returns>
[HttpPost] [HttpPost]
[Route("delete")] [Route("delete")]
[Authorize(SettleAccountPermissions.FISs.Delete)]
virtual public async Task<bool> DeleteListAsync(List<Guid> ids) virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
{ {
foreach (var id in ids) foreach (var id in ids)
@ -440,7 +440,7 @@ namespace Win.Sfs.SettleAccount.FISes
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("listversion")] [Route("listversion")]
[Authorize(SettleAccountPermissions.FISs.Default)]
public async Task<PagedResultDto<FISVersionDto>> GetVersionListAsync(FISVersionRequestDto input) public async Task<PagedResultDto<FISVersionDto>> GetVersionListAsync(FISVersionRequestDto input)
{ {
var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue, var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
@ -470,7 +470,7 @@ namespace Win.Sfs.SettleAccount.FISes
[Route("duplicate")] [Route("duplicate")]
[UnitOfWork(isTransactional: false)] [UnitOfWork(isTransactional: false)]
[Authorize(SettleAccountPermissions.FISs.Default)]
public async Task<bool> UPdateFisAsync() public async Task<bool> UPdateFisAsync()
{ {
await _repository.GetDbContext().Database.ExecuteSqlRawAsync( await _repository.GetDbContext().Database.ExecuteSqlRawAsync(
@ -495,7 +495,6 @@ namespace Win.Sfs.SettleAccount.FISes
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("Export")] [Route("Export")]
[Authorize(SettleAccountPermissions.FISs.Default)]
virtual public async Task<string> ExportAsync(FISRequestDto input) virtual public async Task<string> ExportAsync(FISRequestDto input)
{ {

2
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ItemInvoicePrices/ItemInvoicePriceAppService.cs

@ -46,7 +46,7 @@ namespace Win.Sfs.SettleAccount.ItemInvoicePrices
/// <summary> /// <summary>
/// ERP总成开票数量和价格 /// ERP总成开票数量和价格
/// </summary> /// </summary>
[Authorize(SettleAccountPermissions.ItemInvoicePrices.Default)] //[Authorize(SettleAccountPermissions.ItemInvoicePrices.Default)]
//[AllowAnonymous] //[AllowAnonymous]
[Route("api/settleaccount/ItemInvoicePrice")] [Route("api/settleaccount/ItemInvoicePrice")]
public class ItemInvoicePriceAppService : SettleAccountApplicationBase<ItemInvoicePrice>, IItemInvoicePriceAppService public class ItemInvoicePriceAppService : SettleAccountApplicationBase<ItemInvoicePrice>, IItemInvoicePriceAppService

13
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs

@ -33,7 +33,7 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// <summary> /// <summary>
/// 区域相关应用服务 /// 区域相关应用服务
/// </summary> /// </summary>
[Authorize(SettleAccountPermissions.MaterialRelationships.Default)] //[Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
//[AllowAnonymous] //[AllowAnonymous]
[Route("api/settleaccount/MaterialRelationship")] [Route("api/settleaccount/MaterialRelationship")]
public class MaterialRelationshipAppService : SettleAccountApplicationBase<MaterialRelationship>, IMaterialRelationshipAppService public class MaterialRelationshipAppService : SettleAccountApplicationBase<MaterialRelationship>, IMaterialRelationshipAppService
@ -72,7 +72,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
[HttpPost] [HttpPost]
[Route("ExcelImport-Map")] [Route("ExcelImport-Map")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
[Authorize(SettleAccountPermissions.MaterialRelationships.Create)]
public async Task<string> MaterialRelationshipUploadExcelImportMap([FromForm] IFormFileCollection files) public async Task<string> MaterialRelationshipUploadExcelImportMap([FromForm] IFormFileCollection files)
{ {
@ -137,7 +136,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
[HttpPost] [HttpPost]
[Route("ExcelImport")] [Route("ExcelImport")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
[Authorize(SettleAccountPermissions.MaterialRelationships.Create)]
public async Task<string> MaterialRelationshipUploadExcelImport([FromForm] IFormFileCollection files) public async Task<string> MaterialRelationshipUploadExcelImport([FromForm] IFormFileCollection files)
{ {
@ -203,7 +201,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// <returns>实体DTO</returns> /// <returns>实体DTO</returns>
[HttpGet] [HttpGet]
[Route("{id}")] [Route("{id}")]
[Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
virtual public async Task<MaterialRelationshipDto> GetAsync(Guid id) virtual public async Task<MaterialRelationshipDto> GetAsync(Guid id)
{ {
var result = await GetFromCacheAsync(id); var result = await GetFromCacheAsync(id);
@ -241,7 +238,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// <returns>实体DTO列表</returns> /// <returns>实体DTO列表</returns>
[HttpPost] [HttpPost]
[Route("list")] [Route("list")]
[Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
virtual public async Task<PagedResultDto<MaterialRelationshipDto>> GetListAsync(MaterialRelationshipRequestDto input) virtual public async Task<PagedResultDto<MaterialRelationshipDto>> GetListAsync(MaterialRelationshipRequestDto input)
{ {
var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount, var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
@ -260,7 +256,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// <returns>实体总数</returns> /// <returns>实体总数</returns>
[HttpGet] [HttpGet]
[Route("count")] [Route("count")]
[Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
virtual public async Task<long> GetTotalCountAsync(Guid branchId) virtual public async Task<long> GetTotalCountAsync(Guid branchId)
{ {
return await _repository.GetCountAsync(branchId); return await _repository.GetCountAsync(branchId);
@ -272,7 +267,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// <returns>实体DTO列表</returns> /// <returns>实体DTO列表</returns>
[HttpGet] [HttpGet]
[Route("all")] [Route("all")]
[Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
virtual public async Task<ListResultDto<MaterialRelationshipDto>> GetAllAsync(Guid branchId) virtual public async Task<ListResultDto<MaterialRelationshipDto>> GetAllAsync(Guid branchId)
{ {
var entities = await _repository.GetAllAsync(branchId, true); var entities = await _repository.GetAllAsync(branchId, true);
@ -295,7 +289,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
[HttpPost] [HttpPost]
[Route("")] [Route("")]
[Authorize(SettleAccountPermissions.MaterialRelationships.Create)]
virtual public async Task<MaterialRelationshipDto> CreateAsync(MaterialRelationshipCreateDto input) virtual public async Task<MaterialRelationshipDto> CreateAsync(MaterialRelationshipCreateDto input)
{ {
@ -341,7 +334,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// <returns>实体DTO</returns> /// <returns>实体DTO</returns>
[HttpPut] [HttpPut]
[Route("{id}")] [Route("{id}")]
[Authorize(SettleAccountPermissions.MaterialRelationships.Update)]
virtual public async Task<MaterialRelationshipDto> UpdateAsync(Guid id, MaterialRelationshipUpdateDto input) virtual public async Task<MaterialRelationshipDto> UpdateAsync(Guid id, MaterialRelationshipUpdateDto input)
{ {
var entity = await _repository.GetAsync(id); var entity = await _repository.GetAsync(id);
@ -369,7 +361,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// <returns>无</returns> /// <returns>无</returns>
[HttpDelete] [HttpDelete]
[Route("{id}")] [Route("{id}")]
[Authorize(SettleAccountPermissions.MaterialRelationships.Delete)]
virtual public async Task DeleteAsync(Guid id) virtual public async Task DeleteAsync(Guid id)
{ {
var entity = await GetFromCacheAsync(id); var entity = await GetFromCacheAsync(id);
@ -384,7 +375,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// <returns>是否执行成功</returns> /// <returns>是否执行成功</returns>
[HttpPost] [HttpPost]
[Route("delete")] [Route("delete")]
[Authorize(SettleAccountPermissions.MaterialRelationships.Delete)]
virtual public async Task<bool> DeleteListAsync(List<Guid> ids) virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
{ {
var _query = _repository.Where(p => ids.Contains(p.Id)); var _query = _repository.Where(p => ids.Contains(p.Id));
@ -398,7 +388,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
} }
[HttpPost] [HttpPost]
[Route("Export")] [Route("Export")]
[Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
virtual public async Task<string> ExportAsync(MaterialRelationshipRequestDto input) virtual public async Task<string> ExportAsync(MaterialRelationshipRequestDto input)
{ {
//var _userId = CurrentUser.Id.Value.ToString(); //var _userId = CurrentUser.Id.Value.ToString();

2
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipTHAppService.cs

@ -284,7 +284,7 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// <returns>是否执行成功</returns> /// <returns>是否执行成功</returns>
[HttpPost] [HttpPost]
[Route("delete")] [Route("delete")]
[Authorize(SettleAccountPermissions.MaterialRelationships.Delete)]
virtual public async Task<bool> DeleteListAsync(List<Guid> ids) virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
{ {

20
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prebatch/PrebatchAppService.cs

@ -93,7 +93,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
[HttpPost] [HttpPost]
[Route("ExcelImport")] [Route("ExcelImport")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
[Authorize(SettleAccountPermissions.Prebatchs.Default)] //[Authorize(SettleAccountPermissions.Prebatchs.Default)]
public async Task<string> PrebatchUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId) public async Task<string> PrebatchUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId)
{ {
ExportImporter _exportImporter = new ExportImporter(); ExportImporter _exportImporter = new ExportImporter();
@ -162,7 +162,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
/// <returns>实体DTO</returns> /// <returns>实体DTO</returns>
[HttpGet] [HttpGet]
[Route("{id}")] [Route("{id}")]
[Authorize(SettleAccountPermissions.Prebatchs.Default)] //[Authorize(SettleAccountPermissions.Prebatchs.Default)]
virtual public async Task<PrebatchDto> GetAsync(Guid id) virtual public async Task<PrebatchDto> GetAsync(Guid id)
{ {
var result = await GetFromCacheAsync(id); var result = await GetFromCacheAsync(id);
@ -200,7 +200,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
/// <returns>实体DTO列表</returns> /// <returns>实体DTO列表</returns>
[HttpPost] [HttpPost]
[Route("list")] [Route("list")]
[Authorize(SettleAccountPermissions.Prebatchs.Default)] //[Authorize(SettleAccountPermissions.Prebatchs.Default)]
virtual public async Task<PagedResultDto<PrebatchDto>> GetListAsync(PrebatchRequestDto input) virtual public async Task<PagedResultDto<PrebatchDto>> GetListAsync(PrebatchRequestDto input)
{ {
var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount, var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
@ -219,7 +219,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
/// <returns>实体总数</returns> /// <returns>实体总数</returns>
[HttpGet] [HttpGet]
[Route("count")] [Route("count")]
[Authorize(SettleAccountPermissions.Prebatchs.Default)] ///[Authorize(SettleAccountPermissions.Prebatchs.Default)]
virtual public async Task<long> GetTotalCountAsync(Guid branchId) virtual public async Task<long> GetTotalCountAsync(Guid branchId)
{ {
return await _repository.GetCountAsync(branchId); return await _repository.GetCountAsync(branchId);
@ -231,7 +231,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
/// <returns>实体DTO列表</returns> /// <returns>实体DTO列表</returns>
[HttpGet] [HttpGet]
[Route("all")] [Route("all")]
[Authorize(SettleAccountPermissions.Prebatchs.Default)] //[Authorize(SettleAccountPermissions.Prebatchs.Default)]
virtual public async Task<ListResultDto<PrebatchDto>> GetAllAsync(Guid branchId) virtual public async Task<ListResultDto<PrebatchDto>> GetAllAsync(Guid branchId)
{ {
var entities = await _repository.GetAllAsync(branchId, true); var entities = await _repository.GetAllAsync(branchId, true);
@ -247,7 +247,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
[HttpPost] [HttpPost]
[Route("")] [Route("")]
[Authorize(SettleAccountPermissions.Prebatchs.Create)] //[Authorize(SettleAccountPermissions.Prebatchs.Create)]
virtual public async Task<PrebatchDto> CreateAsync(PrebatchCreateDto input) virtual public async Task<PrebatchDto> CreateAsync(PrebatchCreateDto input)
{ {
var _first = await _repository.FirstOrDefaultAsync(p => p.KENNCode == input.KENNCode); var _first = await _repository.FirstOrDefaultAsync(p => p.KENNCode == input.KENNCode);
@ -283,7 +283,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
/// <returns>实体DTO</returns> /// <returns>实体DTO</returns>
[HttpPut] [HttpPut]
[Route("{id}")] [Route("{id}")]
[Authorize(SettleAccountPermissions.Prebatchs.Update)] //[Authorize(SettleAccountPermissions.Prebatchs.Update)]
virtual public async Task<PrebatchDto> UpdateAsync(Guid id, PrebatchUpdateDto input) virtual public async Task<PrebatchDto> UpdateAsync(Guid id, PrebatchUpdateDto input)
{ {
var entity = await _repository.GetAsync(id); var entity = await _repository.GetAsync(id);
@ -302,7 +302,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
/// <returns>无</returns> /// <returns>无</returns>
[HttpDelete] [HttpDelete]
[Route("{id}")] [Route("{id}")]
[Authorize(SettleAccountPermissions.Prebatchs.Delete)] //[Authorize(SettleAccountPermissions.Prebatchs.Delete)]
virtual public async Task DeleteAsync(Guid id) virtual public async Task DeleteAsync(Guid id)
{ {
var entity = await GetFromCacheAsync(id); var entity = await GetFromCacheAsync(id);
@ -317,7 +317,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
/// <returns>是否执行成功</returns> /// <returns>是否执行成功</returns>
[HttpPost] [HttpPost]
[Route("delete")] [Route("delete")]
[Authorize(SettleAccountPermissions.Prebatchs.Delete)] //[Authorize(SettleAccountPermissions.Prebatchs.Delete)]
virtual public async Task<bool> DeleteListAsync(List<Guid> ids) virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
{ {
foreach (var id in ids) foreach (var id in ids)
@ -342,7 +342,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
} }
[HttpPost] [HttpPost]
[Route("Export")] [Route("Export")]
[Authorize(SettleAccountPermissions.Prebatchs.Default)] //[Authorize(SettleAccountPermissions.Prebatchs.Default)]
virtual public async Task<string> ExportAsync(PrebatchRequestDto input) virtual public async Task<string> ExportAsync(PrebatchRequestDto input)
{ {
string _fileName = string.Format("预批量_{0}.xlsx", DateTime.Now.ToString("yyyyMMdd")); string _fileName = string.Format("预批量_{0}.xlsx", DateTime.Now.ToString("yyyyMMdd"));

2
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs

@ -286,7 +286,7 @@ namespace Win.Sfs.SettleAccount.Entities.SecMatch
/// <returns>是否执行成功</returns> /// <returns>是否执行成功</returns>
[HttpPost] [HttpPost]
[Route("delete")] [Route("delete")]
[Authorize(SettleAccountPermissions.MaterialRelationships.Delete)] //[Authorize(SettleAccountPermissions.MaterialRelationships.Delete)]
virtual public async Task<bool> DeleteListAsync(List<Guid> ids) virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
{ {

12
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementCrossReference/SettlementCrossReferenceAppService.cs

@ -320,7 +320,6 @@ namespace Win.Sfs.SettleAccount.SettlementCrossReferences
[HttpPost] [HttpPost]
[Route("ExcelImport")] [Route("ExcelImport")]
[DisableRequestSizeLimit] [DisableRequestSizeLimit]
[Authorize(SettleAccountPermissions.SettlementCrossReference.Default)]
public async Task<string> SettlementCrossReferenceUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory) public async Task<string> SettlementCrossReferenceUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId, string year, string period, string version, string customerCode, string factory)
{ {
@ -379,7 +378,6 @@ namespace Win.Sfs.SettleAccount.SettlementCrossReferences
/// <returns></returns> /// <returns></returns>
[HttpPost] [HttpPost]
[Route("Export")] [Route("Export")]
//[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
virtual public async Task<string> ExportAsync(SettlementCrossReferenceRequestDto input) virtual public async Task<string> ExportAsync(SettlementCrossReferenceRequestDto input)
{ {
@ -426,7 +424,7 @@ namespace Win.Sfs.SettleAccount.SettlementCrossReferences
[HttpGet] [HttpGet]
[Route("Create")] [Route("Create")]
[Authorize(SettleAccountPermissions.SettlementCrossReference.Default)]
public Task<SettlementCrossReferenceDto> CreateAsync(SettlementCrossReferenceCreateDto input) public Task<SettlementCrossReferenceDto> CreateAsync(SettlementCrossReferenceCreateDto input)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
@ -434,7 +432,7 @@ namespace Win.Sfs.SettleAccount.SettlementCrossReferences
[HttpGet] [HttpGet]
[Route("DeleteList")] [Route("DeleteList")]
[Authorize(SettleAccountPermissions.SettlementCrossReference.Default)]
public Task<bool> DeleteListAsync(List<Guid> ids) public Task<bool> DeleteListAsync(List<Guid> ids)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
@ -442,7 +440,7 @@ namespace Win.Sfs.SettleAccount.SettlementCrossReferences
[HttpGet] [HttpGet]
[Route("{id}")] [Route("{id}")]
[Authorize(SettleAccountPermissions.SettlementCrossReference.Default)]
public Task<SettlementCrossReferenceDto> GetAsync(Guid id) public Task<SettlementCrossReferenceDto> GetAsync(Guid id)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
@ -451,7 +449,7 @@ namespace Win.Sfs.SettleAccount.SettlementCrossReferences
[HttpGet] [HttpGet]
[Route("GetTotalCountAsync")] [Route("GetTotalCountAsync")]
[Authorize(SettleAccountPermissions.SettlementCrossReference.Default)]
public Task<long> GetTotalCountAsync(Guid branchId) public Task<long> GetTotalCountAsync(Guid branchId)
{ {
throw new NotImplementedException(); throw new NotImplementedException();
@ -461,7 +459,7 @@ namespace Win.Sfs.SettleAccount.SettlementCrossReferences
[HttpGet] [HttpGet]
[Route("Update")] [Route("Update")]
[Authorize(SettleAccountPermissions.SettlementCrossReference.Default)]
public Task<SettlementCrossReferenceDto> UpdateAsync(Guid id, SettlementCrossReferenceUpdateDto input) public Task<SettlementCrossReferenceDto> UpdateAsync(Guid id, SettlementCrossReferenceUpdateDto input)
{ {
throw new NotImplementedException(); throw new NotImplementedException();

2
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementParts/SettlementPartAppService.cs

@ -38,7 +38,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettlementParts
/// <summary> /// <summary>
/// 结算件应用服务 /// 结算件应用服务
/// </summary> /// </summary>
[Authorize(SettleAccountPermissions.SettlementParts.Default)] //[Authorize(SettleAccountPermissions.SettlementParts.Default)]
//[AllowAnonymous] //[AllowAnonymous]
[Route("api/settleaccount/SettlementPart")] [Route("api/settleaccount/SettlementPart")]
public class SettlementPartAppService : SettleAccountApplicationBase<SettlementPart>, ISettlementPartAppService public class SettlementPartAppService : SettleAccountApplicationBase<SettlementPart>, ISettlementPartAppService

9
src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml

@ -445,13 +445,10 @@
</member> </member>
<member name="M:Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables.CarMaterialConfigAppService.CreateAsync(Win.Sfs.SettleAccount.Entities.CarMaterialConfigs.CarMaterialConfigCreateDto)"> <member name="M:Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables.CarMaterialConfigAppService.CreateAsync(Win.Sfs.SettleAccount.Entities.CarMaterialConfigs.CarMaterialConfigCreateDto)">
<summary> <summary>
批量导入实体列表 新增实体
</summary> </summary>
<remarks> <param name="input">新增实体DTO</param>
以ID为依据,数据库中找不到ID的实体会新增,已有ID的实体会修改 <returns>实体DTO</returns>
</remarks>
<param name="entities">实体列表</param>
<returns>是否导入成功</returns>
</member> </member>
<member name="M:Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables.CarMaterialConfigAppService.UpdateAsync(System.Guid,Win.Sfs.SettleAccount.Entities.CarMaterialConfigs.CarMaterialConfigUpdateDto)"> <member name="M:Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables.CarMaterialConfigAppService.UpdateAsync(System.Guid,Win.Sfs.SettleAccount.Entities.CarMaterialConfigs.CarMaterialConfigUpdateDto)">
<summary> <summary>

2
src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/SettleAccount.Domain.Shared.csproj

@ -7,7 +7,7 @@
<RootNamespace>Win.Sfs.SettleAccount</RootNamespace> <RootNamespace>Win.Sfs.SettleAccount</RootNamespace>
<GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest> <GenerateEmbeddedFilesManifest>true</GenerateEmbeddedFilesManifest>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>1.0.23</Version> <Version>1.0.25</Version>
</PropertyGroup> </PropertyGroup>

2
src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj

@ -5,7 +5,7 @@
<PropertyGroup> <PropertyGroup>
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RootNamespace>Win.Sfs.SettleAccount</RootNamespace> <RootNamespace>Win.Sfs.SettleAccount</RootNamespace>
<Version>1.0.23</Version> <Version>1.0.25</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup> </PropertyGroup>

2
src/Modules/SettleAccount/src/SettleAccount.HttpApi/SettleAccount.HttpApi.csproj

@ -6,7 +6,7 @@
<TargetFramework>net5.0</TargetFramework> <TargetFramework>net5.0</TargetFramework>
<RootNamespace>Win.Sfs.SettleAccount</RootNamespace> <RootNamespace>Win.Sfs.SettleAccount</RootNamespace>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
<Version>1.0.23</Version> <Version>1.0.25</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

Loading…
Cancel
Save