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 d1d317c3..e9203257 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissionDefinitionProvider.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Permissions/SettleAccountPermissionDefinitionProvider.cs @@ -97,25 +97,25 @@ namespace Win.Sfs.SettleAccount priceLists.AddChild(SettleAccountPermissions.PriceLists.Delete, L("Delete")); - var settlementParts = myGroup.AddPermission(SettleAccountPermissions.SettlementParts.Default, L("SettlementParts")); - settlementParts.AddChild(SettleAccountPermissions.SettlementParts.Create, L("Create")); - settlementParts.AddChild(SettleAccountPermissions.SettlementParts.Update, L("Update")); - settlementParts.AddChild(SettleAccountPermissions.SettlementParts.Delete, L("Delete")); + //var settlementParts = myGroup.AddPermission(SettleAccountPermissions.SettlementParts.Default, L("SettlementParts")); + //settlementParts.AddChild(SettleAccountPermissions.SettlementParts.Create, L("Create")); + //settlementParts.AddChild(SettleAccountPermissions.SettlementParts.Update, L("Update")); + //settlementParts.AddChild(SettleAccountPermissions.SettlementParts.Delete, L("Delete")); - var SettlementPakAndSpareParts = myGroup.AddPermission(SettleAccountPermissions.SettlementPakAndSpareParts.Default, L("SettlementPakAndSpareParts")); - SettlementPakAndSpareParts.AddChild(SettleAccountPermissions.SettlementPakAndSpareParts.Create, L("Create")); - SettlementPakAndSpareParts.AddChild(SettleAccountPermissions.SettlementPakAndSpareParts.Update, L("Update")); - SettlementPakAndSpareParts.AddChild(SettleAccountPermissions.SettlementPakAndSpareParts.Delete, L("Delete")); + //var SettlementPakAndSpareParts = myGroup.AddPermission(SettleAccountPermissions.SettlementPakAndSpareParts.Default, L("SettlementPakAndSpareParts")); + //SettlementPakAndSpareParts.AddChild(SettleAccountPermissions.SettlementPakAndSpareParts.Create, L("Create")); + //SettlementPakAndSpareParts.AddChild(SettleAccountPermissions.SettlementPakAndSpareParts.Update, L("Update")); + //SettlementPakAndSpareParts.AddChild(SettleAccountPermissions.SettlementPakAndSpareParts.Delete, L("Delete")); - var SettlementCrossReferences = myGroup.AddPermission(SettleAccountPermissions.SettlementCrossReference.Default, L("SettlementCrossReference")); - SettlementCrossReferences.AddChild(SettleAccountPermissions.SettlementCrossReference.Create, L("Create")); - SettlementCrossReferences.AddChild(SettleAccountPermissions.SettlementCrossReference.Update, L("Update")); - SettlementCrossReferences.AddChild(SettleAccountPermissions.SettlementCrossReference.Delete, L("Delete")); + //var SettlementCrossReferences = myGroup.AddPermission(SettleAccountPermissions.SettlementCrossReference.Default, L("SettlementCrossReference")); + //SettlementCrossReferences.AddChild(SettleAccountPermissions.SettlementCrossReference.Create, L("Create")); + //SettlementCrossReferences.AddChild(SettleAccountPermissions.SettlementCrossReference.Update, L("Update")); + //SettlementCrossReferences.AddChild(SettleAccountPermissions.SettlementCrossReference.Delete, L("Delete")); - var itemInvoicePrices = myGroup.AddPermission(SettleAccountPermissions.ItemInvoicePrices.Default, L("ItemInvoicePrices")); - itemInvoicePrices.AddChild(SettleAccountPermissions.ItemInvoicePrices.Create, L("Create")); - itemInvoicePrices.AddChild(SettleAccountPermissions.ItemInvoicePrices.Update, L("Update")); - itemInvoicePrices.AddChild(SettleAccountPermissions.ItemInvoicePrices.Delete, L("Delete")); + //var itemInvoicePrices = myGroup.AddPermission(SettleAccountPermissions.ItemInvoicePrices.Default, L("ItemInvoicePrices")); + //itemInvoicePrices.AddChild(SettleAccountPermissions.ItemInvoicePrices.Create, L("Create")); + //itemInvoicePrices.AddChild(SettleAccountPermissions.ItemInvoicePrices.Update, L("Update")); + //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.Delete, L("Delete")); - var CarMaterialConfigs = myGroup.AddPermission(SettleAccountPermissions.CarMaterialConfigs.Default, L("CarMaterialConfigs")); - CarMaterialConfigs.AddChild(SettleAccountPermissions.CarMaterialConfigs.Create, L("Create")); - CarMaterialConfigs.AddChild(SettleAccountPermissions.CarMaterialConfigs.Update, L("Update")); - CarMaterialConfigs.AddChild(SettleAccountPermissions.CarMaterialConfigs.Delete, L("Delete")); + //var CarMaterialConfigs = myGroup.AddPermission(SettleAccountPermissions.CarMaterialConfigs.Default, L("CarMaterialConfigs")); + //CarMaterialConfigs.AddChild(SettleAccountPermissions.CarMaterialConfigs.Create, L("Create")); + //CarMaterialConfigs.AddChild(SettleAccountPermissions.CarMaterialConfigs.Update, L("Update")); + //CarMaterialConfigs.AddChild(SettleAccountPermissions.CarMaterialConfigs.Delete, L("Delete")); var CentralizedControls = myGroup.AddPermission(SettleAccountPermissions.CentralizedControls.Default, L("CentralizedControls")); CentralizedControls.AddChild(SettleAccountPermissions.CentralizedControls.Create, L("Create")); CentralizedControls.AddChild(SettleAccountPermissions.CentralizedControls.Update, L("Update")); CentralizedControls.AddChild(SettleAccountPermissions.CentralizedControls.Delete, L("Delete")); - var FISs = myGroup.AddPermission(SettleAccountPermissions.FISs.Default, L("FISs")); - FISs.AddChild(SettleAccountPermissions.FISs.Create, L("Create")); - FISs.AddChild(SettleAccountPermissions.FISs.Update, L("Update")); - FISs.AddChild(SettleAccountPermissions.FISs.Delete, L("Delete")); + //var FISs = myGroup.AddPermission(SettleAccountPermissions.FISs.Default, L("FISs")); + //FISs.AddChild(SettleAccountPermissions.FISs.Create, L("Create")); + //FISs.AddChild(SettleAccountPermissions.FISs.Update, L("Update")); + //FISs.AddChild(SettleAccountPermissions.FISs.Delete, L("Delete")); - var MaterialRelationships = myGroup.AddPermission(SettleAccountPermissions.MaterialRelationships.Default, L("MaterialRelationships")); - MaterialRelationships.AddChild(SettleAccountPermissions.MaterialRelationships.Create, L("Create")); - MaterialRelationships.AddChild(SettleAccountPermissions.MaterialRelationships.Update, L("Update")); - MaterialRelationships.AddChild(SettleAccountPermissions.MaterialRelationships.Delete, L("Delete")); + //var MaterialRelationships = myGroup.AddPermission(SettleAccountPermissions.MaterialRelationships.Default, L("MaterialRelationships")); + //MaterialRelationships.AddChild(SettleAccountPermissions.MaterialRelationships.Create, L("Create")); + //MaterialRelationships.AddChild(SettleAccountPermissions.MaterialRelationships.Update, L("Update")); + //MaterialRelationships.AddChild(SettleAccountPermissions.MaterialRelationships.Delete, L("Delete")); - var Prebatchs = myGroup.AddPermission(SettleAccountPermissions.Prebatchs.Default, L("Prebatchs")); - Prebatchs.AddChild(SettleAccountPermissions.Prebatchs.Create, L("Create")); - Prebatchs.AddChild(SettleAccountPermissions.Prebatchs.Update, L("Update")); - Prebatchs.AddChild(SettleAccountPermissions.Prebatchs.Delete, L("Delete")); + //var Prebatchs = myGroup.AddPermission(SettleAccountPermissions.Prebatchs.Default, L("Prebatchs")); + //Prebatchs.AddChild(SettleAccountPermissions.Prebatchs.Create, L("Create")); + //Prebatchs.AddChild(SettleAccountPermissions.Prebatchs.Update, L("Update")); + //Prebatchs.AddChild(SettleAccountPermissions.Prebatchs.Delete, L("Delete")); var Materials = myGroup.AddPermission(SettleAccountPermissions.Materials.Default, L("Materials")); Materials.AddChild(SettleAccountPermissions.Materials.Create, L("Create")); 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 773b0507..caad5186 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和一汽）权限 + /// 红旗输出报表（H、F、M和一汽）出库单权限 /// public static class WMSHQ { @@ -37,7 +37,7 @@ namespace Win.Sfs.SettleAccount } /// - /// 一汽轿车-权限 + /// 一汽轿车-导入权限 /// public static class BT_Carlatform { @@ -48,7 +48,7 @@ namespace Win.Sfs.SettleAccount } /// - /// 红旗M平台导入-权限 + /// 红旗F平台导入-权限 /// public static class HQ_FPlatform { @@ -152,35 +152,35 @@ namespace Win.Sfs.SettleAccount /// /// 结算件 /// - public static class SettlementParts - { - public const string Default = GroupName + "." + nameof(SettlementParts); - public const string Create = Default + "." + CreateStr; - public const string Update = Default + "." + UpdateStr; - public const string Delete = Default + "." + DeleteStr; - } + //public static class SettlementParts + //{ + // public const string Default = GroupName + "." + nameof(SettlementParts); + // public const string Create = Default + "." + CreateStr; + // public const string Update = Default + "." + UpdateStr; + // public const string Delete = Default + "." + DeleteStr; + //} /// /// 结算包与散件对应关系 /// - public static class SettlementPakAndSpareParts - { - public const string Default = GroupName + "." + nameof(SettlementPakAndSpareParts); - public const string Create = Default + "." + CreateStr; - public const string Update = Default + "." + UpdateStr; - public const string Delete = Default + "." + DeleteStr; - } + //public static class SettlementPakAndSpareParts + //{ + // public const string Default = GroupName + "." + nameof(SettlementPakAndSpareParts); + // public const string Create = Default + "." + CreateStr; + // public const string Update = Default + "." + UpdateStr; + // public const string Delete = Default + "." + DeleteStr; + //} /// /// 结算件对应关系 /// - public static class SettlementCrossReference - { - public const string Default = GroupName + "." + nameof(SettlementCrossReference); - public const string Create = Default + "." + CreateStr; - public const string Update = Default + "." + UpdateStr; - public const string Delete = Default + "." + DeleteStr; - } + //public static class SettlementCrossReference + //{ + // public const string Default = GroupName + "." + nameof(SettlementCrossReference); + // public const string Create = Default + "." + CreateStr; + // public const string Update = Default + "." + UpdateStr; + // public const string Delete = Default + "." + DeleteStr; + //} 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 Create = Default + "." + "Create"; - public const string Update = Default + "." + "Update"; - public const string Delete = Default + "." + "Delete"; + //{ + // public const string Default = GroupName + "." + nameof(ItemInvoicePrices); + // public const string Create = Default + "." + "Create"; + // public const string Update = Default + "." + "Update"; + // public const string Delete = Default + "." + "Delete"; - } + //} @@ -230,13 +230,13 @@ namespace Win.Sfs.SettleAccount public const string Delete = Default + "." + DeleteStr; } - public static class CarMaterialConfigs - { - public const string Default = GroupName + "." + nameof(CarMaterialConfigs); - public const string Create = Default + "." + CreateStr; - public const string Update = Default + "." + UpdateStr; - public const string Delete = Default + "." + DeleteStr; - } + //public static class CarMaterialConfigs + //{ + // public const string Default = GroupName + "." + nameof(CarMaterialConfigs); + // public const string Create = Default + "." + CreateStr; + // public const string Update = Default + "." + UpdateStr; + // public const string Delete = Default + "." + DeleteStr; + //} public static class ImportColumnMaps @@ -266,13 +266,13 @@ namespace Win.Sfs.SettleAccount } - public static class FISs - { - public const string Default = GroupName + "." + nameof(FISs); - public const string Create = Default + "." + CreateStr; - public const string Update = Default + "." + UpdateStr; - public const string Delete = Default + "." + DeleteStr; - } + //public static class FISs + //{ + // public const string Default = GroupName + "." + nameof(FISs); + // public const string Create = Default + "." + CreateStr; + // public const string Update = Default + "." + UpdateStr; + // public const string Delete = Default + "." + DeleteStr; + //} public static class InventoryDetails @@ -285,13 +285,13 @@ namespace Win.Sfs.SettleAccount - public static class MaterialRelationships - { - public const string Default = GroupName + "." + nameof(MaterialRelationships); - public const string Create = Default + "." + CreateStr; - public const string Update = Default + "." + UpdateStr; - public const string Delete = Default + "." + DeleteStr; - } + //public static class MaterialRelationships + //{ + // public const string Default = GroupName + "." + nameof(MaterialRelationships); + // public const string Create = Default + "." + CreateStr; + // public const string Update = Default + "." + UpdateStr; + // public const string Delete = Default + "." + DeleteStr; + //} @@ -305,13 +305,13 @@ namespace Win.Sfs.SettleAccount - public static class Prebatchs - { - public const string Default = GroupName + "." + nameof(Prebatchs); - public const string Create = Default + "." + CreateStr; - public const string Update = Default + "." + UpdateStr; - public const string Delete = Default + "." + DeleteStr; - } + //public static class Prebatchs + //{ + // public const string Default = GroupName + "." + nameof(Prebatchs); + // public const string Create = Default + "." + CreateStr; + // public const string Update = Default + "." + UpdateStr; + // public const string Delete = Default + "." + DeleteStr; + //} 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 cec6ad47..58614ea0 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.22 + 1.0.23 true 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 cd7a76d9..71f439f5 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs @@ -56,7 +56,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts /// //[AllowAnonymous] - [Authorize(SettleAccountPermissions.WMSHQ.Default)] + //[Authorize(SettleAccountPermissions.WMSHQ.Default)] [Route("api/settleaccount/WmsHQHSharePartoutput")] public class WmsHQHSharePartAppService : 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 b8301eca..4ac68daa 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs +++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WmsHQMSharePartAppService.cs @@ -31,7 +31,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS /// 红旗H平台备件-出库 /// - //[Authorize(SettleAccountPermissions.WMSHQ.Default)] + [Authorize(SettleAccountPermissions.WMSHQ.Default)] [Route("api/settleaccount/WmsHQMSharePartoutput")] public class WmsHQMSharePartAppService : SettleAccountApplicationBase diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/Localization/SettleAccount/zh-Hans.json b/src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/Localization/SettleAccount/zh-Hans.json index b44e76d6..66af3152 100644 --- a/src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/Localization/SettleAccount/zh-Hans.json +++ b/src/Modules/SettleAccount/src/SettleAccount.Domain.Shared/Localization/SettleAccount/zh-Hans.json @@ -11,20 +11,22 @@ "SettleAccount": "菜单授权", "Boms": "BOM产品结构", "CodeSettings": "通用代码设置", - "CarMaterialConfigs": "结算件基本信息", + "WMSJIT": "大众出库单", + "WMSHQ": "红旗出库单", "CentralizedControls": "期间设置", - "MaterialRelationships": "总成与结算件关系", - "EstimatedSums": "标准价格单", - "FISs": "FIS数据查询", + "BT_Carlatform": "一汽轿车导入", + "HQ_FPlatform": "红旗F平台导入", + "HQ_MPlatform": "红旗M平台导入", + "HQ_HPlatform": "红旗H平台导入", "PriceLists": "标准价格单", - "SettlementParts": "结算件基本信息", + "VWKanBan": "大众看板明细结算导入", "Materials": "物料主数据", - "Prebatchs": "预批量数据导入", - "SettleAccounts": "结算数据导入", - "Invoices": "开票数据导入", - "ItemInvoicePrice": "QAD出库账单导入", - "Reports": "销售结算与开票报表", - "ItemInvoicePrices": "ERP总成开票报表", + "ScrapClaims": "CP7报废和索赔导入", + "SettleAccounts": "大众已结算数据导入", + "Invoices": "发票汇总导入", + "SparePart": "大众备件单导入", + "Reports": "大众及红旗报表任务", + "UnSettleAccount": "大众FIS未结算明细", //"Job": "岗位", //"Employee": "职员", 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 50992cc2..a02b0059 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.22 + 1.0.23 diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj b/src/Modules/SettleAccount/src/SettleAccount.Domain/SettleAccount.Domain.csproj index b543842a..c26a00e0 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.22 + 1.0.23 true diff --git a/src/Modules/SettleAccount/src/SettleAccount.HttpApi/SettleAccount.HttpApi.csproj b/src/Modules/SettleAccount/src/SettleAccount.HttpApi/SettleAccount.HttpApi.csproj index ef85b215..d640bbf2 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.22 + 1.0.23