diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissionDefinitionProvider.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissionDefinitionProvider.cs
index e9203257..9b33161e 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissionDefinitionProvider.cs
+++ b/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"));
//红旗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.Update, L("Update"));
hq_f.AddChild(SettleAccountPermissions.HQ_FPlatform.Delete, L("Delete"));
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/SettleAccount.Application.Contracts.csproj b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/SettleAccount.Application.Contracts.csproj
index 58614ea0..5ff1ef4f 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/SettleAccount.Application.Contracts.csproj
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/SettleAccount.Application.Contracts.csproj
@@ -5,7 +5,7 @@
net5.0
Win.Sfs.SettleAccount
- 1.0.23
+ 1.0.25
true
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/CarMaterialConfigs/CarMaterialConfigAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/CarMaterialConfigs/CarMaterialConfigAppService.cs
index 354adfc2..64e9f3b7 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/CarMaterialConfigs/CarMaterialConfigAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/CarMaterialConfigs/CarMaterialConfigAppService.cs
@@ -42,7 +42,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
///
/// 区域相关应用服务
///
- [Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
+ //[Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
//[AllowAnonymous]
[Route("api/settleaccount/CarMaterialConfig")]
public class CarMaterialConfigAppService : SettleAccountApplicationBase, ICarMaterialConfigAppService
@@ -81,7 +81,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
[HttpPost]
[Route("ExcelImport")]
[DisableRequestSizeLimit]
- [Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
+ // [Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
public async Task CarMaterialConfigUploadExcelImport([FromForm] IFormFileCollection files)
{
ExportImporter _exportImporter = new ExportImporter();
@@ -162,7 +162,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// 实体DTO
[HttpGet]
[Route("{id}")]
- [Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
+ //[Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
virtual public async Task GetAsync(Guid id)
{
var result = await _repository.GetAsync(id);
@@ -200,7 +200,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// 实体DTO列表
[HttpPost]
[Route("list")]
- [Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
+ //[Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
virtual public async Task> GetListAsync(CarMaterialConfigRequestDto input)
{
@@ -224,7 +224,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// 实体总数
[HttpGet]
[Route("count")]
- [Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
+
virtual public async Task GetTotalCountAsync(Guid branchId)
{
return await _repository.GetCountAsync(branchId);
@@ -236,7 +236,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// 实体DTO列表
[HttpGet]
[Route("all")]
- [Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
+
virtual public async Task> GetAllAsync(Guid branchId)
{
var entities = await _repository.GetAllAsync(branchId, true);
@@ -274,7 +274,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// 是否导入成功
//[HttpPost]
//[Route("import")]
- [Authorize(SettleAccountPermissions.CarMaterialConfigs.Create)]
+
//virtual public async Task ImportAsync(List dtos)
//{
// var entities =ObjectMapper.Map, List>(dtos);
@@ -293,7 +293,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
[HttpPost]
[Route("")]
- [Authorize(SettleAccountPermissions.CarMaterialConfigs.Create)]
+
virtual public async Task CreateAsync(CarMaterialConfigCreateDto input)
{
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
/// 实体DTO
[HttpPut]
[Route("{id}")]
- [Authorize(SettleAccountPermissions.CarMaterialConfigs.Update)]
+
virtual public async Task UpdateAsync(Guid id, CarMaterialConfigUpdateDto input)
{
var entity = await _repository.GetAsync(id);
@@ -361,7 +361,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// 无
[HttpDelete]
[Route("{id}")]
- [Authorize(SettleAccountPermissions.CarMaterialConfigs.Delete)]
+
virtual public async Task DeleteAsync(Guid id)
{
var entity = await GetFromCacheAsync(id);
@@ -376,7 +376,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
/// 是否执行成功
[HttpPost]
[Route("delete")]
- [Authorize(SettleAccountPermissions.CarMaterialConfigs.Delete)]
+
virtual public async Task DeleteListAsync(List ids)
{
@@ -398,7 +398,7 @@ namespace Win.Sfs.SettleAccount.Entities.CarMaterialConfigTables
///
[HttpPost]
[Route("Export")]
- [Authorize(SettleAccountPermissions.CarMaterialConfigs.Default)]
+
virtual public async Task ExportAsync(CarMaterialConfigRequestDto input)
{
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/FISes/FISAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/FISes/FISAppService.cs
index 062e01c6..45fa8d84 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/FISes/FISAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/FISes/FISAppService.cs
@@ -42,7 +42,7 @@ namespace Win.Sfs.SettleAccount.FISes
///
/// 区域相关应用服务
///
- [Authorize(SettleAccountPermissions.FISs.Default)]
+ //[Authorize(SettleAccountPermissions.FISs.Default)]
//[AllowAnonymous]
[Route("api/settleaccount/fis")]
public class FISAppService : SettleAccountApplicationBase, IFISAppService
@@ -99,7 +99,7 @@ namespace Win.Sfs.SettleAccount.FISes
[HttpPost]
[Route("ExcelImport")]
[DisableRequestSizeLimit]
- [Authorize(SettleAccountPermissions.FISs.Default)]
+
public async Task 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
/// 实体DTO
[HttpGet]
[Route("{id}")]
- [Authorize(SettleAccountPermissions.FISs.Default)]
+
virtual public async Task GetAsync(Guid id)
{
var result = await GetFromCacheAsync(id);
@@ -375,7 +375,7 @@ namespace Win.Sfs.SettleAccount.FISes
/// 实体总数
[HttpGet]
[Route("count")]
- [Authorize(SettleAccountPermissions.FISs.Default)]
+
virtual public async Task GetTotalCountAsync(Guid branchId)
{
return await _repository.GetCountAsync(branchId);
@@ -387,7 +387,7 @@ namespace Win.Sfs.SettleAccount.FISes
/// 实体DTO列表
[HttpGet]
[Route("all")]
- [Authorize(SettleAccountPermissions.FISs.Default)]
+
virtual public async Task> GetAllAsync(Guid branchId)
{
var entities = await _repository.GetAllAsync(branchId, true);
@@ -407,7 +407,7 @@ namespace Win.Sfs.SettleAccount.FISes
/// 无
[HttpDelete]
[Route("{id}")]
- [Authorize(SettleAccountPermissions.FISs.Delete)]
+
virtual public async Task DeleteAsync(Guid id)
{
var entity = await GetFromCacheAsync(id);
@@ -422,7 +422,7 @@ namespace Win.Sfs.SettleAccount.FISes
/// 是否执行成功
[HttpPost]
[Route("delete")]
- [Authorize(SettleAccountPermissions.FISs.Delete)]
+
virtual public async Task DeleteListAsync(List ids)
{
foreach (var id in ids)
@@ -440,7 +440,7 @@ namespace Win.Sfs.SettleAccount.FISes
///
[HttpPost]
[Route("listversion")]
- [Authorize(SettleAccountPermissions.FISs.Default)]
+
public async Task> GetVersionListAsync(FISVersionRequestDto input)
{
var entities = await _versionRepository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, int.MaxValue,
@@ -470,7 +470,7 @@ namespace Win.Sfs.SettleAccount.FISes
[Route("duplicate")]
[UnitOfWork(isTransactional: false)]
- [Authorize(SettleAccountPermissions.FISs.Default)]
+
public async Task UPdateFisAsync()
{
await _repository.GetDbContext().Database.ExecuteSqlRawAsync(
@@ -495,7 +495,6 @@ namespace Win.Sfs.SettleAccount.FISes
///
[HttpPost]
[Route("Export")]
- [Authorize(SettleAccountPermissions.FISs.Default)]
virtual public async Task ExportAsync(FISRequestDto input)
{
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ItemInvoicePrices/ItemInvoicePriceAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ItemInvoicePrices/ItemInvoicePriceAppService.cs
index 951fe4ca..49a9c6e2 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ItemInvoicePrices/ItemInvoicePriceAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/ItemInvoicePrices/ItemInvoicePriceAppService.cs
@@ -46,7 +46,7 @@ namespace Win.Sfs.SettleAccount.ItemInvoicePrices
///
/// ERPܳɿƱͼ۸
///
- [Authorize(SettleAccountPermissions.ItemInvoicePrices.Default)]
+ //[Authorize(SettleAccountPermissions.ItemInvoicePrices.Default)]
//[AllowAnonymous]
[Route("api/settleaccount/ItemInvoicePrice")]
public class ItemInvoicePriceAppService : SettleAccountApplicationBase, IItemInvoicePriceAppService
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs
index e7aa155e..30e03bb6 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipAppService.cs
@@ -33,7 +33,7 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
///
/// 区域相关应用服务
///
- [Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
+ //[Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
//[AllowAnonymous]
[Route("api/settleaccount/MaterialRelationship")]
public class MaterialRelationshipAppService : SettleAccountApplicationBase, IMaterialRelationshipAppService
@@ -72,7 +72,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
[HttpPost]
[Route("ExcelImport-Map")]
[DisableRequestSizeLimit]
- [Authorize(SettleAccountPermissions.MaterialRelationships.Create)]
public async Task MaterialRelationshipUploadExcelImportMap([FromForm] IFormFileCollection files)
{
@@ -137,7 +136,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
[HttpPost]
[Route("ExcelImport")]
[DisableRequestSizeLimit]
- [Authorize(SettleAccountPermissions.MaterialRelationships.Create)]
public async Task MaterialRelationshipUploadExcelImport([FromForm] IFormFileCollection files)
{
@@ -203,7 +201,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// 实体DTO
[HttpGet]
[Route("{id}")]
- [Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
virtual public async Task GetAsync(Guid id)
{
var result = await GetFromCacheAsync(id);
@@ -241,7 +238,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// 实体DTO列表
[HttpPost]
[Route("list")]
- [Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
virtual public async Task> GetListAsync(MaterialRelationshipRequestDto input)
{
var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
@@ -260,7 +256,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// 实体总数
[HttpGet]
[Route("count")]
- [Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
virtual public async Task GetTotalCountAsync(Guid branchId)
{
return await _repository.GetCountAsync(branchId);
@@ -272,7 +267,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// 实体DTO列表
[HttpGet]
[Route("all")]
- [Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
virtual public async Task> GetAllAsync(Guid branchId)
{
var entities = await _repository.GetAllAsync(branchId, true);
@@ -295,7 +289,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
[HttpPost]
[Route("")]
- [Authorize(SettleAccountPermissions.MaterialRelationships.Create)]
virtual public async Task CreateAsync(MaterialRelationshipCreateDto input)
{
@@ -341,7 +334,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// 实体DTO
[HttpPut]
[Route("{id}")]
- [Authorize(SettleAccountPermissions.MaterialRelationships.Update)]
virtual public async Task UpdateAsync(Guid id, MaterialRelationshipUpdateDto input)
{
var entity = await _repository.GetAsync(id);
@@ -369,7 +361,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// 无
[HttpDelete]
[Route("{id}")]
- [Authorize(SettleAccountPermissions.MaterialRelationships.Delete)]
virtual public async Task DeleteAsync(Guid id)
{
var entity = await GetFromCacheAsync(id);
@@ -384,7 +375,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// 是否执行成功
[HttpPost]
[Route("delete")]
- [Authorize(SettleAccountPermissions.MaterialRelationships.Delete)]
virtual public async Task DeleteListAsync(List ids)
{
var _query = _repository.Where(p => ids.Contains(p.Id));
@@ -398,7 +388,6 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
}
[HttpPost]
[Route("Export")]
- [Authorize(SettleAccountPermissions.MaterialRelationships.Default)]
virtual public async Task ExportAsync(MaterialRelationshipRequestDto input)
{
//var _userId = CurrentUser.Id.Value.ToString();
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipTHAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipTHAppService.cs
index 50eb4c46..bb1e1cdb 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipTHAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/MaterialRelationships/MaterialRelationshipTHAppService.cs
@@ -284,7 +284,7 @@ namespace Win.Sfs.SettleAccount.Entities.MaterialRelationships
/// 是否执行成功
[HttpPost]
[Route("delete")]
- [Authorize(SettleAccountPermissions.MaterialRelationships.Delete)]
+
virtual public async Task DeleteListAsync(List ids)
{
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prebatch/PrebatchAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prebatch/PrebatchAppService.cs
index ad16fdfb..5e414290 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prebatch/PrebatchAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/Prebatch/PrebatchAppService.cs
@@ -93,7 +93,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
[HttpPost]
[Route("ExcelImport")]
[DisableRequestSizeLimit]
- [Authorize(SettleAccountPermissions.Prebatchs.Default)]
+ //[Authorize(SettleAccountPermissions.Prebatchs.Default)]
public async Task PrebatchUploadExcelImport([FromForm] IFormFileCollection files, Guid branchId)
{
ExportImporter _exportImporter = new ExportImporter();
@@ -162,7 +162,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
/// 实体DTO
[HttpGet]
[Route("{id}")]
- [Authorize(SettleAccountPermissions.Prebatchs.Default)]
+ //[Authorize(SettleAccountPermissions.Prebatchs.Default)]
virtual public async Task GetAsync(Guid id)
{
var result = await GetFromCacheAsync(id);
@@ -200,7 +200,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
/// 实体DTO列表
[HttpPost]
[Route("list")]
- [Authorize(SettleAccountPermissions.Prebatchs.Default)]
+ //[Authorize(SettleAccountPermissions.Prebatchs.Default)]
virtual public async Task> GetListAsync(PrebatchRequestDto input)
{
var entities = await _repository.GetListByFilterAsync(input.BranchId, input.Filters, input.Sorting, input.MaxResultCount,
@@ -219,7 +219,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
/// 实体总数
[HttpGet]
[Route("count")]
- [Authorize(SettleAccountPermissions.Prebatchs.Default)]
+ ///[Authorize(SettleAccountPermissions.Prebatchs.Default)]
virtual public async Task GetTotalCountAsync(Guid branchId)
{
return await _repository.GetCountAsync(branchId);
@@ -231,7 +231,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
/// 实体DTO列表
[HttpGet]
[Route("all")]
- [Authorize(SettleAccountPermissions.Prebatchs.Default)]
+ //[Authorize(SettleAccountPermissions.Prebatchs.Default)]
virtual public async Task> GetAllAsync(Guid branchId)
{
var entities = await _repository.GetAllAsync(branchId, true);
@@ -247,7 +247,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
[HttpPost]
[Route("")]
- [Authorize(SettleAccountPermissions.Prebatchs.Create)]
+ //[Authorize(SettleAccountPermissions.Prebatchs.Create)]
virtual public async Task CreateAsync(PrebatchCreateDto input)
{
var _first = await _repository.FirstOrDefaultAsync(p => p.KENNCode == input.KENNCode);
@@ -283,7 +283,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
/// 实体DTO
[HttpPut]
[Route("{id}")]
- [Authorize(SettleAccountPermissions.Prebatchs.Update)]
+ //[Authorize(SettleAccountPermissions.Prebatchs.Update)]
virtual public async Task UpdateAsync(Guid id, PrebatchUpdateDto input)
{
var entity = await _repository.GetAsync(id);
@@ -302,7 +302,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
/// 无
[HttpDelete]
[Route("{id}")]
- [Authorize(SettleAccountPermissions.Prebatchs.Delete)]
+ //[Authorize(SettleAccountPermissions.Prebatchs.Delete)]
virtual public async Task DeleteAsync(Guid id)
{
var entity = await GetFromCacheAsync(id);
@@ -317,7 +317,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
/// 是否执行成功
[HttpPost]
[Route("delete")]
- [Authorize(SettleAccountPermissions.Prebatchs.Delete)]
+ //[Authorize(SettleAccountPermissions.Prebatchs.Delete)]
virtual public async Task DeleteListAsync(List ids)
{
foreach (var id in ids)
@@ -342,7 +342,7 @@ namespace Win.Sfs.SettleAccount.Prebatches
}
[HttpPost]
[Route("Export")]
- [Authorize(SettleAccountPermissions.Prebatchs.Default)]
+ //[Authorize(SettleAccountPermissions.Prebatchs.Default)]
virtual public async Task ExportAsync(PrebatchRequestDto input)
{
string _fileName = string.Format("预批量_{0}.xlsx", DateTime.Now.ToString("yyyyMMdd"));
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs
index 2a8b1f5d..2fe00504 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SecMatch/SecMatchAppService.cs
@@ -286,7 +286,7 @@ namespace Win.Sfs.SettleAccount.Entities.SecMatch
/// 是否执行成功
[HttpPost]
[Route("delete")]
- [Authorize(SettleAccountPermissions.MaterialRelationships.Delete)]
+ //[Authorize(SettleAccountPermissions.MaterialRelationships.Delete)]
virtual public async Task DeleteListAsync(List ids)
{
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementCrossReference/SettlementCrossReferenceAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementCrossReference/SettlementCrossReferenceAppService.cs
index 5ab0a341..de2463a5 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementCrossReference/SettlementCrossReferenceAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementCrossReference/SettlementCrossReferenceAppService.cs
@@ -320,7 +320,6 @@ namespace Win.Sfs.SettleAccount.SettlementCrossReferences
[HttpPost]
[Route("ExcelImport")]
[DisableRequestSizeLimit]
- [Authorize(SettleAccountPermissions.SettlementCrossReference.Default)]
public async Task 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
///
[HttpPost]
[Route("Export")]
- //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
virtual public async Task ExportAsync(SettlementCrossReferenceRequestDto input)
{
@@ -426,7 +424,7 @@ namespace Win.Sfs.SettleAccount.SettlementCrossReferences
[HttpGet]
[Route("Create")]
- [Authorize(SettleAccountPermissions.SettlementCrossReference.Default)]
+
public Task CreateAsync(SettlementCrossReferenceCreateDto input)
{
throw new NotImplementedException();
@@ -434,7 +432,7 @@ namespace Win.Sfs.SettleAccount.SettlementCrossReferences
[HttpGet]
[Route("DeleteList")]
- [Authorize(SettleAccountPermissions.SettlementCrossReference.Default)]
+
public Task DeleteListAsync(List ids)
{
throw new NotImplementedException();
@@ -442,7 +440,7 @@ namespace Win.Sfs.SettleAccount.SettlementCrossReferences
[HttpGet]
[Route("{id}")]
- [Authorize(SettleAccountPermissions.SettlementCrossReference.Default)]
+
public Task GetAsync(Guid id)
{
throw new NotImplementedException();
@@ -451,7 +449,7 @@ namespace Win.Sfs.SettleAccount.SettlementCrossReferences
[HttpGet]
[Route("GetTotalCountAsync")]
- [Authorize(SettleAccountPermissions.SettlementCrossReference.Default)]
+
public Task GetTotalCountAsync(Guid branchId)
{
throw new NotImplementedException();
@@ -461,7 +459,7 @@ namespace Win.Sfs.SettleAccount.SettlementCrossReferences
[HttpGet]
[Route("Update")]
- [Authorize(SettleAccountPermissions.SettlementCrossReference.Default)]
+
public Task UpdateAsync(Guid id, SettlementCrossReferenceUpdateDto input)
{
throw new NotImplementedException();
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementParts/SettlementPartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementParts/SettlementPartAppService.cs
index 4b21417c..57ff7cee 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementParts/SettlementPartAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/SettlementParts/SettlementPartAppService.cs
@@ -38,7 +38,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettlementParts
///
/// Ӧ÷
///
- [Authorize(SettleAccountPermissions.SettlementParts.Default)]
+ //[Authorize(SettleAccountPermissions.SettlementParts.Default)]
//[AllowAnonymous]
[Route("api/settleaccount/SettlementPart")]
public class SettlementPartAppService : SettleAccountApplicationBase, ISettlementPartAppService
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
index a65ee43c..feb5aef7 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
@@ -445,13 +445,10 @@
- 批量导入实体列表
+ 新增实体
-
- 以ID为依据,数据库中找不到ID的实体会新增,已有ID的实体会修改
-
- 实体列表
- 是否导入成功
+ 新增实体DTO
+ 实体DTO
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/SettleAccount.Domain.Shared.csproj b/src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/SettleAccount.Domain.Shared.csproj
index a02b0059..113ed56d 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/SettleAccount.Domain.Shared.csproj
+++ b/src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/SettleAccount.Domain.Shared.csproj
@@ -7,7 +7,7 @@
Win.Sfs.SettleAccount
true
true
- 1.0.23
+ 1.0.25
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj b/src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj
index c26a00e0..6a137a39 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj
+++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj
@@ -5,7 +5,7 @@
net5.0
Win.Sfs.SettleAccount
- 1.0.23
+ 1.0.25
true
diff --git a/src/Modules/SettleAccount/src/SettleAccount.HttpApi/SettleAccount.HttpApi.csproj b/src/Modules/SettleAccount/src/SettleAccount.HttpApi/SettleAccount.HttpApi.csproj
index d640bbf2..ab248574 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.HttpApi/SettleAccount.HttpApi.csproj
+++ b/src/Modules/SettleAccount/src/SettleAccount.HttpApi/SettleAccount.HttpApi.csproj
@@ -6,7 +6,7 @@
net5.0
Win.Sfs.SettleAccount
true
- 1.0.23
+ 1.0.25