PG
/
Win.Sfs.SmartSettlementSystem.PG
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

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

FoShanPG
Administrator 3 years ago
parent
8eb05c36bf 6c24f2e0f2
commit
348b5d7b1d
9 changed files with 111 additions and 109 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Unified View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 64
      src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissionDefinitionProvider.cs
  2. 120
      src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissions.cs
  3. 2
      src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/SettleAccount.Application.Contracts.csproj
  4. 2
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
  5. 2
      src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs
  6. 24
      src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/Localization/SettleAccount/zh-Hans.json
  7. 2
      src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/SettleAccount.Domain.Shared.csproj
  8. 2
      src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj
  9. 2
      src/Modules/SettleAccount/src/SettleAccount.HttpApi/SettleAccount.HttpApi.csproj

64
src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissionDefinitionProvider.cs
View File

@ -97,25 +97,25 @@ namespace Win.Sfs.SettleAccount
priceLists.AddChild(SettleAccountPermissions.PriceLists.Delete, L("Delete")); priceLists.AddChild(SettleAccountPermissions.PriceLists.Delete, L("Delete"));
var settlementParts = myGroup.AddPermission(SettleAccountPermissions.SettlementParts.Default, L("SettlementParts")); //var settlementParts = myGroup.AddPermission(SettleAccountPermissions.SettlementParts.Default, L("SettlementParts"));
settlementParts.AddChild(SettleAccountPermissions.SettlementParts.Create, L("Create")); //settlementParts.AddChild(SettleAccountPermissions.SettlementParts.Create, L("Create"));
settlementParts.AddChild(SettleAccountPermissions.SettlementParts.Update, L("Update")); //settlementParts.AddChild(SettleAccountPermissions.SettlementParts.Update, L("Update"));
settlementParts.AddChild(SettleAccountPermissions.SettlementParts.Delete, L("Delete")); //settlementParts.AddChild(SettleAccountPermissions.SettlementParts.Delete, L("Delete"));
var SettlementPakAndSpareParts = myGroup.AddPermission(SettleAccountPermissions.SettlementPakAndSpareParts.Default, L("SettlementPakAndSpareParts")); //var SettlementPakAndSpareParts = myGroup.AddPermission(SettleAccountPermissions.SettlementPakAndSpareParts.Default, L("SettlementPakAndSpareParts"));
SettlementPakAndSpareParts.AddChild(SettleAccountPermissions.SettlementPakAndSpareParts.Create, L("Create")); //SettlementPakAndSpareParts.AddChild(SettleAccountPermissions.SettlementPakAndSpareParts.Create, L("Create"));
SettlementPakAndSpareParts.AddChild(SettleAccountPermissions.SettlementPakAndSpareParts.Update, L("Update")); //SettlementPakAndSpareParts.AddChild(SettleAccountPermissions.SettlementPakAndSpareParts.Update, L("Update"));
SettlementPakAndSpareParts.AddChild(SettleAccountPermissions.SettlementPakAndSpareParts.Delete, L("Delete")); //SettlementPakAndSpareParts.AddChild(SettleAccountPermissions.SettlementPakAndSpareParts.Delete, L("Delete"));
var SettlementCrossReferences = myGroup.AddPermission(SettleAccountPermissions.SettlementCrossReference.Default, L("SettlementCrossReference")); //var SettlementCrossReferences = myGroup.AddPermission(SettleAccountPermissions.SettlementCrossReference.Default, L("SettlementCrossReference"));
SettlementCrossReferences.AddChild(SettleAccountPermissions.SettlementCrossReference.Create, L("Create")); //SettlementCrossReferences.AddChild(SettleAccountPermissions.SettlementCrossReference.Create, L("Create"));
SettlementCrossReferences.AddChild(SettleAccountPermissions.SettlementCrossReference.Update, L("Update")); //SettlementCrossReferences.AddChild(SettleAccountPermissions.SettlementCrossReference.Update, L("Update"));
SettlementCrossReferences.AddChild(SettleAccountPermissions.SettlementCrossReference.Delete, L("Delete")); //SettlementCrossReferences.AddChild(SettleAccountPermissions.SettlementCrossReference.Delete, L("Delete"));
var itemInvoicePrices = myGroup.AddPermission(SettleAccountPermissions.ItemInvoicePrices.Default, L("ItemInvoicePrices")); //var itemInvoicePrices = myGroup.AddPermission(SettleAccountPermissions.ItemInvoicePrices.Default, L("ItemInvoicePrices"));
itemInvoicePrices.AddChild(SettleAccountPermissions.ItemInvoicePrices.Create, L("Create")); //itemInvoicePrices.AddChild(SettleAccountPermissions.ItemInvoicePrices.Create, L("Create"));
itemInvoicePrices.AddChild(SettleAccountPermissions.ItemInvoicePrices.Update, L("Update")); //itemInvoicePrices.AddChild(SettleAccountPermissions.ItemInvoicePrices.Update, L("Update"));
itemInvoicePrices.AddChild(SettleAccountPermissions.ItemInvoicePrices.Delete, L("Delete")); //itemInvoicePrices.AddChild(SettleAccountPermissions.ItemInvoicePrices.Delete, L("Delete"));
@ -126,32 +126,32 @@ namespace Win.Sfs.SettleAccount
CodeSettings.AddChild(SettleAccountPermissions.CodeSettings.Update, L("Update")); CodeSettings.AddChild(SettleAccountPermissions.CodeSettings.Update, L("Update"));
CodeSettings.AddChild(SettleAccountPermissions.CodeSettings.Delete, L("Delete")); CodeSettings.AddChild(SettleAccountPermissions.CodeSettings.Delete, L("Delete"));
var CarMaterialConfigs = myGroup.AddPermission(SettleAccountPermissions.CarMaterialConfigs.Default, L("CarMaterialConfigs")); //var CarMaterialConfigs = myGroup.AddPermission(SettleAccountPermissions.CarMaterialConfigs.Default, L("CarMaterialConfigs"));
CarMaterialConfigs.AddChild(SettleAccountPermissions.CarMaterialConfigs.Create, L("Create")); //CarMaterialConfigs.AddChild(SettleAccountPermissions.CarMaterialConfigs.Create, L("Create"));
CarMaterialConfigs.AddChild(SettleAccountPermissions.CarMaterialConfigs.Update, L("Update")); //CarMaterialConfigs.AddChild(SettleAccountPermissions.CarMaterialConfigs.Update, L("Update"));
CarMaterialConfigs.AddChild(SettleAccountPermissions.CarMaterialConfigs.Delete, L("Delete")); //CarMaterialConfigs.AddChild(SettleAccountPermissions.CarMaterialConfigs.Delete, L("Delete"));
var CentralizedControls = myGroup.AddPermission(SettleAccountPermissions.CentralizedControls.Default, L("CentralizedControls")); var CentralizedControls = myGroup.AddPermission(SettleAccountPermissions.CentralizedControls.Default, L("CentralizedControls"));
CentralizedControls.AddChild(SettleAccountPermissions.CentralizedControls.Create, L("Create")); CentralizedControls.AddChild(SettleAccountPermissions.CentralizedControls.Create, L("Create"));
CentralizedControls.AddChild(SettleAccountPermissions.CentralizedControls.Update, L("Update")); CentralizedControls.AddChild(SettleAccountPermissions.CentralizedControls.Update, L("Update"));
CentralizedControls.AddChild(SettleAccountPermissions.CentralizedControls.Delete, L("Delete")); CentralizedControls.AddChild(SettleAccountPermissions.CentralizedControls.Delete, L("Delete"));
var FISs = myGroup.AddPermission(SettleAccountPermissions.FISs.Default, L("FISs")); //var FISs = myGroup.AddPermission(SettleAccountPermissions.FISs.Default, L("FISs"));
FISs.AddChild(SettleAccountPermissions.FISs.Create, L("Create")); //FISs.AddChild(SettleAccountPermissions.FISs.Create, L("Create"));
FISs.AddChild(SettleAccountPermissions.FISs.Update, L("Update")); //FISs.AddChild(SettleAccountPermissions.FISs.Update, L("Update"));
FISs.AddChild(SettleAccountPermissions.FISs.Delete, L("Delete")); //FISs.AddChild(SettleAccountPermissions.FISs.Delete, L("Delete"));
var MaterialRelationships = myGroup.AddPermission(SettleAccountPermissions.MaterialRelationships.Default, L("MaterialRelationships")); //var MaterialRelationships = myGroup.AddPermission(SettleAccountPermissions.MaterialRelationships.Default, L("MaterialRelationships"));
MaterialRelationships.AddChild(SettleAccountPermissions.MaterialRelationships.Create, L("Create")); //MaterialRelationships.AddChild(SettleAccountPermissions.MaterialRelationships.Create, L("Create"));
MaterialRelationships.AddChild(SettleAccountPermissions.MaterialRelationships.Update, L("Update")); //MaterialRelationships.AddChild(SettleAccountPermissions.MaterialRelationships.Update, L("Update"));
MaterialRelationships.AddChild(SettleAccountPermissions.MaterialRelationships.Delete, L("Delete")); //MaterialRelationships.AddChild(SettleAccountPermissions.MaterialRelationships.Delete, L("Delete"));
var Prebatchs = myGroup.AddPermission(SettleAccountPermissions.Prebatchs.Default, L("Prebatchs")); //var Prebatchs = myGroup.AddPermission(SettleAccountPermissions.Prebatchs.Default, L("Prebatchs"));
Prebatchs.AddChild(SettleAccountPermissions.Prebatchs.Create, L("Create")); //Prebatchs.AddChild(SettleAccountPermissions.Prebatchs.Create, L("Create"));
Prebatchs.AddChild(SettleAccountPermissions.Prebatchs.Update, L("Update")); //Prebatchs.AddChild(SettleAccountPermissions.Prebatchs.Update, L("Update"));
Prebatchs.AddChild(SettleAccountPermissions.Prebatchs.Delete, L("Delete")); //Prebatchs.AddChild(SettleAccountPermissions.Prebatchs.Delete, L("Delete"));
var Materials = myGroup.AddPermission(SettleAccountPermissions.Materials.Default, L("Materials")); var Materials = myGroup.AddPermission(SettleAccountPermissions.Materials.Default, L("Materials"));
Materials.AddChild(SettleAccountPermissions.Materials.Create, L("Create")); Materials.AddChild(SettleAccountPermissions.Materials.Create, L("Create"));

