diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/WinIn.FasterZ.AuthSiteCenter.sln b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/WinIn.FasterZ.AuthSiteCenter.sln index 216af2e61..27def4cce 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/WinIn.FasterZ.AuthSiteCenter.sln +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/WinIn.FasterZ.AuthSiteCenter.sln @@ -23,6 +23,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinIn.FasterZ.AuthSiteCente EndProject Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinIn.FasterZ.AuthSiteCenter.DbMigrator", "src\WinIn.FasterZ.AuthSiteCenter.DbMigrator\WinIn.FasterZ.AuthSiteCenter.DbMigrator.csproj", "{AA94D832-1CCC-4715-95A9-A483F23A1A5D}" EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "ref", "ref", "{E2A25F6E-9C96-49FD-AFB3-FE151228668E}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "WinIn.FasterZ.Wms.Application.Contracts", "..\WinIn.FasterZ.Wms\WinIn.FasterZ.Wms\src\WinIn.FasterZ.Wms.Application.Contracts\WinIn.FasterZ.Wms.Application.Contracts.csproj", "{82395B48-630A-4542-AC6F-CB1241BD278D}" +EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|Any CPU = Debug|Any CPU @@ -65,6 +69,10 @@ Global {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Debug|Any CPU.Build.0 = Debug|Any CPU {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Release|Any CPU.ActiveCfg = Release|Any CPU {AA94D832-1CCC-4715-95A9-A483F23A1A5D}.Release|Any CPU.Build.0 = Release|Any CPU + {82395B48-630A-4542-AC6F-CB1241BD278D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {82395B48-630A-4542-AC6F-CB1241BD278D}.Debug|Any CPU.Build.0 = Debug|Any CPU + {82395B48-630A-4542-AC6F-CB1241BD278D}.Release|Any CPU.ActiveCfg = Release|Any CPU + {82395B48-630A-4542-AC6F-CB1241BD278D}.Release|Any CPU.Build.0 = Release|Any CPU EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE @@ -79,6 +87,7 @@ Global {4164BDF7-F527-4E85-9CE6-E3C2D7426A27} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {3B5A0094-670D-4BB1-BFDD-61B88A8773DC} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} {AA94D832-1CCC-4715-95A9-A483F23A1A5D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0} + {82395B48-630A-4542-AC6F-CB1241BD278D} = {E2A25F6E-9C96-49FD-AFB3-FE151228668E} EndGlobalSection GlobalSection(ExtensibilityGlobals) = postSolution SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/AuthSiteCenterWebModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/AuthSiteCenterWebModule.cs index 1aaf0563a..058338531 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/AuthSiteCenterWebModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/AuthSiteCenterWebModule.cs @@ -53,13 +53,15 @@ using Microsoft.AspNetCore.Authentication.OpenIdConnect; using Microsoft.AspNetCore.Http.Features; using Volo.Abp.Authorization.Permissions; using WinIn.FasterZ.AuthSiteCenter.Permissions; -using WinIn.FasterZ.InterfaceDash; +//using WinIn.FasterZ.InterfaceDash; //using WinIn.FasterZ.Job; using Volo.Abp.AspNetCore.Mvc.AntiForgery; using Autofac.Core; namespace WinIn.FasterZ.AuthSiteCenter.Web; +using WinIn.FasterZ.Wms; + [DependsOn( typeof(AuthSiteCenterHttpApiModule), typeof(AuthSiteCenterApplicationModule), @@ -77,6 +79,7 @@ namespace WinIn.FasterZ.AuthSiteCenter.Web; //typeof(StoreApplicationContractsModule), //typeof(JobApplicationContractsModule), //typeof(InterfaceDashApplicationContractsModule) + typeof(WmsApplicationContractsModule), typeof(AbpSwashbuckleModule) )] @@ -100,7 +103,8 @@ public class AuthSiteCenterWebModule : AbpModule { builder.AddValidation(options => { - options.AddAudiences("AuthSiteCenter Z Store Job"); + //options.AddAudiences("AuthSiteCenter Wms"); + options.AddAudiences("AuthSiteCenter Wms"); options.UseLocalServer(); options.UseAspNetCore(); }); diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/Controllers/CustAccountController.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/Controllers/CustAccountController.cs index 8b3ebbcb0..f76db2b40 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/Controllers/CustAccountController.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/Controllers/CustAccountController.cs @@ -39,8 +39,8 @@ public class CustAccountController : AbpController var dic = new Dictionary { {"client_id","AuthSiteCenter_App"}, - {"scope","offline_access AuthSiteCenter Z Job Store profile"}, - //{"scope","AuthSiteCenter Z Job Store"}, + {"scope","offline_access AuthSiteCenter Wms profile"}, + //{"scope","AuthSiteCenter Wms"}, //{"scope","AuthSiteCenter"}, {"grant_type","password"}, {"username",input.Name}, @@ -51,6 +51,9 @@ public class CustAccountController : AbpController httpContent.Headers.ContentType = new MediaTypeHeaderValue("application/x-www-form-urlencoded"); var oauthRep = await client.PostAsync("connect/token", httpContent); var oauthStr = await oauthRep.Content.ReadAsStringAsync(); + + Console.WriteLine(oauthStr); + var oauthResult = default(Id4TokenOutput); if (oauthRep.IsSuccessStatusCode) { diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/WinIn.FasterZ.AuthSiteCenter.Web.csproj b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/WinIn.FasterZ.AuthSiteCenter.Web.csproj index 1ad93a652..78902d87e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/WinIn.FasterZ.AuthSiteCenter.Web.csproj +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/WinIn.FasterZ.AuthSiteCenter.Web.csproj @@ -53,6 +53,7 @@ + diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/appsettings.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/appsettings.json index 158bff223..35f59cd1b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/appsettings.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.AuthSiteCenter/src/WinIn.FasterZ.AuthSiteCenter.Web/appsettings.json @@ -1,20 +1,21 @@ { - "App": { - "SelfUrl": "http://localhost:60100", - "ClientUrl": "http://localhost:60011,http://localhost:60012,http://localhost:60013,http://localhost:60021,http://localhost:60022,http://localhost:60022,http://localhost:10090", - "CorsOrigins": "http://localhost:60011,http://localhost:60012,http://localhost:60013,http://localhost:60021,http://localhost:60022,http://localhost:60022,http://localhost:10090", - "RedirectAllowedUrls": "http://localhost:60011,http://localhost:60012,http://localhost:60013,http://localhost:60021,http://localhost:60022,http://localhost:60022,http://localhost:10090" - }, - "ConnectionStrings": { - "Default": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Faster_AuthSiteCenter;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;Encrypt=False;" - }, - "StringEncryption": { - "DefaultPassPhrase": "ybgU8NieQZNjguXe" - }, - "Redis": { - "Configuration": "127.0.0.1:6379" - }, - "AuthServer": { - "Authority": "http://localhost:60100" - } + "App": { + "SelfUrl": "http://localhost:60100", + "ClientUrl": "http://localhost:60011,http://localhost:60012,http://localhost:60013,http://localhost:60021,http://localhost:60022,http://localhost:60022,http://localhost:10090", + "CorsOrigins": "http://localhost:60011,http://localhost:60012,http://localhost:60013,http://localhost:60021,http://localhost:60022,http://localhost:60022,http://localhost:10090", + "RedirectAllowedUrls": "http://localhost:60011,http://localhost:60012,http://localhost:60013,http://localhost:60021,http://localhost:60022,http://localhost:60022,http://localhost:10090" + }, + "ConnectionStrings": { + "Default": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Faster_AuthSiteCenter;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;Encrypt=False;" + }, + "StringEncryption": { + "DefaultPassPhrase": "ybgU8NieQZNjguXe" + }, + "Redis": { + "Configuration": "127.0.0.1:6379" + }, + "AuthServer": { + "Authority": "http://localhost:60100" + }, + "urls": "http://localhost:60100" } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissionDefinitionProvider.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissionDefinitionProvider.cs index fb7b64485..672fffa0f 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissionDefinitionProvider.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissionDefinitionProvider.cs @@ -1,4 +1,4 @@ -using WinIn.FasterZ.Wms.Localization; +using WinIn.FasterZ.Wms.Localization; using Volo.Abp.Authorization.Permissions; using Volo.Abp.Localization; @@ -11,6 +11,11 @@ public class WmsPermissionDefinitionProvider : PermissionDefinitionProvider var myGroup = context.AddGroup(WmsPermissions.GroupName); //Define your own permissions here. Example: //myGroup.AddPermission(WmsPermissions.MyPermission1, L("Permission:MyPermission1")); + + var authDepartmentPermission = myGroup.AddPermission(WmsPermissions.AuthDepartment.Default, L("Permission:AuthDepartment")); + authDepartmentPermission.AddChild(WmsPermissions.AuthDepartment.Create, L("Permission:Create")); + authDepartmentPermission.AddChild(WmsPermissions.AuthDepartment.Update, L("Permission:Update")); + authDepartmentPermission.AddChild(WmsPermissions.AuthDepartment.Delete, L("Permission:Delete")); } private static LocalizableString L(string name) diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissions.cs index 58e655655..087235462 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissions.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Permissions/WmsPermissions.cs @@ -1,4 +1,4 @@ -namespace WinIn.FasterZ.Wms.Permissions; +namespace WinIn.FasterZ.Wms.Permissions; public static class WmsPermissions { @@ -6,4 +6,11 @@ public static class WmsPermissions //Add your own permission names. Example: //public const string MyPermission1 = GroupName + ".MyPermission1"; + public class AuthDepartment + { + public const string Default = GroupName + ".AuthDepartment"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/AuthDepartmentDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/AuthDepartmentDto.cs new file mode 100644 index 000000000..00e433e58 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/AuthDepartmentDto.cs @@ -0,0 +1,20 @@ +using System; +using Volo.Abp.Application.Dtos; + +namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; + +[Serializable] +public class AuthDepartmentDto : AuditedEntityDto +{ + public string Code { get; set; } + + public string? Description { get; set; } + + public Guid Id { get; set; } + + public bool? IsActive { get; set; } + + public string? Name { get; set; } + + public string? Remark { get; set; } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/AuthDepartmentGetListInput.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/AuthDepartmentGetListInput.cs new file mode 100644 index 000000000..f1d790f37 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/AuthDepartmentGetListInput.cs @@ -0,0 +1,21 @@ +using System; +using System.ComponentModel; +using Volo.Abp.Application.Dtos; + +namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; + +[Serializable] +public class AuthDepartmentGetListInput : PagedAndSortedResultRequestDto +{ + public string? Code { get; set; } + + public string? Description { get; set; } + + public Guid? Id { get; set; } + + public bool? IsActive { get; set; } + + public string? Name { get; set; } + + public string? Remark { get; set; } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/CreateUpdateAuthDepartmentDto.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/CreateUpdateAuthDepartmentDto.cs new file mode 100644 index 000000000..08850bcc6 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/Dtos/CreateUpdateAuthDepartmentDto.cs @@ -0,0 +1,19 @@ +using System; + +namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; + +[Serializable] +public class CreateUpdateAuthDepartmentDto +{ + public string Code { get; set; } + + public string? Description { get; set; } + + public Guid Id { get; set; } + + public bool? IsActive { get; set; } + + public string? Name { get; set; } + + public string? Remark { get; set; } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/IAuthDepartmentAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/IAuthDepartmentAppService.cs new file mode 100644 index 000000000..6274f55be --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application.Contracts/Z_Business/AuthDepartment/IAuthDepartmentAppService.cs @@ -0,0 +1,17 @@ +using System; +using WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; +using Volo.Abp.Application.Services; + +namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment; + + +public interface IAuthDepartmentAppService : + ICrudAppService< + AuthDepartmentDto, + Guid, + AuthDepartmentGetListInput, + CreateUpdateAuthDepartmentDto, + CreateUpdateAuthDepartmentDto> +{ + +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationAutoMapperProfile.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationAutoMapperProfile.cs index 2f4e6dd68..dfaf1ddae 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationAutoMapperProfile.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/WmsApplicationAutoMapperProfile.cs @@ -1,4 +1,6 @@ -using AutoMapper; +using WinIn.FasterZ.Wms.Z_Business.AuthDepartment; +using WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; +using AutoMapper; namespace WinIn.FasterZ.Wms; @@ -9,5 +11,7 @@ public class WmsApplicationAutoMapperProfile : Profile /* You can configure your AutoMapper mapping configuration here. * Alternatively, you can split your mapping configurations * into multiple profile classes for a better organization. */ + CreateMap(); + CreateMap(MemberList.Source); } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/AuthDepartment/AuthDepartmentAppService.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/AuthDepartment/AuthDepartmentAppService.cs new file mode 100644 index 000000000..407d3075d --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Application/Z_Business/AuthDepartment/AuthDepartmentAppService.cs @@ -0,0 +1,39 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using WinIn.FasterZ.Wms.Permissions; +using WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; +using Volo.Abp.Application.Services; + +namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment; + + +public class AuthDepartmentAppService : CrudAppService, + IAuthDepartmentAppService +{ + protected override string GetPolicyName { get; set; } = WmsPermissions.AuthDepartment.Default; + protected override string GetListPolicyName { get; set; } = WmsPermissions.AuthDepartment.Default; + protected override string CreatePolicyName { get; set; } = WmsPermissions.AuthDepartment.Create; + protected override string UpdatePolicyName { get; set; } = WmsPermissions.AuthDepartment.Update; + protected override string DeletePolicyName { get; set; } = WmsPermissions.AuthDepartment.Delete; + + private readonly IAuthDepartmentRepository _repository; + + public AuthDepartmentAppService(IAuthDepartmentRepository repository) : base(repository) + { + _repository = repository; + } + + protected override async Task> CreateFilteredQueryAsync(AuthDepartmentGetListInput input) + { + // TODO: AbpHelper generated + return (await base.CreateFilteredQueryAsync(input)) + .WhereIf(!input.Code.IsNullOrWhiteSpace(), x => x.Code.Contains(input.Code)) + .WhereIf(input.Description != null, x => x.Description == input.Description) + .WhereIf(input.Id != null, x => x.Id == input.Id) + .WhereIf(input.IsActive != null, x => x.IsActive == input.IsActive) + .WhereIf(input.Name != null, x => x.Name == input.Name) + .WhereIf(input.Remark != null, x => x.Remark == input.Remark) + ; + } +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ar.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ar.json index 96bbf80b4..3ff07423d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ar.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ar.json @@ -1,8 +1,30 @@ { "culture": "ar", "texts": { - "Menu:Home": "الرئيسية", "Menu:Home": "الصفحة الرئيسية", - "LongWelcomeMessage": "مرحبا بكم في التطبيق. هذا مشروع بدء تشغيل يعتمد على إطار عمل ABP. لمزيد من المعلومات ، يرجى زيارة abp.io." + "LongWelcomeMessage": "مرحبا بكم في التطبيق. هذا مشروع بدء تشغيل يعتمد على إطار عمل ABP. لمزيد من المعلومات ، يرجى زيارة abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } -} +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/cs.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/cs.json index 5a0bbf613..eefcebb90 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/cs.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/cs.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Úvod", "Welcome": "Vítejte", - "LongWelcomeMessage": "Vítejte v aplikaci. Toto je startovací projekt založený na ABP frameworku. Pro více informací, navštivte abp.io." + "LongWelcomeMessage": "Vítejte v aplikaci. Toto je startovací projekt založený na ABP frameworku. Pro více informací, navštivte abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } -} +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/de.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/de.json index 831493be8..2dbcfcd07 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/de.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/de.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Home", "Welcome": "Willkommen", - "LongWelcomeMessage": "Willkommen bei der Anwendung. Dies ist ein Startup-Projekt, das auf dem ABP-Framework basiert. Weitere Informationen finden Sie unter abp.io." + "LongWelcomeMessage": "Willkommen bei der Anwendung. Dies ist ein Startup-Projekt, das auf dem ABP-Framework basiert. Weitere Informationen finden Sie unter abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/en-GB.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/en-GB.json index d2ca0793a..a49bcd12a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/en-GB.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/en-GB.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Home", "Welcome": "Welcome", - "LongWelcomeMessage": "Welcome to the application. This is a startup project based on the ABP framework. For more information, visit abp.io." + "LongWelcomeMessage": "Welcome to the application. This is a startup project based on the ABP framework. For more information, visit abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/en.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/en.json index d2a6a9831..c1c00d11d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/en.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/en.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Home", "Welcome": "Welcome", - "LongWelcomeMessage": "Welcome to the application. This is a startup project based on the ABP framework. For more information, visit abp.io." + "LongWelcomeMessage": "Welcome to the application. This is a startup project based on the ABP framework. For more information, visit abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } -} +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/es.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/es.json index 31b4b59e2..0842eb86a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/es.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/es.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Inicio", "Welcome": "Bienvenido", - "LongWelcomeMessage": "Bienvenido a la aplicación, este es un proyecto base basado en el framework ABP. Para más información, visita abp.io." + "LongWelcomeMessage": "Bienvenido a la aplicación, este es un proyecto base basado en el framework ABP. Para más información, visita abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/fi.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/fi.json index a318859f2..aa4c91aea 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/fi.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/fi.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Koti", "Welcome": "Tervetuloa", - "LongWelcomeMessage": "Tervetuloa sovellukseen. Tämä on ABP-kehykseen perustuva käynnistysprojekti. Lisätietoja on osoitteessa abp.io." + "LongWelcomeMessage": "Tervetuloa sovellukseen. Tämä on ABP-kehykseen perustuva käynnistysprojekti. Lisätietoja on osoitteessa abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/fr.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/fr.json index e76eac0c7..939f3d372 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/fr.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/fr.json @@ -1,8 +1,31 @@ { - "culture": "fr", - "texts": { - "Menu:Home": "Accueil", - "Welcome": "Bienvenue", - "LongWelcomeMessage": "Bienvenue dans l'application. Il s'agit d'un projet de démarrage basé sur le framework ABP. Pour plus d'informations, visitez abp.io." - } + "culture": "fr", + "texts": { + "Menu:Home": "Accueil", + "Welcome": "Bienvenue", + "LongWelcomeMessage": "Bienvenue dans l'application. Il s'agit d'un projet de démarrage basé sur le framework ABP. Pour plus d'informations, visitez abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" + } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/hi.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/hi.json index a1676bfd4..743bd5154 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/hi.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/hi.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "घर", "Welcome": "स्वागत हे", - "LongWelcomeMessage": "आवेदन करने के लिए आपका स्वागत है। यह एबीपी ढांचे पर आधारित एक स्टार्टअप परियोजना है। अधिक जानकारी के लिए, abp.io पर जाएं।" + "LongWelcomeMessage": "आवेदन करने के लिए आपका स्वागत है। यह एबीपी ढांचे पर आधारित एक स्टार्टअप परियोजना है। अधिक जानकारी के लिए, abp.io पर जाएं।", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/hr.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/hr.json index fa8efab32..b27f7ddf6 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/hr.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/hr.json @@ -1,8 +1,31 @@ { - "culture": "hr", - "texts": { - "Menu:Home": "Početna", - "Welcome": "Dobrodošli", - "LongWelcomeMessage": "Dobrodošli u aplikaciju. Ovo je startup projekt temeljen na ABP framework-u. Za više informacija posjetite abp.io." - } -} + "culture": "hr", + "texts": { + "Menu:Home": "Početna", + "Welcome": "Dobrodošli", + "LongWelcomeMessage": "Dobrodošli u aplikaciju. Ovo je startup projekt temeljen na ABP framework-u. Za više informacija posjetite abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/hu.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/hu.json index c7b6a33a0..150319e90 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/hu.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/hu.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Kezdőlap", "Welcome": "Üdvözlöm", - "LongWelcomeMessage": "Üdvözöljük az alkalmazásban. Ez egy ABP keretrendszeren alapuló startup projekt. További információkért látogasson el az abp.io oldalra." + "LongWelcomeMessage": "Üdvözöljük az alkalmazásban. Ez egy ABP keretrendszeren alapuló startup projekt. További információkért látogasson el az abp.io oldalra.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/is.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/is.json index 190df9037..16db2c3fe 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/is.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/is.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Heim", "Welcome": "Velkomin", - "LongWelcomeMessage": "Verið velkomin í forritið. Þetta er startup verkefni sem byggir á ABP. Nánari upplýsingar er að finna á abp.io." + "LongWelcomeMessage": "Verið velkomin í forritið. Þetta er startup verkefni sem byggir á ABP. Nánari upplýsingar er að finna á abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/it.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/it.json index 82ce42b03..528413be0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/it.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/it.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Home", "Welcome": "Benvenuto", - "LongWelcomeMessage": "Benvenuto nell'applicazione. Questo è un progetto di avvio basato sul framework ABP. Per ulteriori informazioni, visita abp.io." + "LongWelcomeMessage": "Benvenuto nell'applicazione. Questo è un progetto di avvio basato sul framework ABP. Per ulteriori informazioni, visita abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/nl.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/nl.json index 9ba8da474..2037bd2f0 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/nl.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/nl.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Home", "Welcome": "Welkom", - "LongWelcomeMessage": "Welkom bij de applicatie. Dit is een startup-project gebaseerd op het ABP-framework. Bezoek abp.io voor meer informatie." + "LongWelcomeMessage": "Welkom bij de applicatie. Dit is een startup-project gebaseerd op het ABP-framework. Bezoek abp.io voor meer informatie.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/pl-PL.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/pl-PL.json index 33412f307..058c51acd 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/pl-PL.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/pl-PL.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Home", "Welcome": "Witaj", - "LongWelcomeMessage": "Witaj w aplikacji. To jest inicjalny projekt bazujący na ABP framework. Po więcej informacji odwiedź stronę abp.io." + "LongWelcomeMessage": "Witaj w aplikacji. To jest inicjalny projekt bazujący na ABP framework. Po więcej informacji odwiedź stronę abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/pt-BR.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/pt-BR.json index 8c818a07a..b3e8b446d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/pt-BR.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/pt-BR.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Principal", "Welcome": "Seja bem-vindo!", - "LongWelcomeMessage": "Bem-vindo a esta aplicação. Este é um projeto inicial baseado no ABP framework. Para mais informações, visite abp.io." + "LongWelcomeMessage": "Bem-vindo a esta aplicação. Este é um projeto inicial baseado no ABP framework. Para mais informações, visite abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ro-RO.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ro-RO.json index 1fe560196..e9ec0b34e 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ro-RO.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ro-RO.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Acasă", "Welcome": "Bun venit", - "LongWelcomeMessage": "Bun venit la aplicaţie. Acesta este un proiect de pornire bazat pe framework-ul ABP. Pentru mai multe informaţii, vizitaţi, visit abp.io." + "LongWelcomeMessage": "Bun venit la aplicaţie. Acesta este un proiect de pornire bazat pe framework-ul ABP. Pentru mai multe informaţii, vizitaţi, visit abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ru.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ru.json index 8464e4434..28305f61c 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ru.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/ru.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Главная", "Welcome": "Добро пожаловать", - "LongWelcomeMessage": "Добро пожаловать в приложение. Этот запущенный проект основан на фреймворке ABP. Для получения дополнительной информации посетите сайт abp.io." + "LongWelcomeMessage": "Добро пожаловать в приложение. Этот запущенный проект основан на фреймворке ABP. Для получения дополнительной информации посетите сайт abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } -} +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/sk.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/sk.json index 4f35aaf1c..0a727f297 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/sk.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/sk.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Domov", "Welcome": "Vitajte", - "LongWelcomeMessage": "Vitajte v aplikácii. Toto je štartovací projekt založený na ABP frameworku. Viac informácií nájdete na stránke abp.io." + "LongWelcomeMessage": "Vitajte v aplikácii. Toto je štartovací projekt založený na ABP frameworku. Viac informácií nájdete na stránke abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/sl.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/sl.json index a066ef26b..c5da7f559 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/sl.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/sl.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Domov", "Welcome": "Dobrodošli", - "LongWelcomeMessage": "Dobrodošli v aplikaciji. To je začetni projekt na osnovi okolja ABP. Za več informacij obiščite abp.io." + "LongWelcomeMessage": "Dobrodošli v aplikaciji. To je začetni projekt na osnovi okolja ABP. Za več informacij obiščite abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } -} +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/tr.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/tr.json index 2cc911e48..2e72a2004 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/tr.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/tr.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Ana sayfa", "Welcome": "Hoşgeldiniz", - "LongWelcomeMessage": "Uygulamaya hoşgeldiniz. Bu, ABP framework'ü üzerine bina edilmiş bir başlangıç projesidir. Daha fazla bilgi için abp.io adresini ziyaret edebilirsiniz." + "LongWelcomeMessage": "Uygulamaya hoşgeldiniz. Bu, ABP framework'ü üzerine bina edilmiş bir başlangıç projesidir. Daha fazla bilgi için abp.io adresini ziyaret edebilirsiniz.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/vi.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/vi.json index c115a3572..50d66fe6a 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/vi.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/vi.json @@ -3,6 +3,29 @@ "texts": { "Menu:Home": "Trang chủ", "Welcome": "Chào mừng bạn", - "LongWelcomeMessage": "Chào mừng bạn đến ứng dụng. Đây là một dự án khởi nghiệp dựa trên khung ABP. Để biết thêm thông tin, hãy truy cập abp.io." + "LongWelcomeMessage": "Chào mừng bạn đến ứng dụng. Đây là một dự án khởi nghiệp dựa trên khung ABP. Để biết thêm thông tin, hãy truy cập abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" } -} +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/zh-Hans.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/zh-Hans.json index 23790bde5..8b1b4a327 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/zh-Hans.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/zh-Hans.json @@ -1,8 +1,31 @@ { - "culture": "zh-Hans", - "texts": { - "Menu:Home": "首页", - "Welcome": "欢迎", - "LongWelcomeMessage": "欢迎来到该应用程序. 这是一个基于ABP框架的启动项目. 有关更多信息, 请访问 abp.io." - } - } \ No newline at end of file + "culture": "zh-Hans", + "texts": { + "Menu:Home": "首页", + "Welcome": "欢迎", + "LongWelcomeMessage": "欢迎来到该应用程序. 这是一个基于ABP框架的启动项目. 有关更多信息, 请访问 abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/zh-Hant.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/zh-Hant.json index 31e0ab5a4..4d87b97a1 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/zh-Hant.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain.Shared/Localization/Wms/zh-Hant.json @@ -1,8 +1,31 @@ { - "culture": "zh-Hant", - "texts": { - "Menu:Home": "首頁", - "Welcome": "歡迎", - "LongWelcomeMessage": "歡迎來到此應用程式. 這是一個基於ABP框架的起始專案. 有關更多訊息, 請瀏覽 abp.io." - } - } \ No newline at end of file + "culture": "zh-Hant", + "texts": { + "Menu:Home": "首頁", + "Welcome": "歡迎", + "LongWelcomeMessage": "歡迎來到此應用程式. 這是一個基於ABP框架的起始專案. 有關更多訊息, 請瀏覽 abp.io.", + "Permission:AuthDepartment": "AuthDepartment", + "Permission:Create": "Create", + "Permission:Update": "Update", + "Permission:Delete": "Delete", + "Menu:AuthDepartment": "MenuAuthDepartment", + "AuthDepartment": "AuthDepartment", + "AuthDepartmentCode": "AuthDepartmentCode", + "AuthDepartmentConcurrencyStamp": "AuthDepartmentConcurrencyStamp", + "AuthDepartmentCreationTime": "AuthDepartmentCreationTime", + "AuthDepartmentCreatorId": "AuthDepartmentCreatorId", + "AuthDepartmentDescription": "AuthDepartmentDescription", + "AuthDepartmentExtraProperties": "AuthDepartmentExtraProperties", + "AuthDepartmentId": "AuthDepartmentId", + "AuthDepartmentIsActive": "AuthDepartmentIsActive", + "AuthDepartmentLastModificationTime": "AuthDepartmentLastModificationTime", + "AuthDepartmentLastModifierId": "AuthDepartmentLastModifierId", + "AuthDepartmentName": "AuthDepartmentName", + "AuthDepartmentRemark": "AuthDepartmentRemark", + "CreateAuthDepartment": "CreateAuthDepartment", + "EditAuthDepartment": "EditAuthDepartment", + "AuthDepartmentDeletionConfirmationMessage": "Are you sure to delete the authDepartment {0}?", + "SuccessfullyDeleted": "Successfully deleted", + "TableFilter": "TableFilter" + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WmsConsts.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WmsConsts.cs index 7e73ef761..8c11d6088 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WmsConsts.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/WmsConsts.cs @@ -2,7 +2,7 @@ public static class WmsConsts { - public const string DbTablePrefix = "App"; + public const string DbTablePrefix = null; public const string DbSchema = null; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthDepartment/AuthDepartment.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthDepartment/AuthDepartment.cs index b3d5ce744..f9e1d1c3d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthDepartment/AuthDepartment.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthDepartment/AuthDepartment.cs @@ -8,27 +8,13 @@ public class AuthDepartment : AuditedAggregateRoot { public string Code { get; set; } = null!; - public string? ConcurrencyStamp { get; set; } - - public DateTime CreationTime { get; set; } - - public Guid? CreatorId { get; set; } - public string? Description { get; set; } - public string? ExtraProperties { get; set; } - public Guid Id { get; set; } public bool? IsActive { get; set; } - public DateTime? LastModificationTime { get; set; } - - public Guid? LastModifierId { get; set; } - public string? Name { get; set; } public string? Remark { get; set; } - - public Guid? TenantId { get; set; } } \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthDepartment/IAuthDepartmentRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthDepartment/IAuthDepartmentRepository.cs new file mode 100644 index 000000000..4c3245f5d --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Domain/Z_Business/AuthDepartment/IAuthDepartmentRepository.cs @@ -0,0 +1,8 @@ +using System; +using Volo.Abp.Domain.Repositories; + +namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment; + +public interface IAuthDepartmentRepository : IRepository +{ +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs index 9313dc503..2510b8d60 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsDbContext.cs @@ -1,4 +1,4 @@ -using Microsoft.EntityFrameworkCore; +using Microsoft.EntityFrameworkCore; using Volo.Abp.AuditLogging.EntityFrameworkCore; using Volo.Abp.BackgroundJobs.EntityFrameworkCore; using Volo.Abp.Data; @@ -12,12 +12,14 @@ using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.TenantManagement; using Volo.Abp.TenantManagement.EntityFrameworkCore; +using WinIn.FasterZ.Wms.Z_Business.AuthDepartment; +using Volo.Abp.EntityFrameworkCore.Modeling; namespace WinIn.FasterZ.Wms.EntityFrameworkCore; [ReplaceDbContext(typeof(IIdentityDbContext))] [ReplaceDbContext(typeof(ITenantManagementDbContext))] -[ConnectionStringName("Default")] +[ConnectionStringName("Wms")] public class WmsDbContext : AbpDbContext, IIdentityDbContext, @@ -52,6 +54,7 @@ public class WmsDbContext : public DbSet TenantConnectionStrings { get; set; } #endregion + public DbSet AuthDepartments { get; set; } public WmsDbContext(DbContextOptions options) : base(options) @@ -82,5 +85,15 @@ public class WmsDbContext : // b.ConfigureByConvention(); //auto configure for the base class props // //... //}); + + + builder.Entity(b => + { + b.ToTable(WmsConsts.DbTablePrefix + "Auth_Department", WmsConsts.DbSchema); + b.ConfigureByConvention(); + + + /* Configure more properties here */ + }); } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEntityFrameworkCoreModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEntityFrameworkCoreModule.cs index 795b1158f..90e2fcf9d 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEntityFrameworkCoreModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/EntityFrameworkCore/WmsEntityFrameworkCoreModule.cs @@ -1,4 +1,5 @@ -using System; +using WinIn.FasterZ.Wms.Z_Business.AuthDepartment; +using System; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.Uow; using Volo.Abp.AuditLogging.EntityFrameworkCore; @@ -41,6 +42,7 @@ public class WmsEntityFrameworkCoreModule : AbpModule /* Remove "includeAllEntities: true" to create * default repositories only for aggregate roots */ options.AddDefaultRepositories(includeAllEntities: true); + options.AddRepository(); }); Configure(options => diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/AuthDepartment/AuthDepartmentEfCoreQueryableExtensions.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/AuthDepartment/AuthDepartmentEfCoreQueryableExtensions.cs new file mode 100644 index 000000000..29a3c3261 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/AuthDepartment/AuthDepartmentEfCoreQueryableExtensions.cs @@ -0,0 +1,19 @@ +using System.Linq; +using Microsoft.EntityFrameworkCore; + +namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment; + +public static class AuthDepartmentEfCoreQueryableExtensions +{ + public static IQueryable IncludeDetails(this IQueryable queryable, bool include = true) + { + if (!include) + { + return queryable; + } + + return queryable + // .Include(x => x.xxx) // TODO: AbpHelper generated + ; + } +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/AuthDepartment/AuthDepartmentRepository.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/AuthDepartment/AuthDepartmentRepository.cs new file mode 100644 index 000000000..891519c08 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.EntityFrameworkCore/Z_Business/AuthDepartment/AuthDepartmentRepository.cs @@ -0,0 +1,20 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using WinIn.FasterZ.Wms.EntityFrameworkCore; +using Volo.Abp.Domain.Repositories.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; + +namespace WinIn.FasterZ.Wms.Z_Business.AuthDepartment; + +public class AuthDepartmentRepository : EfCoreRepository, IAuthDepartmentRepository +{ + public AuthDepartmentRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } + + public override async Task> WithDetailsAsync() + { + return (await GetQueryableAsync()).IncludeDetails(); + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/Properties/launchSettings.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/Properties/launchSettings.json index 8583c5b4a..732d964b7 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/Properties/launchSettings.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/Properties/launchSettings.json @@ -1,27 +1,26 @@ { - "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "https://localhost:44355", - "sslPort": 44355 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, + //"iisSettings": { + // "windowsAuthentication": false, + // "anonymousAuthentication": true, + // "iisExpress": { + // "applicationUrl": "https://localhost:44355", + // "sslPort": 44355 + // } + //}, + //"profiles": { + // "IIS Express": { + // "commandName": "IISExpress", + // "launchBrowser": true, + // "environmentVariables": { + // "ASPNETCORE_ENVIRONMENT": "Development" + // } + // }, "WinIn.FasterZ.Wms.HttpApi.Host": { - "commandName": "Project", - "launchBrowser": true, - "applicationUrl": "https://localhost:44355", - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } + "commandName": "Project", + "launchBrowser": true, + "applicationUrl": "http://localhost:60011", + "environmentVariables": { + "ASPNETCORE_ENVIRONMENT": "Development" + } } - } -} \ No newline at end of file +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/WmsHttpApiHostModule.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/WmsHttpApiHostModule.cs index a5c58c611..8b53cec54 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/WmsHttpApiHostModule.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/WmsHttpApiHostModule.cs @@ -31,6 +31,11 @@ using Volo.Abp.VirtualFileSystem; namespace WinIn.FasterZ.Wms; +using Volo.Abp.Application.Dtos; +using Volo.Abp.AspNetCore.Mvc.AntiForgery; +using Volo.Abp.FeatureManagement; +using Volo.Abp.PermissionManagement; + [DependsOn( typeof(WmsHttpApiModule), typeof(AbpAutofacModule), @@ -49,6 +54,11 @@ public class WmsHttpApiHostModule : AbpModule var configuration = context.Services.GetConfiguration(); var hostingEnvironment = context.Services.GetHostingEnvironment(); + Configure(options => + { + options.AutoValidate = false; + }); + ConfigureConventionalControllers(); ConfigureAuthentication(context, configuration); ConfigureCache(configuration); @@ -57,11 +67,15 @@ public class WmsHttpApiHostModule : AbpModule ConfigureDistributedLocking(context, configuration); ConfigureCors(context, configuration); ConfigureSwaggerServices(context, configuration); + + //÷ֵͷҳѯ + SetMaxMaxResultCount(); } private void ConfigureCache(IConfiguration configuration) { - Configure(options => { options.KeyPrefix = "Wms:"; }); + //Configure(options => { options.KeyPrefix = "Wms:"; }); + Configure(options => { options.KeyPrefix = "AuthSiteCenter:"; }); } private void ConfigureVirtualFileSystem(ServiceConfigurationContext context) @@ -98,13 +112,24 @@ public class WmsHttpApiHostModule : AbpModule private void ConfigureAuthentication(ServiceConfigurationContext context, IConfiguration configuration) { - context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) - .AddJwtBearer(options => + + Configure(options => + { + options.IsDynamicPermissionStoreEnabled = true; + }); + + Configure(options => { - options.Authority = configuration["AuthServer:Authority"]; - options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); - options.Audience = "Wms"; + options.IsDynamicFeatureStoreEnabled = true; }); + + context.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme) + .AddJwtBearer(options => + { + options.Authority = configuration["AuthServer:Authority"]; + options.RequireHttpsMetadata = Convert.ToBoolean(configuration["AuthServer:RequireHttpsMetadata"]); + options.Audience = "Wms"; + }); } private static void ConfigureSwaggerServices(ServiceConfigurationContext context, IConfiguration configuration) @@ -207,4 +232,13 @@ public class WmsHttpApiHostModule : AbpModule app.UseUnitOfWork(); app.UseConfiguredEndpoints(); } + + /// + /// ÷ֵͷҳѯ + /// + private void SetMaxMaxResultCount() + { + //LimitedResultRequestDto.MaxMaxResultCount = 50000000; + LimitedResultRequestDto.MaxMaxResultCount = int.MaxValue; + } } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/appsettings.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/appsettings.json index c4094e3e5..75354f0ae 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/appsettings.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.HttpApi.Host/appsettings.json @@ -1,20 +1,27 @@ { - "App": { - "CorsOrigins": "https://*.Wms.com" - }, - "ConnectionStrings": { - "Default": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;Encrypt=False;" - }, - "Redis": { - "Configuration": "127.0.0.1" - }, - "AuthServer": { - "Authority": "https://localhost:44381", - "RequireHttpsMetadata": "true", - "SwaggerClientId": "Wms_Swagger" - }, - "StringEncryption": { - "DefaultPassPhrase": "4jjXQgqwh6PRrjn4" - } + "App": { + "CorsOrigins": "https://*.Wms.com", + "Audit": { + "IsEnabled": false // 禁用审计功能 + // 其他审计相关设置项 + } + }, + "ConnectionStrings": { + "Default": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Faster_AuthSiteCenter;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;Encrypt=False;", + "Wms": "Server=dev.ccwin-in.com,13319;Database=WMS_DongYang_Main;uid=ccwin-in;pwd=Microsoft@2022;timeout=6000;Encrypt=False;" + }, + "Redis": { + "Configuration": "127.0.0.1" + }, + "AuthServer": { + "Authority": "http://localhost:60100", + "RequireHttpsMetadata": "false", + "SwaggerClientId": "Wms_Swagger" + }, + "StringEncryption": { + "DefaultPassPhrase": "4jjXQgqwh6PRrjn4" + }, + "AlwaysAllowAuthorization": "false", + "urls": "http://localhost:60011" } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenuContributor.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenuContributor.cs index eca3546bf..8cce0c6ff 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenuContributor.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenuContributor.cs @@ -1,4 +1,5 @@ -using System; +using System; +using WinIn.FasterZ.Wms.Permissions; using System.Threading.Tasks; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; @@ -35,7 +36,7 @@ public class WmsMenuContributor : IMenuContributor } } - private Task ConfigureMainMenuAsync(MenuConfigurationContext context) + private async Task ConfigureMainMenuAsync(MenuConfigurationContext context) { var administration = context.Menu.GetAdministration(); var l = context.GetLocalizer(); @@ -63,7 +64,12 @@ public class WmsMenuContributor : IMenuContributor administration.SetSubItemOrder(IdentityMenuNames.GroupName, 2); administration.SetSubItemOrder(SettingManagementMenuNames.GroupName, 3); - return Task.CompletedTask; + if (await context.IsGrantedAsync(WmsPermissions.AuthDepartment.Default)) + { + context.Menu.GetAdministration().AddItem( + new ApplicationMenuItem(WmsMenus.AuthDepartment, l["Menu:AuthDepartment"], "/Z_Business/AuthDepartment/AuthDepartment") + ); + } } private Task ConfigureUserMenuAsync(MenuConfigurationContext context) diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenus.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenus.cs index 238a8bc1a..6ea13aa70 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenus.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Menus/WmsMenus.cs @@ -1,4 +1,4 @@ -namespace WinIn.FasterZ.Wms.Web.Menus; +namespace WinIn.FasterZ.Wms.Web.Menus; public class WmsMenus { @@ -7,4 +7,5 @@ public class WmsMenus //Add your menu items here... + public const string AuthDepartment = Prefix + ".AuthDepartment"; } diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/CreateModal.cshtml b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/CreateModal.cshtml new file mode 100644 index 000000000..d03edf830 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/CreateModal.cshtml @@ -0,0 +1,18 @@ +@page +@using Microsoft.AspNetCore.Mvc.Localization +@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal; +@using WinIn.FasterZ.Wms.Localization +@inject IHtmlLocalizer L +@model WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment.CreateModalModel +@{ + Layout = null; +} + + + + + + + + + \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/CreateModal.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/CreateModal.cshtml.cs new file mode 100644 index 000000000..fdd2dcf1f --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/CreateModal.cshtml.cs @@ -0,0 +1,27 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using WinIn.FasterZ.Wms.Z_Business.AuthDepartment; +using WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; +using WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment.ViewModels; + +namespace WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment; + +public class CreateModalModel : WmsPageModel +{ + [BindProperty] + public CreateEditAuthDepartmentViewModel ViewModel { get; set; } + + private readonly IAuthDepartmentAppService _service; + + public CreateModalModel(IAuthDepartmentAppService service) + { + _service = service; + } + + public virtual async Task OnPostAsync() + { + var dto = ObjectMapper.Map(ViewModel); + await _service.CreateAsync(dto); + return NoContent(); + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/EditModal.cshtml b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/EditModal.cshtml new file mode 100644 index 000000000..f5007ee08 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/EditModal.cshtml @@ -0,0 +1,19 @@ +@page +@using WinIn.FasterZ.Wms.Localization +@using Microsoft.AspNetCore.Mvc.Localization +@using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Modal; +@inject IHtmlLocalizer L +@model WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment.EditModalModel +@{ + Layout = null; +} + + + + + + + + + + diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/EditModal.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/EditModal.cshtml.cs new file mode 100644 index 000000000..be3949a9d --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/EditModal.cshtml.cs @@ -0,0 +1,38 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using WinIn.FasterZ.Wms.Z_Business.AuthDepartment; +using WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; +using WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment.ViewModels; + +namespace WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment; + +public class EditModalModel : WmsPageModel +{ + [HiddenInput] + [BindProperty(SupportsGet = true)] + public Guid Id { get; set; } + + [BindProperty] + public CreateEditAuthDepartmentViewModel ViewModel { get; set; } + + private readonly IAuthDepartmentAppService _service; + + public EditModalModel(IAuthDepartmentAppService service) + { + _service = service; + } + + public virtual async Task OnGetAsync() + { + var dto = await _service.GetAsync(Id); + ViewModel = ObjectMapper.Map(dto); + } + + public virtual async Task OnPostAsync() + { + var dto = ObjectMapper.Map(ViewModel); + await _service.UpdateAsync(Id, dto); + return NoContent(); + } +} \ No newline at end of file diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/Index.cshtml b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/Index.cshtml new file mode 100644 index 000000000..b301c12df --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/Index.cshtml @@ -0,0 +1,57 @@ +@page +@using WinIn.FasterZ.Wms.Permissions +@using Microsoft.AspNetCore.Authorization +@using Microsoft.AspNetCore.Mvc.Localization +@using Volo.Abp.AspNetCore.Mvc.UI.Layout +@using WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment +@using WinIn.FasterZ.Wms.Localization +@using WinIn.FasterZ.Wms.Web.Menus +@model IndexModel +@inject IPageLayout PageLayout +@inject IHtmlLocalizer L +@inject IAuthorizationService Authorization +@{ + PageLayout.Content.Title = L["AuthDepartment"].Value; + PageLayout.Content.BreadCrumb.Add(L["Menu:AuthDepartment"].Value); + PageLayout.Content.MenuItemName = WmsMenus.AuthDepartment; +} + +@section scripts +{ + +} +@section styles +{ + +} + + + + + + @L["AuthDepartment"] + + + @if (await Authorization.IsGrantedAsync(WmsPermissions.AuthDepartment.Create)) + { + + } + + + + + + @L["TableFilter"] + + + + + + +
+ + + diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/Index.cshtml.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/Index.cshtml.cs new file mode 100644 index 000000000..87bae5eba --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/Index.cshtml.cs @@ -0,0 +1,43 @@ +using System; +using System.Threading.Tasks; +using System.ComponentModel.DataAnnotations; +using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap.TagHelpers.Form; + +namespace WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment; + +public class IndexModel : WmsPageModel +{ + public AuthDepartmentFilterInput AuthDepartmentFilter { get; set; } + + public virtual async Task OnGetAsync() + { + await Task.CompletedTask; + } +} + +public class AuthDepartmentFilterInput +{ + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "AuthDepartmentCode")] + public string? Code { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "AuthDepartmentDescription")] + public string? Description { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "AuthDepartmentId")] + public Guid? Id { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "AuthDepartmentIsActive")] + public bool? IsActive { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "AuthDepartmentName")] + public string? Name { get; set; } + + [FormControlSize(AbpFormControlSize.Small)] + [Display(Name = "AuthDepartmentRemark")] + public string? Remark { get; set; } +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/ViewModels/CreateEditAuthDepartmentViewModel.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/ViewModels/CreateEditAuthDepartmentViewModel.cs new file mode 100644 index 000000000..ce222ce55 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/ViewModels/CreateEditAuthDepartmentViewModel.cs @@ -0,0 +1,25 @@ +using System; +using System.ComponentModel.DataAnnotations; + +namespace WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment.ViewModels; + +public class CreateEditAuthDepartmentViewModel +{ + [Display(Name = "AuthDepartmentCode")] + public string Code { get; set; } + + [Display(Name = "AuthDepartmentDescription")] + public string? Description { get; set; } + + [Display(Name = "AuthDepartmentId")] + public Guid Id { get; set; } + + [Display(Name = "AuthDepartmentIsActive")] + public bool? IsActive { get; set; } + + [Display(Name = "AuthDepartmentName")] + public string? Name { get; set; } + + [Display(Name = "AuthDepartmentRemark")] + public string? Remark { get; set; } +} diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/index.css b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/index.css new file mode 100644 index 000000000..e69de29bb diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/index.js b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/index.js new file mode 100644 index 000000000..cc8018014 --- /dev/null +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Pages/Z_Business/AuthDepartment/AuthDepartment/index.js @@ -0,0 +1,105 @@ +$(function () { + + $("#AuthDepartmentFilter :input").on('input', function () { + dataTable.ajax.reload(); + }); + + //After abp v7.2 use dynamicForm 'column-size' instead of the following settings + //$('#AuthDepartmentCollapse div').addClass('col-sm-3').parent().addClass('row'); + + var getFilter = function () { + var input = {}; + $("#AuthDepartmentFilter") + .serializeArray() + .forEach(function (data) { + if (data.value != '') { + input[abp.utils.toCamelCase(data.name.replace(/AuthDepartmentFilter./g, ''))] = data.value; + } + }) + return input; + }; + + var l = abp.localization.getResource('Wms'); + + var service = winIn.fasterZ.wms.z_Business.authDepartment.authDepartment; + var createModal = new abp.ModalManager(abp.appPath + 'Z_Business/AuthDepartment/AuthDepartment/CreateModal'); + var editModal = new abp.ModalManager(abp.appPath + 'Z_Business/AuthDepartment/AuthDepartment/EditModal'); + + var dataTable = $('#AuthDepartmentTable').DataTable(abp.libs.datatables.normalizeConfiguration({ + processing: true, + serverSide: true, + paging: true, + searching: false,//disable default searchbox + autoWidth: false, + scrollCollapse: true, + order: [[0, "asc"]], + ajax: abp.libs.datatables.createAjax(service.getList,getFilter), + columnDefs: [ + { + rowAction: { + items: + [ + { + text: l('Edit'), + visible: abp.auth.isGranted('Wms.AuthDepartment.Update'), + action: function (data) { + editModal.open({ id: data.record.id }); + } + }, + { + text: l('Delete'), + visible: abp.auth.isGranted('Wms.AuthDepartment.Delete'), + confirmMessage: function (data) { + return l('AuthDepartmentDeletionConfirmationMessage', data.record.id); + }, + action: function (data) { + service.delete(data.record.id) + .then(function () { + abp.notify.info(l('SuccessfullyDeleted')); + dataTable.ajax.reload(); + }); + } + } + ] + } + }, + { + title: l('AuthDepartmentCode'), + data: "code" + }, + { + title: l('AuthDepartmentDescription'), + data: "description" + }, + { + title: l('AuthDepartmentId'), + data: "id" + }, + { + title: l('AuthDepartmentIsActive'), + data: "isActive" + }, + { + title: l('AuthDepartmentName'), + data: "name" + }, + { + title: l('AuthDepartmentRemark'), + data: "remark" + }, + ] + })); + + createModal.onResult(function () { + dataTable.ajax.reload(); + }); + + editModal.onResult(function () { + dataTable.ajax.reload(); + }); + + $('#NewAuthDepartmentButton').click(function (e) { + e.preventDefault(); + createModal.open(); + }); +}); diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Properties/launchSettings.json b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Properties/launchSettings.json index 2bb434f0b..862b80d5b 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Properties/launchSettings.json +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/Properties/launchSettings.json @@ -1,20 +1,20 @@ { "iisSettings": { - "windowsAuthentication": false, - "anonymousAuthentication": true, - "iisExpress": { - "applicationUrl": "https://localhost:44345", - "sslPort": 44345 - } - }, - "profiles": { - "IIS Express": { - "commandName": "IISExpress", - "launchBrowser": true, - "environmentVariables": { - "ASPNETCORE_ENVIRONMENT": "Development" - } - }, + // "windowsAuthentication": false, + // "anonymousAuthentication": true, + // "iisExpress": { + // "applicationUrl": "https://localhost:44345", + // "sslPort": 44345 + // } + //}, + //"profiles": { + // "IIS Express": { + // "commandName": "IISExpress", + // "launchBrowser": true, + // "environmentVariables": { + // "ASPNETCORE_ENVIRONMENT": "Development" + // } + // }, "WinIn.FasterZ.Wms.Web": { "commandName": "Project", "launchBrowser": true, diff --git a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebAutoMapperProfile.cs b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebAutoMapperProfile.cs index 4cc88c32d..f581bc333 100644 --- a/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebAutoMapperProfile.cs +++ b/WinIn.FasterZ.Wms.Be/WinIn.FasterZ.Wms/WinIn.FasterZ.Wms/src/WinIn.FasterZ.Wms.Web/WmsWebAutoMapperProfile.cs @@ -1,4 +1,6 @@ -using AutoMapper; +using WinIn.FasterZ.Wms.Z_Business.AuthDepartment.Dtos; +using WinIn.FasterZ.Wms.Web.Pages.Z_Business.AuthDepartment.AuthDepartment.ViewModels; +using AutoMapper; namespace WinIn.FasterZ.Wms.Web; @@ -7,5 +9,7 @@ public class WmsWebAutoMapperProfile : Profile public WmsWebAutoMapperProfile() { //Define your AutoMapper configuration here for the Web project. + CreateMap(); + CreateMap(); } }