From 58ffd655715481a37c70bb47e2d9037f6b191aca Mon Sep 17 00:00:00 2001
From: 44673626 <44673626@qq.com>
Date: Thu, 13 Jan 2022 10:22:46 +0800
Subject: [PATCH] =?UTF-8?q?=E5=8F=91=E5=B8=83=E7=89=88=E6=9C=AC=E5=8C=85?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../Permissions/SettleAccountPermissions.cs | 4 ++--
.../SettleAccount.Application.Contracts.csproj | 2 +-
.../Entities/WMS/WMSHQFKanbanAppService.cs | 5 +++--
.../Entities/WMS/WMSHQFSharePartAppService .cs | 5 +++--
.../Entities/WMS/WMSHQHKanbanAppService.cs | 5 +++--
.../Entities/WMS/WMSHQHSharePartAppService.cs | 5 +++--
.../Entities/WMS/WMSJitAppService.cs | 7 +++++--
.../Entities/WMS/WMSKanbanAppService.cs | 5 +++--
.../Entities/WMS/WMSSharePartAppService.cs | 3 ++-
.../Entities/WMS/WmsHQCarAppService.cs | 3 ++-
.../Entities/WMS/WmsHQMKanbanAppService.cs | 3 ++-
.../Entities/WMS/WmsHQMSharePartAppService.cs | 4 ++--
.../SettleAccount.Application.xml | 12 ++++++------
.../SettleAccount.Domain.Shared.csproj | 2 +-
.../SettleAccount.Domain/SettleAccount.Domain.csproj | 2 +-
.../SettleAccount.HttpApi.csproj | 2 +-
16 files changed, 40 insertions(+), 29 deletions(-)
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissions.cs b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissions.cs
index a164c39a..773b0507 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissions.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissions.cs
@@ -15,7 +15,7 @@ namespace Win.Sfs.SettleAccount
#region 派格
///
- /// 大众输出报表权限
+ /// 大众输出报表(准时化、看板、备件)权限
///
public static class WMSJIT
{
@@ -26,7 +26,7 @@ namespace Win.Sfs.SettleAccount
}
///
- /// 红旗输出报表权限
+ /// 红旗输出报表（H、F、M和一汽）权限
///
public static class WMSHQ
{
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 e29996fb..cec6ad47 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.21
+ 1.0.22
true
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
index 5cb2a675..01719f78 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
@@ -52,10 +52,11 @@ using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
{
///
- /// wms出库
+ /// 红旗F平台准时化-出库
///
- [AllowAnonymous]
+ //[AllowAnonymous]
+ [Authorize(SettleAccountPermissions.WMSHQ.Default)]
[Route("api/settleaccount/WMSHQFKanbanoutput")]
public class WmsHQFKanbanAppService :
SettleAccountApplicationBase
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
index a72fb03e..c79c9bda 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
@@ -52,10 +52,11 @@ using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
{
///
- /// wms出库
+ /// 红旗F平台备件-出库
///
- [AllowAnonymous]
+ //[AllowAnonymous]
+ [Authorize(SettleAccountPermissions.WMSHQ.Default)]
[Route("api/settleaccount/wmsHQFSharePartoutput")]
public class WMSHQFSharePartAppService :
SettleAccountApplicationBase
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
index 3c2899db..8bad8cf5 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
@@ -52,10 +52,11 @@ using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
{
///
- /// wms出库
+ /// 红旗H平台准时化-出库
///
- [AllowAnonymous]
+ //[AllowAnonymous]
+ [Authorize(SettleAccountPermissions.WMSHQ.Default)]
[Route("api/settleaccount/WmsHQHKanbanoutput")]
public class WmsHQHKanbanAppService :
SettleAccountApplicationBase
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
index b343e9b0..1275f699 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
@@ -52,10 +52,11 @@ using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
{
///
- /// wms出库
+ /// 红旗M平台备件-出库
///
- [AllowAnonymous]
+ //[AllowAnonymous]
+ [Authorize(SettleAccountPermissions.WMSHQ.Default)]
[Route("api/settleaccount/WmsHQHSharePartoutput")]
public class WmsHQHSharePartAppService :
SettleAccountApplicationBase
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
index 04e7ba18..2f1c518a 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs
@@ -54,8 +54,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
/// wms出库
///
- [AllowAnonymous]
+ //[AllowAnonymous]
[Route("api/settleaccount/wmsjitoutput")]
+ [Authorize(SettleAccountPermissions.WMSJIT.Default)]
public class WMSJitAppService :
SettleAccountApplicationBase
{
@@ -98,7 +99,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[HttpPost]
[Route("ExcelImport")]
[DisableRequestSizeLimit]
- //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+ [Authorize(SettleAccountPermissions.WMSJIT.Create)]
public async Task ExcelImport([FromForm] IFormFileCollection files, string version)
{
var _billNum = "T" + DateTime.Now.ToString("yyyyMMddhhmmss");
@@ -405,6 +406,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[HttpPost]
[Route("WmsJitOutPut-Pass")]
[UnitOfWork(false)]
+ [Authorize(SettleAccountPermissions.WMSJIT.Create)]
public async Task WmsJitOutPutPass(WmsJitRequestDto input)
{
@@ -430,6 +432,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
///
[HttpPost]
[Route("WmsJitOutPut-Cancel")]
+ [Authorize(SettleAccountPermissions.WMSJIT.Delete)]
public async Task WmsJitOutPutCancel(WmsJitRequestDto input)
{
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
index 90cf82d8..5321400a 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
@@ -52,11 +52,12 @@ using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
{
///
- /// wms出库
+ /// 大众看板-出库
///
- [AllowAnonymous]
+ //[AllowAnonymous]
[Route("api/settleaccount/wmskanbanoutput")]
+ [Authorize(SettleAccountPermissions.WMSJIT.Default)]
public class WMSKanbanAppService :
SettleAccountApplicationBase
{
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
index 00bfbcd1..42322920 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
@@ -54,8 +54,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
/// wms出库
///
- [AllowAnonymous]
+ //[AllowAnonymous]
[Route("api/settleaccount/wmsSharePartoutput")]
+ [Authorize(SettleAccountPermissions.WMSJIT.Default)]
public class WMSSharePartAppService :
SettleAccountApplicationBase
{
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs
index 63854263..5681b6a0 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs
@@ -31,7 +31,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
/// wms出库-一汽轿车
///
- [AllowAnonymous]
+ //[AllowAnonymous]
+ [Authorize(SettleAccountPermissions.WMSHQ.Default)]
[Route("api/settleaccount/WmsHQCaroutput")]
public class WmsHQCarAppService :
SettleAccountApplicationBase
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs
index 5806d328..cb908030 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs
@@ -30,7 +30,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
/// wms出库-M平台
///
- [AllowAnonymous]
+ //[AllowAnonymous]
+ [Authorize(SettleAccountPermissions.WMSHQ.Default)]
[Route("api/settleaccount/WMSHQMKanbanoutput")]
public class WmsHQMKanbanAppService :
SettleAccountApplicationBase
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs
index 3469e029..6abc5f0b 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs
@@ -28,10 +28,10 @@ using WY.NewJit.Extends.PaiGe.WMS;
namespace Win.Sfs.SettleAccount.Entities.WMS
{
///
- /// wms出库
+ /// 红旗H平台备件-出库
///
- [AllowAnonymous]
+ //[Authorize(SettleAccountPermissions.WMSHQ.Default)]
[Route("api/settleaccount/WmsHQMSharePartoutput")]
public class WmsHQMSharePartAppService :
SettleAccountApplicationBase
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
index 10151a13..10c756f9 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
@@ -1687,7 +1687,7 @@
- wms出库
+ 红旗F平台准时化-出库
@@ -1747,7 +1747,7 @@
- wms出库
+ 红旗F平台备件-出库
@@ -1807,7 +1807,7 @@
- wms出库
+ 红旗H平台准时化-出库
@@ -1867,7 +1867,7 @@
- wms出库
+ 红旗M平台备件-出库
@@ -1994,7 +1994,7 @@
- wms出库
+ 大众看板-出库
@@ -2801,7 +2801,7 @@
- wms出库
+ 红旗H平台备件-出库
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 e963d9e5..50992cc2 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.21
+ 1.0.22
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj b/src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj
index 5b25cb74..b543842a 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.21
+ 1.0.22
true
diff --git a/src/Modules/SettleAccount/src/SettleAccount.HttpApi/SettleAccount.HttpApi.csproj b/src/Modules/SettleAccount/src/SettleAccount.HttpApi/SettleAccount.HttpApi.csproj
index f1290886..ef85b215 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.21
+ 1.0.22