120
src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissions.cs
View File

@ -15,7 +15,7 @@ namespace Win.Sfs.SettleAccount
#region 派格 #region 派格
/// <summary> /// <summary>
/// 大众输出报表(准时化、看板、备件)权限 /// 大众输出报表(准时化、看板、备件）出库单权限
/// </summary> /// </summary>
public static class WMSJIT public static class WMSJIT
{ {
@ -26,7 +26,7 @@ namespace Win.Sfs.SettleAccount
} }
/// <summary> /// <summary>
/// 红旗输出报表（H、F、M和一汽）权限 /// 红旗输出报表（H、F、M和一汽）出库单权限
/// </summary> /// </summary>
public static class WMSHQ public static class WMSHQ
{ {
@ -37,7 +37,7 @@ namespace Win.Sfs.SettleAccount
} }
/// <summary> /// <summary>
/// 一汽轿车-权限 /// 一汽轿车-导入权限
/// </summary> /// </summary>
public static class BT_Carlatform public static class BT_Carlatform
{ {
@ -48,7 +48,7 @@ namespace Win.Sfs.SettleAccount
} }
/// <summary> /// <summary>
/// 红旗M平台导入-权限 /// 红旗F平台导入-权限
/// </summary> /// </summary>
public static class HQ_FPlatform public static class HQ_FPlatform
{ {
@ -152,35 +152,35 @@ namespace Win.Sfs.SettleAccount
/// <summary> /// <summary>
/// 结算件 /// 结算件
/// </summary> /// </summary>
public static class SettlementParts //public static class SettlementParts
{ //{
public const string Default = GroupName + "." + nameof(SettlementParts); // public const string Default = GroupName + "." + nameof(SettlementParts);
public const string Create = Default + "." + CreateStr; // public const string Create = Default + "." + CreateStr;
public const string Update = Default + "." + UpdateStr; // public const string Update = Default + "." + UpdateStr;
public const string Delete = Default + "." + DeleteStr; // public const string Delete = Default + "." + DeleteStr;
} //}
/// <summary> /// <summary>
/// 结算包与散件对应关系 /// 结算包与散件对应关系
/// </summary> /// </summary>
public static class SettlementPakAndSpareParts //public static class SettlementPakAndSpareParts
{ //{
public const string Default = GroupName + "." + nameof(SettlementPakAndSpareParts); // public const string Default = GroupName + "." + nameof(SettlementPakAndSpareParts);
public const string Create = Default + "." + CreateStr; // public const string Create = Default + "." + CreateStr;
public const string Update = Default + "." + UpdateStr; // public const string Update = Default + "." + UpdateStr;
public const string Delete = Default + "." + DeleteStr; // public const string Delete = Default + "." + DeleteStr;
} //}
/// <summary> /// <summary>
/// 结算件对应关系 /// 结算件对应关系
/// </summary> /// </summary>
public static class SettlementCrossReference //public static class SettlementCrossReference
{ //{
public const string Default = GroupName + "." + nameof(SettlementCrossReference); // public const string Default = GroupName + "." + nameof(SettlementCrossReference);
public const string Create = Default + "." + CreateStr; // public const string Create = Default + "." + CreateStr;
public const string Update = Default + "." + UpdateStr; // public const string Update = Default + "." + UpdateStr;
public const string Delete = Default + "." + DeleteStr; // public const string Delete = Default + "." + DeleteStr;
} //}
public static class PriceListVersions public static class PriceListVersions
@ -194,15 +194,15 @@ namespace Win.Sfs.SettleAccount
public static class ItemInvoicePrices //public static class ItemInvoicePrices
{ //{
public const string Default = GroupName + "." + nameof(ItemInvoicePrices); // public const string Default = GroupName + "." + nameof(ItemInvoicePrices);
public const string Create = Default + "." + "Create"; // public const string Create = Default + "." + "Create";
public const string Update = Default + "." + "Update"; // public const string Update = Default + "." + "Update";
public const string Delete = Default + "." + "Delete"; // public const string Delete = Default + "." + "Delete";
} //}
@ -230,13 +230,13 @@ namespace Win.Sfs.SettleAccount
public const string Delete = Default + "." + DeleteStr; public const string Delete = Default + "." + DeleteStr;
} }
public static class CarMaterialConfigs //public static class CarMaterialConfigs
{ //{
public const string Default = GroupName + "." + nameof(CarMaterialConfigs); // public const string Default = GroupName + "." + nameof(CarMaterialConfigs);
public const string Create = Default + "." + CreateStr; // public const string Create = Default + "." + CreateStr;
public const string Update = Default + "." + UpdateStr; // public const string Update = Default + "." + UpdateStr;
public const string Delete = Default + "." + DeleteStr; // public const string Delete = Default + "." + DeleteStr;
} //}
public static class ImportColumnMaps public static class ImportColumnMaps
@ -266,13 +266,13 @@ namespace Win.Sfs.SettleAccount
} }
public static class FISs //public static class FISs
{ //{
public const string Default = GroupName + "." + nameof(FISs); // public const string Default = GroupName + "." + nameof(FISs);
public const string Create = Default + "." + CreateStr; // public const string Create = Default + "." + CreateStr;
public const string Update = Default + "." + UpdateStr; // public const string Update = Default + "." + UpdateStr;
public const string Delete = Default + "." + DeleteStr; // public const string Delete = Default + "." + DeleteStr;
} //}
public static class InventoryDetails public static class InventoryDetails
@ -285,13 +285,13 @@ namespace Win.Sfs.SettleAccount
public static class MaterialRelationships //public static class MaterialRelationships
{ //{
public const string Default = GroupName + "." + nameof(MaterialRelationships); // public const string Default = GroupName + "." + nameof(MaterialRelationships);
public const string Create = Default + "." + CreateStr; // public const string Create = Default + "." + CreateStr;
public const string Update = Default + "." + UpdateStr; // public const string Update = Default + "." + UpdateStr;
public const string Delete = Default + "." + DeleteStr; // public const string Delete = Default + "." + DeleteStr;
} //}
@ -305,13 +305,13 @@ namespace Win.Sfs.SettleAccount
public static class Prebatchs //public static class Prebatchs
{ //{
public const string Default = GroupName + "." + nameof(Prebatchs); // public const string Default = GroupName + "." + nameof(Prebatchs);
public const string Create = Default + "." + CreateStr; // public const string Create = Default + "." + CreateStr;
public const string Update = Default + "." + UpdateStr; // public const string Update = Default + "." + UpdateStr;
public const string Delete = Default + "." + DeleteStr; // public const string Delete = Default + "." + DeleteStr;
} //}

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

