diff --git a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220108.txt b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220108.txt
new file mode 100644
index 00000000..30bc68b6
--- /dev/null
+++ b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220108.txt
@@ -0,0 +1,654 @@
+2022-01-08 13:59:52.750 G Starting web host.
+2022-01-08 14:00:09.268 G User profile is available. Using '"C:\Users\Administrator\AppData\Local\ASP.NET\DataProtection-Keys"' as key repository and Windows DPAPI to encrypt keys at rest.
+2022-01-08 14:00:09.331 G Loaded ABP modules:
+2022-01-08 14:00:09.333 G - Win.Sfs.SettleAccount.SettleAccountHttpApiHostModule
+2022-01-08 14:00:09.333 G - Win.Sfs.SettleAccount.SettleAccountApplicationModule
+2022-01-08 14:00:09.334 G - Win.Sfs.SettleAccount.SettleAccountJobModule
+2022-01-08 14:00:09.335 G - Win.Sfs.SettleAccount.SettleAccountDomainModule
+2022-01-08 14:00:09.335 G - Volo.Abp.Domain.AbpDddDomainModule
+2022-01-08 14:00:09.336 G - Volo.Abp.Auditing.AbpAuditingModule
+2022-01-08 14:00:09.337 G - Volo.Abp.Data.AbpDataModule
+2022-01-08 14:00:09.337 G - Volo.Abp.ObjectExtending.AbpObjectExtendingModule
+2022-01-08 14:00:09.337 G - Volo.Abp.Localization.AbpLocalizationAbstractionsModule
+2022-01-08 14:00:09.338 G - Volo.Abp.Validation.AbpValidationAbstractionsModule
+2022-01-08 14:00:09.338 G - Volo.Abp.Uow.AbpUnitOfWorkModule
+2022-01-08 14:00:09.339 G - Volo.Abp.EventBus.Abstractions.AbpEventBusAbstractionsModule
+2022-01-08 14:00:09.339 G - Volo.Abp.Json.AbpJsonModule
+2022-01-08 14:00:09.340 G - Volo.Abp.Timing.AbpTimingModule
+2022-01-08 14:00:09.344 G - Volo.Abp.Localization.AbpLocalizationModule
+2022-01-08 14:00:09.344 G - Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemModule
+2022-01-08 14:00:09.345 G - Volo.Abp.Settings.AbpSettingsModule
+2022-01-08 14:00:09.345 G - Volo.Abp.Security.AbpSecurityModule
+2022-01-08 14:00:09.346 G - Volo.Abp.MultiTenancy.AbpMultiTenancyModule
+2022-01-08 14:00:09.347 G - Volo.Abp.Threading.AbpThreadingModule
+2022-01-08 14:00:09.347 G - Volo.Abp.EventBus.AbpEventBusModule
+2022-01-08 14:00:09.348 G - Volo.Abp.Guids.AbpGuidsModule
+2022-01-08 14:00:09.348 G - Volo.Abp.ObjectMapping.AbpObjectMappingModule
+2022-01-08 14:00:09.349 G - Volo.Abp.ExceptionHandling.AbpExceptionHandlingModule
+2022-01-08 14:00:09.350 G - Volo.Abp.Specifications.AbpSpecificationsModule
+2022-01-08 14:00:09.350 G - Win.Sfs.SettleAccount.SettleAccountDomainSharedModule
+2022-01-08 14:00:09.351 G - Volo.Abp.Validation.AbpValidationModule
+2022-01-08 14:00:09.352 G - Win.Sfs.SettleAccount.SettleAccountApplicationContractsModule
+2022-01-08 14:00:09.353 G - Volo.Abp.Application.AbpDddApplicationContractsModule
+2022-01-08 14:00:09.354 G - Volo.Abp.Authorization.AbpAuthorizationModule
+2022-01-08 14:00:09.355 G - Volo.Abp.Authorization.AbpAuthorizationAbstractionsModule
+2022-01-08 14:00:09.355 G - Volo.Abp.AutoMapper.AbpAutoMapperModule
+2022-01-08 14:00:09.358 G - Volo.Abp.Dapper.AbpDapperModule
+2022-01-08 14:00:09.359 G - Volo.Abp.EntityFrameworkCore.AbpEntityFrameworkCoreModule
+2022-01-08 14:00:09.361 G - Win.Abp.Snowflakes.AbpSnowflakeGeneratorModule
+2022-01-08 14:00:09.361 G - Volo.Abp.Http.Client.IdentityModel.AbpHttpClientIdentityModelModule
+2022-01-08 14:00:09.362 G - Volo.Abp.Http.Client.AbpHttpClientModule
+2022-01-08 14:00:09.362 G - Volo.Abp.Http.AbpHttpModule
+2022-01-08 14:00:09.363 G - Volo.Abp.Http.AbpHttpAbstractionsModule
+2022-01-08 14:00:09.364 G - Volo.Abp.Minify.AbpMinifyModule
+2022-01-08 14:00:09.364 G - Volo.Abp.Castle.AbpCastleCoreModule
+2022-01-08 14:00:09.365 G - Volo.Abp.IdentityModel.AbpIdentityModelModule
+2022-01-08 14:00:09.366 G - Volo.Abp.Caching.AbpCachingModule
+2022-01-08 14:00:09.366 G - Volo.Abp.Serialization.AbpSerializationModule
+2022-01-08 14:00:09.367 G - Volo.Abp.Identity.AbpIdentityHttpApiClientModule
+2022-01-08 14:00:09.368 G - Volo.Abp.Identity.AbpIdentityApplicationContractsModule
+2022-01-08 14:00:09.368 G - Volo.Abp.Identity.AbpIdentityDomainSharedModule
+2022-01-08 14:00:09.369 G - Volo.Abp.Users.AbpUsersDomainSharedModule
+2022-01-08 14:00:09.369 G - Volo.Abp.Features.AbpFeaturesModule
+2022-01-08 14:00:09.370 G - Volo.Abp.Users.AbpUsersAbstractionModule
+2022-01-08 14:00:09.371 G - Volo.Abp.Application.AbpDddApplicationModule
+2022-01-08 14:00:09.371 G - Volo.Abp.GlobalFeatures.AbpGlobalFeaturesModule
+2022-01-08 14:00:09.374 G - Volo.Abp.PermissionManagement.AbpPermissionManagementApplicationContractsModule
+2022-01-08 14:00:09.375 G - Volo.Abp.PermissionManagement.AbpPermissionManagementDomainSharedModule
+2022-01-08 14:00:09.375 G - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcModule
+2022-01-08 14:00:09.376 G - Volo.Abp.AspNetCore.AbpAspNetCoreModule
+2022-01-08 14:00:09.377 G - Volo.Abp.ApiVersioning.AbpApiVersioningAbstractionsModule
+2022-01-08 14:00:09.377 G - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcContractsModule
+2022-01-08 14:00:09.378 G - Volo.Abp.UI.Navigation.AbpUiNavigationModule
+2022-01-08 14:00:09.378 G - Volo.Abp.UI.AbpUiModule
+2022-01-08 14:00:09.379 G - Win.Sfs.SettleAccount.SettleAccountEntityFrameworkCoreModule
+2022-01-08 14:00:09.380 G - Volo.Abp.PermissionManagement.EntityFrameworkCore.AbpPermissionManagementEntityFrameworkCoreModule
+2022-01-08 14:00:09.380 G - Volo.Abp.PermissionManagement.AbpPermissionManagementDomainModule
+2022-01-08 14:00:09.381 G - Volo.Abp.SettingManagement.EntityFrameworkCore.AbpSettingManagementEntityFrameworkCoreModule
+2022-01-08 14:00:09.382 G - Volo.Abp.SettingManagement.AbpSettingManagementDomainModule
+2022-01-08 14:00:09.382 G - Volo.Abp.SettingManagement.AbpSettingManagementDomainSharedModule
+2022-01-08 14:00:09.383 G - Volo.Abp.AuditLogging.EntityFrameworkCore.AbpAuditLoggingEntityFrameworkCoreModule
+2022-01-08 14:00:09.384 G - Volo.Abp.AuditLogging.AbpAuditLoggingDomainModule
+2022-01-08 14:00:09.384 G - Volo.Abp.AuditLogging.AbpAuditLoggingDomainSharedModule
+2022-01-08 14:00:09.385 G - Volo.Abp.TenantManagement.EntityFrameworkCore.AbpTenantManagementEntityFrameworkCoreModule
+2022-01-08 14:00:09.385 G - Volo.Abp.TenantManagement.AbpTenantManagementDomainModule
+2022-01-08 14:00:09.386 G - Volo.Abp.TenantManagement.AbpTenantManagementDomainSharedModule
+2022-01-08 14:00:09.387 G - Win.Sfs.SettleAccount.SettleAccountHttpApiModule
+2022-01-08 14:00:09.387 G - Volo.Abp.Autofac.AbpAutofacModule
+2022-01-08 14:00:09.390 G - Volo.Abp.EntityFrameworkCore.SqlServer.AbpEntityFrameworkCoreSqlServerModule
+2022-01-08 14:00:09.391 G - Volo.Abp.AspNetCore.Serilog.AbpAspNetCoreSerilogModule
+2022-01-08 14:00:09.391 G - Volo.Abp.BlobStoring.AbpBlobStoringModule
+2022-01-08 14:00:09.392 G - Volo.Abp.BlobStoring.FileSystem.AbpBlobStoringFileSystemModule
+2022-01-08 14:00:09.392 G - Volo.Abp.BackgroundJobs.Hangfire.AbpBackgroundJobsHangfireModule
+2022-01-08 14:00:09.393 G - Volo.Abp.BackgroundJobs.AbpBackgroundJobsAbstractionsModule
+2022-01-08 14:00:09.394 G - Volo.Abp.Hangfire.AbpHangfireModule
+2022-01-08 14:00:09.454 G Start installing Hangfire SQL objects...
+2022-01-08 14:00:09.568 G Hangfire SQL objects installed.
+2022-01-08 14:00:09.578 G Starting Hangfire Server using job storage: 'SQL Server: 127.0.0.1@SettleAccountService1'
+2022-01-08 14:00:09.579 G Using the following options for SQL Server job storage: Queue poll interval: 00:00:15.
+2022-01-08 14:00:09.580 G Using the following options for Hangfire Server:
+ Worker count: 20
+ Listening queues: 'default'
+ Shutdown timeout: 00:00:15
+ Schedule polling interval: 00:00:15
+2022-01-08 14:00:09.622 G Starting Hangfire Server using job storage: 'SQL Server: 127.0.0.1@SettleAccountService1'
+2022-01-08 14:00:09.624 G Using the following options for SQL Server job storage: Queue poll interval: 00:00:15.
+2022-01-08 14:00:09.625 G Using the following options for Hangfire Server:
+ Worker count: 20
+ Listening queues: 'default'
+ Shutdown timeout: 00:00:15
+ Schedule polling interval: 00:00:15
+2022-01-08 14:00:09.808 G Server sk-20210819huao:28832:c46a7026 successfully announced in 200.4138 ms
+2022-01-08 14:00:09.808 G Server sk-20210819huao:28832:f28bce65 successfully announced in 171.3692 ms
+2022-01-08 14:00:09.819 G Server sk-20210819huao:28832:f28bce65 is starting the registered dispatchers: ServerWatchdog, ServerJobCancellationWatcher, ExpirationManager, CountersAggregator, Worker, DelayedJobScheduler, RecurringJobScheduler...
+2022-01-08 14:00:09.819 G Server sk-20210819huao:28832:c46a7026 is starting the registered dispatchers: ServerWatchdog, ServerJobCancellationWatcher, ExpirationManager, CountersAggregator, Worker, DelayedJobScheduler, RecurringJobScheduler...
+2022-01-08 14:00:09.857 G 2 servers were removed due to timeout
+2022-01-08 14:00:10.009 G Server sk-20210819huao:28832:f28bce65 all the dispatchers started
+2022-01-08 14:00:10.029 G Server sk-20210819huao:28832:c46a7026 all the dispatchers started
+2022-01-08 14:00:11.127 G Entity Framework Core "5.0.8" initialized '"PermissionManagementDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery "
+2022-01-08 14:00:11.416 G Executed DbCommand ("25"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.502 G Executed DbCommand ("2"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.506 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.510 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.515 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.520 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.526 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.530 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.533 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.537 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.544 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.548 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.553 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.559 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.563 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.567 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.573 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.577 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.580 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.584 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.589 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.593 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.597 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.602 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.606 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.610 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.613 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.619 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.623 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.626 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.631 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.638 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.641 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.645 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.651 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.655 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.659 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.662 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.668 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.671 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.675 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.678 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.684 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.687 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.691 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.695 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.700 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.705 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.709 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.716 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.720 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.725 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.733 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.738 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.744 G Executed DbCommand ("2"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.752 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.759 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.768 G Executed DbCommand ("2"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.778 G Executed DbCommand ("2"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.790 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.797 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.806 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.811 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.816 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.821 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.826 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.830 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.835 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.841 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.845 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.851 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.859 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.864 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.872 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.878 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.884 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.890 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.895 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.901 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.906 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.911 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.919 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.923 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.927 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.932 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.937 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.942 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.946 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.953 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.959 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.965 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.971 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.976 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.983 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.987 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:11.992 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:12.000 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:12.004 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:12.009 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:12.017 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:12.022 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:12.028 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:12.033 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:12.038 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:12.042 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:12.047 G Executed DbCommand ("1"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
+""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
+FROM [AbpPermissionGrants] AS [a]
+WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
+ORDER BY [a].[Id]"
+2022-01-08 14:00:12.337 G Initialized all ABP modules.
+2022-01-08 14:00:12.430 G Now listening on: "http://localhost:44378"
+2022-01-08 14:00:12.432 G Application started. Press Ctrl+C to shut down.
+2022-01-08 14:00:12.433 G Hosting environment: "Development"
+2022-01-08 14:00:12.434 G Content root path: "C:\Users\Administrator\source\repos\Win.Sfs.SmartSettlementSystem.PG\src\Modules\SettleAccount\host\SettleAccount.HttpApi.Host"
+2022-01-08 14:00:13.328 G Request starting HTTP/1.1 GET http://localhost:44378/ - -
+2022-01-08 14:00:14.104 G Executing endpoint '"Win.Sfs.SettleAccount.Controllers.HomeController.Index (SettleAccount.HttpApi.Host)"'
+2022-01-08 14:00:14.153 G Route matched with "{action = \"Index\", controller = \"Home\", area = \"\"}". Executing controller action with signature "Microsoft.AspNetCore.Mvc.ActionResult Index()" on controller "Win.Sfs.SettleAccount.Controllers.HomeController" ("SettleAccount.HttpApi.Host").
+2022-01-08 14:00:14.179 G Executing RedirectResult, redirecting to "/swagger".
+2022-01-08 14:00:14.185 G Executed action "Win.Sfs.SettleAccount.Controllers.HomeController.Index (SettleAccount.HttpApi.Host)" in 24.6358ms
+2022-01-08 14:00:14.187 G Executed endpoint '"Win.Sfs.SettleAccount.Controllers.HomeController.Index (SettleAccount.HttpApi.Host)"'
+2022-01-08 14:00:14.199 G Request finished HTTP/1.1 GET http://localhost:44378/ - - - 302 0 - 873.4994ms
+2022-01-08 14:00:14.213 G Request starting HTTP/1.1 GET http://localhost:44378/swagger/index.html - -
+2022-01-08 14:00:14.262 G Request finished HTTP/1.1 GET http://localhost:44378/swagger/index.html - - - 200 - text/html;charset=utf-8 49.4587ms
+2022-01-08 14:00:14.378 G Request starting HTTP/1.1 GET http://localhost:44378/swagger/v1/swagger.json - -
+2022-01-08 14:00:15.641 G Request finished HTTP/1.1 GET http://localhost:44378/swagger/v1/swagger.json - - - 200 - application/json;charset=utf-8 1263.7065ms
diff --git a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj
index c09813b6..47366b8f 100644
--- a/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj
+++ b/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/SettleAccount.HttpApi.Host.csproj
@@ -54,6 +54,7 @@
+
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
index 3a316357..0238a40a 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFKanbanAppService.cs
@@ -237,7 +237,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[Route("WmsHQFKanbanOutPut")]
public async Task WmsHQFKanbanOutPut(WmsJitRequestDto input)
{
- var _billNum = "K" + DateTime.Now.ToString("yyyyMMddhhmmss");
+ var _billNum = "HQKB" + DateTime.Now.ToString("yyyyMMddhhmmss");
var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
if (_joblist.Count() > 0)
@@ -251,23 +251,18 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
var _list = _excelHelper.ExcelToList();
foreach (var itm in _list)
{
-
-
-
-
-
itm.SetData(GuidGenerator.Create(),string.Empty,!string.IsNullOrEmpty(itm.WmsBillNum)? itm.WmsBillNum:string.Empty,input.Version,GuidGenerator.Create());
}
_lst.AddRange(_list.ToArray());
}
- // var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
+
var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
var error = from itm1 in outPutDetail
join itm2 in _lst on
- new { itm1.MaterialCode, itm1.Kanban}
+ new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine }
equals
- new { itm2.MaterialCode, itm2.Kanban }
+ new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine }
select itm1;
var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
if (errList.Count() == 0)
@@ -334,30 +329,20 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[UnitOfWork(false)]
public async Task WmsHQFKanbanOutPutPass(WmsJitRequestDto input)
{
- if (input.Guids != null)
- {
- List _ls = new List();
- if (input.Guids.Count() > 0)
- {
- _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version ==input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
- }
- else
- {
- _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
- }
- if (_ls.Count() > 0)
- {
- var sql = "DECLARE @return_value int\n" +
- "EXEC @return_value = [dbo].[p_wms_output]\n" +
- " @billnum = N'{0}',\n" +
- " @type = 3\n" +
- "SELECT 'Return Value' = @return_value";
- await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
- string.Format(sql, input.BillNum));
-
- }
- }
+ var sql = "DECLARE @return_value int\n" +
+ "EXEC @return_value = [dbo].[p_wms_output]\n" +
+ " @billnum = N'{0}',\n" +
+ " @type = 3,\n" +
+ " @date = N'{1}'\n" +
+ "SELECT 'Return Value' = @return_value";
+ await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+ string.Format(sql, input.BillNum, input.AccountDate)
+ );
+
+
+
return true;
+
}
///
///出库界面功能， 撤销核准出库
@@ -369,26 +354,32 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[Route("WmsHQFKanbanOutPut-Cancel")]
public async Task WmsHQFKanbanOutPutCancel(WmsJitRequestDto input)
{
- var _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.State == 1).ToListAsync();
- var _first = _ls.FirstOrDefault();
- if (_ls.Count()>0)
+ if (input.Guids != null && input.Guids.Count() > 0)
{
- var _guid = GuidGenerator.Create();
- await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls,new BulkConfig() { BulkCopyTimeout=0 });
- var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", input.Version, "WmsHQFKanbanOutPutDetail", _first.BillNum, 0,0, _guid)
+ List _ls = new List();
+ foreach (var itm in input.Guids)
{
- TaskId = _guid,
- SourceBillNum = _first.BillNum,
- TableName = "WmsHQFKanbanOutPutDetail",
- InterfaceType = "2",
- Version = input.Version,
- WmsState = 0,
- SettleAccountState=0
- };
- var _l = new List();
- _l.Add(uniapi);
- await _wmsefRespository.GetDbContext().BulkInsertAsync(_l);
+ _ls.Add(string.Format("{0}", itm));
+ }
+
+ string str = string.Join(",", _ls.ToArray());
+
+ var sql = "DECLARE @return_value int\n" +
+ "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" +
+ " @Guids ={0}, \n" +
+ " @billnum = N'{1}',\n" +
+ " @type = 3,\n" +
+ " @accountdate = N'{2}'\n" +
+ "SELECT 'Return Value' = @return_value";
+
+ sql = string.Format(sql, str, input.BillNum, input.AccountDate);
+
+ await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+ sql
+ );
+
}
+
return true;
}
[HttpPost]
@@ -397,7 +388,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
//[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
public async Task ExcelImport([FromForm] IFormFileCollection files, string version)
{
- var _billNum = "K" + DateTime.Now.ToString("yyyyMMddhhmmss");
+ var _billNum = "HQKB" + DateTime.Now.ToString("yyyyMMddhhmmss");
ExportImporter _exportImporter = new ExportImporter();
var result = await _exportImporter.ExtendExcelImport(files, _excelImportService);
List _lst = new List();
@@ -408,7 +399,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
GuidGenerator.Create(),
itm.WmsBillNum,
itm.Kanban,
-
itm.MaterialCode,
itm.MaterialDesc,
itm.MaterialGroup,
@@ -429,15 +419,15 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
}
_lst.AddRange(_lsCopy.ToArray());
- var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
+
var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
var error = from itm1 in outPutDetail
- join itm2 in _ls1 on
- new { itm1.MaterialCode, itm1.Kanban }
+ join itm2 in _lst on
+ new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine }
equals
- new { itm2.MaterialCode, itm2.Kanban }
+ new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine }
select itm1;
var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
@@ -452,20 +442,11 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
return await ExportErrorReportAsync(checkList);
}
-
-
-
-
-
-
-
-
-
- var query = from itm1 in _ls1
+ var query = from itm1 in _lst
join itm2 in outPutDetail on
- new { itm1.MaterialCode, itm1.Kanban }
+ new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine }
equals
- new { itm2.MaterialCode, itm2.Kanban } into temp1
+ new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } into temp1
from tm1 in temp1.DefaultIfEmpty()
where tm1 == null
select itm1;
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
index 3d8f673a..23230b09 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQFSharePartAppService .cs
@@ -213,14 +213,10 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
GuidGenerator.Create(),
string.Empty,
p.结算数量
-
));
_lst.AddRange(_lsAry.ToArray());
}
}
-
-
-
foreach (var itm in _lst)
{
itm.BillNum = _billNum;
@@ -291,7 +287,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
var sql = "DECLARE @return_value int\n" +
"EXEC @return_value = [dbo].[p_wms_output]\n" +
" @billnum = N'{0}',\n" +
- " @type = 2\n" +
+ " @type = 4\n" +
"SELECT 'Return Value' = @return_value";
await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
string.Format(sql, input.BillNum));
@@ -310,109 +306,111 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[Route("WmsSharePartOutPut-Cancel")]
public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input)
{
- var _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.State == 1).ToListAsync();
- var _first = _ls.FirstOrDefault();
- if (_ls.Count() > 0)
+ if (input.Guids != null && input.Guids.Count() > 0)
{
- //var _guid = GuidGenerator.Create();
- //await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls,new BulkConfig() { BulkCopyTimeout=0 });
- //var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", input.Version, "WmsSharePartOutPutDetail", _first.BillNum, 0,0, _guid)
- //{
- // TaskId = _guid,
- // SourceBillNum = _first.BillNum,
- // TableName = "WmsSharePartOutPutDetail",
- // InterfaceType = "3",
- // Version = input.Version,
- // WmsState = 0,
- // SettleAccountState=0
- //};
- //var _l = new List();
- //_l.Add(uniapi);
- //await _wmsefRespository.GetDbContext().BulkInsertAsync(_l);
+ List _ls = new List();
+ foreach (var itm in input.Guids)
+ {
+ _ls.Add(string.Format("{0}", itm));
+ }
+ string str = string.Join(",", _ls.ToArray());
+
+ var sql = "DECLARE @return_value int\n" +
+ "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" +
+ " @Guids ={0}, \n" +
+ " @billnum = N'{1}',\n" +
+ " @type = 4,\n" +
+ " @accountdate = N'{2}'\n" +
+ "SELECT 'Return Value' = @return_value";
+
+ sql = string.Format(sql, str, input.BillNum, input.AccountDate);
+
+ await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+ sql
+ );
}
return true;
}
- //[HttpPost]
- //[Route("ExcelImport")]
- //[DisableRequestSizeLimit]
- ////[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
- //public async Task ExcelImport([FromForm] IFormFileCollection files, string version)
- //{
- //var _billNum = "BHQ" + DateTime.Now.ToString("yyyyMMddhhmmss");
- //ExportImporter _exportImporter = new ExportImporter();
- //var result = await _exportImporter.ExtendExcelImport(files, _excelImportService);
- //List _lst = new List();
-
-
-
- //var _lsCopy = new List();
- //foreach (var itm in result)
- //{
- // WmsHQFSharePartOutPutDetial _detail = new WmsHQFSharePartOutPutDetial(
- // GuidGenerator.Create(),
- // itm.WmsBillNum,
- // itm.OrderBillNum,
- // itm.MaterialCode,
- // itm.MaterialDesc,
- // itm.MaterialGroup,
- // string.Empty,
- // string.Empty,
- // 0,
- // string.Empty,
- // string.Empty,
- // version,
- // itm.ParentMaterialCode,
- // itm.BillNum,
- // GuidGenerator.Create()
- // , string.Empty
- // , itm.Qty
-
- // );
- // _lsCopy.Add(_detail);
- //}
- //_lst.AddRange(_lsCopy.ToArray());
-
-
- //var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
-
- //var error = from itm1 in outPutDetail
- // join itm2 in _lst on
- // new { itm1.MaterialCode, itm1.OrderBillNum,itm1.WmsBillNum,itm1.po }
- // equals
- // new { itm2.MaterialCode, itm2.OrderBillNum }
- // select itm1;
- //var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
-
- //var checkList = new List();
- //foreach (var itm in errList)
- //{
- // checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
- //}
- //if (checkList.Count > 0)
- //{
- // return await ExportErrorReportAsync(checkList);
- //}
- //var query = from itm1 in _ls1
- // join itm2 in outPutDetail on
- // new { itm1.MaterialCode, itm1.OrderBillNum }
- // equals
- // new { itm2.MaterialCode, itm2.OrderBillNum } into temp1
- // from tm1 in temp1.DefaultIfEmpty()
- // where tm1 == null
- // select itm1;
- //var _wmslst = query.ToList();
- //foreach (var itm in _wmslst)
- //{
- // itm.BillNum = _billNum;
- //}
- //await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
- //int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
- //if (_count == 0)
- //{
- // var _version = new WmsHQFSharePartOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
- // await _wmsVersionRepository.InsertAsync(_version, true);
- //}
- //return _billNum;
+ [HttpPost]
+ [Route("ExcelImport")]
+ [DisableRequestSizeLimit]
+ //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+ public async Task ExcelImport([FromForm] IFormFileCollection files, string version)
+ {
+ var _billNum = "BHQ" + DateTime.Now.ToString("yyyyMMddhhmmss");
+ ExportImporter _exportImporter = new ExportImporter();
+ var result = await _exportImporter.ExtendExcelImport(files, _excelImportService);
+ List _lst = new List();
+
+ var _lsCopy = new List();
+ foreach (var itm in result)
+ {
+ WmsHQFSharePartOutPutDetial _detail = new WmsHQFSharePartOutPutDetial(
+ GuidGenerator.Create(),
+ itm.WmsBillNum,
+ itm.OrderBillNum,
+ itm.MaterialCode,
+ itm.MaterialDesc,
+ itm.MaterialGroup,
+ string.Empty,
+ string.Empty,
+ 0,
+ string.Empty,
+ string.Empty,
+ version,
+ itm.ParentMaterialCode,
+ itm.BillNum,
+ GuidGenerator.Create()
+ , string.Empty
+ , itm.Qty
+
+ );
+ _lsCopy.Add(_detail);
+ }
+ _lst.AddRange(_lsCopy.ToArray());
+
+
+ var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
+
+ var error = from itm1 in outPutDetail
+ join itm2 in _lst on
+ new { itm1.MaterialCode, itm1.OrderBillNum }
+ equals
+ new { itm2.MaterialCode, itm2.OrderBillNum }
+ select itm1;
+ var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
+
+ var checkList = new List();
+ foreach (var itm in errList)
+ {
+ checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
+ }
+ if (checkList.Count > 0)
+ {
+ return await ExportErrorReportAsync(checkList);
+ }
+ var query = from itm1 in _lst
+ join itm2 in outPutDetail on
+ new { itm1.MaterialCode, itm1.OrderBillNum }
+ equals
+ new { itm2.MaterialCode, itm2.OrderBillNum } into temp1
+ from tm1 in temp1.DefaultIfEmpty()
+ where tm1 == null
+ select itm1;
+ var _wmslst = query.ToList();
+ foreach (var itm in _wmslst)
+ {
+ itm.BillNum = _billNum;
+ }
+ await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
+ int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
+ if (_count == 0)
+ {
+ var _version = new WmsHQFSharePartOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
+ await _wmsVersionRepository.InsertAsync(_version, true);
+ }
+ return _billNum;
+ }
}
}
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
new file mode 100644
index 00000000..20fc2a43
--- /dev/null
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHKanbanAppService.cs
@@ -0,0 +1,470 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Caching.Distributed;
+using AutoMapper;
+using System.Linq;
+using System.Text;
+using Volo.Abp.Guids;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Caching;
+
+using Volo.Abp.ObjectMapping;
+using Win.Sfs.SettleAccount.ExcelImporter;
+using Win.Sfs.Shared.CacheBase;
+using Win.Utils;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.BaseData.ImportExcelCommon;
+using Volo.Abp.Domain.Repositories;
+using EFCore.BulkExtensions;
+using System.IO;
+using Microsoft.EntityFrameworkCore;
+using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
+using Win.Sfs.SettleAccount.FISes;
+using Win.Sfs.Shared.Enums.SettleAccount;
+using Win.Sfs.Shared.Filter;
+using Shouldly;
+using Magicodes.ExporterAndImporter.Csv;
+using Magicodes.ExporterAndImporter.Core;
+using Magicodes.ExporterAndImporter.Excel;
+using System.Data.Common;
+using Volo.Abp.Uow;
+using Volo.Abp;
+using Win.Abp.Snowflakes;
+using Win.Sfs.SettleAccount.CommonManagers;
+using Win.Sfs.SettleAccount.ExportReports;
+using Win.Sfs.SettleAccount.Constant;
+using Win.Sfs.SettleAccount.MaterialRelationships;
+using Win.Sfs.SettleAccount.Entities.TaskJobs;
+using Magicodes.ExporterAndImporter.Core.Models;
+
+using TaskJob.Services;
+using TaskJob.EventArgs;
+using Win.Sfs.SettleAccount.Entities.WMS;
+using Win.Sfs.SettleAccount.Entities.Wms;
+using Win.Sfs.SettleAccount.Repository;
+using WY.NewJit.Extends.PaiGe.WMS;
+using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
+
+namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
+{
+ ///
+ /// wms出库
+ ///
+
+ [AllowAnonymous]
+ [Route("api/settleaccount/WmsHQHKanbanoutput")]
+ public class WmsHQHKanbanAppService :
+ SettleAccountApplicationBase
+ {
+
+ private readonly ISettleAccountBranchEfCoreRepository _wmsRepository;
+ private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository;
+ private readonly WMSEfCoreRepository _wmsefRespository;
+
+ private readonly WMSEfCoreRepository _wmstbRespository;
+ private readonly ISettleAccountBranchEfCoreRepository _job;
+ private readonly IExcelImportAppService _excelImportService;
+
+
+ private readonly TaskJobService _service;
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public WmsHQHKanbanAppService(
+
+
+ IExcelImportAppService excelImportService,
+
+ ISettleAccountBranchEfCoreRepository wmsRepository,
+ ISettleAccountBranchEfCoreRepository job,
+ ISettleAccountBranchEfCoreRepository wmsVersionRepository,
+ WMSEfCoreRepository wmsefRespository,
+ WMSEfCoreRepository wmstbRespository,
+ IDistributedCache cache,
+ ISnowflakeIdGenerator snowflakeIdGenerator,
+ ICommonManager commonManager
+ ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
+ {
+ _job = job;
+ _wmstbRespository = wmstbRespository;
+ _wmsRepository = wmsRepository;
+ _wmsVersionRepository = wmsVersionRepository;
+ _wmsefRespository = wmsefRespository;
+ _excelImportService = excelImportService;
+ }
+
+ private async Task GetCountAsync(WmsKanbanOutPutDetialRequestDto input)
+ {
+ return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
+ }
+
+ private async Task GetCountAsync(WmsKanbanOutPutRequestDto input)
+ {
+ return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
+ }
+
+ ///
+ /// 准时化出库主表
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsHQHKanbanList")]
+ //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+ virtual public async Task> GetListAsync( WmsKanbanOutPutRequestDto input)
+ {
+
+ var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
+ input.SkipCount, true);
+
+ var totalCount = await GetCountAsync(input);
+
+
+ return new PagedResultDto(totalCount, entities);
+ }
+
+ ///
+ /// 准时化出库明细
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsHQHKanbanDetailList")]
+ //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+ virtual public async Task> GetListAsync(WmsKanbanOutPutDetialRequestDto input)
+ {
+ var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
+ input.SkipCount, true);
+
+ var totalCount = await GetCountAsync(input);
+ return new PagedResultDto(totalCount, entities);
+ }
+ ///
+ /// 任务明细标记已确认
+ ///
+ /// 上传的文件(前端已经限制只能上传一个附件)
+ ///
+ [HttpPost]
+ [Route("WmsHQHKanbanOutPutAudit")]
+ [DisableRequestSizeLimit]
+
+ public async Task WmsHQHKanbanAudit(List ids)
+ {
+ var _joblist =await _job.Where(p => ids.Contains(p.Id)).ToListAsync();
+ foreach (var itm in _joblist)
+ {
+ itm.FileName = "已确认";
+ await _job.UpdateAsync(itm);
+ }
+
+ return true;
+ }
+
+ /////
+ ///// 选择任务，生成出库单，只包含已确认的单据
+ /////
+ /////
+ /////
+ /////
+ //[HttpPost]
+ //[Route("WmsWithOutKanbanOutPut")]
+ //public async Task WmsWithOutKanbanOutPut(WmsJitRequestDto input)
+ //{
+ // var _billNum = "KA" + DateTime.Now.ToString("yyyyMMddhhmmss");
+
+ // var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
+ // if (_joblist.Count() > 0)
+ // {
+ // var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
+ // List _lst = new List();
+ // foreach (var filename in fileList)
+ // {
+ // string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
+ // ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
+ // var _list = _excelHelper.ExcelToList();
+ // foreach (var itm in _list)
+ // {
+
+ // var _entity= new WmsHQHKanbanOutPutDetial(GuidGenerator.Create(), string.Empty, string.Empty, itm.MaterialCode, itm.MaterialDesc
+ // , itm.SapMaterialGroup, string.Empty, string.Empty, 0, string.Empty, string.Empty, itm.Version, itm.SapMaterialCode,
+ // _billNum, Guid.Empty, string.Empty, itm.InvoiceQty,itm.
+ // );
+
+ // _lst.Add(_entity);
+ // }
+
+ // }
+
+ // var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version && p.Kanban==string.Empty).ToListAsync();
+
+
+ // await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
+ // int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
+ // if (_count == 0)
+ // {
+ // var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
+
+ // await _wmsVersionRepository.InsertAsync(_version, true);
+ // }
+
+ // foreach (var job in _joblist)
+ // {
+ // job.FileName = _billNum;
+ // await _job.UpdateAsync(job);
+ // }
+ // }
+
+ // return ApplicationConsts.SuccessStr; ;
+ //}
+
+
+ ///
+ /// 选择任务，生成出库单，只包含已确认的单据
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsHQHKanbanOutPut")]
+ public async Task WmsHQHKanbanOutPut(WmsJitRequestDto input)
+ {
+ var _billNum = "HQKB" + DateTime.Now.ToString("yyyyMMddhhmmss");
+
+ var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
+ if (_joblist.Count() > 0)
+ {
+ var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
+ List _lst = new List();
+ foreach (var filename in fileList)
+ {
+ string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
+ ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
+ var _list = _excelHelper.ExcelToList();
+ foreach (var itm in _list)
+ {
+ itm.SetData(GuidGenerator.Create(),string.Empty,!string.IsNullOrEmpty(itm.WmsBillNum)? itm.WmsBillNum:string.Empty,input.Version,GuidGenerator.Create());
+ }
+ _lst.AddRange(_list.ToArray());
+ }
+
+ var outPutDetail = await _wmsRepository.Where(p => p.Version == input.Version).ToListAsync();
+
+ var error = from itm1 in outPutDetail
+ join itm2 in _lst on
+ new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine }
+ equals
+ new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine }
+ select itm1;
+ var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
+ if (errList.Count() == 0)
+ {
+
+ var query = from itm1 in _lst
+ join itm2 in outPutDetail on
+ new { itm1.MaterialCode, itm1.Kanban }
+ equals
+ new { itm2.MaterialCode, itm2.Kanban } into temp1
+ from tm1 in temp1.DefaultIfEmpty()
+ where tm1 == null
+ select itm1;
+ var _wmslst = query.ToList();
+ foreach (var itm in _wmslst)
+ {
+ itm.BillNum = _billNum;
+ }
+ await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
+ int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
+ if (_count == 0)
+ {
+ var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
+
+ await _wmsVersionRepository.InsertAsync(_version, true);
+ }
+
+ foreach (var job in _joblist)
+ {
+ job.FileName = _billNum;
+ await _job.UpdateAsync(job);
+ }
+ }
+ else
+ {
+ StringBuilder _buffer = new StringBuilder();
+ foreach (var itm in errList)
+ {
+ _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
+ }
+ var _errinfo = _buffer.ToString();
+
+ foreach (var job in _joblist)
+ {
+ job.FileName = _errinfo;
+ await _job.UpdateAsync(job);
+ }
+ }
+ }
+ else
+ {
+ _billNum = string.Empty;
+ }
+ return ApplicationConsts.SuccessStr; ;
+ }
+ ///
+ /// 出库界面功能，核准出库功能
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsHQHKanbanOutPut-Pass")]
+ [UnitOfWork(false)]
+ public async Task WmsHQHKanbanOutPutPass(WmsJitRequestDto input)
+ {
+ var sql = "DECLARE @return_value int\n" +
+ "EXEC @return_value = [dbo].[p_wms_output]\n" +
+ " @billnum = N'{0}',\n" +
+ " @type = 3,\n" +
+ " @date = N'{1}'\n" +
+ "SELECT 'Return Value' = @return_value";
+ await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+ string.Format(sql, input.BillNum, input.AccountDate)
+ );
+
+
+
+ return true;
+
+ }
+ ///
+ ///出库界面功能， 撤销核准出库
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsHQHKanbanOutPut-Cancel")]
+ public async Task WmsHQHKanbanOutPutCancel(WmsJitRequestDto input)
+ {
+ if (input.Guids != null && input.Guids.Count() > 0)
+ {
+ List _ls = new List();
+ foreach (var itm in input.Guids)
+ {
+ _ls.Add(string.Format("{0}", itm));
+ }
+
+ string str = string.Join(",", _ls.ToArray());
+
+ var sql = "DECLARE @return_value int\n" +
+ "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" +
+ " @Guids ={0}, \n" +
+ " @billnum = N'{1}',\n" +
+ " @type = 3,\n" +
+ " @accountdate = N'{2}'\n" +
+ "SELECT 'Return Value' = @return_value";
+
+ sql = string.Format(sql, str, input.BillNum, input.AccountDate);
+
+ await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+ sql
+ );
+
+ }
+
+ return true;
+ }
+ [HttpPost]
+ [Route("ExcelImport")]
+ [DisableRequestSizeLimit]
+ //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+ public async Task ExcelImport([FromForm] IFormFileCollection files, string version)
+ {
+ var _billNum = "HQKB" + DateTime.Now.ToString("yyyyMMddhhmmss");
+ ExportImporter _exportImporter = new ExportImporter();
+ var result = await _exportImporter.ExtendExcelImport(files, _excelImportService);
+ List _lst = new List();
+ var _lsCopy = new List();
+ foreach (var itm in result)
+ {
+ WmsHQHKanbanOutPutDetial _detail = new WmsHQHKanbanOutPutDetial(
+ GuidGenerator.Create(),
+ itm.WmsBillNum,
+ itm.Kanban,
+ itm.MaterialCode,
+ itm.MaterialDesc,
+ itm.MaterialGroup,
+ string.Empty,
+ string.Empty,
+ 0,
+ string.Empty,
+ string.Empty,
+ version,
+ itm.ParentMaterialCode,
+ itm.BillNum,
+ GuidGenerator.Create()
+ , string.Empty
+ , itm.Qty,
+ itm.PoLine
+ );
+ _lsCopy.Add(_detail);
+ }
+ _lst.AddRange(_lsCopy.ToArray());
+
+
+ var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
+
+
+ var error = from itm1 in outPutDetail
+ join itm2 in _lst on
+ new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine }
+ equals
+ new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine }
+ select itm1;
+ var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
+
+ var checkList = new List();
+ foreach (var itm in errList)
+ {
+ checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
+ }
+ if (checkList.Count > 0)
+ {
+
+ return await ExportErrorReportAsync(checkList);
+ }
+
+ var query = from itm1 in _lst
+ join itm2 in outPutDetail on
+ new { itm1.MaterialCode, itm1.Kanban,itm1.PoLine }
+ equals
+ new { itm2.MaterialCode, itm2.Kanban,itm2.PoLine } into temp1
+ from tm1 in temp1.DefaultIfEmpty()
+ where tm1 == null
+ select itm1;
+ var _wmslst = query.ToList();
+ foreach (var itm in _wmslst)
+ {
+ itm.BillNum = _billNum;
+ }
+ await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
+ int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
+ if (_count == 0)
+ {
+ var _version = new WmsHQHKanbanOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
+ await _wmsVersionRepository.InsertAsync(_version, true);
+ }
+ return _billNum;
+ }
+
+
+ }
+}
\ No newline at end of file
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
new file mode 100644
index 00000000..b6cb06fe
--- /dev/null
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSHQHSharePartAppService.cs
@@ -0,0 +1,416 @@
+using System;
+using System.Collections.Generic;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.Extensions.Caching.Distributed;
+using AutoMapper;
+using System.Linq;
+using System.Text;
+using Volo.Abp.Guids;
+using Volo.Abp.Application.Services;
+using Volo.Abp.Caching;
+
+using Volo.Abp.ObjectMapping;
+using Win.Sfs.SettleAccount.ExcelImporter;
+using Win.Sfs.Shared.CacheBase;
+using Win.Utils;
+using Volo.Abp.Application.Dtos;
+using Win.Sfs.BaseData.ImportExcelCommon;
+using Volo.Abp.Domain.Repositories;
+using EFCore.BulkExtensions;
+using System.IO;
+using Microsoft.EntityFrameworkCore;
+using Win.Sfs.SettleAccount.Entities.SettleAccountVersion;
+using Win.Sfs.SettleAccount.FISes;
+using Win.Sfs.Shared.Enums.SettleAccount;
+using Win.Sfs.Shared.Filter;
+using Shouldly;
+using Magicodes.ExporterAndImporter.Csv;
+using Magicodes.ExporterAndImporter.Core;
+using Magicodes.ExporterAndImporter.Excel;
+using System.Data.Common;
+using Volo.Abp.Uow;
+using Volo.Abp;
+using Win.Abp.Snowflakes;
+using Win.Sfs.SettleAccount.CommonManagers;
+using Win.Sfs.SettleAccount.ExportReports;
+using Win.Sfs.SettleAccount.Constant;
+using Win.Sfs.SettleAccount.MaterialRelationships;
+using Win.Sfs.SettleAccount.Entities.TaskJobs;
+using Magicodes.ExporterAndImporter.Core.Models;
+
+using TaskJob.Services;
+using TaskJob.EventArgs;
+using Win.Sfs.SettleAccount.Entities.WMS;
+using Win.Sfs.SettleAccount.Entities.Wms;
+using Win.Sfs.SettleAccount.Repository;
+using WY.NewJit.Extends.PaiGe.WMS;
+using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
+
+namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
+{
+ ///
+ /// wms出库
+ ///
+
+ [AllowAnonymous]
+ [Route("api/settleaccount/WmsHQHSharePartoutput")]
+ public class WmsHQHSharePartAppService :
+ SettleAccountApplicationBase
+ {
+ private readonly ISettleAccountBranchEfCoreRepository _wmsRepository;
+ private readonly ISettleAccountBranchEfCoreRepository _wmsVersionRepository;
+ private readonly WMSEfCoreRepository _wmsefRespository;
+
+ private readonly WMSEfCoreRepository _wmstbRespository;
+ private readonly ISettleAccountBranchEfCoreRepository _job;
+ private readonly IExcelImportAppService _excelImportService;
+
+ private readonly TaskJobService _service;
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ ///
+ public WmsHQHSharePartAppService(
+
+ ISettleAccountBranchEfCoreRepository wmsRepository,
+ ISettleAccountBranchEfCoreRepository job,
+ ISettleAccountBranchEfCoreRepository wmsVersionRepository,
+ WMSEfCoreRepository wmsefRespository,
+ WMSEfCoreRepository wmstbRespository,
+ IExcelImportAppService excelImportService,
+ IDistributedCache cache,
+ ISnowflakeIdGenerator snowflakeIdGenerator,
+ ICommonManager commonManager
+ ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
+ {
+ _excelImportService = excelImportService;
+ _job = job;
+ _wmstbRespository = wmstbRespository;
+ _wmsRepository = wmsRepository;
+ _wmsVersionRepository = wmsVersionRepository;
+ _wmsefRespository = wmsefRespository;
+ }
+
+ private async Task GetCountAsync(WmsSharePartOutPutDetialRequestDto input)
+ {
+ return await _wmsRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
+ }
+
+ private async Task GetCountAsync(WmsSharePartOutPutRequestDto input)
+ {
+ return await _wmsVersionRepository.GetCountByFilterAsync(GuidGenerator.Create(), input.Filters);
+ }
+
+ ///
+ /// 准时化出库主表
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsSharePartList")]
+ //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+ virtual public async Task> GetListAsync(WmsSharePartOutPutRequestDto input)
+ {
+
+ var entities = await _wmsVersionRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
+ input.SkipCount, true);
+
+ var totalCount = await GetCountAsync(input);
+
+
+ return new PagedResultDto(totalCount, entities);
+ }
+
+ ///
+ /// 准时化出库明细
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsSharePartDetailList")]
+ //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+ virtual public async Task> GetListAsync(WmsSharePartOutPutDetialRequestDto input)
+ {
+ var entities = await _wmsRepository.GetListByFilterAsync(GuidGenerator.Create(), input.Filters, input.Sorting, input.MaxResultCount,
+ input.SkipCount, true);
+
+ var totalCount = await GetCountAsync(input);
+ return new PagedResultDto(totalCount, entities);
+ }
+ ///
+ /// 任务明细标记已确认
+ ///
+ /// 上传的文件(前端已经限制只能上传一个附件)
+ ///
+ [HttpPost]
+ [Route("WmsSharePartOutPutAudit")]
+ [DisableRequestSizeLimit]
+
+ public async Task WmsSharePartAudit(List ids)
+ {
+ var _joblist = await _job.Where(p => ids.Contains(p.Id)).ToListAsync();
+ foreach (var itm in _joblist)
+ {
+ itm.FileName = "已确认";
+ }
+ foreach (var itm in _joblist)
+ {
+ await _job.UpdateAsync(itm);
+ }
+ var _count = await _job.BatchUpdateAsync(_joblist.ToList());
+ if (_count > 0)
+ {
+ return true;
+ }
+ return false;
+ }
+ ///
+ /// 选择任务，生成出库单，只包含已确认的单据
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsSharePartOutPut")]
+ public async Task WmsSharePartOutPut(WmsJitRequestDto input)
+ {
+ var _billNum = "BHQ" + DateTime.Now.ToString("yyyyMMddhhmmss");
+ var _joblist = _job.Where(p => input.Guids.Contains(p.Id) && p.FileName == "已确认").ToList();
+ if (_joblist.Count() > 0)
+ {
+ var fileList = _joblist.Select(p => p.RealDownFileName).ToList();
+ List _lst = new List();
+ foreach (var filename in fileList)
+ {
+ string fileSavePath = Environment.CurrentDirectory + @"\wwwroot\files\host\my-file-container\" + filename;
+ ExcelHelper _excelHelper = new ExcelHelper(fileSavePath);
+ var _list = _excelHelper.ExcelToList();
+ if (_list.Count() > 0)
+ {
+ var _lsAry = _list.Select(p => new
+ WmsHQHSharePartOutPutDetial(
+ GuidGenerator.Create(),
+ "",
+ string.Empty,
+ p.结算物料号,
+ p.物料描述,
+ p.物料组,
+ string.Empty,
+ string.Empty,
+ 0,
+ string.Empty,
+ string.Empty,
+ input.Version,
+ p.Sap编码,
+ _billNum,
+ GuidGenerator.Create(),
+ string.Empty,
+ p.结算数量
+ ));
+ _lst.AddRange(_lsAry.ToArray());
+ }
+ }
+ foreach (var itm in _lst)
+ {
+ itm.BillNum = _billNum;
+ }
+ await _wmsRepository.GetDbContext().BulkInsertAsync(_lst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
+ int _count = _wmsVersionRepository.Count(p => p.Version == input.Version && p.BillNum == _billNum);
+ if (_count == 0)
+ {
+ var _version = new WmsHQHSharePartOutPut(GuidGenerator.Create(), input.Version, _billNum, CurrentUser.Email);
+
+ await _wmsVersionRepository.InsertAsync(_version, true);
+
+ }
+
+ foreach (var job in _joblist)
+ {
+ job.FileName = _billNum;
+ await _job.UpdateAsync(job);
+ }
+ }
+ //return _billNum;
+ //else
+ //{
+ // StringBuilder _buffer = new StringBuilder();
+ // foreach (var itm in errList)
+ // {
+ // _buffer.AppendFormat("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number);
+ // }
+ // var _errinfo = _buffer.ToString();
+ // foreach (var job in _joblist)
+ // {
+ // job.FileName = _errinfo;
+ // await _job.UpdateAsync(job);
+ // }
+
+ // //}
+ //}
+ //else
+ //{
+ // _billNum = string.Empty;
+ //}
+ return ApplicationConsts.SuccessStr;
+ }
+ ///
+ /// 出库界面功能，核准出库功能
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsSharePartOutPut-Pass")]
+ [UnitOfWork(false)]
+ public async Task WmsSharePartOutPutPass(WmsJitRequestDto input)
+ {
+ if (input.Guids != null)
+ {
+ List _ls = new List();
+ if (input.Guids.Count() > 0)
+ {
+ _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
+ }
+ else
+ {
+ _ls = await _wmsRepository.Where(p => p.Version == input.Version && p.BillNum == input.BillNum && p.State != 2).ToListAsync();
+ }
+ if (_ls.Count() > 0)
+ {
+ var sql = "DECLARE @return_value int\n" +
+ "EXEC @return_value = [dbo].[p_wms_output]\n" +
+ " @billnum = N'{0}',\n" +
+ " @type = 4\n" +
+ "SELECT 'Return Value' = @return_value";
+ await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+ string.Format(sql, input.BillNum));
+
+ }
+ }
+ return true;
+ }
+ ///
+ ///出库界面功能， 撤销核准出库
+ ///
+ ///
+ ///
+ ///
+ [HttpPost]
+ [Route("WmsSharePartOutPut-Cancel")]
+ public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input)
+ {
+ if (input.Guids != null && input.Guids.Count() > 0)
+ {
+ List _ls = new List();
+ foreach (var itm in input.Guids)
+ {
+ _ls.Add(string.Format("{0}", itm));
+ }
+ string str = string.Join(",", _ls.ToArray());
+
+ var sql = "DECLARE @return_value int\n" +
+ "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" +
+ " @Guids ={0}, \n" +
+ " @billnum = N'{1}',\n" +
+ " @type = 4,\n" +
+ " @accountdate = N'{2}'\n" +
+ "SELECT 'Return Value' = @return_value";
+
+ sql = string.Format(sql, str, input.BillNum, input.AccountDate);
+
+ await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+ sql
+ );
+ }
+ return true;
+ }
+ [HttpPost]
+ [Route("ExcelImport")]
+ [DisableRequestSizeLimit]
+ //[Authorize(SettleAccountPermissions.SettleAccounts.Default)]
+ public async Task ExcelImport([FromForm] IFormFileCollection files, string version)
+ {
+ var _billNum = "BHQ" + DateTime.Now.ToString("yyyyMMddhhmmss");
+ ExportImporter _exportImporter = new ExportImporter();
+ var result = await _exportImporter.ExtendExcelImport(files, _excelImportService);
+ List _lst = new List();
+
+ var _lsCopy = new List();
+ foreach (var itm in result)
+ {
+ WmsHQHSharePartOutPutDetial _detail = new WmsHQHSharePartOutPutDetial(
+ GuidGenerator.Create(),
+ itm.WmsBillNum,
+ itm.OrderBillNum,
+ itm.MaterialCode,
+ itm.MaterialDesc,
+ itm.MaterialGroup,
+ string.Empty,
+ string.Empty,
+ 0,
+ string.Empty,
+ string.Empty,
+ version,
+ itm.ParentMaterialCode,
+ itm.BillNum,
+ GuidGenerator.Create()
+ , string.Empty
+ , itm.Qty
+
+ );
+ _lsCopy.Add(_detail);
+ }
+ _lst.AddRange(_lsCopy.ToArray());
+
+
+ var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
+
+ var error = from itm1 in outPutDetail
+ join itm2 in _lst on
+ new { itm1.MaterialCode, itm1.OrderBillNum }
+ equals
+ new { itm2.MaterialCode, itm2.OrderBillNum }
+ select itm1;
+ var errList = error.GroupBy(p => new { p.BillNum }).Select(p => new { BillNum = p.Key.BillNum, Number = p.Sum(itm => itm.Qty) });
+
+ var checkList = new List();
+ foreach (var itm in errList)
+ {
+ checkList.Add(new ErrorExportDto() { Message = string.Format("出库单号:{0}重复记录数:{1}条", itm.BillNum, itm.Number) });
+ }
+ if (checkList.Count > 0)
+ {
+ return await ExportErrorReportAsync(checkList);
+ }
+ var query = from itm1 in _lst
+ join itm2 in outPutDetail on
+ new { itm1.MaterialCode, itm1.OrderBillNum }
+ equals
+ new { itm2.MaterialCode, itm2.OrderBillNum } into temp1
+ from tm1 in temp1.DefaultIfEmpty()
+ where tm1 == null
+ select itm1;
+ var _wmslst = query.ToList();
+ foreach (var itm in _wmslst)
+ {
+ itm.BillNum = _billNum;
+ }
+ await _wmsRepository.GetDbContext().BulkInsertAsync(_wmslst, new BulkConfig() { BulkCopyTimeout = 0, BatchSize = 10000 });
+ int _count = _wmsVersionRepository.Count(p => p.Version == version && p.BillNum == _billNum);
+ if (_count == 0)
+ {
+ var _version = new WmsHQHSharePartOutPut(GuidGenerator.Create(), version, _billNum, CurrentUser.Email);
+ await _wmsVersionRepository.InsertAsync(_version, true);
+ }
+ return _billNum;
+ }
+ }
+
+}
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
index 9a41c23c..961e41ca 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSKanbanAppService.cs
@@ -395,26 +395,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
"SELECT 'Return Value' = @return_value";
await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
string.Format(sql, input.BillNum));
- //var _first = _ls.FirstOrDefault();
- //var _guid = GuidGenerator.Create();
- //foreach (var itm in _ls)
- //{
- // itm.TaskId = _guid;
- //}
- //await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls);
- //var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", input.Version, "WmsKanbanOutPutDetail",_first.BillNum, 0,0 ,_guid)
- //{
- // TaskId = _guid,
- // SourceBillNum = _first.BillNum,
- // TableName = "WmsKanbanOutPutDetail",
- // InterfaceType = "2",
- // Version = input.Version,
- // SettleAccountState = 0,
- // WmsState=0
- //};
- //var _l = new List();
- //_l.Add(uniapi);
- //await _wmsefRespository.GetDbContext().BulkInsertAsync(_l);
+
}
}
return true;
@@ -429,25 +410,30 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[Route("WmsKanbanOutPut-Cancel")]
public async Task WmsKanbanOutPutCancel(WmsJitRequestDto input)
{
- var _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.State == 1).ToListAsync();
- var _first = _ls.FirstOrDefault();
- if (_ls.Count()>0)
+ if (input.Guids != null && input.Guids.Count() > 0)
{
- //var _guid = GuidGenerator.Create();
- //await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls,new BulkConfig() { BulkCopyTimeout=0 });
- //var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", input.Version, "WmsKanbanOutPutDetail", _first.BillNum, 0,0, _guid)
- //{
- // TaskId = _guid,
- // SourceBillNum = _first.BillNum,
- // TableName = "WmsKanbanOutPutDetail",
- // InterfaceType = "2",
- // Version = input.Version,
- // WmsState = 0,
- // SettleAccountState=0
- //};
- //var _l = new List();
- //_l.Add(uniapi);
- //await _wmsefRespository.GetDbContext().BulkInsertAsync(_l);
+ List _ls = new List();
+ foreach (var itm in input.Guids)
+ {
+ _ls.Add(string.Format("{0}", itm));
+ }
+
+ string str = string.Join(",", _ls.ToArray());
+
+ var sql = "DECLARE @return_value int\n" +
+ "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" +
+ " @Guids ={0}, \n" +
+ " @billnum = N'{1}',\n" +
+ " @type = 2,\n" +
+ " @accountdate = N'{2}'\n" +
+ "SELECT 'Return Value' = @return_value";
+
+ sql = string.Format(sql, str, input.BillNum, input.AccountDate);
+
+ await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+ sql
+ );
+
}
return true;
}
@@ -488,12 +474,12 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
}
_lst.AddRange(_lsCopy.ToArray());
- var _ls1 = _lst.Where(p => p.ParentMaterialCode == p.MaterialCode).ToList();
+
var outPutDetail = await _wmsRepository.Where(p => p.Version == version).ToListAsync();
var error = from itm1 in outPutDetail
- join itm2 in _ls1 on
+ join itm2 in _lst on
new { itm1.MaterialCode, itm1.Kanban }
equals
new { itm2.MaterialCode, itm2.Kanban }
@@ -513,14 +499,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
-
-
-
-
-
-
-
- var query = from itm1 in _ls1
+ var query = from itm1 in _lst
join itm2 in outPutDetail on
new { itm1.MaterialCode, itm1.Kanban }
equals
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
index 2e1d2f33..67af3e2a 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/WMS/WMSSharePartAppService.cs
@@ -350,26 +350,7 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
"SELECT 'Return Value' = @return_value";
await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
string.Format(sql, input.BillNum));
- //var _first = _ls.FirstOrDefault();
- //var _guid = GuidGenerator.Create();
- //foreach (var itm in _ls)
- //{
- // itm.TaskId = _guid;
- //}
- //await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls);
- //var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", input.Version, "WmsSharePartOutPutDetail",_first.BillNum, 0,0 ,_guid)
- //{
- // TaskId = _guid,
- // SourceBillNum = _first.BillNum,
- // TableName = "WmsSharePartOutPutDetail",
- // InterfaceType = "3",
- // Version = input.Version,
- // SettleAccountState = 0,
- // WmsState=0
- //};
- //var _l = new List();
- //_l.Add(uniapi);
- //await _wmsefRespository.GetDbContext().BulkInsertAsync(_l);
+
}
}
return true;
@@ -384,25 +365,30 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
[Route("WmsSharePartOutPut-Cancel")]
public async Task WmsSharePartOutPutCancel(WmsJitRequestDto input)
{
- var _ls = await _wmsRepository.Where(p => input.Guids.Contains(p.Id) && p.Version == input.Version && p.State == 1).ToListAsync();
- var _first = _ls.FirstOrDefault();
- if (_ls.Count()>0)
+ if(input.Guids != null && input.Guids.Count() > 0)
{
- var _guid = GuidGenerator.Create();
- await _wmsefRespository.GetDbContext().BulkInsertAsync(_ls,new BulkConfig() { BulkCopyTimeout=0 });
- var uniapi = new TS_UNI_API(GuidGenerator.Create(), "1", input.Version, "WmsSharePartOutPutDetail", _first.BillNum, 0,0, _guid)
+ List _ls = new List();
+ foreach (var itm in input.Guids)
{
- TaskId = _guid,
- SourceBillNum = _first.BillNum,
- TableName = "WmsSharePartOutPutDetail",
- InterfaceType = "3",
- Version = input.Version,
- WmsState = 0,
- SettleAccountState=0
- };
- var _l = new List();
- _l.Add(uniapi);
- await _wmsefRespository.GetDbContext().BulkInsertAsync(_l);
+ _ls.Add(string.Format("{0}", itm));
+ }
+
+ string str = string.Join(",", _ls.ToArray());
+
+ var sql = "DECLARE @return_value int\n" +
+ "EXEC @return_value = [dbo].[p_wms_output_cancel]\n" +
+ " @Guids ={0}, \n" +
+ " @billnum = N'{1}',\n" +
+ " @type = 2,\n" +
+ " @accountdate = N'{2}'\n" +
+ "SELECT 'Return Value' = @return_value";
+
+ sql = string.Format(sql, str, input.BillNum, input.AccountDate);
+
+ await _wmsRepository.GetDbContext().Database.ExecuteSqlRawAsync(
+ sql
+ );
+
}
return true;
}
@@ -417,8 +403,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
var result = await _exportImporter.ExtendExcelImport(files, _excelImportService);
List _lst = new List();
-
-
var _lsCopy = new List();
foreach (var itm in result)
{
@@ -470,11 +454,6 @@ namespace Win.Sfs.SettleAccount.Entities.SettleAccounts
return await ExportErrorReportAsync(checkList);
}
-
-
-
-
-
var query = from itm1 in _ls1
join itm2 in outPutDetail on
new { itm1.MaterialCode, itm1.OrderBillNum }
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
index cd2bfa3e..e1a8319d 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs
@@ -72,8 +72,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
_invoiceVersionRepository = invoiceVersionRepository;
_fisVersionrepository = fisVersionrepository;
_itemInvoicePriceVersionrepository = itemInvoicePriceVersionrepository;
- //_versionRepository = versionRepository;
- //_repository = repository;
+
_service = service;
}
@@ -249,22 +248,8 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
});
return _taskid;
}
-
-
-
-
-
-
-
-
-
-
-
-
-
#endregion
-
[HttpGet]
[Route("SharePartUnSettledExport")]
[DisableRequestSizeLimit]
@@ -315,125 +300,6 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
}
-
-
-
-
-
- ///
- /// 未结算对比
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- //[HttpGet]
- //[Route("UnSettledDiff-Make")]
- //[DisableRequestSizeLimit]
-
- //public async Task UnSettledMake(string year, string period, string version, string customerCode, string factory, string matialCode, string state,DateTime begin,DateTime end)
- //{
-
- // List customConditionList = new List();
- // customConditionList.Add(new CustomCondition() { Name = "Version", Value = version ?? string.Empty });
- // customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode ?? string.Empty });
- // customConditionList.Add(new CustomCondition() { Name = "Factory", Value = factory ?? string.Empty });
- // customConditionList.Add(new CustomCondition() { Name = "State", Value = state ?? "0" });
- // customConditionList.Add(new CustomCondition() { Name = "MatialCode", Value = matialCode ?? "0" });
- // customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "未结算对比" });
- // customConditionList.Add(new CustomCondition() { Name = "Year", Value = year ?? string.Empty });
- // customConditionList.Add(new CustomCondition() { Name = "BegingTime", Value = begin.ToString() });
- // customConditionList.Add(new CustomCondition() { Name = "EndTime", Value = end.ToString() });
-
- // var _taskid = await _service.ExportEnqueueAsync("未结算对比", ExportExtentsion.Excel,version, string.IsNullOrEmpty(materialGroup) ? string.Empty : materialGroup, CurrentUser, typeof(UnSettledExportService), customConditionList, (rs) =>
- // {
- // });
- // return _taskid;
- //}
-
-
- ///
- /// ERP总成开票报表功能
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- //[HttpGet]
- //[Route("FisUnSettledDiff-Make")]
- //[DisableRequestSizeLimit]
-
- //public async Task FisUnSettledMake(string year, string version, string customerCode, string factory, string state)
- //{
-
- // List customConditionList = new List();
- // customConditionList.Add(new CustomCondition() { Name = "Version", Value = version ?? string.Empty });
- // customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode ?? string.Empty });
- // customConditionList.Add(new CustomCondition() { Name = "Factory", Value = factory ?? string.Empty });
- // customConditionList.Add(new CustomCondition() { Name = "State", Value = state ?? "0" });
- // customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "ERP总成开票报表" });
- // customConditionList.Add(new CustomCondition() { Name = "Year", Value = year ?? DateTime.Now.Year.ToString() });
-
- // var _taskid = await _service.ExportEnqueueAsync("ERP总成开票报表", ExportExtentsion.Excel,version,string.Empty ,CurrentUser, typeof(fisUnsettledDiffReport), customConditionList, (rs) =>
- // {
- // });
- // return _taskid;
- //}
-
- ///
- /// 价差量差分析报表
- ///
- ///
- ///
- ///
- ///
- ///
- ///
- //[HttpGet]
- //[Route("PriceQtyDiff-Make")]
- //[DisableRequestSizeLimit]
-
- //public async Task PriceQtyDiffMake(string year, string version, string customerCode, string factory, string state)
- //{
- // //if (!_invoiceVersionRepository.Any(p => p.Version == version))
- // //{
- // // throw new BusinessException("8989", string.Format("不存发票{0}期间", version));
- // //}
- // //if (!_settleAccountVersionrepository.Any(p => p.Version == version))
- // //{
- // // throw new BusinessException("8989", string.Format("不存结算{0}期间", version));
- // //}
- // //if (!_itemInvoicePriceVersionrepository.Any(p => p.Version == version))
- // //{
- // // throw new BusinessException("8989", string.Format("不存QAD价格导入{0}期间", version));
- // //}
- // List customConditionList = new List();
- // customConditionList.Add(new CustomCondition() { Name = "Version", Value = version ?? string.Empty });
- // customConditionList.Add(new CustomCondition() { Name = "CustomerCode", Value = customerCode ?? string.Empty });
- // customConditionList.Add(new CustomCondition() { Name = "Factory", Value = factory ?? string.Empty });
- // customConditionList.Add(new CustomCondition() { Name = "State", Value = state ?? "0" });
- // customConditionList.Add(new CustomCondition() { Name = "ProjectName", Value = "价差量差分析报表" });
- // customConditionList.Add(new CustomCondition() { Name = "Year", Value = year ?? DateTime.Now.Year.ToString() });
-
- // var _taskid = await _service.ExportEnqueueAsync("价差量差分析报表", ExportExtentsion.Excel,version,string.Empty ,CurrentUser, typeof(PriceQtyDifferenceExportService), customConditionList, (rs) =>
- // {
- // });
- // return _taskid;
- //}
-
-
///
/// 1.大众发票与结算核对汇总表
///
@@ -510,10 +376,7 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
[DisableRequestSizeLimit]
public async Task UnInvoiceSettledDetailDiffMake(
-
-
BaseRequestDto request
-
)
{
List customConditionList = new List();
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
index 15663265..27dd12f1 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
+++ b/src/Modules/SettleAccount/src/SettleAccount.Application/SettleAccount.Application.xml
@@ -1787,6 +1787,126 @@
+
+
+ wms出库
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 准时化出库主表
+
+
+
+
+
+
+ 准时化出库明细
+
+
+
+
+
+
+ 任务明细标记已确认
+
+ 上传的文件(前端已经限制只能上传一个附件)
+
+
+
+
+ 选择任务，生成出库单，只包含已确认的单据
+
+
+
+
+
+
+
+ 出库界面功能，核准出库功能
+
+
+
+
+
+
+
+ 出库界面功能， 撤销核准出库
+
+
+
+
+
+
+
+ wms出库
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+ 准时化出库主表
+
+
+
+
+
+
+ 准时化出库明细
+
+
+
+
+
+
+ 任务明细标记已确认
+
+ 上传的文件(前端已经限制只能上传一个附件)
+
+
+
+
+ 选择任务，生成出库单，只包含已确认的单据
+
+
+
+
+
+
+
+ 出库界面功能，核准出库功能
+
+
+
+
+
+
+
+ 出库界面功能， 撤销核准出库
+
+
+
+
+
wms出库
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs
index 01b4920b..53f61f23 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/TaskList.cs
@@ -271,11 +271,7 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
}
-
-
// 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明
-
-
[ImporterHeader(Name = "组件组物料",IsIgnore =true)]
public string ParentMaterialCode { set; get; }
[ImporterHeader(Name = "交货单号")]
@@ -393,9 +389,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
// 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明
[ImporterHeader(Name = "行号")]
public string PoLine { set; get; }
-
- //交货单号
-
[ImporterHeader(Name = "组件组物料", IsIgnore = true)]
public string ParentMaterialCode { set; get; }
[ImporterHeader(Name = "交货单号")]
@@ -550,6 +543,229 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
public Guid TaskId { set; get; }
}
+
+
+ public class WmsHQHKanbanOutPut : FullAuditedAggregateRootBase
+ {
+ public WmsHQHKanbanOutPut()
+ {
+ }
+
+ public WmsHQHKanbanOutPut(Guid id, string version, string billNum, string creator) : base(id)
+ {
+ Id = id;
+ Version = version;
+ BillNum = billNum;
+ Creator = creator;
+ }
+
+ public string Version { set; get; }
+ public string BillNum { set; get; }
+ public string Creator { set; get; }
+ }
+
+
+ ///
+ /// 看板明细
+ ///
+ public class WmsHQHKanbanOutPutDetial : FullAuditedAggregateRootBase
+ {
+ public WmsHQHKanbanOutPutDetial()
+ {
+ }
+
+ public WmsHQHKanbanOutPutDetial(Guid id, string wmsBillNum, string kanban, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty, string poline)
+ {
+ Id = id;
+ WmsBillNum = wmsBillNum;
+ Kanban = kanban;
+ MaterialCode = materialCode;
+ MaterialDesc = materialDesc;
+ MaterialGroup = materialGroup;
+ OutPut = outPut;
+ InPut = inPut;
+ State = state;
+ Extend1 = extend1;
+ Extend2 = extend2;
+ Version = extend3;
+ ParentMaterialCode = parentMaterialCode;
+ BillNum = billNum;
+ TaskId = taskId;
+ Remark = remark;
+ Qty = qty;
+ PoLine = poline;
+ }
+ public void SetData(Guid id, string remark, string wmsbillnum, string version, Guid taskId)
+ {
+ Id = id;
+ Remark = remark;
+ WmsBillNum = wmsbillnum;
+ Version = version;
+ TaskId = taskId;
+ }
+
+
+ // 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明
+ [ImporterHeader(Name = "行号")]
+ public string PoLine { set; get; }
+ [ImporterHeader(Name = "组件组物料", IsIgnore = true)]
+ public string ParentMaterialCode { set; get; }
+ [ImporterHeader(Name = "交货单号")]
+ public string WmsBillNum { set; get; }
+ [ImporterHeader(Name = "条码号")]
+ //KENN号
+ public string Kanban { set; get; }
+
+ [ImporterHeader(Name = "物料号")]
+ //物料号
+ public string MaterialCode { set; get; }
+ [ImporterHeader(Name = "物料描述")]
+ //物料描述
+ public string MaterialDesc { set; get; }
+ [ImporterHeader(Name = "物料组(车型)")]
+ //物料组(车型)
+ public string MaterialGroup { set; get; }
+ [ImporterHeader(Name = "出库库位", IsIgnore = true)]
+ //出库库位
+ public string OutPut { set; get; }
+ [ImporterHeader(Name = "入库库位", IsIgnore = true)]
+ //入库库位
+ public string InPut { set; get; }
+ [ImporterHeader(Name = "状态", IsIgnore = true)]
+ public int State { get; set; }
+ [ImporterHeader(Name = "客户物料")]
+ ///
+ /// 扩展字段1
+ ///
+ public string Extend1 { set; get; }
+ ///
+ /// 扩展字段2
+ ///
+ [ImporterHeader(Name = "订单日期")]
+ public string Extend2 { set; get; }
+ ///
+ /// 扩展字段3
+ ///
+ [ImporterHeader(Name = "版本号", IsIgnore = true)]
+ public string Version { set; get; }
+ [ImporterHeader(Name = "结算数量")]
+ public decimal Qty { set; get; }
+
+ [ImporterHeader(Name = "单据", IsIgnore = true)]
+ public string BillNum { set; get; }
+
+ [ImporterHeader(Name = "任务", IsIgnore = true)]
+ public Guid TaskId { set; get; }
+
+
+ }
+
+ ///
+ /// 备件出库
+ ///
+ public class WmsHQHSharePartOutPut : FullAuditedAggregateRootBase
+ {
+ public WmsHQHSharePartOutPut()
+ {
+ }
+ public WmsHQHSharePartOutPut(Guid id, string version, string billNum, string creator) : base(id)
+ {
+ Id = id;
+ Version = version;
+ BillNum = billNum;
+ Creator = creator;
+ }
+ public string Version { set; get; }
+ public string BillNum { set; get; }
+ public string Creator { set; get; }
+
+ }
+
+
+ ///
+ /// 备件出库明细
+ ///
+ public class WmsHQHSharePartOutPutDetial : FullAuditedAggregateRootBase
+ {
+ public WmsHQHSharePartOutPutDetial()
+ {
+ }
+ public WmsHQHSharePartOutPutDetial(Guid id, string wmsBillNum, string orderBillNum, string materialCode, string materialDesc, string materialGroup, string outPut, string inPut, int state, string extend1, string extend2, string extend3, string parentMaterialCode, string billNum, Guid taskId, string remark, decimal qty)
+ {
+ Id = id;
+ WmsBillNum = wmsBillNum;
+ OrderBillNum = orderBillNum;
+ MaterialCode = materialCode;
+ MaterialDesc = materialDesc;
+ MaterialGroup = materialGroup;
+ OutPut = outPut;
+ InPut = inPut;
+ State = state;
+ Extend1 = extend1;
+ Extend2 = extend2;
+ Version = extend3;
+ ParentMaterialCode = parentMaterialCode;
+ BillNum = billNum;
+ TaskId = taskId;
+ Remark = remark;
+ Qty = qty;
+ }
+ public void SetId(Guid id)
+ {
+ Id = id;
+ }
+ //交货单号
+
+ [ImporterHeader(Name = "组件组物料")]
+ public string ParentMaterialCode { set; get; }
+ [ImporterHeader(Name = "交货单号")]
+ public string WmsBillNum { set; get; }
+ [ImporterHeader(Name = "看板号")]
+ //KENN号
+ public string OrderBillNum { set; get; }
+ [ImporterHeader(Name = "SAP编码")]
+ //物料号
+ public string MaterialCode { set; get; }
+ [ImporterHeader(Name = "物料描述")]
+ //物料描述
+ public string MaterialDesc { set; get; }
+ [ImporterHeader(Name = "物料组(车型)")]
+ //物料组(车型)
+ public string MaterialGroup { set; get; }
+ [ImporterHeader(Name = "出库库位", IsIgnore = true)]
+ //出库库位
+ public string OutPut { set; get; }
+ [ImporterHeader(Name = "入库库位", IsIgnore = true)]
+ //入库库位
+ public string InPut { set; get; }
+ [ImporterHeader(Name = "状态", IsIgnore = true)]
+ public int State { get; set; }
+ [ImporterHeader(Name = "物料代码")]
+ ///
+ /// 扩展字段1
+ ///
+ public string Extend1 { set; get; }
+ ///
+ /// 扩展字段2
+ ///
+ [ImporterHeader(Name = "扩展字段2", IsIgnore = true)]
+ public string Extend2 { set; get; }
+ ///
+ /// 扩展字段3
+ ///
+ [ImporterHeader(Name = "版本号", IsIgnore = true)]
+ public string Version { set; get; }
+ [ImporterHeader(Name = "开票数量")]
+ public decimal Qty { set; get; }
+ [ImporterHeader(Name = "数量", IsIgnore = true)]
+ public string BillNum { set; get; }
+ public Guid TaskId { set; get; }
+ }
+
+
+
+
+
#endregion
///
@@ -714,8 +930,6 @@ namespace Win.Sfs.SettleAccount.Entities.WMS
}
// 交货单号 实际发货日期 KENN号 底盘号 物料号 物料描述 客户物料 组件组物料 组件组物料描述 物料组(车型) 定价 金额 结算平台未结数量 大众R3未结数量 差异金额 差异数量 漏结标识 漏结期间 说明
-
-
//交货单号
[ImporterHeader(Name = "组件组物料")]
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/WmsOutPutPercent.cs b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/WmsOutPutPercent.cs
new file mode 100644
index 00000000..52acfb16
--- /dev/null
+++ b/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/WMS/WmsOutPutPercent.cs
@@ -0,0 +1,28 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Win.Sfs.Shared.DomainBase;
+
+namespace Win.Sfs.SettleAccount.Entities.WMS
+{
+ public class WmsOutPutPercent:FullAuditedAggregateRootBase
+ {
+ public WmsOutPutPercent(Guid id,decimal completeQty, decimal applyQty, decimal cancelQty):base(id)
+ {
+ CompleteQty = completeQty;
+ ApplyQty = applyQty;
+ CancelQty = cancelQty;
+ }
+
+ public decimal CompleteQty { set; get; }
+
+ public decimal ApplyQty { set; get; }
+
+ public decimal CancelQty { set; get; }
+
+
+
+ }
+}
diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
index ba80cc36..b6c60ee9 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/EntityFrameworkCore/SettleAccountDbContextModelCreatingExtensions.cs
@@ -333,9 +333,19 @@ namespace Win.Sfs.SettleAccount
builder.ConfigureWmsKanbanOutPutDetail(options);
builder.ConfigureWmsSharePartOutPutDetail(options);
builder.ConfigureWmsSharePartOutPutVersion(options);
+
builder.ConfigureHQFKanban(options);
builder.ConfigureHQMKanban(options);
builder.ConfigureHQHKanban(options);
+ builder.ConfigureWmsHQFKanbanOutPutVersion(options);
+ builder.ConfigureWmsHQFKanbanOutPutDetial(options);
+ builder.ConfigureWmsHQFSharePartOutPutVersion(options);
+ builder.ConfigureWmsHQFSharePartOutPutDetial(options);
+ builder.ConfigureWmsHQHKanbanOutPutVersion(options);
+ builder.ConfigureWmsHQHKanbanOutPutDetial(options);
+ builder.ConfigureWmsHQHSharePartOutPutVersion(options);
+ builder.ConfigureWmsHQHSharePartOutPutDetial(options);
+
#endregion
}
@@ -1228,6 +1238,159 @@ namespace Win.Sfs.SettleAccount
}
+ private static void ConfigureWmsHQFKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+ {
+
+ builder.Entity(b =>
+ {
+ b.ToTable($"{options.TablePrefix}_WmsHQFKanbanOutPut", options.Schema);
+ b.ConfigureByConvention();
+ b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+
+ b.HasIndex(x => new { x.BillNum });
+ });
+
+ }
+ private static void ConfigureWmsHQFKanbanOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+ {
+
+ builder.Entity(b =>
+ {
+ b.ToTable($"{options.TablePrefix}_WmsHQFKanbanOutPutDetial", options.Schema);
+ b.ConfigureByConvention();
+ b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
+ });
+
+ }
+
+ private static void ConfigureWmsHQFSharePartOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+ {
+
+ builder.Entity(b =>
+ {
+ b.ToTable($"{options.TablePrefix}_WmsHQFSharePartOutPut", options.Schema);
+ b.ConfigureByConvention();
+ b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+
+ b.HasIndex(x => new { x.BillNum });
+ });
+
+ }
+ private static void ConfigureWmsHQFSharePartOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+ {
+
+ builder.Entity(b =>
+ {
+ b.ToTable($"{options.TablePrefix}_WmsHQFSharePartOutPutDetial", options.Schema);
+ b.ConfigureByConvention();
+ b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength);
+
+ //b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength);
+ //b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
+ });
+
+ }
+
+ private static void ConfigureWmsHQHKanbanOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+ {
+
+ builder.Entity(b =>
+ {
+ b.ToTable($"{options.TablePrefix}_WmsHQHKanbanOutPut", options.Schema);
+ b.ConfigureByConvention();
+ b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+
+ b.HasIndex(x => new { x.BillNum });
+ });
+
+ }
+ private static void ConfigureWmsHQHKanbanOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+ {
+
+ builder.Entity(b =>
+ {
+ b.ToTable($"{options.TablePrefix}_WmsHQHKanbanOutPutDetial", options.Schema);
+ b.ConfigureByConvention();
+ b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
+ });
+
+ }
+
+ private static void ConfigureWmsHQHSharePartOutPutVersion(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+ {
+
+ builder.Entity(b =>
+ {
+ b.ToTable($"{options.TablePrefix}_WmsHQHSharePartOutPut", options.Schema);
+ b.ConfigureByConvention();
+ b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+
+ b.HasIndex(x => new { x.BillNum });
+ });
+
+ }
+ private static void ConfigureWmsHQHSharePartOutPutDetial(this ModelBuilder builder, SettleAccountModelBuilderConfigurationOptions options)
+ {
+
+ builder.Entity(b =>
+ {
+ b.ToTable($"{options.TablePrefix}_WmsHQHSharePartOutPutDetial", options.Schema);
+ b.ConfigureByConvention();
+ b.Property(x => x.BillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.WmsBillNum).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Version).IsRequired().HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.OutPut).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.InPut).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.OrderBillNum).HasMaxLength(CommonConsts.MaxCodeLength);
+
+ //b.Property(x => x.PoLine).HasMaxLength(CommonConsts.MaxCodeLength);
+ //b.Property(x => x.Kanban).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.ParentMaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Extend1).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.Extend2).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.Property(x => x.MaterialCode).HasMaxLength(CommonConsts.MaxCodeLength);
+ b.HasIndex(x => new { x.Version }).IsUnique().HasFilter(IsDeletedFilter);
+ });
+
+ }
+
+
#endregion
diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs
index a8aab722..84b248b9 100644
--- a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs
+++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFSettledDetailDapperRepository.cs
@@ -116,7 +116,7 @@ namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
List _list = new List();
- string condition = " where 1=1 ";
+ string condition = " ";
////if (!string.IsNullOrEmpty(materialCode))
diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFShippingDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFShippingDapperRepository.cs
new file mode 100644
index 00000000..cc8cd239
--- /dev/null
+++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQFShippingDapperRepository.cs
@@ -0,0 +1,107 @@
+using Dapper;
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories.Dapper;
+using Volo.Abp.EntityFrameworkCore;
+
+namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
+{
+ public class HQFShippingDapperRepository : DapperRepository, ITransientDependency
+ {
+ public HQFShippingDapperRepository(IDbContextProvider dbContextProvider)
+ : base(dbContextProvider)
+ {
+ }
+ public virtual List GetHQFShippingReportList(string version, string begin, string end)
+ {
+
+ List _list = new List();
+
+ string condition = " where 1=1 ";
+ if (!string.IsNullOrEmpty(begin))
+ {
+ condition += string.Format(" and b.LastModificationTime>='{0}' ", begin);
+ }
+ if (!string.IsNullOrEmpty(end))
+ {
+ condition += string.Format(" and b.LastModificationTime<='{0}' ", end);
+ }
+ string str =
+ "SELECT\n" +
+ " temp1.*,\n" +
+ " Isnull( TEMP2.Price, 0 ) 单价 ,\n" +
+ " Round( Isnull( TEMP2.Price, 0 ) * temp1.数量, 2 ) 金额 \n" +
+ "FROM\n" +
+ " (\n" +
+ " SELECT\n" +
+ " A.LastModificationTime 交货时间,\n" +
+ " A.WmsBillNum 交货单号,\n" +
+ " A.PoLine 行号,\n" +
+ " A.MaterialCode 发货零件号,\n" +
+ " B.MaterialCode Sap零件号,\n" +
+ " A.MaterialDesc 物料描述,\n" +
+ " A.Qty 数量,\n" +
+ " A.Kanban 看板号,\n" +
+ " A.IsAuto 手工或自动 ,\n" +
+ " A.Warehouse 收货仓库,\n" +
+ " A.WarehouseDesc 收货仓库描述,\n" +
+ " A.Supplier 供应商 \n" +
+ " FROM\n" +
+ " Set_HQ_H_Kanban AS A\n" +
+ " LEFT OUTER JOIN Set_HQ_F_Platform AS B ON A.Kanban = B.HQHKanBan \n" +
+ " AND A.MaterialCode = B.MaterialCode\n" +
+ " LEFT OUTER JOIN Set_material AS C ON A.MaterialCode = C.CustomerPartCode \n" +
+ " WHERE\n" +
+ " ( B.Id IS NULL ) \n" +
+ " {0} \n" +
+ " ) TEMP1\n" +
+ " LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE ( Version = ( SELECT MAX ( Version ) FROM Set_PriceList ) ) ) TEMP2 ON temp1.Sap零件号= temp2.MaterialCode";
+ var _sql = string.Format(str, condition);
+
+ var _query = DbConnection.Query(_sql, null, null, true, 1200, null);
+ _list = _query.ToList();
+ return _list;
+
+ }
+
+ }
+
+
+ public class HQFShippingDiff
+ {
+ [ExporterHeader(DisplayName = "交货单号")]
+ public string 交货单号 { set; get; }
+ [ExporterHeader(DisplayName = "交货时间")]
+ public string 交货时间 { set; get; }
+ [ExporterHeader(DisplayName = "行号")]
+ public string 行号 { set; get; }
+
+ [ExporterHeader(DisplayName = "发货零件号")]
+ public string 发货零件号 { set; get; }
+
+ [ExporterHeader(DisplayName = "Sap零件号")]
+ public string Sap零件号 { set; get; }
+
+ [ExporterHeader(DisplayName = "物料描述")]
+ public string 物料描述 { set; get; }
+
+ [ExporterHeader(DisplayName = "数量")]
+ public decimal 数量 { set; get; }
+ [ExporterHeader(DisplayName = "看板号")]
+ public string 看板号 { set; get; }
+ [ExporterHeader(DisplayName = "手工或自动")]
+ public string 手工或自动 { set; get; }
+ [ExporterHeader(DisplayName = "收货仓库")]
+ public string 收货仓库 { set; get; }
+ [ExporterHeader(DisplayName = "收货仓库描述")]
+ public string 收货仓库描述 { set; get; }
+ [ExporterHeader(DisplayName = "供应商")]
+ public string 供应商 { set; get; }
+
+ }
+}
diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHShippingDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHShippingDapperRepository.cs
new file mode 100644
index 00000000..fe6f333b
--- /dev/null
+++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQHShippingDapperRepository.cs
@@ -0,0 +1,109 @@
+using Dapper;
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories.Dapper;
+using Volo.Abp.EntityFrameworkCore;
+
+namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
+{
+
+ public class HQHShippingDapperRepository : DapperRepository, ITransientDependency
+ {
+ public HQHShippingDapperRepository(IDbContextProvider dbContextProvider)
+ : base(dbContextProvider)
+ {
+ }
+ public virtual List GetHQHShippingReportList(string version, string materialCode, string begin, string end, string materialGroup)
+ {
+
+ List _list = new List();
+
+ string condition = " where 1=1 ";
+ if (!string.IsNullOrEmpty(begin))
+ {
+ condition += string.Format(" and b.LastModificationTime>='{0}' ", begin);
+ }
+ if (!string.IsNullOrEmpty(end))
+ {
+ condition += string.Format(" and b.LastModificationTime<='{0}' ", end);
+ }
+ string str =
+ "SELECT\n" +
+ " temp1.*,\n" +
+ " Isnull( TEMP2.Price, 0 ) 单价 ,\n" +
+ " Round( Isnull( TEMP2.Price, 0 ) * temp1.数量, 2 ) 金额 \n" +
+ "FROM\n" +
+ " (\n" +
+ " SELECT\n" +
+ " A.LastModificationTime 交货时间,\n" +
+ " A.WmsBillNum 交货单号,\n" +
+ " A.PoLine 行号,\n" +
+ " A.MaterialCode 发货零件号,\n" +
+ " B.MaterialCode Sap零件号,\n" +
+ " A.MaterialDesc 物料描述,\n" +
+ " A.Qty 数量,\n" +
+ " A.Kanban 看板号,\n" +
+ " A.IsAuto 手工或自动 ,\n" +
+ " A.Warehouse 收货仓库,\n" +
+ " A.WarehouseDesc 收货仓库描述,\n" +
+ " A.Supplier 供应商 \n" +
+ " FROM\n" +
+ " Set_HQ_H_Kanban AS A\n" +
+ " LEFT OUTER JOIN Set_HQ_H_Platform AS B ON A.Kanban = B.HQHKanBan \n" +
+ " AND A.MaterialCode = B.MaterialCode\n" +
+ " LEFT OUTER JOIN Set_material AS C ON A.MaterialCode = C.CustomerPartCode \n" +
+ " WHERE\n" +
+ " ( B.Id IS NULL ) \n" +
+ " {0} \n" +
+ " ) TEMP1\n" +
+ " LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE ( Version = ( SELECT MAX ( Version ) FROM Set_PriceList ) ) ) TEMP2 ON temp1.Sap零件号= temp2.MaterialCode";
+ var _sql = string.Format(str, condition);
+
+ var _query = DbConnection.Query(_sql, null, null, true, 1200, null);
+ _list = _query.ToList();
+ return _list;
+
+ }
+
+ }
+
+
+ public class HQHShippingDiff
+ {
+ [ExporterHeader(DisplayName = "交货单号")]
+ public string 交货单号 { set; get; }
+ [ExporterHeader(DisplayName = "交货时间")]
+ public string 交货时间 { set; get; }
+ [ExporterHeader(DisplayName = "行号")]
+ public string 行号 { set; get; }
+
+ [ExporterHeader(DisplayName = "发货零件号")]
+ public string 发货零件号 { set; get; }
+
+ [ExporterHeader(DisplayName = "Sap零件号")]
+ public string Sap零件号 { set; get; }
+
+ [ExporterHeader(DisplayName = "物料描述")]
+ public string 物料描述 { set; get; }
+
+ [ExporterHeader(DisplayName = "数量")]
+ public decimal 数量 { set; get; }
+ [ExporterHeader(DisplayName = "看板号")]
+ public string 看板号 { set; get; }
+ [ExporterHeader(DisplayName = "手工或自动")]
+ public string 手工或自动 { set; get; }
+ [ExporterHeader(DisplayName = "收货仓库")]
+ public string 收货仓库 { set; get; }
+ [ExporterHeader(DisplayName = "收货仓库描述")]
+ public string 收货仓库描述 { set; get; }
+ [ExporterHeader(DisplayName = "供应商")]
+ public string 供应商 { set; get; }
+
+ }
+
+}
diff --git a/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMShippingDapperRepository.cs b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMShippingDapperRepository.cs
new file mode 100644
index 00000000..6a4ee5b7
--- /dev/null
+++ b/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Repository/SettleAccountJob/Report/HQMShippingDapperRepository.cs
@@ -0,0 +1,107 @@
+using Dapper;
+using Magicodes.ExporterAndImporter.Core;
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using Volo.Abp.DependencyInjection;
+using Volo.Abp.Domain.Repositories.Dapper;
+using Volo.Abp.EntityFrameworkCore;
+
+namespace Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report
+{
+ public class HQMShippingDapperRepository : DapperRepository, ITransientDependency
+ {
+ public HQMShippingDapperRepository(IDbContextProvider dbContextProvider)
+ : base(dbContextProvider)
+ {
+ }
+ public virtual List GetHQFShippingReportList(string version, string begin, string end)
+ {
+
+ List _list = new List();
+
+ string condition = " where 1=1 ";
+ if (!string.IsNullOrEmpty(begin))
+ {
+ condition += string.Format(" and b.LastModificationTime>='{0}' ", begin);
+ }
+ if (!string.IsNullOrEmpty(end))
+ {
+ condition += string.Format(" and b.LastModificationTime<='{0}' ", end);
+ }
+ string str =
+ "SELECT\n" +
+ " temp1.*,\n" +
+ " Isnull( TEMP2.Price, 0 ) 单价 ,\n" +
+ " Round( Isnull( TEMP2.Price, 0 ) * temp1.数量, 2 ) 金额 \n" +
+ "FROM\n" +
+ " (\n" +
+ " SELECT\n" +
+ " A.LastModificationTime 交货时间,\n" +
+ " A.WmsBillNum 交货单号,\n" +
+ " A.PoLine 行号,\n" +
+ " A.MaterialCode 发货零件号,\n" +
+ " B.MaterialCode Sap零件号,\n" +
+ " A.MaterialDesc 物料描述,\n" +
+ " A.Qty 数量,\n" +
+ " A.Kanban 看板号,\n" +
+ " A.IsAuto 手工或自动 ,\n" +
+ " A.Warehouse 收货仓库,\n" +
+ " A.WarehouseDesc 收货仓库描述,\n" +
+ " A.Supplier 供应商 \n" +
+ " FROM\n" +
+ " Set_HQ_H_Kanban AS A\n" +
+ " LEFT OUTER JOIN Set_HQ_M_Platform AS B ON A.Kanban = B.HQMKanBan \n" +
+ " AND A.MaterialCode = B.MaterialCode\n" +
+ " LEFT OUTER JOIN Set_material AS C ON A.MaterialCode = C.CustomerPartCode \n" +
+ " WHERE\n" +
+ " ( B.Id IS NULL ) \n" +
+ " {0} \n" +
+ " ) TEMP1\n" +
+ " LEFT JOIN ( SELECT Price, MaterialCode FROM Set_PriceList WHERE ( Version = ( SELECT MAX ( Version ) FROM Set_PriceList ) ) ) TEMP2 ON temp1.Sap零件号= temp2.MaterialCode";
+ var _sql = string.Format(str, condition);
+
+ var _query = DbConnection.Query(_sql, null, null, true, 1200, null);
+ _list = _query.ToList();
+ return _list;
+
+ }
+
+ }
+
+
+ public class HQMShippingDiff
+ {
+ [ExporterHeader(DisplayName = "交货单号")]
+ public string 交货单号 { set; get; }
+ [ExporterHeader(DisplayName = "交货时间")]
+ public string 交货时间 { set; get; }
+ [ExporterHeader(DisplayName = "行号")]
+ public string 行号 { set; get; }
+
+ [ExporterHeader(DisplayName = "发货零件号")]
+ public string 发货零件号 { set; get; }
+
+ [ExporterHeader(DisplayName = "Sap零件号")]
+ public string Sap零件号 { set; get; }
+
+ [ExporterHeader(DisplayName = "物料描述")]
+ public string 物料描述 { set; get; }
+
+ [ExporterHeader(DisplayName = "数量")]
+ public decimal 数量 { set; get; }
+ [ExporterHeader(DisplayName = "看板号")]
+ public string 看板号 { set; get; }
+ [ExporterHeader(DisplayName = "手工或自动")]
+ public string 手工或自动 { set; get; }
+ [ExporterHeader(DisplayName = "收货仓库")]
+ public string 收货仓库 { set; get; }
+ [ExporterHeader(DisplayName = "收货仓库描述")]
+ public string 收货仓库描述 { set; get; }
+ [ExporterHeader(DisplayName = "供应商")]
+ public string 供应商 { set; get; }
+
+ }
+}
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQFShippingExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQFShippingExportService.cs
new file mode 100644
index 00000000..e6c33faa
--- /dev/null
+++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQFShippingExportService.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TaskJob.EventArgs;
+using TaskJob.Interfaces;
+using Volo.Abp.DependencyInjection;
+using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
+
+namespace SettleAccount.Job.Services.Report
+{
+ public class HQFShippingExportService : ITransientDependency, IExportJob
+ {
+
+ private readonly HQFShippingDapperRepository _dapperRepository;
+ private readonly ErpPartDapperRepository _erpdapperRepository;
+
+ private readonly OutputService _outputService;
+ private readonly InputService _inputService;
+
+ public HQFShippingExportService(
+
+ ErpPartDapperRepository erpdapperRepository,
+ HQFShippingDapperRepository dapperRepository,
+ OutputService outputService,
+ InputService inputService
+ )
+ {
+ _inputService = inputService;
+ _outputService = outputService;
+ _erpdapperRepository = erpdapperRepository;
+
+ _dapperRepository = dapperRepository;
+ }
+
+ public string ExportFile(Guid id, List exportName, List p_list)
+ {
+ var _filename = exportName.FirstOrDefault();
+ var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
+ var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value;
+ var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value;
+ var _ls = _dapperRepository.GetHQFShippingReportList(version, begin, end);
+
+
+ _outputService.Export(id, _filename, _ls);
+ return id.ToString();
+ }
+
+ }
+}
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHShippingExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHShippingExportService.cs
new file mode 100644
index 00000000..c334bc70
--- /dev/null
+++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQHShippingExportService.cs
@@ -0,0 +1,57 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TaskJob.EventArgs;
+using TaskJob.Interfaces;
+using Volo.Abp.DependencyInjection;
+using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
+
+namespace SettleAccount.Job.Services.Report
+{
+ public class HQHShippingExportService : ITransientDependency, IExportJob
+ {
+
+ private readonly HQHShippingDapperRepository _dapperRepository;
+ private readonly ErpPartDapperRepository _erpdapperRepository;
+
+ private readonly OutputService _outputService;
+ private readonly InputService _inputService;
+
+ public HQHShippingExportService(
+
+ ErpPartDapperRepository erpdapperRepository,
+ HQHShippingDapperRepository dapperRepository,
+ OutputService outputService,
+ InputService inputService
+ )
+ {
+ _inputService = inputService;
+ _outputService = outputService;
+ _erpdapperRepository = erpdapperRepository;
+
+ _dapperRepository = dapperRepository;
+ }
+
+ public string ExportFile(Guid id, List exportName, List p_list)
+ {
+ var _filename = exportName.FirstOrDefault();
+ var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
+ var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value;
+ var kanban = p_list.Where(p => p.Name == "Kanban").FirstOrDefault().Value;
+ var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value;
+ var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value;
+ var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value;
+ var acceptNo = p_list.Where(p => p.Name == "AcceptNo").FirstOrDefault().Value;
+ var sapCode = p_list.Where(p => p.Name == "SapCode").FirstOrDefault().Value;
+ var warehouseDesc = p_list.Where(p => p.Name == "WarehouseDesc").FirstOrDefault().Value;
+ var _ls = _dapperRepository.GetHQHShippingReportList(version, materialCode, begin, end, materialGroup);
+
+
+ _outputService.Export(id, _filename, _ls);
+ return id.ToString();
+ }
+
+ }
+}
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSharePartSettledDetailDiffExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSharePartSettledDetailDiffExportService.cs
new file mode 100644
index 00000000..ba91cf18
--- /dev/null
+++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMSharePartSettledDetailDiffExportService.cs
@@ -0,0 +1,118 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TaskJob.EventArgs;
+using TaskJob.Interfaces;
+using Volo.Abp.DependencyInjection;
+using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
+
+namespace SettleAccount.Job.Services.Report
+{
+ public class HQMSharePartSettledDetailDiffExportService : ITransientDependency, IExportJob
+ {
+
+ private readonly HQMSettledDetailDapperRepository _dapperRepository;
+ private readonly ErpPartDapperRepository _erpdapperRepository;
+
+ private readonly OutputService _outputService;
+ private readonly InputService _inputService;
+
+ public HQMSharePartSettledDetailDiffExportService(
+
+ ErpPartDapperRepository erpdapperRepository,
+ HQMSettledDetailDapperRepository dapperRepository,
+ OutputService outputService,
+ InputService inputService
+ )
+ {
+ _inputService = inputService;
+ _outputService = outputService;
+ _erpdapperRepository = erpdapperRepository;
+
+ _dapperRepository = dapperRepository;
+ }
+
+ public string ExportFile(Guid id, List exportName, List p_list)
+ {
+ var _filename = exportName.FirstOrDefault();
+ var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
+ var materialCode = p_list.Where(p => p.Name == "MaterialCode").FirstOrDefault().Value;
+ var kanban = p_list.Where(p => p.Name == "Kanban").FirstOrDefault().Value;
+ var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value;
+ var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value;
+ var materialGroup = p_list.Where(p => p.Name == "MaterialGroup").FirstOrDefault().Value;
+ var acceptNo = p_list.Where(p => p.Name == "AcceptNo").FirstOrDefault().Value;
+ var sapCode = p_list.Where(p => p.Name == "SapCode").FirstOrDefault().Value;
+ var warehouseDesc = p_list.Where(p => p.Name == "WarehouseDesc").FirstOrDefault().Value;
+ var _ls = _dapperRepository.GetSharePartSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup);
+ //var _ls = _dapperRepository.GetInvoiceSettledDetailDiffReportList(version, materialCode, begin, end, materialGroup);
+ //var _lst=_dapperRepository.GetDiffQtyList(version);
+
+ //foreach (var itm in _lst)
+ //{
+ // var _first = _ls.FirstOrDefault(p => p.订货看板编号 == itm.看板号 && p.订货零件号==itm.客户物料号);
+ // if(_first!=null)
+ // {
+ // _first.发货数量 = _first.结算数量+ itm.差异数量;
+ // _first.数量差异 = itm.差异数量;
+ // }
+ //}
+ if (!string.IsNullOrEmpty(kanban))
+ {
+ var _groupList = kanban.Split(new char[] { '\n' }).Distinct().ToList();
+ if (_groupList.Count() > 0)
+ {
+ _ls = _ls.Where(p => _groupList.Contains(p.结算物料号)).ToList();
+ }
+ }
+
+
+ if (!string.IsNullOrEmpty(warehouseDesc))
+ {
+ var _groupList = warehouseDesc.Split(new char[] { '\n' }).Distinct().ToList();
+ if (_groupList.Count() > 0)
+ {
+ _ls = _ls.Where(p => _groupList.Contains(p.收货仓库描述)).ToList();
+ }
+ }
+
+ //if (!string.IsNullOrEmpty(acceptNo))
+ //{
+ // var _groupList = acceptNo.Split(new char[] { ',' }).Distinct().ToList();
+ // if (_groupList.Count() > 0)
+ // {
+ // _ls = _ls.Where(p => _groupList.Contains(p.结算验收单号)).ToList();
+ // }
+ //}
+ if (!string.IsNullOrEmpty(materialGroup))
+ {
+ var _groupList = materialGroup.Split(new char[] { ',' }).Distinct().ToList();
+ if (_groupList.Count() > 0)
+ {
+ _ls = _ls.Where(p => _groupList.Contains(p.物料组)).ToList();
+ }
+ }
+ if (!string.IsNullOrEmpty(materialCode))
+ {
+ var _groupList = materialCode.Split(new char[] { '\n' }).Distinct().ToList();
+ if (_groupList.Count() > 0)
+ {
+ _ls = _ls.Where(p => _groupList.Contains(p.结算物料号)).ToList();
+ }
+ }
+ if (!string.IsNullOrEmpty(sapCode))
+ {
+ var _groupList = sapCode.Split(new char[] { '\n' }).Distinct().ToList();
+ if (_groupList.Count() > 0)
+ {
+ _ls = _ls.Where(p => _groupList.Contains(p.Sap编码)).ToList();
+ }
+ }
+ _outputService.Export(id, _filename, _ls);
+ return id.ToString();
+ }
+
+ }
+}
diff --git a/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMShippingExportService.cs b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMShippingExportService.cs
new file mode 100644
index 00000000..6e87486a
--- /dev/null
+++ b/src/Modules/SettleAccount/src/SettleAccount.Job/Services/Report/HQMShippingExportService.cs
@@ -0,0 +1,51 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TaskJob.EventArgs;
+using TaskJob.Interfaces;
+using Volo.Abp.DependencyInjection;
+using Win.Sfs.SettleAccount.Repository.SettleAccountJob.Report;
+
+namespace SettleAccount.Job.Services.Report
+{
+ public class HQMShippingExportService : ITransientDependency, IExportJob
+ {
+
+ private readonly HQMShippingDapperRepository _dapperRepository;
+ private readonly ErpPartDapperRepository _erpdapperRepository;
+
+ private readonly OutputService _outputService;
+ private readonly InputService _inputService;
+
+ public HQMShippingExportService(
+
+ ErpPartDapperRepository erpdapperRepository,
+ HQMShippingDapperRepository dapperRepository,
+ OutputService outputService,
+ InputService inputService
+ )
+ {
+ _inputService = inputService;
+ _outputService = outputService;
+ _erpdapperRepository = erpdapperRepository;
+
+ _dapperRepository = dapperRepository;
+ }
+
+ public string ExportFile(Guid id, List exportName, List p_list)
+ {
+ var _filename = exportName.FirstOrDefault();
+ var version = p_list.Where(p => p.Name == "Version").FirstOrDefault().Value;
+ var begin = p_list.Where(p => p.Name == "BeginTime").FirstOrDefault().Value;
+ var end = p_list.Where(p => p.Name == "EndTime").FirstOrDefault().Value;
+ var _ls = _dapperRepository.GetHQFShippingReportList(version, begin, end);
+
+
+ _outputService.Export(id, _filename, _ls);
+ return id.ToString();
+ }
+
+ }
+}
diff --git a/src/Modules/SettleAccount/数据库修改记录.xlsx b/src/Modules/SettleAccount/数据库修改记录.xlsx
deleted file mode 100644
index 28f489d1..00000000
Binary files a/src/Modules/SettleAccount/数据库修改记录.xlsx and /dev/null differ