Merge branch 'master' of http://dev.ccwin-in.com:3000/BoXu.Zheng/BeiJinSettleAccount

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/.gitignore

@@ -1 +1,2 @@
-appsettings.Development.json
+appsettings.Development.json
+Logs

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Logs/log-20220629.txt

@@ -1,528 +0,0 @@
-2022-06-29 15:38:10.988 G Starting web host.
-2022-06-29 15:38:26.005 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-06-29 15:38:26.126 G Loaded ABP modules:
-2022-06-29 15:38:26.128 G - Win.Sfs.SettleAccount.SettleAccountHttpApiHostModule
-2022-06-29 15:38:26.130 G   - Win.Sfs.SettleAccount.SettleAccountApplicationModule
-2022-06-29 15:38:26.131 G     - Win.Sfs.SettleAccount.SettleAccountJobModule
-2022-06-29 15:38:26.132 G       - Win.Sfs.SettleAccount.SettleAccountDomainModule
-2022-06-29 15:38:26.133 G         - Volo.Abp.Domain.AbpDddDomainModule
-2022-06-29 15:38:26.134 G           - Volo.Abp.Auditing.AbpAuditingModule
-2022-06-29 15:38:26.135 G             - Volo.Abp.Data.AbpDataModule
-2022-06-29 15:38:26.136 G               - Volo.Abp.ObjectExtending.AbpObjectExtendingModule
-2022-06-29 15:38:26.138 G                 - Volo.Abp.Localization.AbpLocalizationAbstractionsModule
-2022-06-29 15:38:26.139 G                 - Volo.Abp.Validation.AbpValidationAbstractionsModule
-2022-06-29 15:38:26.140 G               - Volo.Abp.Uow.AbpUnitOfWorkModule
-2022-06-29 15:38:26.141 G               - Volo.Abp.EventBus.Abstractions.AbpEventBusAbstractionsModule
-2022-06-29 15:38:26.142 G             - Volo.Abp.Json.AbpJsonModule
-2022-06-29 15:38:26.143 G               - Volo.Abp.Timing.AbpTimingModule
-2022-06-29 15:38:26.144 G                 - Volo.Abp.Localization.AbpLocalizationModule
-2022-06-29 15:38:26.145 G                   - Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemModule
-2022-06-29 15:38:26.146 G                   - Volo.Abp.Settings.AbpSettingsModule
-2022-06-29 15:38:26.148 G                     - Volo.Abp.Security.AbpSecurityModule
-2022-06-29 15:38:26.149 G                     - Volo.Abp.MultiTenancy.AbpMultiTenancyModule
-2022-06-29 15:38:26.150 G             - Volo.Abp.Threading.AbpThreadingModule
-2022-06-29 15:38:26.153 G           - Volo.Abp.EventBus.AbpEventBusModule
-2022-06-29 15:38:26.154 G           - Volo.Abp.Guids.AbpGuidsModule
-2022-06-29 15:38:26.155 G           - Volo.Abp.ObjectMapping.AbpObjectMappingModule
-2022-06-29 15:38:26.156 G           - Volo.Abp.ExceptionHandling.AbpExceptionHandlingModule
-2022-06-29 15:38:26.157 G           - Volo.Abp.Specifications.AbpSpecificationsModule
-2022-06-29 15:38:26.157 G         - Win.Sfs.SettleAccount.SettleAccountDomainSharedModule
-2022-06-29 15:38:26.158 G           - Volo.Abp.Validation.AbpValidationModule
-2022-06-29 15:38:26.159 G       - Win.Sfs.SettleAccount.SettleAccountApplicationContractsModule
-2022-06-29 15:38:26.160 G         - Volo.Abp.Application.AbpDddApplicationContractsModule
-2022-06-29 15:38:26.161 G         - Volo.Abp.Authorization.AbpAuthorizationModule
-2022-06-29 15:38:26.162 G           - Volo.Abp.Authorization.AbpAuthorizationAbstractionsModule
-2022-06-29 15:38:26.163 G       - Volo.Abp.AutoMapper.AbpAutoMapperModule
-2022-06-29 15:38:26.164 G       - Volo.Abp.Dapper.AbpDapperModule
-2022-06-29 15:38:26.166 G         - Volo.Abp.EntityFrameworkCore.AbpEntityFrameworkCoreModule
-2022-06-29 15:38:26.170 G     - Win.Abp.Snowflakes.AbpSnowflakeGeneratorModule
-2022-06-29 15:38:26.172 G     - Volo.Abp.Http.Client.IdentityModel.AbpHttpClientIdentityModelModule
-2022-06-29 15:38:26.174 G       - Volo.Abp.Http.Client.AbpHttpClientModule
-2022-06-29 15:38:26.175 G         - Volo.Abp.Http.AbpHttpModule
-2022-06-29 15:38:26.176 G           - Volo.Abp.Http.AbpHttpAbstractionsModule
-2022-06-29 15:38:26.177 G           - Volo.Abp.Minify.AbpMinifyModule
-2022-06-29 15:38:26.178 G         - Volo.Abp.Castle.AbpCastleCoreModule
-2022-06-29 15:38:26.179 G       - Volo.Abp.IdentityModel.AbpIdentityModelModule
-2022-06-29 15:38:26.180 G         - Volo.Abp.Caching.AbpCachingModule
-2022-06-29 15:38:26.181 G           - Volo.Abp.Serialization.AbpSerializationModule
-2022-06-29 15:38:26.182 G     - Volo.Abp.Identity.AbpIdentityHttpApiClientModule
-2022-06-29 15:38:26.183 G       - Volo.Abp.Identity.AbpIdentityApplicationContractsModule
-2022-06-29 15:38:26.186 G         - Volo.Abp.Identity.AbpIdentityDomainSharedModule
-2022-06-29 15:38:26.189 G           - Volo.Abp.Users.AbpUsersDomainSharedModule
-2022-06-29 15:38:26.190 G           - Volo.Abp.Features.AbpFeaturesModule
-2022-06-29 15:38:26.191 G         - Volo.Abp.Users.AbpUsersAbstractionModule
-2022-06-29 15:38:26.192 G         - Volo.Abp.Application.AbpDddApplicationModule
-2022-06-29 15:38:26.193 G           - Volo.Abp.GlobalFeatures.AbpGlobalFeaturesModule
-2022-06-29 15:38:26.194 G         - Volo.Abp.PermissionManagement.AbpPermissionManagementApplicationContractsModule
-2022-06-29 15:38:26.195 G           - Volo.Abp.PermissionManagement.AbpPermissionManagementDomainSharedModule
-2022-06-29 15:38:26.196 G     - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcModule
-2022-06-29 15:38:26.197 G       - Volo.Abp.AspNetCore.AbpAspNetCoreModule
-2022-06-29 15:38:26.198 G       - Volo.Abp.ApiVersioning.AbpApiVersioningAbstractionsModule
-2022-06-29 15:38:26.201 G       - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcContractsModule
-2022-06-29 15:38:26.204 G       - Volo.Abp.UI.Navigation.AbpUiNavigationModule
-2022-06-29 15:38:26.206 G         - Volo.Abp.UI.AbpUiModule
-2022-06-29 15:38:26.207 G   - Win.Sfs.SettleAccount.SettleAccountEntityFrameworkCoreModule
-2022-06-29 15:38:26.208 G     - Volo.Abp.PermissionManagement.EntityFrameworkCore.AbpPermissionManagementEntityFrameworkCoreModule
-2022-06-29 15:38:26.209 G       - Volo.Abp.PermissionManagement.AbpPermissionManagementDomainModule
-2022-06-29 15:38:26.210 G     - Volo.Abp.SettingManagement.EntityFrameworkCore.AbpSettingManagementEntityFrameworkCoreModule
-2022-06-29 15:38:26.211 G       - Volo.Abp.SettingManagement.AbpSettingManagementDomainModule
-2022-06-29 15:38:26.212 G         - Volo.Abp.SettingManagement.AbpSettingManagementDomainSharedModule
-2022-06-29 15:38:26.213 G     - Volo.Abp.AuditLogging.EntityFrameworkCore.AbpAuditLoggingEntityFrameworkCoreModule
-2022-06-29 15:38:26.214 G       - Volo.Abp.AuditLogging.AbpAuditLoggingDomainModule
-2022-06-29 15:38:26.215 G         - Volo.Abp.AuditLogging.AbpAuditLoggingDomainSharedModule
-2022-06-29 15:38:26.219 G     - Volo.Abp.TenantManagement.EntityFrameworkCore.AbpTenantManagementEntityFrameworkCoreModule
-2022-06-29 15:38:26.220 G       - Volo.Abp.TenantManagement.AbpTenantManagementDomainModule
-2022-06-29 15:38:26.223 G         - Volo.Abp.TenantManagement.AbpTenantManagementDomainSharedModule
-2022-06-29 15:38:26.224 G   - Win.Sfs.SettleAccount.SettleAccountHttpApiModule
-2022-06-29 15:38:26.225 G   - Volo.Abp.Autofac.AbpAutofacModule
-2022-06-29 15:38:26.227 G   - Volo.Abp.EntityFrameworkCore.SqlServer.AbpEntityFrameworkCoreSqlServerModule
-2022-06-29 15:38:26.227 G   - Volo.Abp.AspNetCore.Serilog.AbpAspNetCoreSerilogModule
-2022-06-29 15:38:26.229 G   - Volo.Abp.BlobStoring.AbpBlobStoringModule
-2022-06-29 15:38:26.229 G   - Volo.Abp.BlobStoring.FileSystem.AbpBlobStoringFileSystemModule
-2022-06-29 15:38:26.231 G   - Volo.Abp.BackgroundJobs.Hangfire.AbpBackgroundJobsHangfireModule
-2022-06-29 15:38:26.237 G     - Volo.Abp.BackgroundJobs.AbpBackgroundJobsAbstractionsModule
-2022-06-29 15:38:26.239 G     - Volo.Abp.Hangfire.AbpHangfireModule
-2022-06-29 15:38:26.320 G Start installing Hangfire SQL objects...
-2022-06-29 15:38:26.617 G Hangfire SQL objects installed.
-2022-06-29 15:38:26.639 G Starting Hangfire Server using job storage: 'SQL Server: 192.168.0.140@SettleAccountService'
-2022-06-29 15:38:26.641 G Using the following options for SQL Server job storage: Queue poll interval: 00:00:15.
-2022-06-29 15:38:26.643 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-06-29 15:38:26.711 G Starting Hangfire Server using job storage: 'SQL Server: 192.168.0.140@SettleAccountService'
-2022-06-29 15:38:26.713 G Using the following options for SQL Server job storage: Queue poll interval: 00:00:15.
-2022-06-29 15:38:26.717 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-06-29 15:38:27.080 G Server win102022ptzdgh:10716:72a90b73 successfully announced in 401.5503 ms
-2022-06-29 15:38:27.102 G Server win102022ptzdgh:10716:72a90b73 is starting the registered dispatchers: ServerWatchdog, ServerJobCancellationWatcher, ExpirationManager, CountersAggregator, Worker, DelayedJobScheduler, RecurringJobScheduler...
-2022-06-29 15:38:27.227 G Server win102022ptzdgh:10716:72a90b73 all the dispatchers started
-2022-06-29 15:38:27.301 G Server win102022ptzdgh:10716:e2ba15e7 successfully announced in 564.9342 ms
-2022-06-29 15:38:27.303 G Server win102022ptzdgh:10716:e2ba15e7 is starting the registered dispatchers: ServerWatchdog, ServerJobCancellationWatcher, ExpirationManager, CountersAggregator, Worker, DelayedJobScheduler, RecurringJobScheduler...
-2022-06-29 15:38:27.504 G Server win102022ptzdgh:10716:e2ba15e7 all the dispatchers started
-2022-06-29 15:38:28.841 G Server win102022ptzdgh:10716:e2ba15e7 caught stopping signal...
-2022-06-29 15:38:28.844 G Server win102022ptzdgh:10716:e2ba15e7 caught stopped signal...
-2022-06-29 15:38:29.082 G Server win102022ptzdgh:10716:72a90b73 caught stopping signal...
-2022-06-29 15:38:29.232 G Server win102022ptzdgh:10716:e2ba15e7 All dispatchers stopped
-2022-06-29 15:38:29.330 G Server win102022ptzdgh:10716:72a90b73 caught stopped signal...
-2022-06-29 15:38:29.341 G Server win102022ptzdgh:10716:72a90b73 All dispatchers stopped
-2022-06-29 15:38:29.386 G Server win102022ptzdgh:10716:72a90b73 successfully reported itself as stopped in 22.0439 ms
-2022-06-29 15:38:29.386 G Server win102022ptzdgh:10716:e2ba15e7 successfully reported itself as stopped in 28.9496 ms
-2022-06-29 15:38:29.388 G Server win102022ptzdgh:10716:72a90b73 has been stopped in total 286.1768 ms
-2022-06-29 15:38:29.389 G Server win102022ptzdgh:10716:e2ba15e7 has been stopped in total 545.9906 ms
-2022-06-29 15:38:29.391 G Application is shutting down...
-2022-06-29 15:38:29.609 G Entity Framework Core "5.0.8" initialized '"PermissionManagementDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery "
-2022-06-29 15:38:30.180 G Executed DbCommand ("44"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-06-29 15:38:30.301 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-06-29 15:38:30.308 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-06-29 15:38:30.314 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-06-29 15:38:30.323 G Executed DbCommand ("5"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-06-29 15:38:30.329 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-06-29 15:38:30.343 G Executed DbCommand ("9"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-06-29 15:38:30.357 G Executed DbCommand ("10"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-06-29 15:38:30.366 G Executed DbCommand ("7"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-06-29 15:38:30.383 G Executed DbCommand ("14"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-06-29 15:38:30.392 G Executed DbCommand ("7"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-06-29 15:38:30.407 G Executed DbCommand ("12"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-06-29 15:38:30.427 G Executed DbCommand ("16"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-06-29 15:38:30.438 G Executed DbCommand ("8"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-06-29 15:38:30.446 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-06-29 15:38:30.452 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-06-29 15:38:30.461 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-06-29 15:38:30.466 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-06-29 15:38:30.472 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-06-29 15:38:30.480 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-06-29 15:38:30.489 G Executed DbCommand ("6"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-06-29 15:38:30.495 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-06-29 15:38:30.500 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-06-29 15:38:30.507 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-06-29 15:38:30.513 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-06-29 15:38:30.518 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-06-29 15:38:30.525 G Executed DbCommand ("4"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-06-29 15:38:30.531 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-06-29 15:38:30.541 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-06-29 15:38:30.547 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-06-29 15:38:30.554 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-06-29 15:38:30.561 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-06-29 15:38:30.569 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-06-29 15:38:30.575 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-06-29 15:38:30.581 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-06-29 15:38:30.585 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-06-29 15:38:30.589 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-06-29 15:38:30.594 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-06-29 15:38:30.599 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-06-29 15:38:30.603 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-06-29 15:38:30.609 G Executed DbCommand ("4"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-06-29 15:38:30.618 G Executed DbCommand ("6"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-06-29 15:38:30.624 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-06-29 15:38:30.628 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-06-29 15:38:30.634 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-06-29 15:38:30.639 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-06-29 15:38:30.645 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-06-29 15:38:30.650 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-06-29 15:38:30.657 G Executed DbCommand ("4"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-06-29 15:38:30.664 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-06-29 15:38:30.669 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-06-29 15:38:30.677 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-06-29 15:38:30.683 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-06-29 15:38:30.697 G Executed DbCommand ("9"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-06-29 15:38:30.706 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-06-29 15:38:30.721 G Executed DbCommand ("11"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-06-29 15:38:30.733 G Executed DbCommand ("8"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-06-29 15:38:30.742 G Executed DbCommand ("6"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-06-29 15:38:30.748 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-06-29 15:38:30.761 G Executed DbCommand ("9"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-06-29 15:38:30.803 G Executed DbCommand ("36"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-06-29 15:38:30.817 G Executed DbCommand ("9"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-06-29 15:38:30.829 G Executed DbCommand ("10"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-06-29 15:38:30.846 G Executed DbCommand ("14"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-06-29 15:38:30.851 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-06-29 15:38:30.897 G Executed DbCommand ("42"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-06-29 15:38:30.937 G Executed DbCommand ("38"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-06-29 15:38:30.951 G Executed DbCommand ("9"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-06-29 15:38:30.975 G Executed DbCommand ("22"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-06-29 15:38:31.008 G Executed DbCommand ("27"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-06-29 15:38:31.015 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-06-29 15:38:31.028 G Executed DbCommand ("10"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-06-29 15:38:31.054 G Executed DbCommand ("23"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-06-29 15:38:31.072 G Executed DbCommand ("13"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-06-29 15:38:31.082 G Executed DbCommand ("4"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-06-29 15:38:31.092 G Executed DbCommand ("7"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-06-29 15:38:31.102 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-06-29 15:38:31.117 G Executed DbCommand ("7"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-06-29 15:38:31.138 G Executed DbCommand ("14"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-06-29 15:38:31.152 G Executed DbCommand ("9"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-06-29 15:38:31.162 G Executed DbCommand ("5"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-06-29 15:38:31.187 G Executed DbCommand ("19"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]"

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Program.cs

@@ -5,61 +5,60 @@ using Microsoft.Extensions.Hosting;
 using Serilog;
 using Win.Sfs.SettleAccount.influxdb;
 
-namespace Win.Sfs.SettleAccount
+namespace Win.Sfs.SettleAccount;
+
+public class Program
 {
-    public class Program
+    public static int Main(string[] args)
     {
-        public static int Main(string[] args)
+        var configuration = new ConfigurationBuilder()
+            .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
+            .AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}.json", optional: true, reloadOnChange: true)
+            .Build();
+        try
         {
-            var configuration = new ConfigurationBuilder()
-                .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true)
-                .AddJsonFile($"appsettings.{Environment.GetEnvironmentVariable("ASPNETCORE_ENVIRONMENT")}.json", optional: true, reloadOnChange: true)
-                .Build();
-            try
-            {
-                new InfluxHelper(configuration).Start().Query("create database vmi").Wait();
-            }
-            catch (Exception ex)
-            {
-                throw new Exception("influxdb 启动失败", ex);
-            }
+            new InfluxHelper(configuration).Start().Query("create database vmi").Wait();
+        }
+        catch (Exception ex)
+        {
+            throw new Exception("influxdb 启动失败", ex);
+        }
 
-            Log.Logger = new LoggerConfiguration()
-                .ReadFrom.Configuration(configuration)
-                .WriteTo.Async(c => c.Console())
-                .CreateLogger();
+        Log.Logger = new LoggerConfiguration()
+            .ReadFrom.Configuration(configuration)
+            .WriteTo.Async(c => c.Console())
+            .CreateLogger();
 
-            try
-            {
-                Log.Information("Starting web host.");
-                CreateHostBuilder(args).Build().Run();
-                return 0;
-            }
-            catch (Exception ex)
-            {
-                Log.Fatal(ex, "Host terminated unexpectedly!");
-                return 1;
-            }
-            finally
-            {
-                Log.CloseAndFlush();
-            }
+        try
+        {
+            Log.Information("Starting web host.");
+            CreateHostBuilder(args).Build().Run();
+            return 0;
+        }
+        catch (Exception ex)
+        {
+            Log.Fatal(ex, "Host terminated unexpectedly!");
+            return 1;
+        }
+        finally
+        {
+            Log.CloseAndFlush();
         }
+    }
 
-        internal static IHostBuilder CreateHostBuilder(string[] args) =>
-            Host.CreateDefaultBuilder(args)
-                .ConfigureWebHostDefaults(webBuilder =>
+    internal static IHostBuilder CreateHostBuilder(string[] args) =>
+        Host.CreateDefaultBuilder(args)
+            .ConfigureWebHostDefaults(webBuilder =>
+            {
+                webBuilder.ConfigureKestrel((context, options) =>
                 {
-                    webBuilder.ConfigureKestrel((context, options) =>
-                    {
-                        //设置应用服务器Kestrel请求体最大为50MB
-                        options.Limits.MaxRequestBodySize = 5242880000;
-                        options.Limits.MaxRequestBufferSize = 302768;
-                        options.Limits.MaxRequestLineSize = 302768;
-                    });
-                    webBuilder.UseStartup<Startup>();
-                })
-                .UseAutofac()
-                .UseSerilog();
-    }
+                    //设置应用服务器Kestrel请求体最大为50MB
+                    options.Limits.MaxRequestBodySize = 5242880000;
+                    options.Limits.MaxRequestBufferSize = 302768;
+                    options.Limits.MaxRequestLineSize = 302768;
+                });
+                webBuilder.UseStartup<Startup>();
+            })
+            .UseAutofac()
+            .UseSerilog();
 }

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Startup.cs

@@ -51,8 +51,8 @@ public class Startup
         app.UseEndpoints(endpoints => endpoints.MapHub<PageHub>("/api/hub"));
         app.ApplicationServices.UseScheduler(scheduler =>
         {
-            //scheduler.Schedule<HBPOSeSyncAppService>().EveryMinute();
-            //scheduler.Schedule<BBACSeSyncAppService>().EveryMinute();
+            scheduler.Schedule<HBPOSeSyncAppService>().EveryMinute();
+            scheduler.Schedule<BBACSeSyncAppService>().EveryMinute();
             scheduler.Schedule<ZhiGongBBACSeSyncAppService>().EveryMinute();
             scheduler.Schedule<ZhiGongHBPOSeSyncAppService>().EveryMinute();
             scheduler.Schedule<BeiSeSyncAppService>().EveryMinute();

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/form/form-input.js

@@ -13,6 +13,7 @@ export default {
         <template v-else-if="schema.input==='date'">{{dayjs(model[prop]).format('YYYY-MM-DD')}}</template>
         <template v-else-if="schema.input==='datetime'">{{dayjs(model[prop]).format('YYYY-MM-DD HH:mm:ss')}}</template>
         <template v-else-if="schema.input==='password'">******</template>
+        <template v-else-if="schema.input==='select'">{{options[model[prop]]?.label}}</template>
         <template v-else>{{model[prop]}}</template>
       </template>
     </template>
@@ -24,7 +25,6 @@ export default {
           :multiple="!!schema.multiple"
           :clearable="!!schema.clearable"
           style="width:100%"
-          :title="JSON.stringify(options)"
         >
           <el-option v-for="item in options" :key="item.key" :label="item.label" :value="item.value" />
         </el-select>

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/components/list/index.js

@@ -5,9 +5,7 @@ import { useRoute, useRouter } from "vue-router";
 import { useI18n } from "vue-i18n";
 import { listToTree, schemaToModel, importFunction, format } from "../../utils/index.js";
 import qs from "../../lib/qs/shim.js";
-import VueOfficeExcel from "@vue-office/excel";
 import { camelCase, capitalize } from "lodash";
-import { useAppStore } from "../../store/index.js";
 import { ElMessage, ElMessageBox } from "element-plus";
 
 export default {
@@ -17,7 +15,6 @@ export default {
     AppFormInput: defineAsyncComponent(() => import("../../components/form/form-input.js")),
     SvgIcon: defineAsyncComponent(() => import("../../components/icon/index.js")),
     AppFormInput: defineAsyncComponent(() => import("../form/form-input.js")),
-    VueOfficeExcel,
   },
   template: html`
     <div v-loading="tableLoading">
@@ -639,7 +636,7 @@ export default {
         editFormTitle.value = t("自定义查询");
         dialogVisible.value = true;
       } else {
-        context.emit("command", item, rows, showList);
+        context.emit("command", item, rows, load, showList);
       }
       editFormloading.value = false;
     };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/index.html

@@ -66,7 +66,6 @@
         "vue-echarts": "./lib/vue-echarts/index.esm.min.js",
         "xe-echarts": "./lib/vue-echarts/index.esm.min.js",
         "resize-detector": "./lib/resize-detector/index.js",
-        "@vue-office/excel": "./lib/@vue-office/excel/vue-office-excel.mjs",
         "@vue/devtools-api": "./lib/@vue/devtools-api/shim.js",
         "vue-demi": "./lib/vue-demi/shim.js"
       }
@@ -78,4 +77,4 @@
   <script type="module" src="./main.js"></script>
 </body>
 
-</html>
+</html>

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/main.css

@@ -3,6 +3,5 @@
 @import url("./lib/element-plus/theme-chalk/dark/css-vars.css");
 @import url("./lib/github-markdown-css/github-markdown.min.css");
 @import url("./lib/highlightjs/highlight.css");
-@import url("./lib/@vue-office/excel/index.css");
 @import url("./lib/tailwindcss/tailwind.min.css");
 @import url("./styles/site.css");

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/business-type.js

@@ -0,0 +1,11 @@
+export default [
+  { value: 0, label: "未定义" },
+  { value: 1, label: "JisBBAC" },
+  { value: 2, label: "JisHBPO" },
+  { value: 3, label: "直供件BBAC" },
+  { value: 4, label: "直供件HBPO" },
+  { value: 5, label: "买单件BBAC" },
+  { value: 6, label: "买单件HBPO" },
+  { value: 7, label: "备件" },
+  { value: 8, label: "印度件" },
+];

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/price-list.js

@@ -1,33 +1,39 @@
+import businessTypes from "./business-type.js";
+
 const schema = {
   title: "销售价格单",
   type: "object",
   properties: {
-    version: {
-      title: "版本",
+    lu: {
+      title: "零件号",
       type: "string",
     },
-    beginDate: {
+    price: {
+      title: "价格",
+      type: "number",
+    },
+    beginTime: {
       title: "开始时间",
-      type: "DateTime",
+      type: "string",
+      input: "datetime",
     },
-    endDate: {
+    endTime: {
       title: "结算时间",
-      type: "DateTime",
-    },
-    price: {
-      title: "价格",
-      type: "decimal",
+      type: "string",
+      input: "datetime",
     },
-    materialCode: {
-      title: "物料编号",
+    clientCode: {
+      title: "客户编码",
       type: "string",
     },
-    type: {
-      title: "价格类型",
-      type: "int",
+    businessType: {
+      title: "业务类别",
+      type: "string",
+      input: "select",
+      options: businessTypes,
     },
-    customerCode: {
-      title: "客户",
+    version: {
+      title: "版本",
       type: "string",
     },
   },

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/tb_re-parts-relationship_service.js

@@ -3,11 +3,11 @@ const schema = {
   type: "object",
   properties: {
     lu: {
-      title: "零件号",
+      title: "客户零件号",
       type: "string",
     },
     repLU: {
-      title: "替换零件号",
+      title: "替换客户零件号",
       type: "string",
     },
     clientCode: {

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/models/user.js

@@ -61,7 +61,7 @@ const schema = {
       showForList: true,
       rules: [
         { required: true },
-        { pattern: "^[a-zA-Z0-9_-]+@[a-zA-Z0-9_-]+.[a-zA-Z0-9_-]+$", message: "%s必须是正确的格式" },
+        { pattern: "^([a-zA-Z0-9_.-])+@(([a-zA-Z0-9-])+.)+([a-zA-Z]{2,4})+$", message: "%s必须是正确的格式" },
       ],
     },
     roleNames: {
@@ -102,7 +102,7 @@ export default function () {
         type: "object",
         properties: {
           filter: {
-            title: "用户名",
+            title: "搜索",
             type: "string",
           },
           skipCount: {

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/request/index.js

@@ -43,12 +43,13 @@ const getResult = async (response) => {
     [401, "未登录"],
     [403, "权限不足"],
     [500, "服务器异常"],
+    [503, "服务不可用"],
   ]);
   const result = {
     status: response.status,
     message: messages.get(response.status),
   };
-  if (response.status === 200 || response.status === 204) {
+  if (response.status === 200 || response.status === 201 || response.status === 204) {
     const contentType = response.headers.get("Content-Type");
     if (contentType.indexOf("application/json") > -1) {
       result.data = await response.json();
@@ -58,10 +59,13 @@ const getResult = async (response) => {
       result.data = await response.blob();
       result.filename = getFileName(response.headers.get("Content-Disposition"));
     }
-  } /*if (response.status === 400 || response.status === 500) */ else {
+  } else {
     result.errors = await response.json();
     if (result.errors) {
-      ElMessageBox.alert(`错误：${result.errors?.error?.message}`, `代码：${result.errors?.error?.code}`);
+      ElMessageBox.alert(
+        `错误：${result.errors?.error?.message ?? messages.get(response.status)}`,
+        `代码：${result.errors?.error?.code}`
+      );
     }
   }
   return result;

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/utils/index.js

@@ -1,5 +1,9 @@
 import { get } from "lodash";
 
+async function delay(ms) {
+  return new Promise((resolve, _) => setTimeout(resolve, ms));
+}
+
 // format html`...` by vscode lit-html
 function html(strings, ...values) {
   let output = "";
@@ -135,6 +139,7 @@ async function importFunction(input) {
 
 export default html;
 export {
+  delay,
   persentFormat,
   bytesFormat,
   format,

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/centralized-control.js

@@ -3,6 +3,8 @@ import { ref } from "vue";
 import request from "../../request/index.js";
 import AppList from "../../components/list/index.js";
 import useConfig from "../../models/centralized-control.js";
+import { ElMessage, ElMessageBox } from "element-plus";
+import { format } from "../../utils/index.js";
 
 export default {
   components: { AppList },
@@ -12,14 +14,27 @@ export default {
     const config = useConfig();
     const onCommand = async (item, rows, load) => {
       if (item.path === "open-version" || item.path === "closed-version") {
-        const url = `${config.baseUrl}/${item.path}`;
-        await request(
-          url,
-          rows.map((o) => o.id),
-          { method: "POST" }
-        );
-        console.log(context);
-        await load();
+        try {
+          await ElMessageBox.confirm("删除", "提示", {
+            type: "warning",
+            message: format(`确认${item.path === "open-version" ? "启用" : "停用"}选中的%s行数据吗？`, rows.length),
+          });
+          const url = `${config.baseUrl}/${item.path}`;
+          await request(
+            url,
+            rows.map((o) => o.id),
+            { method: "POST" }
+          );
+          console.log(context);
+          await load();
+        } catch (error) {
+          if (error === "cancel") {
+            ElMessage({
+              type: "info",
+              message: "操作取消",
+            });
+          }
+        }
       }
     };
     return { config, onCommand };

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/base-data/job-item.js

@@ -9,7 +9,7 @@ export default {
   template: html`<app-list v-if="refresh" :config="config" @command="onCommand" />`,
   setup() {
     const config = useConfig();
-    const onCommand = async (item, rows, showList) => {
+    const onCommand = async (item, rows, load, showList) => {
       console.log(item.path, item, rows);
       console.log(showList);
       const config = useConfig2();

code/src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/wwwroot/views/invoice/invoice_map_group.js

@@ -1,15 +1,114 @@
 import AppList from "../../../components/list/index.js";
 import html from "html";
+import { ref } from "vue";
+import { delay } from "../../../utils/index.js";
 import useConfig from "../../../models/invoice/invoice_map_group.js";
+import request from "../../../request/index.js";
 
 export default {
   components: { AppList },
-  template: html`<app-list :config="config" @command="onCommand" />`,
+  template: html`<app-list :config="config" @command="onCommand" />
+    <el-drawer v-model="drawer" destroy-on-close size="50%" class="page-drawer">
+      <template #header> <span class="el-dialog__title"> INVOICE_GRP_DETAIL_DTO </span> </template>
+      <el-row v-loading="loading">
+        <el-col style="height:calc(100vh - 180px);">
+          <el-tabs style="width:100%;height:100%;" v-if="drawer&&!loading">
+            <el-tab-pane label="invoicE_WAIT_DETAIL" v-if="model.invoicE_WAIT_DETAIL.length">
+              <el-auto-resizer>
+                <template #default="{ height, width }">
+                  <el-table-v2
+                    fixed
+                    :data="model.invoicE_WAIT_DETAIL"
+                    :columns="columns1"
+                    :width="width"
+                    :height="height"
+                  />
+                </template>
+              </el-auto-resizer>
+            </el-tab-pane>
+            <el-tab-pane label="invoicE_MAP_GROUP" v-if="model.invoicE_MAP_GROUP.length">
+              <el-auto-resizer>
+                <template #default="{ height, width }">
+                  <el-table-v2
+                    fixed
+                    :data="model.invoicE_MAP_GROUP"
+                    :columns="columns2"
+                    :width="width"
+                    :height="height"
+                  />
+                </template>
+              </el-auto-resizer>
+            </el-tab-pane>
+            <el-tab-pane label="invoicE_NOT_SETTLE" v-if="model.invoicE_NOT_SETTLE.length">
+              <el-auto-resizer>
+                <template #default="{ height, width }">
+                  <el-table-v2
+                    fixed
+                    :data="model.invoicE_NOT_SETTLE"
+                    :columns="columns3"
+                    :width="width"
+                    :height="height"
+                  />
+                </template>
+              </el-auto-resizer>
+            </el-tab-pane>
+          </el-tabs>
+        </el-col>
+      </el-row>
+
+      <template #footer>
+        <span class="dialog-footer">
+          <el-button type="primary" @click="drawer=false"> {{$t('confirm')}} </el-button>
+        </span>
+      </template>
+    </el-drawer>`,
+  styles: html` <style>
+    .page-drawer .el-tab-pane {
+      width: 100%;
+      height: 100%;
+    }
+    .page-drawer .el-tabs__content {
+      height: calc(100% - 40px);
+    }
+  </style>`,
   setup() {
     const config = useConfig();
+    const drawer = ref(false);
+    const loading = ref(false);
+    const model = ref({
+      invoicE_WAIT_DETAIL: [{ version: "version" }],
+      invoicE_MAP_GROUP: [{ version: "version" }],
+      invoicE_NOT_SETTLE: [{ version: "version" }],
+    });
+
     const onCommand = async (item, rows) => {
-      console.log(item.path, item, rows);
+      drawer.value = true;
+      loading.value = true;
+      const data = { [item.path]: rows[0][item.path] };
+      // const response = await request("settleaccount/b-bAC_BA_SERVICE/detail-query", data, { method: "POST" });
+      // model.value = response.data;
+      await delay(1000);
+      loading.value = false;
     };
-    return { config, onCommand };
+    const columns1 = [
+      {
+        key: "version",
+        dataKey: "version",
+        title: "期间",
+      },
+    ];
+    const columns2 = [
+      {
+        dataKey: "version",
+        title: "期间",
+      },
+    ];
+    const columns3 = [
+      {
+        dataKey: "version",
+        title: "期间",
+      },
+    ];
+    return { config, onCommand, drawer, loading, model, columns1, columns2, columns3 };
   },
 };

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/BBAC_SE_DETAIL_DTO.cs

@@ -1,159 +1,356 @@
-using Magicodes.ExporterAndImporter.Core;
+using Magicodes.ExporterAndImporter.Core;
 using System;
 using System.ComponentModel.DataAnnotations;
 using Volo.Abp.Application.Dtos;
 
-namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+
+/// <summary>
+/// BBAC发运
+/// </summary>
+public class BBAC_SE_DETAIL_DTO : EntityDto<Guid>
+{
+    /// <summary>
+    /// 发货单号
+    /// </summary>
+    [Display(Name = "发货单号")]
+    public string WmsBillNum { get; set; }
+
+    /// <summary>
+    /// 单据编号
+    /// </summary>
+    [Display(Name = "单据编号")]
+    public string Num { get; set; }
+
+    /// <summary>
+    /// 发货时间
+    /// </summary>
+    [Display(Name = "发货时间")]
+    public DateTime BillTime { get; set; }
+
+    /// <summary>
+    /// 发货人
+    /// </summary>
+    [Display(Name = "发货人")]
+    public string Oper { get; set; }
+
+    /// <summary>
+    /// 排序单号
+    /// </summary>
+    [Display(Name = "排序单号")]
+    public string OrderNum { get; set; }
+
+    /// <summary>
+    /// 订单序号
+    /// </summary>
+    [Display(Name = "订单序号")]
+    public string Seq { get; set; }
+
+    /// <summary>
+    /// 实际生产码
+    /// </summary>
+    [Display(Name = "实际生产码")]
+    public string RealCode { get; set; }
+
+    /// <summary>
+    /// 订单生产码
+    /// </summary>
+    [Display(Name = "订单生产码")]
+    public string VinCode { get; set; }
+
+    /// <summary>
+    /// 生产码类型
+    /// </summary>
+    [Display(Name = "生产码类型")]
+    public string CodeType { get; set; }
+
+    /// <summary>
+    /// 实际零件号
+    /// </summary>
+    [Display(Name = "实际零件号")]
+    public string RealPartCode { get; set; }
+
+    /// <summary>
+    /// 零件号
+    /// </summary>
+    [Display(Name = "零件号")]
+    public string PartCode { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Batch { get; set; }
+
+    /// <summary>
+    /// MES配置码
+    /// </summary>
+    [Display(Name = "MES配置码")]
+    public string MESConfigCode { get; set; }
+
+    /// <summary>
+    /// 来源库位
+    /// </summary>
+    [Display(Name = "来源库位")]
+    public string FromLoc { get; set; }
+
+    /// <summary>
+    /// 目标库位
+    /// </summary>
+    [Display(Name = "目标库位")]
+    public string ToLoc { get; set; }
+
+    /// <summary>
+    /// 参照订单生产码
+    /// </summary>
+    [Display(Name = "参照订单生产码")]
+    public string RefVinCode { get; set; }
+
+    /// <summary>
+    /// 单据性质
+    /// </summary>
+    [Display(Name = "单据性质")]
+    public string BillCharacter { get; set; }
+
+    /// <summary>
+    /// 发货关联单号
+    /// </summary>
+    [Display(Name = "发货关联单号")]
+    public string RefBillNum { get; set; }
+
+    /// <summary>
+    /// Erp目标库位
+    /// </summary>
+    [Display(Name = "Erp目标库位")]
+    public string ErpToLoc { get; set; }
+
+    /// <summary>
+    /// 原生产码
+    /// </summary>
+    [Display(Name = "原生产码")]
+    public string OrigiCode { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [Display(Name = "备注")]
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 塑件唯一码
+    /// </summary>
+    [Display(Name = "塑件唯一码")]
+    public string UniqueCode { get; set; }
+
+    /// <summary>
+    /// PJS顺序号
+    /// </summary>
+    [Display(Name = "PJS顺序号")]
+    public string PjsNum { get; set; }
+
+    /// <summary>
+    /// 虚拟小总成
+    /// </summary>
+    [Display(Name = "虚拟小总成")]
+    public string MatchNumber { get; set; }
+
+    /// <summary>
+    /// 发货条码
+    /// </summary>
+    [Display(Name = "发货条码")]
+    public string DeliverCode { get; set; }
+
+    /// <summary>
+    /// 客户位置
+    /// </summary>
+    [Display(Name = "客户位置")]
+    public string Position { get; set; }
+}
+
+/// <summary>
+/// 导出
+/// </summary>
+public class BBAC_SE_DETAIL_EXPORT_DTO
 {
     /// <summary>
-    /// BBAC发运
-    /// </summary>
-    public class BBAC_SE_DETAIL_DTO : EntityDto<Guid>
-    {
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        public int Version { set; get; }
-
-        /// <summary>
-        /// 发货时间 
-        /// </summary>
-        [Display(Name = "发货时间")]
-        public DateTime ShippingDate { set; get; }
-
-        /// <summary>
-        /// 发运单号
-        /// </summary>
-        [Display(Name = "发运单号")]
-        public string WmsBillNum { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [Display(Name = "零件号")]
-        public string LU { get; set; }
-        [ExporterHeader(DisplayName = "物料描述")]
-        public string MaterialDesc { get; set; }
-
-
-        /// <summary>
-        /// 生产号
-        /// </summary>
-        [Display(Name = "生产号")]
-        public string PN { get; set; }
-
-        /// <summary>
-        /// 组合键值（LU+PN）
-        /// </summary>
-        [Display(Name = "组合键值（LU+PN）")]
-        public string KeyCode { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [Display(Name = "数量")]
-        public decimal Qty { get; set; }
-
-        /// <summary>
-        /// 日顺序号
-        /// </summary>
-        [Display(Name = "日顺序号")]
-        public string SeqNumber { get; set; }
-
-        /// <summary>
-        /// 小总成号
-        /// </summary>
-        [Display(Name = "小总成号")]
-        public string AssemblyCode { get; set; }
-
-        /// <summary>
-        /// 注塑码
-        /// </summary>
-        [Display(Name = "注塑码")]
-        public string InjectionCode { get; set; }
-
-        /// <summary>
-        /// 订单时间
-        /// </summary>
-        [Display(Name = "订单时间")]
-        public DateTime BeginDate { get; set; }
-    }
-
-    /// <summary>
-    /// 导出
-    /// </summary>
-    public class BBAC_SE_DETAIL_EXPORT_DTO
-    {
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public int Version { set; get; }
-
-        /// <summary>
-        /// 发货时间 
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public DateTime ShippingDate { set; get; }
-
-        /// <summary>
-        /// 发运单号
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string WmsBillNum { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string LU { get; set; }
-        
-        /// <summary>
-        /// 生产号
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string PN { get; set; }
-        
-        /// <summary>
-        /// 组合键值（LU+PN）
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string KeyCode { get; set; }
-        
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public decimal Qty { get; set; }
-
-        /// <summary>
-        /// 日顺序号
-        /// </summary>
-        [Display(Name = "日顺序号")]
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string SeqNumber { get; set; }
-
-        /// <summary>
-        /// 小总成号
-        /// </summary>
-        [Display(Name = "小总成号")]
-        [ExporterHeader(DisplayName = "小总成号")]
-        public string AssemblyCode { get; set; }
-
-        /// <summary>
-        /// 注塑码
-        /// </summary>
-        [Display(Name = "注塑码")]
-        [ExporterHeader(DisplayName = "注塑码")]
-        public string InjectionCode { get; set; }
-
-        /// <summary>
-        /// 订单时间
-        /// </summary>
-        [Display(Name = "订单时间")]
-        [ExporterHeader(DisplayName = "订单时间")]
-        public DateTime BeginDate { get; set; }
-    }
+    /// 发货单号
+    /// </summary>
+    [Display(Name = "发货单号")]
+    [ExporterHeader(DisplayName = "发货单号")]
+    public string WmsBillNum { get; set; }
+
+    /// <summary>
+    /// 单据编号
+    /// </summary>
+    [Display(Name = "单据编号")]
+    [ExporterHeader(DisplayName = "单据编号")]
+    public string Num { get; set; }
+
+    /// <summary>
+    /// 发货时间
+    /// </summary>
+    [Display(Name = "发货时间")]
+    [ExporterHeader(DisplayName = "发货时间")]
+    public DateTime BillTime { get; set; }
+
+    /// <summary>
+    /// 发货人
+    /// </summary>
+    [Display(Name = "发货人")]
+    [ExporterHeader(DisplayName = "发货人")]
+    public string Oper { get; set; }
+
+    /// <summary>
+    /// 排序单号
+    /// </summary>
+    [Display(Name = "排序单号")]
+    [ExporterHeader(DisplayName = "排序单号")]
+    public string OrderNum { get; set; }
+
+    /// <summary>
+    /// 订单序号
+    /// </summary>
+    [Display(Name = "订单序号")]
+    [ExporterHeader(DisplayName = "订单序号")]
+    public string Seq { get; set; }
+
+    /// <summary>
+    /// 实际生产码
+    /// </summary>
+    [Display(Name = "实际生产码")]
+    [ExporterHeader(DisplayName = "实际生产码")]
+    public string RealCode { get; set; }
+
+    /// <summary>
+    /// 订单生产码
+    /// </summary>
+    [Display(Name = "订单生产码")]
+    [ExporterHeader(DisplayName = "订单生产码")]
+    public string VinCode { get; set; }
+
+    /// <summary>
+    /// 生产码类型
+    /// </summary>
+    [Display(Name = "生产码类型")]
+    [ExporterHeader(DisplayName = "生产码类型")]
+    public string CodeType { get; set; }
+
+    /// <summary>
+    /// 实际零件号
+    /// </summary>
+    [Display(Name = "实际零件号")]
+    [ExporterHeader(DisplayName = "实际零件号")]
+    public string RealPartCode { get; set; }
+
+    /// <summary>
+    /// 零件号
+    /// </summary>
+    [Display(Name = "零件号")]
+    [ExporterHeader(DisplayName = "零件号")]
+    public string PartCode { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    [Display(Name = "批次")]
+    [ExporterHeader(DisplayName = "批次")]
+    public string Batch { get; set; }
+
+    /// <summary>
+    /// MES配置码
+    /// </summary>
+    [Display(Name = "MES配置码")]
+    [ExporterHeader(DisplayName = "MES配置码")]
+    public string MESConfigCode { get; set; }
+
+    /// <summary>
+    /// 来源库位
+    /// </summary>
+    [Display(Name = "来源库位")]
+    [ExporterHeader(DisplayName = "来源库位")]
+    public string FromLoc { get; set; }
+
+    /// <summary>
+    /// 目标库位
+    /// </summary>
+    [Display(Name = "目标库位")]
+    [ExporterHeader(DisplayName = "目标库位")]
+    public string ToLoc { get; set; }
+
+    /// <summary>
+    /// 参照订单生产码
+    /// </summary>
+    [Display(Name = "参照订单生产码")]
+    [ExporterHeader(DisplayName = "参照订单生产码")]
+    public string RefVinCode { get; set; }
 
+    /// <summary>
+    /// 单据性质
+    /// </summary>
+    [Display(Name = "单据性质")]
+    [ExporterHeader(DisplayName = "单据性质")]
+    public string BillCharacter { get; set; }
+
+    /// <summary>
+    /// 发货关联单号
+    /// </summary>
+    [Display(Name = "发货关联单号")]
+    [ExporterHeader(DisplayName = "发货关联单号")]
+    public string RefBillNum { get; set; }
+
+    /// <summary>
+    /// Erp目标库位
+    /// </summary>
+    [Display(Name = "Erp目标库位")]
+    [ExporterHeader(DisplayName = "Erp目标库位")]
+    public string ErpToLoc { get; set; }
+
+    /// <summary>
+    /// 原生产码
+    /// </summary>
+    [Display(Name = "原生产码")]
+    [ExporterHeader(DisplayName = "原生产码")]
+    public string OrigiCode { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [Display(Name = "备注")]
+    [ExporterHeader(DisplayName = "备注")]
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 塑件唯一码
+    /// </summary>
+    [Display(Name = "塑件唯一码")]
+    [ExporterHeader(DisplayName = "塑件唯一码")]
+    public string UniqueCode { get; set; }
+
+    /// <summary>
+    /// PJS顺序号
+    /// </summary>
+    [Display(Name = "PJS顺序号")]
+    [ExporterHeader(DisplayName = "PJS顺序号")]
+    public string PjsNum { get; set; }
+
+    /// <summary>
+    /// 虚拟小总成
+    /// </summary>
+    [Display(Name = "虚拟小总成")]
+    [ExporterHeader(DisplayName = "虚拟小总成")]
+    public string MatchNumber { get; set; }
+
+    /// <summary>
+    /// 发货条码
+    /// </summary>
+    [Display(Name = "发货条码")]
+    [ExporterHeader(DisplayName = "发货条码")]
+    public string DeliverCode { get; set; }
+
+    /// <summary>
+    /// 客户位置
+    /// </summary>
+    [Display(Name = "客户位置")]
+    [ExporterHeader(DisplayName = "客户位置")]
+    public string Position { get; set; }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/HBPO_SE_DETAIL_DTO.cs

@@ -1,167 +1,356 @@
-using Magicodes.ExporterAndImporter.Core;
 using System;
-using System.Collections.Generic;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Magicodes.ExporterAndImporter.Core;
 using Volo.Abp.Application.Dtos;
 
-namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+
+/// <summary>
+/// HBPO发运单
+/// </summary>
+public class HBPO_SE_DETAIL_DTO : EntityDto<Guid>
+{
+    /// <summary>
+    /// 发货单号
+    /// </summary>
+    [Display(Name = "发货单号")]
+    public string WmsBillNum { get; set; }
+
+    /// <summary>
+    /// 单据编号
+    /// </summary>
+    [Display(Name = "单据编号")]
+    public string Num { get; set; }
+
+    /// <summary>
+    /// 发货时间
+    /// </summary>
+    [Display(Name = "发货时间")]
+    public DateTime BillTime { get; set; }
+
+    /// <summary>
+    /// 发货人
+    /// </summary>
+    [Display(Name = "发货人")]
+    public string Oper { get; set; }
+
+    /// <summary>
+    /// 排序单号
+    /// </summary>
+    [Display(Name = "排序单号")]
+    public string OrderNum { get; set; }
+
+    /// <summary>
+    /// 订单序号
+    /// </summary>
+    [Display(Name = "订单序号")]
+    public string Seq { get; set; }
+
+    /// <summary>
+    /// 实际生产码
+    /// </summary>
+    [Display(Name = "实际生产码")]
+    public string RealCode { get; set; }
+
+    /// <summary>
+    /// 订单生产码
+    /// </summary>
+    [Display(Name = "订单生产码")]
+    public string VinCode { get; set; }
+
+    /// <summary>
+    /// 生产码类型
+    /// </summary>
+    [Display(Name = "生产码类型")]
+    public string CodeType { get; set; }
+
+    /// <summary>
+    /// 实际零件号
+    /// </summary>
+    [Display(Name = "实际零件号")]
+    public string RealPartCode { get; set; }
+
+    /// <summary>
+    /// 零件号
+    /// </summary>
+    [Display(Name = "零件号")]
+    public string PartCode { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Batch { get; set; }
+
+    /// <summary>
+    /// MES配置码
+    /// </summary>
+    [Display(Name = "MES配置码")]
+    public string MESConfigCode { get; set; }
+
+    /// <summary>
+    /// 来源库位
+    /// </summary>
+    [Display(Name = "来源库位")]
+    public string FromLoc { get; set; }
+
+    /// <summary>
+    /// 目标库位
+    /// </summary>
+    [Display(Name = "目标库位")]
+    public string ToLoc { get; set; }
+
+    /// <summary>
+    /// 参照订单生产码
+    /// </summary>
+    [Display(Name = "参照订单生产码")]
+    public string RefVinCode { get; set; }
+
+    /// <summary>
+    /// 单据性质
+    /// </summary>
+    [Display(Name = "单据性质")]
+    public string BillCharacter { get; set; }
+
+    /// <summary>
+    /// 发货关联单号
+    /// </summary>
+    [Display(Name = "发货关联单号")]
+    public string RefBillNum { get; set; }
+
+    /// <summary>
+    /// Erp目标库位
+    /// </summary>
+    [Display(Name = "Erp目标库位")]
+    public string ErpToLoc { get; set; }
+
+    /// <summary>
+    /// 原生产码
+    /// </summary>
+    [Display(Name = "原生产码")]
+    public string OrigiCode { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [Display(Name = "备注")]
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 塑件唯一码
+    /// </summary>
+    [Display(Name = "塑件唯一码")]
+    public string UniqueCode { get; set; }
+
+    /// <summary>
+    /// PJS顺序号
+    /// </summary>
+    [Display(Name = "PJS顺序号")]
+    public string PjsNum { get; set; }
+
+    /// <summary>
+    /// 虚拟小总成
+    /// </summary>
+    [Display(Name = "虚拟小总成")]
+    public string MatchNumber { get; set; }
+
+    /// <summary>
+    /// 发货条码
+    /// </summary>
+    [Display(Name = "发货条码")]
+    public string DeliverCode { get; set; }
+
+    /// <summary>
+    /// 客户位置
+    /// </summary>
+    [Display(Name = "客户位置")]
+    public string Position { get; set; }
+}
+
+/// <summary>
+/// 导出
+/// </summary>
+public class HBPO_SE_DETAIL_EXPORT_DTO
 {
     /// <summary>
-    /// HBPO发运单
-    /// </summary>
-    public class HBPO_SE_DETAIL_DTO : EntityDto<Guid>
-    {
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        public int Version { set; get; }
-
-        /// <summary>
-        /// 发货时间 
-        /// </summary>
-        [Display(Name = "发货时间")]
-        public DateTime ShippingDate { set; get; }
-
-        /// <summary>
-        /// 发运单号
-        /// </summary>
-        [Display(Name = "发运单号")]
-        public string WmsBillNum { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [Display(Name = "零件号")]
-        public string LU { get; set; }
-        
-        /// <summary>
-        /// 生产号
-        /// </summary>
-        [Display(Name = "生产号")]
-        public string PN { get; set; }
-        
-        /// <summary>
-        /// 组合键值（LU+PN）
-        /// </summary>
-        [Display(Name = "组合键值（LU+PN）")]
-        public string KeyCode { get; set; }
-        
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [Display(Name = "数量")]
-        public decimal Qty { get; set; }
-
-        /// <summary>
-        /// 日顺序号
-        /// </summary>
-        [Display(Name = "日顺序号")]
-        public string SeqNumber { get; set; }
-
-        /// <summary>
-        /// 小总成号
-        /// </summary>
-        [Display(Name = "小总成号")]
-        public string AssemblyCode { get; set; }
-
-        /// <summary>
-        /// 注塑码
-        /// </summary>
-        [Display(Name = "注塑码")]
-        public string InjectionCode { get; set; }
-
-        /// <summary>
-        /// 订单时间
-        /// </summary>
-        [Display(Name = "订单时间")]
-        public DateTime BeginDate { get; set; }
-    }
-
-    /// <summary>
-    /// 导出
-    /// </summary>
-    public class HBPO_SE_DETAIL_EXPORT_DTO 
-    {
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        [ExporterHeader(DisplayName = "期间")]
-        public int Version { set; get; }
-
-        /// <summary>
-        /// 发货时间 
-        /// </summary>
-        [Display(Name = "发货时间")]
-        [ExporterHeader(DisplayName = "发货时间")]
-        public DateTime ShippingDate { set; get; }
-
-        /// <summary>
-        /// 发运单号
-        /// </summary>
-        [Display(Name = "发运单号")]
-        [ExporterHeader(DisplayName = "发运单号")]
-        public string WmsBillNum { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [Display(Name = "零件号")]
-        [ExporterHeader(DisplayName = "零件号")]
-        public string LU { get; set; }
-
-        /// <summary>
-        /// 生产号
-        /// </summary>
-        [Display(Name = "生产号")]
-        [ExporterHeader(DisplayName = "生产号")]
-        public string PN { get; set; }
-
-        /// <summary>
-        /// 组合键值（LU+PN）
-        /// </summary>
-        [Display(Name = "组合键值（LU+PN）")]
-        [ExporterHeader(DisplayName = "组合键值（LU+PN）")]
-        public string KeyCode { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [Display(Name = "数量")]
-        [ExporterHeader(DisplayName = "数量")]
-        public decimal Qty { get; set; }
-
-        /// <summary>
-        /// 日顺序号
-        /// </summary>
-        [Display(Name = "日顺序号")]
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string SeqNumber { get; set; }
-
-        /// <summary>
-        /// 小总成号
-        /// </summary>
-        [Display(Name = "小总成号")]
-        [ExporterHeader(DisplayName = "小总成号")]
-        public string AssemblyCode { get; set; }
-
-        /// <summary>
-        /// 注塑码
-        /// </summary>
-        [Display(Name = "注塑码")]
-        [ExporterHeader(DisplayName = "注塑码")]
-        public string InjectionCode { get; set; }
-
-        /// <summary>
-        /// 订单时间
-        /// </summary>
-        [Display(Name = "订单时间")]
-        [ExporterHeader(DisplayName = "订单时间")]
-        public DateTime BeginDate { get; set; }
-    }
+    /// 发货单号
+    /// </summary>
+    [Display(Name = "发货单号")]
+    [ExporterHeader(DisplayName = "发货单号")]
+    public string WmsBillNum { get; set; }
+
+    /// <summary>
+    /// 单据编号
+    /// </summary>
+    [Display(Name = "单据编号")]
+    [ExporterHeader(DisplayName = "单据编号")]
+    public string Num { get; set; }
+
+    /// <summary>
+    /// 发货时间
+    /// </summary>
+    [Display(Name = "发货时间")]
+    [ExporterHeader(DisplayName = "发货时间")]
+    public DateTime BillTime { get; set; }
+
+    /// <summary>
+    /// 发货人
+    /// </summary>
+    [Display(Name = "发货人")]
+    [ExporterHeader(DisplayName = "发货人")]
+    public string Oper { get; set; }
+
+    /// <summary>
+    /// 排序单号
+    /// </summary>
+    [Display(Name = "排序单号")]
+    [ExporterHeader(DisplayName = "排序单号")]
+    public string OrderNum { get; set; }
+
+    /// <summary>
+    /// 订单序号
+    /// </summary>
+    [Display(Name = "订单序号")]
+    [ExporterHeader(DisplayName = "订单序号")]
+    public string Seq { get; set; }
+
+    /// <summary>
+    /// 实际生产码
+    /// </summary>
+    [Display(Name = "实际生产码")]
+    [ExporterHeader(DisplayName = "实际生产码")]
+    public string RealCode { get; set; }
+
+    /// <summary>
+    /// 订单生产码
+    /// </summary>
+    [Display(Name = "订单生产码")]
+    [ExporterHeader(DisplayName = "订单生产码")]
+    public string VinCode { get; set; }
+
+    /// <summary>
+    /// 生产码类型
+    /// </summary>
+    [Display(Name = "生产码类型")]
+    [ExporterHeader(DisplayName = "生产码类型")]
+    public string CodeType { get; set; }
+
+    /// <summary>
+    /// 实际零件号
+    /// </summary>
+    [Display(Name = "实际零件号")]
+    [ExporterHeader(DisplayName = "实际零件号")]
+    public string RealPartCode { get; set; }
+
+    /// <summary>
+    /// 零件号
+    /// </summary>
+    [Display(Name = "零件号")]
+    [ExporterHeader(DisplayName = "零件号")]
+    public string PartCode { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    [Display(Name = "批次")]
+    [ExporterHeader(DisplayName = "批次")]
+    public string Batch { get; set; }
+
+    /// <summary>
+    /// MES配置码
+    /// </summary>
+    [Display(Name = "MES配置码")]
+    [ExporterHeader(DisplayName = "MES配置码")]
+    public string MESConfigCode { get; set; }
+
+    /// <summary>
+    /// 来源库位
+    /// </summary>
+    [Display(Name = "来源库位")]
+    [ExporterHeader(DisplayName = "来源库位")]
+    public string FromLoc { get; set; }
+
+    /// <summary>
+    /// 目标库位
+    /// </summary>
+    [Display(Name = "目标库位")]
+    [ExporterHeader(DisplayName = "目标库位")]
+    public string ToLoc { get; set; }
+
+    /// <summary>
+    /// 参照订单生产码
+    /// </summary>
+    [Display(Name = "参照订单生产码")]
+    [ExporterHeader(DisplayName = "参照订单生产码")]
+    public string RefVinCode { get; set; }
 
+    /// <summary>
+    /// 单据性质
+    /// </summary>
+    [Display(Name = "单据性质")]
+    [ExporterHeader(DisplayName = "单据性质")]
+    public string BillCharacter { get; set; }
+
+    /// <summary>
+    /// 发货关联单号
+    /// </summary>
+    [Display(Name = "发货关联单号")]
+    [ExporterHeader(DisplayName = "发货关联单号")]
+    public string RefBillNum { get; set; }
+
+    /// <summary>
+    /// Erp目标库位
+    /// </summary>
+    [Display(Name = "Erp目标库位")]
+    [ExporterHeader(DisplayName = "Erp目标库位")]
+    public string ErpToLoc { get; set; }
+
+    /// <summary>
+    /// 原生产码
+    /// </summary>
+    [Display(Name = "原生产码")]
+    [ExporterHeader(DisplayName = "原生产码")]
+    public string OrigiCode { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [Display(Name = "备注")]
+    [ExporterHeader(DisplayName = "备注")]
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 塑件唯一码
+    /// </summary>
+    [Display(Name = "塑件唯一码")]
+    [ExporterHeader(DisplayName = "塑件唯一码")]
+    public string UniqueCode { get; set; }
+
+    /// <summary>
+    /// PJS顺序号
+    /// </summary>
+    [Display(Name = "PJS顺序号")]
+    [ExporterHeader(DisplayName = "PJS顺序号")]
+    public string PjsNum { get; set; }
+
+    /// <summary>
+    /// 虚拟小总成
+    /// </summary>
+    [Display(Name = "虚拟小总成")]
+    [ExporterHeader(DisplayName = "虚拟小总成")]
+    public string MatchNumber { get; set; }
+
+    /// <summary>
+    /// 发货条码
+    /// </summary>
+    [Display(Name = "发货条码")]
+    [ExporterHeader(DisplayName = "发货条码")]
+    public string DeliverCode { get; set; }
+
+    /// <summary>
+    /// 客户位置
+    /// </summary>
+    [Display(Name = "客户位置")]
+    [ExporterHeader(DisplayName = "客户位置")]
+    public string Position { get; set; }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Application.Contracts/Entities/BQ/Dtos/PUB_SE_DETAIL_DTO.cs

@@ -1,160 +1,264 @@
-using Magicodes.ExporterAndImporter.Core;
 using System;
-using System.Collections.Generic;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
-using System.Linq;
-using System.Text;
-using System.Threading.Tasks;
+using Magicodes.ExporterAndImporter.Core;
 using Volo.Abp.Application.Dtos;
 
-namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos
+namespace Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+
+/// <summary>
+/// PUB发运数据
+/// </summary>
+public class PUB_SE_DETAIL_DTO : EntityDto<Guid>
 {
     /// <summary>
-    /// PUB发运数据
-    /// </summary>
-    public class PUB_SE_DETAIL_DTO : EntityDto<Guid>
-    {
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [Display(Name = "期间")]
-        public int Version { set; get; }
-
-        /// <summary>
-        /// 发货时间 
-        /// </summary>
-        [Display(Name = "发货时间")]
-        public DateTime ShippingDate { set; get; }
-
-        /// <summary>
-        /// 发运单号
-        /// </summary>
-        [Display(Name = "发运单号")]
-        public string WmsBillNum { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [Display(Name = "零件号")]
-        public string LU { get; set; }
-
-        /// <summary>
-        /// 生产号
-        /// </summary>
-        [Display(Name = "生产号")]
-        public string PN { get; set; }
-
-        /// <summary>
-        /// 组合键值（LU+PN）
-        /// </summary>
-        [Display(Name = "组合键值（LU+PN）")]
-        public string KeyCode { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [Display(Name = "数量")]
-        public decimal Qty { get; set; }
-
-        /// <summary>
-        /// 日顺序号
-        /// </summary>
-        [Display(Name = "日顺序号")]
-        public string SeqNumber { get; set; }
-
-        /// <summary>
-        /// 小总成号
-        /// </summary>
-        [Display(Name = "小总成号")]
-        public string AssemblyCode { get; set; }
-
-        /// <summary>
-        /// 注塑码
-        /// </summary>
-        [Display(Name = "注塑码")]
-        public string InjectionCode { get; set; }
-
-        /// <summary>
-        /// 订单时间
-        /// </summary>
-        [Display(Name = "订单时间")]
-        public DateTime BeginDate { get; set; }
-    }
-
-    /// <summary>
-    /// 导出
-    /// </summary>
-    public class PUB_SE_DETAIL_EXPORT_DTO
-    {
-        /// <summary>
-        /// 期间
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public int Version { set; get; }
-
-        /// <summary>
-        /// 发货时间 
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public DateTime ShippingDate { set; get; }
-
-        /// <summary>
-        /// 发运单号
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string WmsBillNum { set; get; }
-
-        /// <summary>
-        /// 零件号
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string LU { get; set; }
-
-        /// <summary>
-        /// 生产号
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string PN { get; set; }
-
-        /// <summary>
-        /// 组合键值（LU+PN）
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string KeyCode { get; set; }
-
-        /// <summary>
-        /// 数量
-        /// </summary>
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public decimal Qty { get; set; }
-
-        /// <summary>
-        /// 日顺序号
-        /// </summary>
-        [Display(Name = "日顺序号")]
-        [ExporterHeader(DisplayName = "日顺序号")]
-        public string SeqNumber { get; set; }
-
-        /// <summary>
-        /// 小总成号
-        /// </summary>
-        [Display(Name = "小总成号")]
-        [ExporterHeader(DisplayName = "小总成号")]
-        public string AssemblyCode { get; set; }
-
-        /// <summary>
-        /// 注塑码
-        /// </summary>
-        [Display(Name = "注塑码")]
-        [ExporterHeader(DisplayName = "注塑码")]
-        public string InjectionCode { get; set; }
-
-        /// <summary>
-        /// 订单时间
-        /// </summary>
-        [Display(Name = "订单时间")]
-        [ExporterHeader(DisplayName = "订单时间")]
-        public DateTime BeginDate { get; set; }
-    }
+    /// 发货单号
+    /// </summary>
+    [Display(Name = "发货单号")]
+    public string WmsBillNum { get; set; }
+
+    /// <summary>
+    /// 发货时间
+    /// </summary>
+    [DisplayName("发货时间")]
+    public DateTime BillTime { get; set; }
+
+    /// <summary>
+    /// 零件号
+    /// </summary>
+    [DisplayName("零件号")]
+    public string PartCode { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    [DisplayName("批次")]
+    public string Batch { get; set; }
+
+    /// <summary>
+    /// 发货人
+    /// </summary>
+    [DisplayName("发货人")]
+    public string Oper { get; set; }
+
+    /// <summary>
+    /// DN单据号
+    /// </summary>
+    [DisplayName("DN单据号")]
+    public string DnBillNum { get; set; }
+
+    /// <summary>
+    /// DN单据时间
+    /// </summary>
+    [DisplayName("DN单据时间")]
+    public DateTime DnBillTime { get; set; }
+
+    /// <summary>
+    /// DN单添加人
+    /// </summary>
+    [DisplayName("DN单添加人")]
+    public string DnOper { get; set; }
+
+    /// <summary>
+    /// 交付索引
+    /// </summary>
+    [DisplayName("交付索引")]
+    public string DeliveryIndex { get; set; }
+
+    /// <summary>
+    /// 客户
+    /// </summary>
+    [DisplayName("客户")]
+    public string CustId { get; set; }
 
+    /// <summary>
+    /// 发货仓库
+    /// </summary>
+    [DisplayName("发货仓库")]
+    public string DeliveryHose { get; set; }
+
+    /// <summary>
+    /// 来源库位
+    /// </summary>
+    [DisplayName("来源库位")]
+    public string FromLocCode { get; set; }
+
+    /// <summary>
+    /// 来源仓库
+    /// </summary>
+    [DisplayName("来源仓库")]
+    public string FromHose { get; set; }
+
+    /// <summary>
+    /// 来源ERP库存
+    /// </summary>
+    [DisplayName("来源ERP库存")]
+    public string FromErpLocCode { get; set; }
+
+    /// <summary>
+    /// 目标库位
+    /// </summary>
+    [DisplayName("目标库位")]
+    public string ToLocCode { get; set; }
+
+    /// <summary>
+    /// 目标Erp库位
+    /// </summary>
+    [DisplayName("目标Erp库位")]
+    public string ToErpLocCode { get; set; }
+
+    /// <summary>
+    /// 目标仓库
+    /// </summary>
+    [DisplayName("目标仓库")]
+    public string ToHose { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [DisplayName("备注")]
+    public string Remark { get; set; }
+}
+
+/// <summary>
+/// 查询
+/// </summary>
+public class PUB_SE_DETAIL_RequestDto : RequestDto
+{
+    /// <summary>
+    /// 业务类别
+    /// </summary>
+    public EnumBusinessType BusinessType { get; set; }
+}
+
+/// <summary>
+/// 导出
+/// </summary>
+public class PUB_SE_DETAIL_EXPORT_DTO
+{
+    /// <summary>
+    /// 发货单号
+    /// </summary>
+    [Display(Name = "发货单号")]
+    [ExporterHeader(DisplayName = "发货单号")]
+    public string WmsBillNum { get; set; }
+
+    /// <summary>
+    /// 发货时间
+    /// </summary>
+    [DisplayName("发货时间")]
+    [ExporterHeader(DisplayName = "发货时间")]
+    public DateTime BillTime { get; set; }
+
+    /// <summary>
+    /// 零件号
+    /// </summary>
+    [DisplayName("零件号")]
+    [ExporterHeader(DisplayName = "零件号")]
+    public string PartCode { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    [DisplayName("批次")]
+    [ExporterHeader(DisplayName = "批次")]
+    public string Batch { get; set; }
+
+    /// <summary>
+    /// 发货人
+    /// </summary>
+    [DisplayName("发货人")]
+    [ExporterHeader(DisplayName = "发货人")]
+    public string Oper { get; set; }
+
+    /// <summary>
+    /// DN单据号
+    /// </summary>
+    [DisplayName("DN单据号")]
+    [ExporterHeader(DisplayName = "DN单据号")]
+    public string DnBillNum { get; set; }
+
+    /// <summary>
+    /// DN单据时间
+    /// </summary>
+    [DisplayName("DN单据时间")]
+    [ExporterHeader(DisplayName = "DN单据时间")]
+    public DateTime DnBillTime { get; set; }
+
+    /// <summary>
+    /// DN单添加人
+    /// </summary>
+    [DisplayName("DN单添加人")]
+    [ExporterHeader(DisplayName = "DN单添加人")]
+    public string DnOper { get; set; }
+
+    /// <summary>
+    /// 交付索引
+    /// </summary>
+    [DisplayName("交付索引")]
+    [ExporterHeader(DisplayName = "交付索引")]
+    public string DeliveryIndex { get; set; }
+
+    /// <summary>
+    /// 客户
+    /// </summary>
+    [DisplayName("客户")]
+    [ExporterHeader(DisplayName = "客户")]
+    public string CustId { get; set; }
+
+    /// <summary>
+    /// 发货仓库
+    /// </summary>
+    [DisplayName("发货仓库")]
+    [ExporterHeader(DisplayName = "发货仓库")]
+    public string DeliveryHose { get; set; }
+
+    /// <summary>
+    /// 来源库位
+    /// </summary>
+    [DisplayName("来源库位")]
+    [ExporterHeader(DisplayName = "来源库位")]
+    public string FromLocCode { get; set; }
+
+    /// <summary>
+    /// 来源仓库
+    /// </summary>
+    [DisplayName("来源仓库")]
+    [ExporterHeader(DisplayName = "来源仓库")]
+    public string FromHose { get; set; }
+
+    /// <summary>
+    /// 来源ERP库存
+    /// </summary>
+    [DisplayName("来源ERP库存")]
+    [ExporterHeader(DisplayName = "来源ERP库存")]
+    public string FromErpLocCode { get; set; }
+
+    /// <summary>
+    /// 目标库位
+    /// </summary>
+    [DisplayName("目标库位")]
+    [ExporterHeader(DisplayName = "目标库位")]
+    public string ToLocCode { get; set; }
+
+    /// <summary>
+    /// 目标Erp库位
+    /// </summary>
+    [DisplayName("目标Erp库位")]
+    [ExporterHeader(DisplayName = "目标Erp库位")]
+    public string ToErpLocCode { get; set; }
+
+    /// <summary>
+    /// 目标仓库
+    /// </summary>
+    [DisplayName("目标仓库")]
+    [ExporterHeader(DisplayName = "目标仓库")]
+    public string ToHose { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [DisplayName("备注")]
+    [ExporterHeader(DisplayName = "备注")]
+    public string Remark { get; set; }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/JobHostdService.cs

@@ -66,31 +66,40 @@ public class JobHostdService : BackgroundService, IApplicationService
                                         var now = DateTime.UtcNow;
                                         var nextUtc = expression.GetNextOccurrence(now);
                                         var span = nextUtc - now;
-                                        await Task.Delay(span.Value).ConfigureAwait(false);
-                                        Debug.WriteLine($"{job.Name} 定时任务开始执行");
-                                        using var scope = this._serviceProvider.CreateScope();
-                                        if (scope.ServiceProvider.GetService(serviceType) is IJobService jobService)
+                                        if (span != null && (int)span.Value.TotalMilliseconds > 0)
                                         {
-                                            if (!job.IsDisabled)
+                                            var delay = (int)span.Value.TotalMilliseconds;
+                                            while (delay > 0)
                                             {
-                                                var jobItem = this.GetJobItem(job.Id);
-                                                Guid? jobLogId = null;
-                                                if (!jobItem.IsRunning)
+                                                var currentDelay = delay > int.MaxValue ? int.MaxValue : delay;
+                                                delay -= currentDelay;
+                                                await Task.Delay(currentDelay).ConfigureAwait(false);
+                                            }
+                                            Debug.WriteLine($"{job.Name} 定时任务开始执行");
+                                            using var scope = this._serviceProvider.CreateScope();
+                                            if (scope.ServiceProvider.GetService(serviceType) is IJobService jobService)
+                                            {
+                                                if (!job.IsDisabled)
                                                 {
-                                                    jobLogId = this.JobItemStart(job.Id);
-                                                    if (jobLogId.HasValue)
+                                                    var jobItem = this.GetJobItem(job.Id);
+                                                    Guid? jobLogId = null;
+                                                    if (!jobItem.IsRunning)
                                                     {
-                                                        try
-                                                        {
-                                                            await jobService.Invoke().ConfigureAwait(false);
-                                                            this.JobItemSuccess(job.Id, jobLogId.Value);
-                                                            Debug.WriteLine($"{job.Name} 定时任务执行成功");
-                                                        }
-                                                        catch (Exception ex)
+                                                        jobLogId = this.JobItemStart(job.Id);
+                                                        if (jobLogId.HasValue)
                                                         {
-                                                            Debug.WriteLine($"{job.Name} 定时任务执行失败:{ex.Message}");
-                                                            Console.WriteLine(ex.ToString());
-                                                            this.JobItemFaild(job.Id, jobLogId.Value, ex);
+                                                            try
+                                                            {
+                                                                await jobService.Invoke(scope.ServiceProvider).ConfigureAwait(false);
+                                                                this.JobItemSuccess(job.Id, jobLogId.Value);
+                                                                Debug.WriteLine($"{job.Name} 定时任务执行成功");
+                                                            }
+                                                            catch (Exception ex)
+                                                            {
+                                                                Debug.WriteLine($"{job.Name} 定时任务执行失败:{ex.Message}");
+                                                                Console.WriteLine(ex.ToString());
+                                                                this.JobItemFaild(job.Id, jobLogId.Value, ex);
+                                                            }
                                                         }
                                                     }
                                                 }

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/PUB_SE_DETAIL_SERVICE.cs

@@ -1,4 +1,4 @@
-using Microsoft.AspNetCore.Authorization;
+using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
 using SettleAccount.Domain.BQ;
 using Shouldly;
@@ -10,6 +10,7 @@ using Volo.Abp.Application.Services;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 using Win.Sfs.SettleAccount.ExcelImporter;
+using Win.Sfs.Shared.Filter;
 using Win.Sfs.Shared.RepositoryBase;
 namespace Win.Sfs.SettleAccount.Entities.BQ
 {
@@ -64,8 +65,9 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         /// 获取列表
         /// </summary>
         [HttpPost]
-        public async Task<PagedResultDto<PUB_SE_DETAIL_DTO>> GetListAsync(RequestDto input)
+        public async Task<PagedResultDto<PUB_SE_DETAIL_DTO>> GetListAsync(PUB_SE_DETAIL_RequestDto input)
         {
+            input.Filters.Add(new FilterCondition("BusinessType", input.BusinessType.ToString(), EnumFilterAction.Equal, EnumFilterLogic.And));
             var entities = await _repository.GetListByFilterAsync(input.Filters, input.Sorting, input.MaxResultCount, input.SkipCount, true);
             var totalCount = await _repository.GetCountByFilterAsync(input.Filters);
             var dtos = ObjectMapper.Map<List<PUB_SE_DETAIL>, List<PUB_SE_DETAIL_DTO>>(entities);
@@ -74,4 +76,4 @@ namespace Win.Sfs.SettleAccount.Entities.BQ
         #endregion
 
     }
-}
+}

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/BBACSeSyncAppService.cs

@@ -51,47 +51,45 @@ public class BBACSeSyncAppService : ApplicationService, IInvocable
     [HttpPost]
     public async Task Invoke()
     {
-        await SyncJitRecord();
-        //await SyncJisRecord();
+        await SyncJitRecordAsync();
+        await SyncJisRecordAsync();
     }
 
     /// <summary>
     /// 同步JitRecord
     /// </summary>
-    /// <returns></returns>
-    private async Task SyncJitRecord()
+    private async Task SyncJitRecordAsync()
     {
         //同步表名称
-        var syncTableName = "TM_BJBMPT_JIT_RECORD";
+        var syncTableName = "JisBBACSeSync_Jit";
         //BBAC类型集合
         var EnumDeliverSubBillTypes = new List<EnumDeliverSubBillType>
         {
             EnumDeliverSubBillType.保险杠BBAC,
             EnumDeliverSubBillType.买单件保险杠BBAC,
             EnumDeliverSubBillType.买单件小件BBAC,
-            EnumDeliverSubBillType.小件BBAC,
-            EnumDeliverSubBillType.JIT直供件BBAC
+            EnumDeliverSubBillType.小件BBAC
         };
 
         Expression<Func<TM_BJBMPT_JIT_RECORD, bool>> predicate = (t) => t.DeliverBillType == EnumDeliverBjBmpBillType.JIS件 && EnumDeliverSubBillTypes.Contains(t.DeliverSubBillType);
         var syncPositionFlag = await _syncPositionFlagRepository.FindAsync(t => t.TableName == syncTableName);
         if (syncPositionFlag != null)
         {
-            Expression<Func<TM_BJBMPT_JIT_RECORD, bool>> expression = (t) => t.UID > int.Parse(syncPositionFlag.Position);
-            var body = expression.Body;
-            predicate = Expression.Lambda<Func<TM_BJBMPT_JIT_RECORD, bool>>(Expression.And(predicate.Body, body), predicate.Parameters);
+            predicate = (t) => t.UID > int.Parse(syncPositionFlag.Position) && t.DeliverBillType == EnumDeliverBjBmpBillType.JIS件 && EnumDeliverSubBillTypes.Contains(t.DeliverSubBillType);
         }
 
-        var jitRecords = _wmsBJBMPTContext.TM_BJBMPT_JIT_RECORD.Where(predicate).OrderBy(b => b.UID).ToList();
+        //WMS发运记录
+        var wmsSeRecords = _wmsBJBMPTContext.TM_BJBMPT_JIT_RECORD.Where(predicate).OrderBy(b => b.UID).ToList();
 
-        var bbacSeDetails = ObjectMapper.Map<List<TM_BJBMPT_JIT_RECORD>, List<BBAC_SE_DETAIL>>(jitRecords);
+        var bbacSeDetails = ObjectMapper.Map<List<TM_BJBMPT_JIT_RECORD>, List<BBAC_SE_DETAIL>>(wmsSeRecords);
         if (bbacSeDetails.Any())
         {
+            bbacSeDetails.ForEach(bbacSeDetail => bbacSeDetail.KeyCode = bbacSeDetail.PN + bbacSeDetail.LU);
             await _bbacSeDetailRepository.InsertManyAsync(bbacSeDetails);
 
             if (syncPositionFlag != null)
             {
-                syncPositionFlag.Position = jitRecords.Last().UID.ToString();
+                syncPositionFlag.Position = wmsSeRecords.Last().UID.ToString();
                 await _syncPositionFlagRepository.UpdateAsync(syncPositionFlag);
             }
             else
@@ -99,34 +97,47 @@ public class BBACSeSyncAppService : ApplicationService, IInvocable
                 syncPositionFlag = new SyncPositionFlag()
                 {
                     TableName = syncTableName,
-                    Position = jitRecords.Last().UID.ToString()
+                    Position = wmsSeRecords.Last().UID.ToString()
                 };
                 await _syncPositionFlagRepository.InsertAsync(syncPositionFlag);
             }
         }
     }
 
-    private async Task SyncJisRecord()
+    /// <summary>
+    /// 同步JisRecord
+    /// </summary>
+    private async Task SyncJisRecordAsync()
     {
         //同步表名称
-        var syncTableName = "TM_BJBMPT_JIS_RECORD";
-        Expression<Func<TM_BJBMPT_JIS_RECORD, bool>> predicate = (t) => true;
+        var syncTableName = "JisBBACSeSync_Jis";
+        //BBAC类型集合
+        var EnumDeliverSubBillTypes = new List<EnumDeliverSubBillType>
+        {
+            EnumDeliverSubBillType.保险杠BBAC,
+            EnumDeliverSubBillType.买单件保险杠BBAC,
+            EnumDeliverSubBillType.买单件小件BBAC,
+            EnumDeliverSubBillType.小件BBAC
+        };
+        Expression<Func<TM_BJBMPT_JIS_RECORD, bool>> predicate = (t) => t.DeliverBillType == EnumDeliverBjBmpBillType.JIS件 && EnumDeliverSubBillTypes.Contains(t.DeliverSubBillType);
         var syncPositionFlag = await _syncPositionFlagRepository.FindAsync(t => t.TableName == syncTableName);
         if (syncPositionFlag != null)
         {
-            predicate = (t) => t.UID > int.Parse(syncPositionFlag.Position);
+            predicate = (t) => t.UID > int.Parse(syncPositionFlag.Position) && t.DeliverBillType == EnumDeliverBjBmpBillType.JIS件 && EnumDeliverSubBillTypes.Contains(t.DeliverSubBillType);
         }
 
-        var jisRecords = _wmsBJBMPTContext.TM_BJBMPT_JIS_RECORD.Where(predicate).OrderBy(b => b.UID).ToList();
+        //WMS发运数据
+        var wmsRecords = _wmsBJBMPTContext.TM_BJBMPT_JIS_RECORD.Where(predicate).OrderBy(b => b.UID).ToList();
 
-        var bbacSeDetails = ObjectMapper.Map<List<TM_BJBMPT_JIS_RECORD>, List<BBAC_SE_DETAIL>>(jisRecords);
+        var bbacSeDetails = ObjectMapper.Map<List<TM_BJBMPT_JIS_RECORD>, List<BBAC_SE_DETAIL>>(wmsRecords);
         if (bbacSeDetails.Any())
         {
+            bbacSeDetails.ForEach(bbacSeDetail => bbacSeDetail.KeyCode = bbacSeDetail.PN + bbacSeDetail.LU);
             await _bbacSeDetailRepository.InsertManyAsync(bbacSeDetails);
 
             if (syncPositionFlag != null)
             {
-                syncPositionFlag.Position = jisRecords.Last().UID.ToString();
+                syncPositionFlag.Position = wmsRecords.Last().UID.ToString();
                 await _syncPositionFlagRepository.UpdateAsync(syncPositionFlag);
             }
             else
@@ -134,7 +145,7 @@ public class BBACSeSyncAppService : ApplicationService, IInvocable
                 syncPositionFlag = new SyncPositionFlag()
                 {
                     TableName = syncTableName,
-                    Position = jisRecords.Last().UID.ToString()
+                    Position = wmsRecords.Last().UID.ToString()
                 };
                 await _syncPositionFlagRepository.InsertAsync(syncPositionFlag);
             }

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/HBPOSeSyncAppService.cs

@@ -1,6 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
+using System.Linq.Dynamic.Core;
 using System.Linq.Expressions;
 using System.Threading.Tasks;
 using Coravel.Invocable;
@@ -48,117 +49,47 @@ public class HBPOSeSyncAppService : ApplicationService, IInvocable //IJobService
         _hbpoSeDetailRepository = hbpoSeDetailRepository;
     }
 
-    //private readonly IRepository<TM_BJBMPT_JIT_RECORD> _TMBJBMPTJITRECORDRepository;
-
-    //public HBPOSeSyncAppService(IRepository<TM_BJBMPT_JIT_RECORD> TMBJBMPTJITRECORDRepository)
-    //{
-    //    _TMBJBMPTJITRECORDRepository = TMBJBMPTJITRECORDRepository;
-    //}
-
     [HttpPost]
     public async Task Invoke()
     {
-        await SyncJitRecord();
-        //await SyncJisRecord();
-        //if (!dbContext.GetService<IRelationalDatabaseCreator>().Exists() && dbContext.Database.EnsureCreated())
-        //{
-        //    this._balanceRepository.AsNoTracking().ForEachAsync(o =>
-        //    {
-        //        dbContext.Set<VmiBalance>().Add(o);
-        //    });
-        //    dbContext.SaveChanges();
-        //    var snapshot = new VmiSnapshot { Name = date, Path = connectionString };
-        //    this._snapshotRepository.InsertAsync(snapshot).Wait();
-        //}
-
-
-        //using (var context = new HouseDbContext(optionsBuilder.Options))
-        //{
-        //    var one = context.Notices.FirstOrDefault(n => n.Id == notice.Id);
-        //    // 当然你也可以直接初始化其他的Service
-        //    var nService = new NoticeService(context, null);
-        //    var one = nService.FindOne(notice.Id);
-        //}
-
-
-
-        //var TM_BJBMPT_JIT_RECORDs = _wmsBJBMPTContext.TM_BJBMPT_JIT_RECORD
-        //        .Where(b => b.UID > 3)
-        //        .OrderBy(b => b.BillTime)
-        //        .ToList();
-        //foreach (var TM_BJBMPT_JIT_RECORD in TM_BJBMPT_JIT_RECORDs)
-        //{
-        //    Console.WriteLine($"{TM_BJBMPT_JIT_RECORD.UID}");
-        //}
-
-        //using (var db = new WMSBJBMPTDbContext())
-        //{
-        //    var blogs = db.TM_BJBMPT_JIT_RECORD
-        //        .Where(b => b.UID > 3)
-        //        .OrderBy(b => b.BillTime)
-        //        .ToList();
-
-        //    foreach (var blog in blogs)
-        //    {
-        //        Console.WriteLine($"{blog.UID}");
-        //    }
-        //}
-        Console.WriteLine($"{GetType().FullName}执行了");
+        await SyncJitRecordAsync();
+        await SyncJisRecordAsync();
     }
 
     /// <summary>
     /// 同步JitRecord
     /// </summary>
-    /// <returns></returns>
-    private async Task SyncJitRecord()
+    private async Task SyncJitRecordAsync()
     {
         //同步表名称
-        var syncTableName = "TM_BJBMPT_JIT_RECORD";
+        var syncTableName = "JisHBPOSeSync_Jit";
         //HBPO类型集合
         var EnumDeliverSubBillTypes = new List<EnumDeliverSubBillType>
         {
             EnumDeliverSubBillType.保险杠HBPO,
             EnumDeliverSubBillType.买单件保险杠HBPO,
             EnumDeliverSubBillType.买单件小件HBPO,
-            EnumDeliverSubBillType.小件HBPO,
-            EnumDeliverSubBillType.JIT直供件HBPO
+            EnumDeliverSubBillType.小件HBPO
         };
-
         Expression<Func<TM_BJBMPT_JIT_RECORD, bool>> predicate = (t) => t.DeliverBillType == EnumDeliverBjBmpBillType.JIS件 && EnumDeliverSubBillTypes.Contains(t.DeliverSubBillType);
         var syncPositionFlag = await _syncPositionFlagRepository.FindAsync(t => t.TableName == syncTableName);
         if (syncPositionFlag != null)
         {
-            //var inv = Expression.Invoke(t=>t.UID > int.Parse(syncPositionFlag.Position), predicate.Parameters);
-            //return Expression.Lambda<Func<T, bool>>(Expression.And(exp.Body, inv), exp.Parameters);
-
-            //predicate.And(t => t.UID > int.Parse(syncPositionFlag.Position));
-
-            Expression<Func<TM_BJBMPT_JIT_RECORD, bool>> expression = (t) => t.UID > int.Parse(syncPositionFlag.Position);
-            var body = expression.Body;
-
-            //var inv = Expression.Invoke(condition, exp.Parameters);
-            predicate = Expression.Lambda<Func<TM_BJBMPT_JIT_RECORD, bool>>(Expression.And(predicate.Body, body), predicate.Parameters);
-
-            //Expression.Lambda<Func<T, bool>>(Expression.Equal(member, constant), parameter);
-            //var expression = predicate.And(t => t.UID > int.Parse(syncPositionFlag.Position));
-
+            predicate = (t) => t.UID > int.Parse(syncPositionFlag.Position) && t.DeliverBillType == EnumDeliverBjBmpBillType.JIS件 && EnumDeliverSubBillTypes.Contains(t.DeliverSubBillType);
         }
 
-        Console.WriteLine($"表达式:{predicate}");
-
-        var jitRecords = _wmsBJBMPTContext.TM_BJBMPT_JIT_RECORD
-                .Where(predicate)
-                .OrderBy(b => b.UID)
-                .ToList();
+        //WMS发运数据
+        var wmsRecords = _wmsBJBMPTContext.TM_BJBMPT_JIT_RECORD.Where(predicate).OrderBy(b => b.UID).ToList();
 
-        var hbpoSeDetails = ObjectMapper.Map<List<TM_BJBMPT_JIT_RECORD>, List<HBPO_SE_DETAIL>>(jitRecords);
+        var hbpoSeDetails = ObjectMapper.Map<List<TM_BJBMPT_JIT_RECORD>, List<HBPO_SE_DETAIL>>(wmsRecords);
         if (hbpoSeDetails.Any())
         {
+            hbpoSeDetails.ForEach(hbpoSeDetail => hbpoSeDetail.KeyCode = hbpoSeDetail.PN + hbpoSeDetail.LU);
             await _hbpoSeDetailRepository.InsertManyAsync(hbpoSeDetails);
 
             if (syncPositionFlag != null)
             {
-                syncPositionFlag.Position = jitRecords.Last().UID.ToString();
+                syncPositionFlag.Position = wmsRecords.Last().UID.ToString();
                 await _syncPositionFlagRepository.UpdateAsync(syncPositionFlag);
             }
             else
@@ -166,37 +97,47 @@ public class HBPOSeSyncAppService : ApplicationService, IInvocable //IJobService
                 syncPositionFlag = new SyncPositionFlag()
                 {
                     TableName = syncTableName,
-                    Position = jitRecords.Last().UID.ToString()
+                    Position = wmsRecords.Last().UID.ToString()
                 };
                 await _syncPositionFlagRepository.InsertAsync(syncPositionFlag);
             }
         }
     }
 
-    private async Task SyncJisRecord()
+    /// <summary>
+    /// 同步JisRecord
+    /// </summary>
+    private async Task SyncJisRecordAsync()
     {
         //同步表名称
-        var syncTableName = "TM_BJBMPT_JIS_RECORD";
-        Expression<Func<TM_BJBMPT_JIS_RECORD, bool>> predicate = (t) => true;
+        var syncTableName = "JisHBPOSeSync_Jis";
+        //BBAC类型集合
+        var EnumDeliverSubBillTypes = new List<EnumDeliverSubBillType>
+        {
+            EnumDeliverSubBillType.保险杠BBAC,
+            EnumDeliverSubBillType.买单件保险杠BBAC,
+            EnumDeliverSubBillType.买单件小件BBAC,
+            EnumDeliverSubBillType.小件BBAC
+        };
+        Expression<Func<TM_BJBMPT_JIS_RECORD, bool>> predicate = (t) => t.DeliverBillType == EnumDeliverBjBmpBillType.JIS件 && EnumDeliverSubBillTypes.Contains(t.DeliverSubBillType);
         var syncPositionFlag = await _syncPositionFlagRepository.FindAsync(t => t.TableName == syncTableName);
         if (syncPositionFlag != null)
         {
-            predicate = (t) => t.UID > int.Parse(syncPositionFlag.Position);
+            predicate = (t) => t.UID > int.Parse(syncPositionFlag.Position) && t.DeliverBillType == EnumDeliverBjBmpBillType.JIS件 && EnumDeliverSubBillTypes.Contains(t.DeliverSubBillType);
         }
 
-        var jisRecords = _wmsBJBMPTContext.TM_BJBMPT_JIS_RECORD
-                .Where(predicate)
-                .OrderBy(b => b.UID)
-                .ToList();
+        //WMS发运数据
+        var wmsRecords = _wmsBJBMPTContext.TM_BJBMPT_JIS_RECORD.Where(predicate).OrderBy(b => b.UID).ToList();
 
-        var hbpoSeDetails = ObjectMapper.Map<List<TM_BJBMPT_JIS_RECORD>, List<HBPO_SE_DETAIL>>(jisRecords);
+        var hbpoSeDetails = ObjectMapper.Map<List<TM_BJBMPT_JIS_RECORD>, List<HBPO_SE_DETAIL>>(wmsRecords);
         if (hbpoSeDetails.Any())
         {
+            hbpoSeDetails.ForEach(hbpoSeDetail => hbpoSeDetail.KeyCode = hbpoSeDetail.PN + hbpoSeDetail.LU);
             await _hbpoSeDetailRepository.InsertManyAsync(hbpoSeDetails);
 
             if (syncPositionFlag != null)
             {
-                syncPositionFlag.Position = jisRecords.Last().UID.ToString();
+                syncPositionFlag.Position = wmsRecords.Last().UID.ToString();
                 await _syncPositionFlagRepository.UpdateAsync(syncPositionFlag);
             }
             else
@@ -204,7 +145,7 @@ public class HBPOSeSyncAppService : ApplicationService, IInvocable //IJobService
                 syncPositionFlag = new SyncPositionFlag()
                 {
                     TableName = syncTableName,
-                    Position = jisRecords.Last().UID.ToString()
+                    Position = wmsRecords.Last().UID.ToString()
                 };
                 await _syncPositionFlagRepository.InsertAsync(syncPositionFlag);
             }

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/Syncs/JitSeSyncAppService.cs

@@ -75,7 +75,11 @@ public class JitSeSyncAppService : ApplicationService, IInvocable
         var pubSeDetails = ObjectMapper.Map<List<TM_BJBMPT_OTHER_RECORD>, List<PUB_SE_DETAIL>>(wmsSeRecords);
         if (pubSeDetails.Any())
         {
-            pubSeDetails.ForEach(t => t.BusinessType = businessType);
+            pubSeDetails.ForEach(t =>
+            {
+                t.BusinessType = businessType;
+                t.KeyCode = t.PN + t.LU;
+            });
             await _pubSeDetailRepository.InsertManyAsync(pubSeDetails);
 
             if (syncPositionFlag != null)

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/TB_RePartsRelationship_SERVICE.cs

@@ -1,3 +1,4 @@
+using DocumentFormat.OpenXml.Spreadsheet;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
@@ -14,8 +15,10 @@ using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.CommonManagers;
 using Win.Sfs.SettleAccount.Constant;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
+using Win.Sfs.SettleAccount.Entities.Prices;
 using Win.Sfs.SettleAccount.ExcelImporter;
 using Win.Sfs.SettleAccount.ExportReports;
+using Win.Sfs.SettleAccount.MaterialRelationships;
 using Win.Sfs.Shared.RepositoryBase;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ;
@@ -32,8 +35,14 @@ public class TB_RePartsRelationship_SERVICE : SettleAccountApplicationBase<TB_Re
     /// </summary>
     private readonly INormalEfCoreRepository<TB_RePartsRelationship, Guid> _repository;
 
+    /// <summary>
+    /// 客户零件关系仓储
+    /// </summary>
+    private readonly INormalEfCoreRepository<MaterialRelationship, Guid> _materialRelationshipRepository;
+
     public TB_RePartsRelationship_SERVICE(
         INormalEfCoreRepository<TB_RePartsRelationship, Guid> repository,
+        INormalEfCoreRepository<MaterialRelationship, Guid> materialRelationshipRepository,
         IDistributedCache<TB_RePartsRelationship> cache,
         IExcelImportAppService excelImportService,
         ISnowflakeIdGenerator snowflakeIdGenerator,
@@ -41,6 +50,7 @@ public class TB_RePartsRelationship_SERVICE : SettleAccountApplicationBase<TB_Re
     ) : base(cache, excelImportService, snowflakeIdGenerator, commonManager)
     {
         _repository = repository;
+        _materialRelationshipRepository = materialRelationshipRepository;
     }
 
     #region 导入、导出
@@ -58,6 +68,16 @@ public class TB_RePartsRelationship_SERVICE : SettleAccountApplicationBase<TB_Re
 
         if (_ls.Count > 0)
         {
+            //导入的替换零件号
+            var tbRePartsRelationshipLus = _ls.Select(t => t.LU);
+            var haveLu = (await _materialRelationshipRepository.GetListAsync(t => tbRePartsRelationshipLus.Contains(t.SettleMaterialCode) == false)).Select(t => t.SettleMaterialCode);
+            //导入不存在的零件号
+            var exceptLus = tbRePartsRelationshipLus.Except(haveLu).ToList();
+            exceptLus.ForEach(exceptLu =>
+            {
+                checkList.Add(new ErrorExportDto(string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Empty, string.Format("客户物料号{0}不存在，无法替换", exceptLu), string.Empty));
+            });
+
             var query = from arc in _ls
                         group arc by new { arc.LU }
                         into g

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/BQ/VmiAppService.cs

@@ -8,6 +8,8 @@ using System.Linq.Dynamic.Core;
 using System.Reflection;
 using System.Threading.Tasks;
 using ClosedXML.Excel;
+using Flurl;
+using Flurl.Http;
 using InfluxDB.LineProtocol.Client;
 using Magicodes.ExporterAndImporter.Core.Extension;
 using Microsoft.AspNetCore.Authorization;
@@ -17,6 +19,7 @@ using Microsoft.EntityFrameworkCore;
 using Microsoft.EntityFrameworkCore.Infrastructure;
 using Microsoft.EntityFrameworkCore.Storage;
 using Microsoft.Extensions.Configuration;
+using Microsoft.Extensions.DependencyInjection;
 using Microsoft.OpenApi.Extensions;
 using SettleAccount.Job.SignalR;
 using Volo.Abp.Application.Dtos;
@@ -24,6 +27,7 @@ using Volo.Abp.Application.Services;
 using Volo.Abp.BlobStoring;
 using Volo.Abp.DependencyInjection;
 using Volo.Abp.Uow;
+using Volo.Abp.Validation;
 using Win.Sfs.BaseData.ImportExcelCommon;
 using Win.Sfs.SettleAccount.Entities.BQ.Dtos;
 using Win.Sfs.SettleAccount.Entities.BQ.Vmi;
@@ -70,11 +74,11 @@ public class VmiAppService : ApplicationService, IVmiService, IJobService, ITran
     }
 
     /// <summary>
-    /// 定时备份
+    /// 定时备份:0 0 8 26 * ?
     /// </summary>
     [HttpPost]
-    [UnitOfWork]
-    public virtual Task Invoke()
+    [DisableValidation]
+    public virtual async Task Invoke(IServiceProvider serviceProvider)
     {
         this._hubContext.Clients.All.ServerToClient("JobItem", "refresh", "");
         Directory.CreateDirectory(Path.Combine(Directory.GetCurrentDirectory(), "wwwroot/files/vmi"));
@@ -83,7 +87,7 @@ public class VmiAppService : ApplicationService, IVmiService, IJobService, ITran
         using var dbContext = new VmiSqliteContext(connectionString);
         if (!dbContext.GetService<IRelationalDatabaseCreator>().Exists() && dbContext.Database.EnsureCreated())
         {
-            var list = this._balanceRepository.ToList();
+            var list = await serviceProvider.GetRequiredService<SettleAccountDbContext>().Set<VmiBalance>().AsNoTracking().ToListAsync().ConfigureAwait(false);
             foreach (var item in list)
             {
                 dbContext.Set<VmiBalance>().Add(item);
@@ -93,7 +97,6 @@ public class VmiAppService : ApplicationService, IVmiService, IJobService, ITran
             this._snapshotRepository.InsertAsync(snapshot).Wait();
         }
         this._hubContext.Clients.All.ServerToClient("JobItem", "refresh", "");
-        return Task.CompletedTask;
     }
 
     /// <summary>
@@ -122,6 +125,18 @@ public class VmiAppService : ApplicationService, IVmiService, IJobService, ITran
     {
     }
 
+    /// <summary>
+    /// InfluxDB Query Test
+    /// </summary>
+    /// <param name="q"></param>
+    /// <returns></returns>
+    [HttpPost]
+    public async Task<dynamic> influxdb(string q)
+    {
+        var helper = new InfluxHelper(_cfg);
+        return await helper.GetUrl().AppendPathSegment("query").SetQueryParam("q", q).SetQueryParam("db", "vmi").GetJsonAsync().ConfigureAwait(false);
+    }
+
     /// <summary>
     /// 库存余额查询
     /// </summary>
@@ -158,8 +173,8 @@ public class VmiAppService : ApplicationService, IVmiService, IJobService, ITran
     public async Task<PagedResultDto<VmiLog>> Log(RequestDto input)
     {
         var type = typeof(VmiLog);
-        var querySql = $"select * from {typeof(VmiLog).Name} where 1=1";
-        var countSql = $"select count(*) from {typeof(VmiLog).Name} where 1=1";
+        var querySql = $"select * from {typeof(VmiLog).Name}";
+        var countSql = $"select count(*) from {typeof(VmiLog).Name}";
         var where = "";
         if (input.Filters.Any())
         {
@@ -170,16 +185,17 @@ public class VmiAppService : ApplicationService, IVmiService, IJobService, ITran
                 {
                     var @operator = GetOperator(item.Action);
                     var value = GetValue(property, item.Value);
-                    where += $" and {property.Name}{string.Format(GetOperator(item.Action), item.Value)}";
+                    where += $" {(string.IsNullOrEmpty(where) ? "where" : "and")} {property.Name}{string.Format(GetOperator(item.Action), item.Value)}";
                 }
             }
         }
         var herlper = new InfluxHelper(_cfg);
         var countResult = await herlper.Query(countSql + where).ConfigureAwait(false);
-        var count = Convert.ToInt32(countResult.results.FirstOrDefault().series.FirstOrDefault().values.FirstOrDefault().LastOrDefault());
+        var count = Convert.ToInt32(countResult.results.FirstOrDefault()?.series.FirstOrDefault()?.values.FirstOrDefault()?.LastOrDefault());
+        where += $" order by time desc limit {input.MaxResultCount} offset {input.SkipCount} ";
         var result = await herlper.Query(querySql + where).ConfigureAwait(false);
         var entities = new List<VmiLog>();
-        result.results.FirstOrDefault().series.FirstOrDefault().values.ForEach(v =>
+        result.results.FirstOrDefault()?.series.FirstOrDefault()?.values.ForEach(v =>
         {
             var entity = Activator.CreateInstance<VmiLog>();
             entities.Add(entity);
@@ -287,19 +303,6 @@ public class VmiAppService : ApplicationService, IVmiService, IJobService, ITran
         return stream.ToArray();
     }
 
-    [HttpGet]
-    public async Task<InfluxQueryResult> InfluxQueryTest(string q)
-    {
-        return await new InfluxHelper(_cfg).Query(q).ConfigureAwait(false);
-    }
-
-    [HttpGet]
-    public List<VmiLog> InfluxQueryTest2()
-    {
-        var sql = this._logRepository.Where(o => o.Category == null || o.Category == "").ToQueryString();
-        return new InfluxHelper(_cfg).Query<VmiLog>(out long total, 1, 10, o => o.Category == null || o.Category == "");
-    }
-
     [HttpGet]
     public async Task<LineProtocolWriteResult> InfluxInsertTest(string q)
     {

code/src/Modules/SettleAccount/src/SettleAccount.Application/Entities/TaskJobs/JobAppService.cs

@@ -1,135 +1,79 @@
-
-
 using System;
 using System.Collections.Generic;
-using System.IO;
-using System.Linq;
 using System.Threading.Tasks;
-using EFCore.BulkExtensions;
-using Magicodes.ExporterAndImporter.Core;
-using Magicodes.ExporterAndImporter.Excel;
 using Microsoft.AspNetCore.Authorization;
-using Microsoft.AspNetCore.Http;
 using Microsoft.AspNetCore.Mvc;
-using Microsoft.Extensions.Caching.Distributed;
-using SettleAccount.Job.Services;
-using Shouldly;
-using Volo.Abp;
-using Volo.Abp.Application.Dtos;
 using Volo.Abp.Application.Services;
-using Volo.Abp.BackgroundJobs;
-using Volo.Abp.Caching;
-using Volo.Abp.Domain.Repositories;
-using Volo.Abp.Guids;
-using Volo.Abp.ObjectMapping;
 using Volo.Abp.Uow;
-using Win.Abp.Snowflakes;
-using Win.Sfs.BaseData.ImportExcelCommon;
-using Win.Sfs.SettleAccount.CommonManagers;
-using Win.Sfs.SettleAccount.Constant;
-using Win.Sfs.SettleAccount.Entities.TaskJobs;
-using Win.Sfs.SettleAccount.ExcelImporter;
-using Win.Sfs.SettleAccount.ExportReports;
-
-using Win.Sfs.SettleAccount.MaterialRelationships;
-using Win.Sfs.Shared.CacheBase;
-using Win.Utils;
-
-namespace Win.Sfs.SettleAccount.Entities.TaskJobs
-{
-    //调整权限-派格张影导入数据时此模块她要看
-    [Authorize(SettleAccountPermissions.HQ_FPlatform.Default)]
-    //[AllowAnonymous]
-    [Route("api/settleaccount/Job")]
-    public class JobAppService: ApplicationService
-    {
-     
-        private readonly TaskJobService _service;
-        public JobAppService(TaskJobService service)
-        {
-          
-            _service = service; 
-        }
 
+namespace Win.Sfs.SettleAccount.Entities.TaskJobs;
 
-        /// <summary>
-        /// 根据筛选条件获取实体列表
-        /// </summary>
-        /// <remarks>
-        /// 请求条件包括:筛选条件列表,排序条件,数据数量,页码
-        /// </remarks>
-        /// <param name="input">请求条件</param>
-        /// <returns>实体DTO列表</returns>
-        [HttpPost]
-        [Route("list")]
-        //[Authorize(SettleAccountPermissions.Materials.Default)]
-        [UnitOfWork(false)]
-        virtual public async Task<List<JobDto>> GetListAsync(JobRequestDto input)
-        {
-
-           
-            //SettleAccount.Job.Services.Report.SettleKBWithCodeExportService
-            //switch (input.ServiceName)
-            //{
-            //    case typeof(InvoiceSettledDetailDiffExportService).FullName:
-            //        break;
-            //    case "":
-            //        break;
-            //    case "":
-            //        break;
-            //    case "":
-            //        break;
-            //}
-           
+[AllowAnonymous]
+[Route("api/settleaccount/Job")]
+public class JobAppService: ApplicationService
+{
+    private readonly TaskJobService _service;
 
-            return await  _service.GetListAsync(input);
-        }
+    public JobAppService(TaskJobService service)
+    {
+        _service = service;
+    }
 
+    /// <summary>
+    /// 根据筛选条件获取实体列表
+    /// </summary>
+    /// <remarks>
+    [HttpPost]
+    [Route("list")]
+    [UnitOfWork(false)]
+    public virtual async Task<List<JobDto>> GetListAsync(JobRequestDto input)
+    {
+        return await _service.GetListAsync(input);
+    }
 
 
-        [HttpGet]
-        [Route("{id}")]
+    [HttpGet]
+    [Route("{id}")]
 
-        //[Authorize(SettleAccountPermissions.Materials.Default)]
-        [UnitOfWork(false)]
-        virtual public async Task<List<string>> GetUploadListAsync(string id)
-        {
-            return await _service.GetUpFileListAsync(id);
-        }
+    //[Authorize(SettleAccountPermissions.Materials.Default)]
+    [UnitOfWork(false)]
+    virtual public async Task<List<string>> GetUploadListAsync(string id)
+    {
+        return await _service.GetUpFileListAsync(id);
+    }
 
 
-        [HttpPost]
-        [Route("versionlist")]
+    [HttpPost]
+    [Route("versionlist")]
 
-        [UnitOfWork(false)]
-        virtual public async Task<List<string>> GetVersionListAsync()
-        {
-            return await _service.GetVersionListAsync();
-        }
+    [UnitOfWork(false)]
+    virtual public async Task<List<string>> GetVersionListAsync()
+    {
+        return await _service.GetVersionListAsync();
+    }
 
 
-        [HttpPost]
-        [Route("delete")]
+    [HttpPost]
+    [Route("delete")]
 
-       
-        virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
-        {
-            return await _service.DeleteListAsync(ids);
-        }
+   
+    virtual public async Task<bool> DeleteListAsync(List<Guid> ids)
+    {
+        return await _service.DeleteListAsync(ids);
+    }
 
 
 
-        [HttpGet]
-        [Route("updateRemark")]
+    [HttpGet]
+    [Route("updateRemark")]
 
 
-        virtual public async Task<bool> UpdateRemarkAsync(Guid p_id,string remark)
-        {
-            return await _service.UpdateAsync(p_id,remark);
-        }
+    virtual public async Task<bool> UpdateRemarkAsync(Guid p_id,string remark)
+    {
+        return await _service.UpdateAsync(p_id,remark);
+    }
 
 
-    }
 }
 
 

code/src/Modules/SettleAccount/src/SettleAccount.Application/influxdb/InfluxHelper.cs

@@ -6,11 +6,12 @@ using System.Linq;
 using System.Linq.Dynamic.Core;
 using System.Reflection;
 using System.Threading.Tasks;
-using CodeArts.Db;
+using Flurl;
 using Flurl.Http;
 using InfluxDB.LineProtocol.Client;
 using InfluxDB.LineProtocol.Payload;
 using Microsoft.Extensions.Configuration;
+using Volo.Abp.Domain.Entities.Auditing;
 
 namespace Win.Sfs.SettleAccount.influxdb;
 
@@ -47,46 +48,24 @@ public class InfluxHelper
     {
         var influxUrl = GetUrl();
         var response = await $"{influxUrl}/query".PostUrlEncodedAsync(new { q, db = this._database }).ConfigureAwait(false);
-        if (response.StatusCode == 200)
-        {
-            var result = await response.GetJsonAsync<InfluxQueryResult>().ConfigureAwait(false);
-            return result;
-        }
-        throw new Exception($"StatusCode:{response.StatusCode}");
+        return await response.GetJsonAsync<InfluxQueryResult>().ConfigureAwait(false);
     }
 
-    private string GetUrl()
+    public string GetUrl()
     {
         return (_configuration.GetConnectionString("influxdb") ?? "http://localhost:8086").TrimEnd('/');
     }
 
-    public async Task<LineProtocolWriteResult> Insert<T>(T data)
+    public async Task<LineProtocolWriteResult> Insert<T>(T entity) where T : AuditedEntity<Guid>
     {
         var influxUrl = GetUrl();
         var client = new LineProtocolClient(new Uri(influxUrl), this._database);
         var table = typeof(T).Name;
         var payload = new LineProtocolPayload();
         var dictonary = typeof(T).GetProperties(BindingFlags.Public | BindingFlags.Instance | BindingFlags.DeclaredOnly)
-            .ToDictionary(o => o.Name, o => o.GetValue(data, null));
-        payload.Add(new LineProtocolPoint(table, dictonary));
+            .ToDictionary(o => o.Name, o => o.GetValue(entity, null));
+        payload.Add(new LineProtocolPoint(table, dictonary, new Dictionary<string, string> { { "Id", entity.Id.ToString() } }, entity.CreationTime.ToUniversalTime()));
         var result = await client.WriteAsync(payload).ConfigureAwait(false);
         return result;
     }
-
-    public List<T> Query<T>(out long total, int pageIndex, int pageSize, Func<T, bool> where) where T : class, new()
-    {
-        var influxOptions = new InfluxOptions(GetUrl(), _database, string.Empty, string.Empty);
-        var influxDbClient = influxOptions.CreateSampleInfluxClient();
-        var connectionConfig = new Influx17xConnectionConfig(influxDbClient);
-        CodeArtsHelper.InitializeBasic();
-        Influx17xHelper.InitializeCodeArts();
-        Influx17xHelper.InitializeDefaultConnectionConfig(connectionConfig);
-        var query = Influx17xHelper.CreateQuery<T>(connectionConfig, null);
-        //.Where(where);
-        //total = query.LongCount();
-        Debug.WriteLine(query.ToString());
-        total = 10;
-        var result = query.Skip(0).Take(10).ToList();
-        return result;
-    }
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/BBAC_SE_DETAIL.cs

@@ -1,5 +1,6 @@
-using SettleAccount.Bases;
+using SettleAccount.Bases;
 using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 
@@ -43,6 +44,156 @@ public class BBAC_SE_DETAIL:SE_BASE
     //[Display(Name = "Wms发货单号")]
     //public string WmsBillNum { get; set; } = null!;
 
+    /// <summary>
+    /// 单据编号
+    /// </summary>
+    [Display(Name = "单据编号")]
+    public string Num { get; set; }
+
+    /// <summary>
+    /// 发货时间
+    /// </summary>
+    [Display(Name = "发货时间")]
+    public DateTime BillTime { get; set; }
+
+    /// <summary>
+    /// 发货人
+    /// </summary>
+    [Display(Name = "发货人")]
+    public string Oper { get; set; }
+
+    /// <summary>
+    /// 排序单号
+    /// </summary>
+    [Display(Name = "排序单号")]
+    public string OrderNum { get; set; }
+
+    /// <summary>
+    /// 订单序号
+    /// </summary>
+    [Display(Name = "订单序号")]
+    public string Seq { get; set; }
+
+    /// <summary>
+    /// 实际生产码
+    /// </summary>
+    [Display(Name = "实际生产码")]
+    public string RealCode { get; set; }
+
+    /// <summary>
+    /// 订单生产码
+    /// </summary>
+    [Display(Name = "订单生产码")]
+    public string VinCode { get; set; }
+
+    /// <summary>
+    /// 生产码类型
+    /// </summary>
+    [Display(Name = "生产码类型")]
+    public string CodeType { get; set; }
+
+    /// <summary>
+    /// 实际零件号
+    /// </summary>
+    [Display(Name = "实际零件号")]
+    public string RealPartCode { get; set; }
+
+    /// <summary>
+    /// 零件号
+    /// </summary>
+    [Display(Name = "零件号")]
+    public string PartCode { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Batch { get; set; }
+
+    /// <summary>
+    /// MES配置码
+    /// </summary>
+    [Display(Name = "MES配置码")]
+    public string MESConfigCode { get; set; }
+
+    /// <summary>
+    /// 来源库位
+    /// </summary>
+    [Display(Name = "来源库位")]
+    public string FromLoc { get; set; }
+
+    /// <summary>
+    /// 目标库位
+    /// </summary>
+    [Display(Name = "目标库位")]
+    public string ToLoc { get; set; }
+
+    /// <summary>
+    /// 参照订单生产码
+    /// </summary>
+    [Display(Name = "参照订单生产码")]
+    public string RefVinCode { get; set; }
+
+    /// <summary>
+    /// 单据性质
+    /// </summary>
+    [Display(Name = "单据性质")]
+    public string BillCharacter { get; set; }
+
+    /// <summary>
+    /// 发货关联单号
+    /// </summary>
+    [Display(Name = "发货关联单号")]
+    public string RefBillNum { get; set; }
+
+    /// <summary>
+    /// Erp目标库位
+    /// </summary>
+    [Display(Name = "Erp目标库位")]
+    public string ErpToLoc { get; set; }
+
+    /// <summary>
+    /// 原生产码
+    /// </summary>
+    [Display(Name = "原生产码")]
+    public string OrigiCode { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [Display(Name = "备注")]
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 塑件唯一码
+    /// </summary>
+    [Display(Name = "塑件唯一码")]
+    public string UniqueCode { get; set; }
+
+    /// <summary>
+    /// PJS顺序号
+    /// </summary>
+    [Display(Name = "PJS顺序号")]
+    public string PjsNum { get; set; }
+
+    /// <summary>
+    /// 虚拟小总成
+    /// </summary>
+    [Display(Name = "虚拟小总成")]
+    public string MatchNumber { get; set; }
+
+    /// <summary>
+    /// 发货条码
+    /// </summary>
+    [Display(Name = "发货条码")]
+    public string DeliverCode { get; set; }
+
+    /// <summary>
+    /// 客户位置
+    /// </summary>
+    [Display(Name = "客户位置")]
+    public string Position { get; set; }
+
     public BBAC_SE_DETAIL(Guid guid,   string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate, DateTime shippingDate, string wmsBillNum)
     {
         Id= guid;

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/HBPO_SE_DETAIL.cs

@@ -1,5 +1,6 @@
-using SettleAccount.Bases;
+using SettleAccount.Bases;
 using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 
 
@@ -42,6 +43,156 @@ public class HBPO_SE_DETAIL :SE_BASE
     //[Display(Name = "Wms发货单号")]
     //public string WmsBillNum { get; set; } = null!;
 
+    /// <summary>
+    /// 单据编号
+    /// </summary>
+    [Display(Name = "单据编号")]
+    public string Num { get; set; }
+
+    /// <summary>
+    /// 发货时间
+    /// </summary>
+    [Display(Name = "发货时间")]
+    public DateTime BillTime { get; set; }
+
+    /// <summary>
+    /// 发货人
+    /// </summary>
+    [Display(Name = "发货人")]
+    public string Oper { get; set; }
+
+    /// <summary>
+    /// 排序单号
+    /// </summary>
+    [Display(Name = "排序单号")]
+    public string OrderNum { get; set; }
+
+    /// <summary>
+    /// 订单序号
+    /// </summary>
+    [Display(Name = "订单序号")]
+    public string Seq { get; set; }
+
+    /// <summary>
+    /// 实际生产码
+    /// </summary>
+    [Display(Name = "实际生产码")]
+    public string RealCode { get; set; }
+
+    /// <summary>
+    /// 订单生产码
+    /// </summary>
+    [Display(Name = "订单生产码")]
+    public string VinCode { get; set; }
+
+    /// <summary>
+    /// 生产码类型
+    /// </summary>
+    [Display(Name = "生产码类型")]
+    public string CodeType { get; set; }
+
+    /// <summary>
+    /// 实际零件号
+    /// </summary>
+    [Display(Name = "实际零件号")]
+    public string RealPartCode { get; set; }
+
+    /// <summary>
+    /// 零件号
+    /// </summary>
+    [Display(Name = "零件号")]
+    public string PartCode { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Batch { get; set; }
+
+    /// <summary>
+    /// MES配置码
+    /// </summary>
+    [Display(Name = "MES配置码")]
+    public string MESConfigCode { get; set; }
+
+    /// <summary>
+    /// 来源库位
+    /// </summary>
+    [Display(Name = "来源库位")]
+    public string FromLoc { get; set; }
+
+    /// <summary>
+    /// 目标库位
+    /// </summary>
+    [Display(Name = "目标库位")]
+    public string ToLoc { get; set; }
+
+    /// <summary>
+    /// 参照订单生产码
+    /// </summary>
+    [Display(Name = "参照订单生产码")]
+    public string RefVinCode { get; set; }
+
+    /// <summary>
+    /// 单据性质
+    /// </summary>
+    [Display(Name = "单据性质")]
+    public string BillCharacter { get; set; }
+
+    /// <summary>
+    /// 发货关联单号
+    /// </summary>
+    [Display(Name = "发货关联单号")]
+    public string RefBillNum { get; set; }
+
+    /// <summary>
+    /// Erp目标库位
+    /// </summary>
+    [Display(Name = "Erp目标库位")]
+    public string ErpToLoc { get; set; }
+
+    /// <summary>
+    /// 原生产码
+    /// </summary>
+    [Display(Name = "原生产码")]
+    public string OrigiCode { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [Display(Name = "备注")]
+    public string Remark { get; set; }
+
+    /// <summary>
+    /// 塑件唯一码
+    /// </summary>
+    [Display(Name = "塑件唯一码")]
+    public string UniqueCode { get; set; }
+
+    /// <summary>
+    /// PJS顺序号
+    /// </summary>
+    [Display(Name = "PJS顺序号")]
+    public string PjsNum { get; set; }
+
+    /// <summary>
+    /// 虚拟小总成
+    /// </summary>
+    [Display(Name = "虚拟小总成")]
+    public string MatchNumber { get; set; }
+
+    /// <summary>
+    /// 发货条码
+    /// </summary>
+    [Display(Name = "发货条码")]
+    public string DeliverCode { get; set; }
+
+    /// <summary>
+    /// 客户位置
+    /// </summary>
+    [Display(Name = "客户位置")]
+    public string Position { get; set; }
+
     public HBPO_SE_DETAIL(Guid guid, string keyCode, int version, string lU, string pN, string seqNumber, string assemblyCode, string injectionCode, decimal qty, DateTime beginDate, DateTime shippingDate, string wmsBillNum)
     {
         this.Id = guid;

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/PUB_SE_DETAIL.cs

@@ -1,5 +1,6 @@
-using SettleAccount.Bases;
+using SettleAccount.Bases;
 using System;
+using System.ComponentModel;
 using System.ComponentModel.DataAnnotations;
 using Win.Sfs.SettleAccount;
 
@@ -32,7 +33,7 @@ public class PUB_SE_DETAIL :SE_BASE
     public string Extend3 { get; set; } = null!;
 
     /// <summary>
-    /// 1、JIT 2、买单件  3、备件 3、印度件
+    /// 业务分类
     /// </summary>
     [Display(Name = "业务分类")]
     public EnumBusinessType BusinessType { get; set; }
@@ -46,6 +47,109 @@ public class PUB_SE_DETAIL :SE_BASE
     //[Display(Name = "Wms发货单号")]
     //public string WmsBillNum { get; set; } = null!;
 
+
+    /// <summary>
+    /// 发货时间
+    /// </summary>
+    [Display(Name = "发货时间")]
+    public DateTime BillTime { get; set; }
+
+    /// <summary>
+    /// 零件号
+    /// </summary>
+    [Display(Name = "零件号")]
+    public string PartCode { get; set; }
+
+    /// <summary>
+    /// 批次
+    /// </summary>
+    [Display(Name = "批次")]
+    public string Batch { get; set; }
+
+    /// <summary>
+    /// 发货人
+    /// </summary>
+    [Display(Name = "发货人")]
+    public string Oper { get; set; }
+
+    /// <summary>
+    /// DN单据号
+    /// </summary>
+    [Display(Name = "DN单据号")]
+    public string DnBillNum { get; set; }
+
+    /// <summary>
+    /// DN单据时间
+    /// </summary>
+    [Display(Name = "DN单据时间")]
+    public DateTime DnBillTime { get; set; }
+
+    /// <summary>
+    /// DN单添加人
+    /// </summary>
+    [Display(Name = "DN单添加人")]
+    public string DnOper { get; set; }
+
+    /// <summary>
+    /// 交付索引
+    /// </summary>
+    [Display(Name = "交付索引")]
+    public string DeliveryIndex { get; set; }
+
+    /// <summary>
+    /// 客户
+    /// </summary>
+    [Display(Name = "客户")]
+    public string CustId { get; set; }
+
+    /// <summary>
+    /// 发货仓库
+    /// </summary>
+    [Display(Name = "发货仓库")]
+    public string DeliveryHose { get; set; }
+
+    /// <summary>
+    /// 来源库位
+    /// </summary>
+    [Display(Name = "来源库位")]
+    public string FromLocCode { get; set; }
+
+    /// <summary>
+    /// 来源仓库
+    /// </summary>
+    [Display(Name = "来源仓库")]
+    public string FromHose { get; set; }
+
+    /// <summary>
+    /// 来源ERP库存
+    /// </summary>
+    [Display(Name = "来源ERP库存")]
+    public string FromErpLocCode { get; set; }
+
+    /// <summary>
+    /// 目标库位
+    /// </summary>
+    [Display(Name = "目标库位")]
+    public string ToLocCode { get; set; }
+
+    /// <summary>
+    /// 目标Erp库位
+    /// </summary>
+    [Display(Name = "目标Erp库位")]
+    public string ToErpLocCode { get; set; }
+
+    /// <summary>
+    /// 目标仓库
+    /// </summary>
+    [Display(Name = "目标仓库")]
+    public string ToHose { get; set; }
+
+    /// <summary>
+    /// 备注
+    /// </summary>
+    [Display(Name = "备注")]
+    public string Remark { get; set; }
+
     public PUB_SE_DETAIL(Guid guid,  string keyCode, int version, string lU, string pN, decimal qty, string extend1, string extend2, string extend3, EnumBusinessType businessType, DateTime beginDate, DateTime shippingDate, string wmsBillNum)
     {
         Id=guid;

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/IJobService.cs

@@ -1,8 +1,9 @@
+using System;
 using System.Threading.Tasks;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi;
 
 public interface IJobService
 {
-    Task Invoke();
+    Task Invoke(IServiceProvider serviceProvider);
 }

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/BQ/Vmi/VmiLog.cs

@@ -1,13 +1,13 @@
 using System;
 using System.ComponentModel.DataAnnotations;
-using Volo.Abp.Domain.Entities;
+using Volo.Abp.Domain.Entities.Auditing;
 
 namespace Win.Sfs.SettleAccount.Entities.BQ.Vmi;
 
 /// <summary>
 /// 寄售库存操作记录
 /// </summary>
-public class VmiLog : Entity<Guid>
+public class VmiLog : AuditedEntity<Guid>
 {
     /// <summary>
     /// 批量操作Id

code/src/Modules/SettleAccount/src/SettleAccount.Domain/Entities/Prices/PriceListManager.cs

@@ -96,6 +96,13 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
                          where item1.Price != item2.Price && item1.BeginTime == item2.BeginTime && item1.EndTime == item1.EndTime
                          select new PriceList(item2.Id, item2.LU, item1.Price, item2.BeginTime, item2.EndTime, item2.ClientCode, item2.Date, item2.ContractNo);
 
+            //新日期
+            var updateNewDate = from item1 in entities
+                             join item2 in pricelist
+                             on new { item1.LU, item1.ClientCode } equals new { item2.LU, item2.ClientCode }
+                             where item1.BeginTime != item2.BeginTime || item1.EndTime != item2.EndTime
+                             select item1;
+            update = update.Concat(updateNewDate);
             if (update.Any())
             {
                 await _repository.GetDbContext().BulkUpdateAsync(update.ToList());
@@ -109,17 +116,10 @@ namespace Win.Sfs.SettleAccount.Entities.Prices
                            from item3 in temp.DefaultIfEmpty()
                            where item3 == null
                            select item1;
-            //新日期
-            var addNewDate = from item1 in entities
-                             join item2 in pricelist
-                             on new { item1.LU, item1.ClientCode } equals new { item2.LU, item2.ClientCode }
-                             where item1.BeginTime != item2.BeginTime || item1.EndTime != item2.EndTime
-                             select item1;
 
-            var add = addNewLu.Concat(addNewDate);
-            if (add.Any())
+            if (addNewLu.Any())
             {
-                await _repository.GetDbContext().BulkInsertAsync(add.ToList());
+                await _repository.GetDbContext().BulkInsertAsync(addNewLu.ToList());
             }
 
             return _errorList;

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230731014604_20230731-1.cs

@@ -0,0 +1,216 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+    public partial class _202307311 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<Guid>(
+                name: "CreatorId",
+                table: "Set_VmiLog",
+                type: "uniqueidentifier",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "LastModificationTime",
+                table: "Set_VmiLog",
+                type: "datetime2",
+                nullable: true);
+
+            migrationBuilder.AddColumn<Guid>(
+                name: "LastModifierId",
+                table: "Set_VmiLog",
+                type: "uniqueidentifier",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Batch",
+                table: "Set_PUB_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "BillTime",
+                table: "Set_PUB_SE_DETAIL",
+                type: "datetime2",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<string>(
+                name: "CustId",
+                table: "Set_PUB_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "DeliveryHose",
+                table: "Set_PUB_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "DeliveryIndex",
+                table: "Set_PUB_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "DnBillNum",
+                table: "Set_PUB_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "DnBillTime",
+                table: "Set_PUB_SE_DETAIL",
+                type: "datetime2",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<string>(
+                name: "DnOper",
+                table: "Set_PUB_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "FromErpLocCode",
+                table: "Set_PUB_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "FromHose",
+                table: "Set_PUB_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "FromLocCode",
+                table: "Set_PUB_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Oper",
+                table: "Set_PUB_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "PartCode",
+                table: "Set_PUB_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Remark",
+                table: "Set_PUB_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ToErpLocCode",
+                table: "Set_PUB_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ToHose",
+                table: "Set_PUB_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ToLocCode",
+                table: "Set_PUB_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "CreatorId",
+                table: "Set_VmiLog");
+
+            migrationBuilder.DropColumn(
+                name: "LastModificationTime",
+                table: "Set_VmiLog");
+
+            migrationBuilder.DropColumn(
+                name: "LastModifierId",
+                table: "Set_VmiLog");
+
+            migrationBuilder.DropColumn(
+                name: "Batch",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "BillTime",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "CustId",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "DeliveryHose",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "DeliveryIndex",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "DnBillNum",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "DnBillTime",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "DnOper",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "FromErpLocCode",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "FromHose",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "FromLocCode",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "Oper",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "PartCode",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "Remark",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "ToErpLocCode",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "ToHose",
+                table: "Set_PUB_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "ToLocCode",
+                table: "Set_PUB_SE_DETAIL");
+        }
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/20230731031816_20230731-2.cs

@@ -0,0 +1,516 @@
+using System;
+using Microsoft.EntityFrameworkCore.Migrations;
+
+namespace Win.Sfs.SettleAccount.Migrations
+{
+    public partial class _202307312 : Migration
+    {
+        protected override void Up(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.AddColumn<string>(
+                name: "Batch",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "BillCharacter",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "BillTime",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "datetime2",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<string>(
+                name: "CodeType",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "DeliverCode",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ErpToLoc",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "FromLoc",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "MESConfigCode",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "MatchNumber",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Num",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Oper",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "OrderNum",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "OrigiCode",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "PartCode",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "PjsNum",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Position",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RealCode",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RealPartCode",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RefBillNum",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RefVinCode",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Remark",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Seq",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ToLoc",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "UniqueCode",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "VinCode",
+                table: "Set_HBPO_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Batch",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "BillCharacter",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<DateTime>(
+                name: "BillTime",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "datetime2",
+                nullable: false,
+                defaultValue: new DateTime(1, 1, 1, 0, 0, 0, 0, DateTimeKind.Unspecified));
+
+            migrationBuilder.AddColumn<string>(
+                name: "CodeType",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "DeliverCode",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ErpToLoc",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "FromLoc",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "MESConfigCode",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "MatchNumber",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Num",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Oper",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "OrderNum",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "OrigiCode",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "PartCode",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "PjsNum",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Position",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RealCode",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RealPartCode",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RefBillNum",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "RefVinCode",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Remark",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "Seq",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "ToLoc",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "UniqueCode",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+
+            migrationBuilder.AddColumn<string>(
+                name: "VinCode",
+                table: "Set_BBAC_SE_DETAIL",
+                type: "nvarchar(max)",
+                nullable: true);
+        }
+
+        protected override void Down(MigrationBuilder migrationBuilder)
+        {
+            migrationBuilder.DropColumn(
+                name: "Batch",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "BillCharacter",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "BillTime",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "CodeType",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "DeliverCode",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "ErpToLoc",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "FromLoc",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "MESConfigCode",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "MatchNumber",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "Num",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "Oper",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "OrderNum",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "OrigiCode",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "PartCode",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "PjsNum",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "Position",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "RealCode",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "RealPartCode",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "RefBillNum",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "RefVinCode",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "Remark",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "Seq",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "ToLoc",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "UniqueCode",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "VinCode",
+                table: "Set_HBPO_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "Batch",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "BillCharacter",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "BillTime",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "CodeType",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "DeliverCode",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "ErpToLoc",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "FromLoc",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "MESConfigCode",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "MatchNumber",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "Num",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "Oper",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "OrderNum",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "OrigiCode",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "PartCode",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "PjsNum",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "Position",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "RealCode",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "RealPartCode",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "RefBillNum",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "RefVinCode",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "Remark",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "Seq",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "ToLoc",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "UniqueCode",
+                table: "Set_BBAC_SE_DETAIL");
+
+            migrationBuilder.DropColumn(
+                name: "VinCode",
+                table: "Set_BBAC_SE_DETAIL");
+        }
+    }
+}

code/src/Modules/SettleAccount/src/SettleAccount.EntityFrameworkCore/Migrations/SettleAccountDbContextModelSnapshot.cs

@@ -532,9 +532,21 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
+                    b.Property<string>("Batch")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<DateTime>("BeginDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("BillCharacter")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("BillTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CodeType")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .HasMaxLength(50)
@@ -557,10 +569,19 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasColumnType("datetime2")
                         .HasColumnName("DeletionTime");
 
+                    b.Property<string>("DeliverCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ErpToLoc")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<string>("FromLoc")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("InjectionCode")
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
@@ -587,13 +608,58 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("LastModifierId");
 
+                    b.Property<string>("MESConfigCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("MatchNumber")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Num")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Oper")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("OrderNum")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("OrigiCode")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("PN")
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
+                    b.Property<string>("PartCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("PjsNum")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Position")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<decimal>("Qty")
                         .HasColumnType("decimal(18,2)");
 
+                    b.Property<string>("RealCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RealPartCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RefBillNum")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RefVinCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Seq")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("SeqNumber")
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
@@ -601,9 +667,18 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.Property<DateTime>("ShippingDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("ToLoc")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UniqueCode")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<int>("Version")
                         .HasColumnType("int");
 
+                    b.Property<string>("VinCode")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("WmsBillNum")
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
@@ -1507,9 +1582,21 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
+                    b.Property<string>("Batch")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<DateTime>("BeginDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("BillCharacter")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("BillTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("CodeType")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("ConcurrencyStamp")
                         .IsConcurrencyToken()
                         .HasMaxLength(50)
@@ -1532,10 +1619,19 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasColumnType("datetime2")
                         .HasColumnName("DeletionTime");
 
+                    b.Property<string>("DeliverCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ErpToLoc")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("ExtraProperties")
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<string>("FromLoc")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("InjectionCode")
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
@@ -1562,13 +1658,58 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("LastModifierId");
 
+                    b.Property<string>("MESConfigCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("MatchNumber")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Num")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Oper")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("OrderNum")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("OrigiCode")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("PN")
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
+                    b.Property<string>("PartCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("PjsNum")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Position")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<decimal>("Qty")
                         .HasColumnType("decimal(18,2)");
 
+                    b.Property<string>("RealCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RealPartCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RefBillNum")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("RefVinCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Remark")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("Seq")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("SeqNumber")
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
@@ -1576,9 +1717,18 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.Property<DateTime>("ShippingDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("ToLoc")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("UniqueCode")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<int>("Version")
                         .HasColumnType("int");
 
+                    b.Property<string>("VinCode")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("WmsBillNum")
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
@@ -2977,9 +3127,15 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .ValueGeneratedOnAdd()
                         .HasColumnType("uniqueidentifier");
 
+                    b.Property<string>("Batch")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<DateTime>("BeginDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<DateTime>("BillTime")
+                        .HasColumnType("datetime2");
+
                     b.Property<int>("BusinessType")
                         .HasMaxLength(50)
                         .HasColumnType("int");
@@ -2998,6 +3154,9 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("CreatorId");
 
+                    b.Property<string>("CustId")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<Guid?>("DeleterId")
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("DeleterId");
@@ -3006,6 +3165,21 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasColumnType("datetime2")
                         .HasColumnName("DeletionTime");
 
+                    b.Property<string>("DeliveryHose")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DeliveryIndex")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("DnBillNum")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<DateTime>("DnBillTime")
+                        .HasColumnType("datetime2");
+
+                    b.Property<string>("DnOper")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("Extend1")
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
@@ -3022,6 +3196,15 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasColumnType("nvarchar(max)")
                         .HasColumnName("ExtraProperties");
 
+                    b.Property<string>("FromErpLocCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("FromHose")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("FromLocCode")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<bool>("IsDeleted")
                         .ValueGeneratedOnAdd()
                         .HasColumnType("bit")
@@ -3044,16 +3227,34 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasColumnType("uniqueidentifier")
                         .HasColumnName("LastModifierId");
 
+                    b.Property<string>("Oper")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<string>("PN")
                         .HasMaxLength(50)
                         .HasColumnType("nvarchar(50)");
 
+                    b.Property<string>("PartCode")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<decimal>("Qty")
                         .HasColumnType("decimal(18,2)");
 
+                    b.Property<string>("Remark")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<DateTime>("ShippingDate")
                         .HasColumnType("datetime2");
 
+                    b.Property<string>("ToErpLocCode")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ToHose")
+                        .HasColumnType("nvarchar(max)");
+
+                    b.Property<string>("ToLocCode")
+                        .HasColumnType("nvarchar(max)");
+
                     b.Property<int>("Version")
                         .HasColumnType("int");
 
@@ -3931,7 +4132,12 @@ namespace Win.Sfs.SettleAccount.Migrations
                         .HasColumnType("datetime2");
 
                     b.Property<DateTime>("CreationTime")
-                        .HasColumnType("datetime2");
+                        .HasColumnType("datetime2")
+                        .HasColumnName("CreationTime");
+
+                    b.Property<Guid?>("CreatorId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("CreatorId");
 
                     b.Property<string>("Desc")
                         .HasColumnType("nvarchar(max)");
@@ -3963,6 +4169,14 @@ namespace Win.Sfs.SettleAccount.Migrations
                     b.Property<string>("LU")
                         .HasColumnType("nvarchar(max)");
 
+                    b.Property<DateTime?>("LastModificationTime")
+                        .HasColumnType("datetime2")
+                        .HasColumnName("LastModificationTime");
+
+                    b.Property<Guid?>("LastModifierId")
+                        .HasColumnType("uniqueidentifier")
+                        .HasColumnName("LastModifierId");
+
                     b.Property<string>("MatchNumber")
                         .HasColumnType("nvarchar(max)");