@ -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.22</Version> <Version>1.0.23</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup> </PropertyGroup>

2
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
View File

@ -56,7 +56,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
/// </summary> /// </summary>
//[AllowAnonymous] //[AllowAnonymous]
[Authorize(SettleAccountPermissions.WMSHQ.Default)] //[Authorize(SettleAccountPermissions.WMSHQ.Default)]
[Route("api/settleaccount/WmsHQHSharePartoutput")] [Route("api/settleaccount/WmsHQHSharePartoutput")]
public class WmsHQHSharePartAppService : public class WmsHQHSharePartAppService :
SettleAccountApplicationBase<WmsHQHSharePartOutPutDetial> SettleAccountApplicationBase<WmsHQHSharePartOutPutDetial>

2
src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs
View File

@ -31,7 +31,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
/// 红旗H平台备件-出库 /// 红旗H平台备件-出库
/// </summary> /// </summary>
//[Authorize(SettleAccountPermissions.WMSHQ.Default)] [Authorize(SettleAccountPermissions.WMSHQ.Default)]
[Route("api/settleaccount/WmsHQMSharePartoutput")] [Route("api/settleaccount/WmsHQMSharePartoutput")]
public class WmsHQMSharePartAppService : public class WmsHQMSharePartAppService :
SettleAccountApplicationBase<WmsHQMSharePartOutPutDetial> SettleAccountApplicationBase<WmsHQMSharePartOutPutDetial>

