Merge branch 'master' of http://dev.ccwin-in.com:6090/Win.Sfs.SmartSettlementSystem.PG

src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissions.cs

@@ -15,7 +15,7 @@ namespace Win.Sfs.SettleAccount
         #region 派格
 
         /// <summary>
-        /// 大众输出报表权限
+        /// 大众输出报表(准时化、看板、备件)权限
         /// </summary>
         public static class WMSJIT
         {
@@ -26,7 +26,7 @@ namespace Win.Sfs.SettleAccount
         }
 
         /// <summary>
-        /// 红旗输出报表权限
+        /// 红旗输出报表（H、F、M和一汽）权限
         /// </summary>
         public static class WMSHQ
         {

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

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

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
 {
     /// <summary>
-    /// wms出库
+    /// 红旗F平台准时化-出库
     /// </summary>
 
-    [AllowAnonymous]
+    //[AllowAnonymous]
+    [Authorize(SettleAccountPermissions.WMSHQ.Default)]
     [Route("api/settleaccount/WMSHQFKanbanoutput")]
     public class WmsHQFKanbanAppService :
         SettleAccountApplicationBase<WmsHQFKanbanOutPutDetial>

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
 {
     /// <summary>
-    /// wms出库
+    /// 红旗F平台备件-出库
     /// </summary>
 
-    [AllowAnonymous]
+    //[AllowAnonymous]
+    [Authorize(SettleAccountPermissions.WMSHQ.Default)]
     [Route("api/settleaccount/wmsHQFSharePartoutput")]
     public class WMSHQFSharePartAppService :
          SettleAccountApplicationBase<WmsHQFSharePartOutPutDetial>

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
 {
     /// <summary>
-    /// wms出库
+    /// 红旗H平台准时化-出库
     /// </summary>
 
-    [AllowAnonymous]
+    //[AllowAnonymous]
+    [Authorize(SettleAccountPermissions.WMSHQ.Default)]
     [Route("api/settleaccount/WmsHQHKanbanoutput")]
     public class WmsHQHKanbanAppService :
         SettleAccountApplicationBase<WmsHQHKanbanOutPutDetial>

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
 {
     /// <summary>
-    /// wms出库
+    /// 红旗M平台备件-出库
     /// </summary>
 
-    [AllowAnonymous]
+    //[AllowAnonymous]
+    [Authorize(SettleAccountPermissions.WMSHQ.Default)]
     [Route("api/settleaccount/WmsHQHSharePartoutput")]
     public class WmsHQHSharePartAppService :
          SettleAccountApplicationBase<WmsHQHSharePartOutPutDetial>

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSJitAppService.cs

@@ -54,8 +54,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
     /// wms出库
     /// </summary>
 
-    [AllowAnonymous]
+    //[AllowAnonymous]
     [Route("api/settleaccount/wmsjitoutput")]
+    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
     public class WMSJitAppService :
         SettleAccountApplicationBase<WmsJitOutPutDetial>
     {
@@ -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<string> 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<bool> WmsJitOutPutPass(WmsJitRequestDto input)
         {
          
@@ -470,6 +472,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
         /// <returns></returns>
         [HttpPost]
         [Route("WmsJitOutPut-Cancel")]
+        [Authorize(SettleAccountPermissions.WMSJIT.Delete)]
         public async Task<bool> WmsJitOutPutCancel(WmsJitRequestDto input)
         {
 

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
 {
     /// <summary>
-    /// wms出库
+    /// 大众看板-出库
     /// </summary>
 
-    [AllowAnonymous]
+    //[AllowAnonymous]
     [Route("api/settleaccount/wmskanbanoutput")]
+    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
     public class WMSKanbanAppService :
         SettleAccountApplicationBase<WmsKanbanOutPutDetial>
     {

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs

@@ -54,8 +54,9 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
     /// wms出库
     /// </summary>
 
-    [AllowAnonymous]
+    //[AllowAnonymous]
     [Route("api/settleaccount/wmsSharePartoutput")]
+    [Authorize(SettleAccountPermissions.WMSJIT.Default)]
     public class WMSSharePartAppService :
          SettleAccountApplicationBase<WmsSharePartOutPutDetial>
     {

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQCarAppService.cs

@@ -31,7 +31,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
     /// wms出库-一汽轿车
     /// </summary>
 
-    [AllowAnonymous]
+    //[AllowAnonymous]
+    [Authorize(SettleAccountPermissions.WMSHQ.Default)]
     [Route("api/settleaccount/WmsHQCaroutput")]
     public class WmsHQCarAppService :
          SettleAccountApplicationBase<WmsHQCarOutPutDetial>

src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMKanbanAppService.cs

@@ -30,7 +30,8 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
     /// wms出库-M平台
     /// </summary>
 
-    [AllowAnonymous]
+    //[AllowAnonymous]
+    [Authorize(SettleAccountPermissions.WMSHQ.Default)]
     [Route("api/settleaccount/WMSHQMKanbanoutput")]
     public class WmsHQMKanbanAppService :
         SettleAccountApplicationBase<WmsHQMKanbanOutPutDetial>

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
 {
     /// <summary>
-    /// wms出库
+    /// 红旗H平台备件-出库
     /// </summary>
 
-    [AllowAnonymous]
+    //[Authorize(SettleAccountPermissions.WMSHQ.Default)]
     [Route("api/settleaccount/WmsHQMSharePartoutput")]
     public class WmsHQMSharePartAppService :
          SettleAccountApplicationBase<WmsHQMSharePartOutPutDetial>

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

@@ -1687,7 +1687,7 @@
         </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQFKanbanAppService">
             <summary>
-            wms出库
+            红旗F平台准时化-出库
             </summary>
         </member>
         <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQFKanbanAppService.#ctor(Win.Sfs.BaseData.ImportExcelCommon.IExcelImportAppService,Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsHQFKanbanOutPutDetial,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.TaskJob,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsHQFKanbanOutPut,System.Guid},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsHQFKanbanOutPutDetial},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{WY.NewJit.Extends.PaiGe.WMS.TB_BILL},Volo.Abp.Caching.IDistributedCache{Win.Sfs.SettleAccount.Entities.WMS.WmsHQFKanbanOutPutDetial},Win.Abp.Snowflakes.ISnowflakeIdGenerator,Win.Sfs.SettleAccount.CommonManagers.ICommonManager)">
@@ -1747,7 +1747,7 @@
         </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSHQFSharePartAppService">
             <summary>
-            wms出库
+            红旗F平台备件-出库
             </summary>
         </member>
         <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSHQFSharePartAppService.#ctor(Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report.WmsDapperRepository,Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsHQFSharePartOutPutDetial,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.TaskJob,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsHQFSharePartOutPut,System.Guid},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsHQFSharePartOutPutDetial},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{WY.NewJit.Extends.PaiGe.WMS.TB_BILL},Win.Sfs.BaseData.ImportExcelCommon.IExcelImportAppService,Volo.Abp.Caching.IDistributedCache{Win.Sfs.SettleAccount.Entities.WMS.WmsHQFSharePartOutPutDetial},Win.Abp.Snowflakes.ISnowflakeIdGenerator,Win.Sfs.SettleAccount.CommonManagers.ICommonManager)">
@@ -1814,7 +1814,7 @@
         </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQHKanbanAppService">
             <summary>
-            wms出库
+            红旗H平台准时化-出库
             </summary>
         </member>
         <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQHKanbanAppService.#ctor(Win.Sfs.BaseData.ImportExcelCommon.IExcelImportAppService,Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsHQHKanbanOutPutDetial,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.TaskJob,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsHQHKanbanOutPut,System.Guid},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsHQHKanbanOutPutDetial},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{WY.NewJit.Extends.PaiGe.WMS.TB_BILL},Volo.Abp.Caching.IDistributedCache{Win.Sfs.SettleAccount.Entities.WMS.WmsHQHKanbanOutPutDetial},Win.Abp.Snowflakes.ISnowflakeIdGenerator,Win.Sfs.SettleAccount.CommonManagers.ICommonManager)">
@@ -1874,7 +1874,7 @@
         </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQHSharePartAppService">
             <summary>
-            wms出库
+            红旗M平台备件-出库
             </summary>
         </member>
         <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WmsHQHSharePartAppService.#ctor(Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsHQHSharePartOutPutDetial,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.TaskJob,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsHQHSharePartOutPut,System.Guid},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsHQHSharePartOutPutDetial},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{WY.NewJit.Extends.PaiGe.WMS.TB_BILL},Win.Sfs.BaseData.ImportExcelCommon.IExcelImportAppService,Volo.Abp.Caching.IDistributedCache{Win.Sfs.SettleAccount.Entities.WMS.WmsHQHSharePartOutPutDetial},Win.Abp.Snowflakes.ISnowflakeIdGenerator,Win.Sfs.SettleAccount.CommonManagers.ICommonManager,Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report.WmsDapperRepository)">
@@ -2008,7 +2008,7 @@
         </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSKanbanAppService">
             <summary>
-            wms出库
+            大众看板-出库
             </summary>
         </member>
         <member name="M:Win.Sfs.SettleAccount.Entities.SettleAccounts.WMSKanbanAppService.#ctor(Win.Sfs.BaseData.ImportExcelCommon.IExcelImportAppService,Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsKanbanOutPutDetial,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.TaskJob,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsKanbanOutPut,System.Guid},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsKanbanOutPutDetial},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{WY.NewJit.Extends.PaiGe.WMS.TB_BILL},Volo.Abp.Caching.IDistributedCache{Win.Sfs.SettleAccount.Entities.WMS.WmsKanbanOutPutDetial},Win.Abp.Snowflakes.ISnowflakeIdGenerator,Win.Sfs.SettleAccount.CommonManagers.ICommonManager)">
@@ -2815,7 +2815,7 @@
         </member>
         <member name="T:Win.Sfs.SettleAccount.Entities.WMS.WmsHQMSharePartAppService">
             <summary>
-            wms出库
+            红旗H平台备件-出库
             </summary>
         </member>
         <member name="M:Win.Sfs.SettleAccount.Entities.WMS.WmsHQMSharePartAppService.#ctor(Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsHQMSharePartOutPutDetial,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.TaskJob,System.Guid},Win.Sfs.SettleAccount.ISettleAccountBranchEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsHQMSharePartOutPut,System.Guid},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{Win.Sfs.SettleAccount.Entities.WMS.WmsHQMSharePartOutPutDetial},Win.Sfs.SettleAccount.Repository.WMSEfCoreRepository{WY.NewJit.Extends.PaiGe.WMS.TB_BILL},Win.Sfs.BaseData.ImportExcelCommon.IExcelImportAppService,Volo.Abp.Caching.IDistributedCache{Win.Sfs.SettleAccount.Entities.WMS.WmsHQMSharePartOutPutDetial},Win.Abp.Snowflakes.ISnowflakeIdGenerator,Win.Sfs.SettleAccount.CommonManagers.ICommonManager,Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report.WmsDapperRepository)">

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

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

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

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

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

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