From 5af7d8cbe5c600b7be4d9ff45e4ba08f057e362c Mon Sep 17 00:00:00 2001 From: "boxu.zheng" Date: Thu, 18 Jul 2024 17:32:55 +0800 Subject: [PATCH] =?UTF-8?q?=E6=8E=A5=E5=8F=A3?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- ...Dy_ExchangePermissionDefinitionProvider.cs | 5 + .../Permissions/Dy_ExchangePermissions.cs | 10 ++ .../Dtos/ArchivedIncomingToWmDto.cs | 81 ++++++++++++++++ .../CreateUpdateArchivedIncomingToWmDto.cs | 92 +++++++++++++++++++ .../IArchivedIncomingToWmAppService.cs | 21 +++++ ...Dy_ExchangeApplicationAutoMapperProfile.cs | 2 + .../ArchivedIncomingToWmAppService.cs | 30 ++++++ .../Localization/Dy_Exchange/ar.json | 22 ++++- .../IArchivedIncomingToWmRepository.cs | 11 +++ .../Dy_ExchangeDbContext.cs | 14 +++ .../Dy_ExchangeEntityFrameworkCoreModule.cs | 1 + ...vedIncomingToWmEfCoreQuerableExtensions.cs | 22 +++++ .../ArchivedIncomingToWmRepository.cs | 20 ++++ 13 files changed, 330 insertions(+), 1 deletion(-) create mode 100644 InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Z_Business/Dtos/ArchivedIncomingToWmDto.cs create mode 100644 InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Z_Business/Dtos/CreateUpdateArchivedIncomingToWmDto.cs create mode 100644 InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Z_Business/IArchivedIncomingToWmAppService.cs create mode 100644 InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/Z_Business/ArchivedIncomingToWmAppService.cs create mode 100644 InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Domain/Z_Business/IArchivedIncomingToWmRepository.cs create mode 100644 InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/Z_Business/ArchivedIncomingToWmEfCoreQuerableExtensions.cs create mode 100644 InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/Z_Business/ArchivedIncomingToWmRepository.cs diff --git a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Permissions/Dy_ExchangePermissionDefinitionProvider.cs b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Permissions/Dy_ExchangePermissionDefinitionProvider.cs index dc2d00dcc..83d599d36 100644 --- a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Permissions/Dy_ExchangePermissionDefinitionProvider.cs +++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Permissions/Dy_ExchangePermissionDefinitionProvider.cs @@ -16,6 +16,11 @@ public class Dy_ExchangePermissionDefinitionProvider : PermissionDefinitionProvi dataExchangeInterfaceConfigPermission.AddChild(Dy_ExchangePermissions.DataExchangeInterfaceConfig.Create, L("Permission:Create")); dataExchangeInterfaceConfigPermission.AddChild(Dy_ExchangePermissions.DataExchangeInterfaceConfig.Update, L("Permission:Update")); dataExchangeInterfaceConfigPermission.AddChild(Dy_ExchangePermissions.DataExchangeInterfaceConfig.Delete, L("Permission:Delete")); + + var archivedIncomingToWmPermission = myGroup.AddPermission(Dy_ExchangePermissions.ArchivedIncomingToWm.Default, L("Permission:ArchivedIncomingToWm")); + archivedIncomingToWmPermission.AddChild(Dy_ExchangePermissions.ArchivedIncomingToWm.Create, L("Permission:Create")); + archivedIncomingToWmPermission.AddChild(Dy_ExchangePermissions.ArchivedIncomingToWm.Update, L("Permission:Update")); + archivedIncomingToWmPermission.AddChild(Dy_ExchangePermissions.ArchivedIncomingToWm.Delete, L("Permission:Delete")); } private static LocalizableString L(string name) diff --git a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Permissions/Dy_ExchangePermissions.cs b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Permissions/Dy_ExchangePermissions.cs index 2e756935e..7ed52aa4b 100644 --- a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Permissions/Dy_ExchangePermissions.cs +++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Permissions/Dy_ExchangePermissions.cs @@ -26,4 +26,14 @@ public static class Dy_ExchangePermissions public const string Create = Default + ".Create"; public const string Delete = Default + ".Delete"; } + /// + /// 日志 + /// + public class ArchivedIncomingToWm + { + public const string Default = GroupName + ".ArchivedIncomingToWm"; + public const string Update = Default + ".Update"; + public const string Create = Default + ".Create"; + public const string Delete = Default + ".Delete"; + } } diff --git a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Z_Business/Dtos/ArchivedIncomingToWmDto.cs b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Z_Business/Dtos/ArchivedIncomingToWmDto.cs new file mode 100644 index 000000000..fa43b77c6 --- /dev/null +++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Z_Business/Dtos/ArchivedIncomingToWmDto.cs @@ -0,0 +1,81 @@ +using System; +using Volo.Abp.Application.Dtos; + +namespace Dy_Exchange.Z_Business.Dtos; + +/// +/// 日志 +/// +[Serializable] +public class ArchivedIncomingToWmDto : AuditedEntityDto +{ + /// + /// + /// + public long Number { get; set; } + + /// + /// + /// + public string? Remark { get; set; } + + /// + /// + /// + public string? DataType { get; set; } + + /// + /// + /// + public int DataAction { get; set; } + + /// + /// + /// + public DateTime EffectiveDate { get; set; } + + /// + /// + /// + public int Status { get; set; } + + /// + /// + /// + public string? DataIdentityCode { get; set; } + + /// + /// + /// + public string? DataContent { get; set; } + + /// + /// + /// + public string? SourceSystem { get; set; } + + /// + /// + /// + public DateTime WriteTime { get; set; } + + /// + /// + /// + public DateTime? ReadTime { get; set; } + + /// + /// + /// + public int ErrorCode { get; set; } + + /// + /// + /// + public string? ErrorMessage { get; set; } + + /// + /// + /// + public int RetryTimes { get; set; } +} \ No newline at end of file diff --git a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Z_Business/Dtos/CreateUpdateArchivedIncomingToWmDto.cs b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Z_Business/Dtos/CreateUpdateArchivedIncomingToWmDto.cs new file mode 100644 index 000000000..df0f9a623 --- /dev/null +++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Z_Business/Dtos/CreateUpdateArchivedIncomingToWmDto.cs @@ -0,0 +1,92 @@ +using System; +using System.ComponentModel; + +namespace Dy_Exchange.Z_Business.Dtos; + +[Serializable] +public class CreateUpdateArchivedIncomingToWmDto +{ + /// + /// + /// + [DisplayName("ArchivedIncomingToWmNumber")] + public long Number { get; set; } + + /// + /// + /// + [DisplayName("ArchivedIncomingToWmRemark")] + public string? Remark { get; set; } + + /// + /// + /// + [DisplayName("ArchivedIncomingToWmDataType")] + public string? DataType { get; set; } + + /// + /// + /// + [DisplayName("ArchivedIncomingToWmDataAction")] + public int DataAction { get; set; } + + /// + /// + /// + [DisplayName("ArchivedIncomingToWmEffectiveDate")] + public DateTime EffectiveDate { get; set; } + + /// + /// + /// + [DisplayName("ArchivedIncomingToWmStatus")] + public int Status { get; set; } + + /// + /// + /// + [DisplayName("ArchivedIncomingToWmDataIdentityCode")] + public string? DataIdentityCode { get; set; } + + /// + /// + /// + [DisplayName("ArchivedIncomingToWmDataContent")] + public string? DataContent { get; set; } + + /// + /// + /// + [DisplayName("ArchivedIncomingToWmSourceSystem")] + public string? SourceSystem { get; set; } + + /// + /// + /// + [DisplayName("ArchivedIncomingToWmWriteTime")] + public DateTime WriteTime { get; set; } + + /// + /// + /// + [DisplayName("ArchivedIncomingToWmReadTime")] + public DateTime? ReadTime { get; set; } + + /// + /// + /// + [DisplayName("ArchivedIncomingToWmErrorCode")] + public int ErrorCode { get; set; } + + /// + /// + /// + [DisplayName("ArchivedIncomingToWmErrorMessage")] + public string? ErrorMessage { get; set; } + + /// + /// + /// + [DisplayName("ArchivedIncomingToWmRetryTimes")] + public int RetryTimes { get; set; } +} \ No newline at end of file diff --git a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Z_Business/IArchivedIncomingToWmAppService.cs b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Z_Business/IArchivedIncomingToWmAppService.cs new file mode 100644 index 000000000..f39eae493 --- /dev/null +++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application.Contracts/Z_Business/IArchivedIncomingToWmAppService.cs @@ -0,0 +1,21 @@ +using System; +using Dy_Exchange.Z_Business.Dtos; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Services; + +namespace Dy_Exchange.Z_Business; + + +/// +/// 日志 +/// +public interface IArchivedIncomingToWmAppService : + ICrudAppService< + ArchivedIncomingToWmDto, + Guid, + PagedAndSortedResultRequestDto, + CreateUpdateArchivedIncomingToWmDto, + CreateUpdateArchivedIncomingToWmDto> +{ + +} \ No newline at end of file diff --git a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/Dy_ExchangeApplicationAutoMapperProfile.cs b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/Dy_ExchangeApplicationAutoMapperProfile.cs index 45aad6ede..2fa3c8318 100644 --- a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/Dy_ExchangeApplicationAutoMapperProfile.cs +++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/Dy_ExchangeApplicationAutoMapperProfile.cs @@ -13,5 +13,7 @@ public class Dy_ExchangeApplicationAutoMapperProfile : Profile * into multiple profile classes for a better organization. */ CreateMap(); CreateMap(MemberList.Source); + CreateMap(); + CreateMap(MemberList.Source); } } diff --git a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/Z_Business/ArchivedIncomingToWmAppService.cs b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/Z_Business/ArchivedIncomingToWmAppService.cs new file mode 100644 index 000000000..bbef309a2 --- /dev/null +++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Application/Z_Business/ArchivedIncomingToWmAppService.cs @@ -0,0 +1,30 @@ +using System; +using Dy_Exchange.Permissions; +using Dy_Exchange.Z_Business.Dtos; +using Volo.Abp.Application.Dtos; +using Volo.Abp.Application.Services; +using WinIn.FasterZ.Wms.AppBase; + +namespace Dy_Exchange.Z_Business; + + +/// +/// 日志 +/// +public class ArchivedIncomingToWmAppService : ZbxBase, + IArchivedIncomingToWmAppService +{ + protected override string GetPolicyName { get; set; } = Dy_ExchangePermissions.ArchivedIncomingToWm.Default; + protected override string GetListPolicyName { get; set; } = Dy_ExchangePermissions.ArchivedIncomingToWm.Default; + protected override string CreatePolicyName { get; set; } = Dy_ExchangePermissions.ArchivedIncomingToWm.Create; + protected override string UpdatePolicyName { get; set; } = Dy_ExchangePermissions.ArchivedIncomingToWm.Update; + protected override string DeletePolicyName { get; set; } = Dy_ExchangePermissions.ArchivedIncomingToWm.Delete; + + private readonly IArchivedIncomingToWmRepository _repository; + + public ArchivedIncomingToWmAppService(IArchivedIncomingToWmRepository repository) : base(repository) + { + _repository = repository; + } + +} diff --git a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Domain.Shared/Localization/Dy_Exchange/ar.json b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Domain.Shared/Localization/Dy_Exchange/ar.json index cc2bc09fd..1f57ee66d 100644 --- a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Domain.Shared/Localization/Dy_Exchange/ar.json +++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Domain.Shared/Localization/Dy_Exchange/ar.json @@ -25,6 +25,26 @@ "EditDataExchangeInterfaceConfig": "EditDataExchangeInterfaceConfig", "DataExchangeInterfaceConfigDeletionConfirmationMessage": "Are you sure to delete the dataExchangeInterfaceConfig {0}?", "SuccessfullyDeleted": "Successfully deleted", - "TableFilter": "TableFilter" + "TableFilter": "TableFilter", + "Permission:ArchivedIncomingToWm": "ArchivedIncomingToWm", + "Menu:ArchivedIncomingToWm": "MenuArchivedIncomingToWm", + "ArchivedIncomingToWm": "ArchivedIncomingToWm", + "ArchivedIncomingToWmNumber": "ArchivedIncomingToWmNumber", + "ArchivedIncomingToWmRemark": "ArchivedIncomingToWmRemark", + "ArchivedIncomingToWmDataType": "ArchivedIncomingToWmDataType", + "ArchivedIncomingToWmDataAction": "ArchivedIncomingToWmDataAction", + "ArchivedIncomingToWmEffectiveDate": "ArchivedIncomingToWmEffectiveDate", + "ArchivedIncomingToWmStatus": "ArchivedIncomingToWmStatus", + "ArchivedIncomingToWmDataIdentityCode": "ArchivedIncomingToWmDataIdentityCode", + "ArchivedIncomingToWmDataContent": "ArchivedIncomingToWmDataContent", + "ArchivedIncomingToWmSourceSystem": "ArchivedIncomingToWmSourceSystem", + "ArchivedIncomingToWmWriteTime": "ArchivedIncomingToWmWriteTime", + "ArchivedIncomingToWmReadTime": "ArchivedIncomingToWmReadTime", + "ArchivedIncomingToWmErrorCode": "ArchivedIncomingToWmErrorCode", + "ArchivedIncomingToWmErrorMessage": "ArchivedIncomingToWmErrorMessage", + "ArchivedIncomingToWmRetryTimes": "ArchivedIncomingToWmRetryTimes", + "CreateArchivedIncomingToWm": "CreateArchivedIncomingToWm", + "EditArchivedIncomingToWm": "EditArchivedIncomingToWm", + "ArchivedIncomingToWmDeletionConfirmationMessage": "Are you sure to delete the archivedIncomingToWm {0}?" } } \ No newline at end of file diff --git a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Domain/Z_Business/IArchivedIncomingToWmRepository.cs b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Domain/Z_Business/IArchivedIncomingToWmRepository.cs new file mode 100644 index 000000000..378db8859 --- /dev/null +++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.Domain/Z_Business/IArchivedIncomingToWmRepository.cs @@ -0,0 +1,11 @@ +using System; +using Volo.Abp.Domain.Repositories; + +namespace Dy_Exchange.Z_Business; + +/// +/// 日志 +/// +public interface IArchivedIncomingToWmRepository : IRepository +{ +} diff --git a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/EntityFrameworkCore/Dy_ExchangeDbContext.cs b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/EntityFrameworkCore/Dy_ExchangeDbContext.cs index 8f9550708..c00e1bd3d 100644 --- a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/EntityFrameworkCore/Dy_ExchangeDbContext.cs +++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/EntityFrameworkCore/Dy_ExchangeDbContext.cs @@ -58,6 +58,10 @@ public class Dy_ExchangeDbContext : /// /// public DbSet DataExchangeInterfaceConfigs { get; set; } + /// + /// 日志 + /// + public DbSet ArchivedIncomingToWms { get; set; } public Dy_ExchangeDbContext(DbContextOptions options) : base(options) @@ -96,6 +100,16 @@ public class Dy_ExchangeDbContext : b.ConfigureByConvention(); + /* Configure more properties here */ + }); + + + builder.Entity(b => + { + b.ToTable(Dy_ExchangeConsts.DbTablePrefix + "ArchivedIncomingToWms", Dy_ExchangeConsts.DbSchema, table => table.HasComment(" 日志")); + b.ConfigureByConvention(); + + /* Configure more properties here */ }); } diff --git a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/EntityFrameworkCore/Dy_ExchangeEntityFrameworkCoreModule.cs b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/EntityFrameworkCore/Dy_ExchangeEntityFrameworkCoreModule.cs index fc5136325..277f2eeb2 100644 --- a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/EntityFrameworkCore/Dy_ExchangeEntityFrameworkCoreModule.cs +++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/EntityFrameworkCore/Dy_ExchangeEntityFrameworkCoreModule.cs @@ -43,6 +43,7 @@ public class Dy_ExchangeEntityFrameworkCoreModule : AbpModule * default repositories only for aggregate roots */ options.AddDefaultRepositories(includeAllEntities: true); options.AddRepository(); + options.AddRepository(); }); Configure(options => diff --git a/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/Z_Business/ArchivedIncomingToWmEfCoreQuerableExtensions.cs b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/Z_Business/ArchivedIncomingToWmEfCoreQuerableExtensions.cs new file mode 100644 index 000000000..52ae5cf36 --- /dev/null +++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/Z_Business/ArchivedIncomingToWmEfCoreQuerableExtensions.cs @@ -0,0 +1,22 @@ +using System.Linq; +using Microsoft.EntityFrameworkCore; + +namespace Dy_Exchange.Z_Business; + +/// +/// 日志 +/// +public static class ArchivedIncomingToWmEfCoreQueryableExtensions +{ + 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/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/Z_Business/ArchivedIncomingToWmRepository.cs b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/Z_Business/ArchivedIncomingToWmRepository.cs new file mode 100644 index 000000000..f7de32752 --- /dev/null +++ b/InterFaceContorl/Dy_Exchange/src/Dy_Exchange.EntityFrameworkCore/Z_Business/ArchivedIncomingToWmRepository.cs @@ -0,0 +1,20 @@ +using System; +using System.Linq; +using System.Threading.Tasks; +using Dy_Exchange.EntityFrameworkCore; +using Volo.Abp.Domain.Repositories.EntityFrameworkCore; +using Volo.Abp.EntityFrameworkCore; + +namespace Dy_Exchange.Z_Business; + +public class ArchivedIncomingToWmRepository : EfCoreRepository, IArchivedIncomingToWmRepository +{ + public ArchivedIncomingToWmRepository(IDbContextProvider dbContextProvider) : base(dbContextProvider) + { + } + + public override async Task> WithDetailsAsync() + { + return (await GetQueryableAsync()).IncludeDetails(); + } +} \ No newline at end of file