24
src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/Localization/SettleAccount/zh-Hans.json
View File

@ -11,20 +11,22 @@
"SettleAccount": "菜单授权", "SettleAccount": "菜单授权",
"Boms": "BOM产品结构", "Boms": "BOM产品结构",
"CodeSettings": "通用代码设置", "CodeSettings": "通用代码设置",
"CarMaterialConfigs": "结算件基本信息", "WMSJIT": "大众出库单",
"WMSHQ": "红旗出库单",
"CentralizedControls": "期间设置", "CentralizedControls": "期间设置",
"MaterialRelationships": "总成与结算件关系", "BT_Carlatform": "一汽轿车导入",
"EstimatedSums": "标准价格单", "HQ_FPlatform": "红旗F平台导入",
"FISs": "FIS数据查询", "HQ_MPlatform": "红旗M平台导入",
"HQ_HPlatform": "红旗H平台导入",
"PriceLists": "标准价格单", "PriceLists": "标准价格单",
"SettlementParts": "结算件基本信息", "VWKanBan": "大众看板明细结算导入",
"Materials": "物料主数据", "Materials": "物料主数据",
"Prebatchs": "预批量数据导入", "ScrapClaims": "CP7报废和索赔导入",
"SettleAccounts": "结算数据导入", "SettleAccounts": "大众已结算数据导入",
"Invoices": "开票数据导入", "Invoices": "发票汇总导入",
"ItemInvoicePrice": "QAD出库账单导入", "SparePart": "大众备件单导入",
"Reports": "销售结算与开票报表", "Reports": "大众及红旗报表任务",
"ItemInvoicePrices": "ERP总成开票报表", "UnSettleAccount": "大众FIS未结算明细",
//"Job": "岗位", //"Job": "岗位",
//"Employee": "职员", //"Employee": "职员",

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

@ -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.22</Version> <Version>1.0.23</Version>
</PropertyGroup> </PropertyGroup>

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

@ -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.22</Version> <Version>1.0.23</Version>
<GeneratePackageOnBuild>true</GeneratePackageOnBuild> <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
</PropertyGroup> </PropertyGroup>

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

@ -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.22</Version> <Version>1.0.23</Version>
</PropertyGroup> </PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'"> <PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">

Write Preview
Loading…
Cancel
Save