更新版本

src/Modules/BaseService/BaseService.Host/appsettings.json

@@ -7,7 +7,7 @@
     "CorsOrigins": "http://localhost:9527,http://localhost:9528"
   },
   "ConnectionStrings": {
-    "Default": "Server=192.168.0.213;Database=ABP;User ID=sa;Password=Microsoft@2021;"
+    "Default": "Server=192.168.0.140;Database=ABP;user id=sa;Password=Microsoft2008"
     // "Default": "Server=LAPTOP-V3U07C2O;Database=ABP;User ID=sa;Password=1q2w!@#;"
     //"Default": "Server=114.116.225.148,13314;Database=ABP;User ID=sa;Password=Microsoft2020;"
   },

src/Modules/SettleAccount/NuGet.Config

@@ -1,6 +1,3 @@
-<?xml version="1.0" encoding="utf-8"?>
+<?xml version="1.0" encoding="utf-8"?>
 <configuration>
-  <packageSources>
-    <add key="BlazoriseMyGet" value="https://www.myget.org/F/blazorise/api/v3/index.json" />
-  </packageSources>
 </configuration>

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

@@ -1,779 +0,0 @@
-2021-12-01 08:25:03.736 G Execution BackgroundServerProcess is still in the Failed state for 11:47:22.5715963 due to an exception, will be retried no more than in 00:00:15
-System.Data.SqlClient.SqlException (0x80131904): A network-related or instance-specific error occurred while establishing a connection to SQL Server. The server was not found or was not accessible. Verify that the instance name is correct and that SQL Server is configured to allow remote connections. (provider: Named Pipes Provider, error: 40 - Could not open a connection to SQL Server)
- ---> System.ComponentModel.Win32Exception (53): 找不到网络路径。
-   at System.Data.SqlClient.SqlInternalConnectionTds..ctor(DbConnectionPoolIdentity identity, SqlConnectionString connectionOptions, SqlCredential credential, Object providerInfo, String newPassword, SecureString newSecurePassword, Boolean redirectedUserInstance, SqlConnectionString userConnectionOptions, SessionData reconnectSessionData, Boolean applyTransientFaultHandling, String accessToken)
-   at System.Data.SqlClient.SqlConnectionFactory.CreateConnection(DbConnectionOptions options, DbConnectionPoolKey poolKey, Object poolGroupProviderInfo, DbConnectionPool pool, DbConnection owningConnection, DbConnectionOptions userOptions)
-   at System.Data.ProviderBase.DbConnectionFactory.CreatePooledConnection(DbConnectionPool pool, DbConnection owningObject, DbConnectionOptions options, DbConnectionPoolKey poolKey, DbConnectionOptions userOptions)
-   at System.Data.ProviderBase.DbConnectionPool.CreateObject(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
-   at System.Data.ProviderBase.DbConnectionPool.UserCreateRequest(DbConnection owningObject, DbConnectionOptions userOptions, DbConnectionInternal oldConnection)
-   at System.Data.ProviderBase.DbConnectionPool.TryGetConnection(DbConnection owningObject, UInt32 waitForMultipleObjectsTimeout, Boolean allowCreate, Boolean onlyOneCheckConnection, DbConnectionOptions userOptions, DbConnectionInternal& connection)
-   at System.Data.ProviderBase.DbConnectionPool.TryGetConnection(DbConnection owningObject, TaskCompletionSource`1 retry, DbConnectionOptions userOptions, DbConnectionInternal& connection)
-   at System.Data.ProviderBase.DbConnectionFactory.TryGetConnection(DbConnection owningConnection, TaskCompletionSource`1 retry, DbConnectionOptions userOptions, DbConnectionInternal oldConnection, DbConnectionInternal& connection)
-   at System.Data.ProviderBase.DbConnectionInternal.TryOpenConnectionInternal(DbConnection outerConnection, DbConnectionFactory connectionFactory, TaskCompletionSource`1 retry, DbConnectionOptions userOptions)
-   at System.Data.SqlClient.SqlConnection.TryOpen(TaskCompletionSource`1 retry)
-   at System.Data.SqlClient.SqlConnection.Open()
-   at Hangfire.SqlServer.SqlServerStorage.CreateAndOpenConnection()
-   at Hangfire.SqlServer.SqlServerStorage.UseConnection[T](DbConnection dedicatedConnection, Func`2 func)
-   at Hangfire.SqlServer.SqlServerStorage.UseConnection(DbConnection dedicatedConnection, Action`1 action)
-   at Hangfire.SqlServer.SqlServerConnection.AnnounceServer(String serverId, ServerContext context)
-   at Hangfire.Server.BackgroundServerProcess.CreateServer(BackgroundServerContext context)
-   at Hangfire.Server.BackgroundServerProcess.Execute(Guid executionId, BackgroundExecution execution, CancellationToken stoppingToken, CancellationToken stoppedToken, CancellationToken shutdownToken)
-   at Hangfire.Server.BackgroundProcessingServer.RunServer(Guid executionId, Object state)
-   at Hangfire.Processing.BackgroundExecution.Run(Action`2 callback, Object state)
-ClientConnectionId:00000000-0000-0000-0000-000000000000
-Error Number:53,State:0,Class:20
-2021-12-01 08:25:07.522 G Server sk-20210819huao:18204:2c5db9ff successfully announced in 41966266.1643 ms
-2021-12-01 08:25:07.525 G Server sk-20210819huao:18204:2c5db9ff is starting the registered dispatchers: ServerWatchdog, ServerJobCancellationWatcher, ExpirationManager, CountersAggregator, Worker, DelayedJobScheduler, RecurringJobScheduler...
-2021-12-01 08:25:07.610 G Server sk-20210819huao:18204:2c5db9ff all the dispatchers started
-2021-12-01 08:25:07.615 G Execution BackgroundServerProcess recovered from the Failed state after 11:48:48.8099556 and is in the Running state now
-2021-12-01 08:25:07.652 G 2 servers were removed due to timeout
-2021-12-01 08:25:18.844 G Server sk-20210819huao:18204:fb638a6f successfully announced in 28.0588 ms
-2021-12-01 08:25:18.846 G Server sk-20210819huao:18204:fb638a6f is starting the registered dispatchers: ServerWatchdog, ServerJobCancellationWatcher, ExpirationManager, CountersAggregator, Worker, DelayedJobScheduler, RecurringJobScheduler...
-2021-12-01 08:25:18.931 G Server sk-20210819huao:18204:fb638a6f all the dispatchers started
-2021-12-01 08:25:18.938 G Execution BackgroundServerProcess recovered from the Failed state after 11:47:37.7742454 and is in the Running state now
-2021-12-01 08:40:36.547 G Starting web host.
-2021-12-01 08:40:43.823 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.
-2021-12-01 08:40:45.558 G Loaded ABP modules:
-2021-12-01 08:40:45.560 G - Win.Sfs.SettleAccount.SettleAccountHttpApiHostModule
-2021-12-01 08:40:45.561 G   - Win.Sfs.SettleAccount.SettleAccountApplicationModule
-2021-12-01 08:40:45.561 G     - Win.Sfs.SettleAccount.SettleAccountJobModule
-2021-12-01 08:40:45.562 G       - Win.Sfs.SettleAccount.SettleAccountDomainModule
-2021-12-01 08:40:45.562 G         - Volo.Abp.Domain.AbpDddDomainModule
-2021-12-01 08:40:45.563 G           - Volo.Abp.Auditing.AbpAuditingModule
-2021-12-01 08:40:45.563 G             - Volo.Abp.Data.AbpDataModule
-2021-12-01 08:40:45.563 G               - Volo.Abp.ObjectExtending.AbpObjectExtendingModule
-2021-12-01 08:40:45.564 G                 - Volo.Abp.Localization.AbpLocalizationAbstractionsModule
-2021-12-01 08:40:45.564 G                 - Volo.Abp.Validation.AbpValidationAbstractionsModule
-2021-12-01 08:40:45.565 G               - Volo.Abp.Uow.AbpUnitOfWorkModule
-2021-12-01 08:40:45.565 G               - Volo.Abp.EventBus.Abstractions.AbpEventBusAbstractionsModule
-2021-12-01 08:40:45.565 G             - Volo.Abp.Json.AbpJsonModule
-2021-12-01 08:40:45.566 G               - Volo.Abp.Timing.AbpTimingModule
-2021-12-01 08:40:45.566 G                 - Volo.Abp.Localization.AbpLocalizationModule
-2021-12-01 08:40:45.567 G                   - Volo.Abp.VirtualFileSystem.AbpVirtualFileSystemModule
-2021-12-01 08:40:45.567 G                   - Volo.Abp.Settings.AbpSettingsModule
-2021-12-01 08:40:45.567 G                     - Volo.Abp.Security.AbpSecurityModule
-2021-12-01 08:40:45.568 G                     - Volo.Abp.MultiTenancy.AbpMultiTenancyModule
-2021-12-01 08:40:45.568 G             - Volo.Abp.Threading.AbpThreadingModule
-2021-12-01 08:40:45.569 G           - Volo.Abp.EventBus.AbpEventBusModule
-2021-12-01 08:40:45.569 G           - Volo.Abp.Guids.AbpGuidsModule
-2021-12-01 08:40:45.569 G           - Volo.Abp.ObjectMapping.AbpObjectMappingModule
-2021-12-01 08:40:45.570 G           - Volo.Abp.ExceptionHandling.AbpExceptionHandlingModule
-2021-12-01 08:40:45.570 G           - Volo.Abp.Specifications.AbpSpecificationsModule
-2021-12-01 08:40:45.571 G         - Win.Sfs.SettleAccount.SettleAccountDomainSharedModule
-2021-12-01 08:40:45.571 G           - Volo.Abp.Validation.AbpValidationModule
-2021-12-01 08:40:45.571 G       - Win.Sfs.SettleAccount.SettleAccountApplicationContractsModule
-2021-12-01 08:40:45.572 G         - Volo.Abp.Application.AbpDddApplicationContractsModule
-2021-12-01 08:40:45.572 G         - Volo.Abp.Authorization.AbpAuthorizationModule
-2021-12-01 08:40:45.573 G           - Volo.Abp.Authorization.AbpAuthorizationAbstractionsModule
-2021-12-01 08:40:45.573 G       - Volo.Abp.AutoMapper.AbpAutoMapperModule
-2021-12-01 08:40:45.574 G       - Volo.Abp.Dapper.AbpDapperModule
-2021-12-01 08:40:45.574 G         - Volo.Abp.EntityFrameworkCore.AbpEntityFrameworkCoreModule
-2021-12-01 08:40:45.577 G     - Win.Abp.Snowflakes.AbpSnowflakeGeneratorModule
-2021-12-01 08:40:45.579 G     - Volo.Abp.Http.Client.IdentityModel.AbpHttpClientIdentityModelModule
-2021-12-01 08:40:45.579 G       - Volo.Abp.Http.Client.AbpHttpClientModule
-2021-12-01 08:40:45.579 G         - Volo.Abp.Http.AbpHttpModule
-2021-12-01 08:40:45.580 G           - Volo.Abp.Http.AbpHttpAbstractionsModule
-2021-12-01 08:40:45.580 G           - Volo.Abp.Minify.AbpMinifyModule
-2021-12-01 08:40:45.581 G         - Volo.Abp.Castle.AbpCastleCoreModule
-2021-12-01 08:40:45.582 G       - Volo.Abp.IdentityModel.AbpIdentityModelModule
-2021-12-01 08:40:45.582 G         - Volo.Abp.Caching.AbpCachingModule
-2021-12-01 08:40:45.583 G           - Volo.Abp.Serialization.AbpSerializationModule
-2021-12-01 08:40:45.584 G     - Volo.Abp.Identity.AbpIdentityHttpApiClientModule
-2021-12-01 08:40:45.585 G       - Volo.Abp.Identity.AbpIdentityApplicationContractsModule
-2021-12-01 08:40:45.585 G         - Volo.Abp.Identity.AbpIdentityDomainSharedModule
-2021-12-01 08:40:45.586 G           - Volo.Abp.Users.AbpUsersDomainSharedModule
-2021-12-01 08:40:45.587 G           - Volo.Abp.Features.AbpFeaturesModule
-2021-12-01 08:40:45.588 G         - Volo.Abp.Users.AbpUsersAbstractionModule
-2021-12-01 08:40:45.589 G         - Volo.Abp.Application.AbpDddApplicationModule
-2021-12-01 08:40:45.593 G           - Volo.Abp.GlobalFeatures.AbpGlobalFeaturesModule
-2021-12-01 08:40:45.596 G         - Volo.Abp.PermissionManagement.AbpPermissionManagementApplicationContractsModule
-2021-12-01 08:40:45.597 G           - Volo.Abp.PermissionManagement.AbpPermissionManagementDomainSharedModule
-2021-12-01 08:40:45.598 G     - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcModule
-2021-12-01 08:40:45.598 G       - Volo.Abp.AspNetCore.AbpAspNetCoreModule
-2021-12-01 08:40:45.599 G       - Volo.Abp.ApiVersioning.AbpApiVersioningAbstractionsModule
-2021-12-01 08:40:45.600 G       - Volo.Abp.AspNetCore.Mvc.AbpAspNetCoreMvcContractsModule
-2021-12-01 08:40:45.601 G       - Volo.Abp.UI.Navigation.AbpUiNavigationModule
-2021-12-01 08:40:45.602 G         - Volo.Abp.UI.AbpUiModule
-2021-12-01 08:40:45.602 G   - Win.Sfs.SettleAccount.SettleAccountEntityFrameworkCoreModule
-2021-12-01 08:40:45.603 G     - Volo.Abp.PermissionManagement.EntityFrameworkCore.AbpPermissionManagementEntityFrameworkCoreModule
-2021-12-01 08:40:45.604 G       - Volo.Abp.PermissionManagement.AbpPermissionManagementDomainModule
-2021-12-01 08:40:45.605 G     - Volo.Abp.SettingManagement.EntityFrameworkCore.AbpSettingManagementEntityFrameworkCoreModule
-2021-12-01 08:40:45.610 G       - Volo.Abp.SettingManagement.AbpSettingManagementDomainModule
-2021-12-01 08:40:45.612 G         - Volo.Abp.SettingManagement.AbpSettingManagementDomainSharedModule
-2021-12-01 08:40:45.613 G     - Volo.Abp.AuditLogging.EntityFrameworkCore.AbpAuditLoggingEntityFrameworkCoreModule
-2021-12-01 08:40:45.614 G       - Volo.Abp.AuditLogging.AbpAuditLoggingDomainModule
-2021-12-01 08:40:45.614 G         - Volo.Abp.AuditLogging.AbpAuditLoggingDomainSharedModule
-2021-12-01 08:40:45.615 G     - Volo.Abp.TenantManagement.EntityFrameworkCore.AbpTenantManagementEntityFrameworkCoreModule
-2021-12-01 08:40:45.616 G       - Volo.Abp.TenantManagement.AbpTenantManagementDomainModule
-2021-12-01 08:40:45.617 G         - Volo.Abp.TenantManagement.AbpTenantManagementDomainSharedModule
-2021-12-01 08:40:45.618 G   - Win.Sfs.SettleAccount.SettleAccountHttpApiModule
-2021-12-01 08:40:45.618 G   - Volo.Abp.Autofac.AbpAutofacModule
-2021-12-01 08:40:45.619 G   - Volo.Abp.EntityFrameworkCore.SqlServer.AbpEntityFrameworkCoreSqlServerModule
-2021-12-01 08:40:45.620 G   - Volo.Abp.AspNetCore.Serilog.AbpAspNetCoreSerilogModule
-2021-12-01 08:40:45.621 G   - Volo.Abp.BlobStoring.AbpBlobStoringModule
-2021-12-01 08:40:45.624 G   - Volo.Abp.BlobStoring.FileSystem.AbpBlobStoringFileSystemModule
-2021-12-01 08:40:45.628 G   - Volo.Abp.BackgroundJobs.Hangfire.AbpBackgroundJobsHangfireModule
-2021-12-01 08:40:45.629 G     - Volo.Abp.BackgroundJobs.AbpBackgroundJobsAbstractionsModule
-2021-12-01 08:40:45.629 G     - Volo.Abp.Hangfire.AbpHangfireModule
-2021-12-01 08:40:45.697 G Start installing Hangfire SQL objects...
-2021-12-01 08:40:45.900 G Hangfire SQL objects installed.
-2021-12-01 08:40:45.911 G Starting Hangfire Server using job storage: 'SQL Server: 192.168.0.140@SettleAccountService'
-2021-12-01 08:40:45.912 G Using the following options for SQL Server job storage: Queue poll interval: 00:00:15.
-2021-12-01 08:40:45.913 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
-2021-12-01 08:40:45.964 G Starting Hangfire Server using job storage: 'SQL Server: 192.168.0.140@SettleAccountService'
-2021-12-01 08:40:45.966 G Using the following options for SQL Server job storage: Queue poll interval: 00:00:15.
-2021-12-01 08:40:45.966 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
-2021-12-01 08:40:46.248 G Server sk-20210819huao:16904:261a6ec0 successfully announced in 303.5335 ms
-2021-12-01 08:40:46.256 G Server sk-20210819huao:16904:5f78c42e successfully announced in 278.3355 ms
-2021-12-01 08:40:46.257 G Server sk-20210819huao:16904:261a6ec0 is starting the registered dispatchers: ServerWatchdog, ServerJobCancellationWatcher, ExpirationManager, CountersAggregator, Worker, DelayedJobScheduler, RecurringJobScheduler...
-2021-12-01 08:40:46.257 G Server sk-20210819huao:16904:5f78c42e is starting the registered dispatchers: ServerWatchdog, ServerJobCancellationWatcher, ExpirationManager, CountersAggregator, Worker, DelayedJobScheduler, RecurringJobScheduler...
-2021-12-01 08:40:46.473 G Server sk-20210819huao:16904:261a6ec0 all the dispatchers started
-2021-12-01 08:40:46.485 G Server sk-20210819huao:16904:5f78c42e all the dispatchers started
-2021-12-01 08:40:47.967 G Entity Framework Core "5.0.8" initialized '"PermissionManagementDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery "
-2021-12-01 08:40:48.532 G Executed DbCommand ("66"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]"
-2021-12-01 08:40:48.679 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]"
-2021-12-01 08:40:48.687 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]"
-2021-12-01 08:40:48.696 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]"
-2021-12-01 08:40:48.708 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]"
-2021-12-01 08:40:48.718 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]"
-2021-12-01 08:40:48.727 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]"
-2021-12-01 08:40:48.734 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]"
-2021-12-01 08:40:48.743 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]"
-2021-12-01 08:40:48.750 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]"
-2021-12-01 08:40:48.759 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]"
-2021-12-01 08:40:48.765 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]"
-2021-12-01 08:40:48.775 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]"
-2021-12-01 08:40:48.782 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]"
-2021-12-01 08:40:48.790 G Executed DbCommand ("3"ms) [Parameters=["@__ef_filter__p_0='?' (DbType = Boolean), @__name_0='?' (Size = 128), @__providerName_1='?' (Size = 64), @__providerKey_2='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
-""SELECT TOP(1) [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[TenantId]
-FROM [AbpPermissionGrants] AS [a]
-WHERE ((@__ef_filter__p_0 = CAST(1 AS bit)) OR [a].[TenantId] IS NULL) AND ((([a].[Name] = @__name_0) AND ([a].[ProviderName] = @__providerName_1)) AND ([a].[ProviderKey] = @__providerKey_2))
-ORDER BY [a].[Id]"
-2021-12-01 08:40:48.800 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]"
-2021-12-01 08:40:48.807 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]"
-2021-12-01 08:40:48.814 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]"
-2021-12-01 08:40:48.822 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]"
-2021-12-01 08:40:48.833 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]"
-2021-12-01 08:40:48.845 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]"
-2021-12-01 08:40:48.855 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]"
-2021-12-01 08:40:48.864 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]"
-2021-12-01 08:40:48.872 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]"
-2021-12-01 08:40:48.881 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]"
-2021-12-01 08:40:48.888 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]"
-2021-12-01 08:40:48.901 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]"
-2021-12-01 08:40:48.908 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]"
-2021-12-01 08:40:48.917 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]"
-2021-12-01 08:40:48.924 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]"
-2021-12-01 08:40:48.934 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]"
-2021-12-01 08:40:48.940 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]"
-2021-12-01 08:40:48.948 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]"
-2021-12-01 08:40:48.955 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]"
-2021-12-01 08:40:48.968 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]"
-2021-12-01 08:40:48.998 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]"
-2021-12-01 08:40:49.012 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]"
-2021-12-01 08:40:49.019 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]"
-2021-12-01 08:40:49.030 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]"
-2021-12-01 08:40:49.049 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]"
-2021-12-01 08:40:49.059 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]"
-2021-12-01 08:40:49.065 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]"
-2021-12-01 08:40:49.074 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]"
-2021-12-01 08:40:49.081 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]"
-2021-12-01 08:40:49.094 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]"
-2021-12-01 08:40:49.114 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]"
-2021-12-01 08:40:49.125 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]"
-2021-12-01 08:40:49.138 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]"
-2021-12-01 08:40:49.146 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]"
-2021-12-01 08:40:49.165 G Executed DbCommand ("15"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]"
-2021-12-01 08:40:49.172 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]"
-2021-12-01 08:40:49.212 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]"
-2021-12-01 08:40:49.220 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]"
-2021-12-01 08:40:49.234 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]"
-2021-12-01 08:40:49.247 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]"
-2021-12-01 08:40:49.254 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]"
-2021-12-01 08:40:49.264 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]"
-2021-12-01 08:40:49.290 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]"
-2021-12-01 08:40:49.299 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]"
-2021-12-01 08:40:49.322 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]"
-2021-12-01 08:40:49.332 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]"
-2021-12-01 08:40:49.349 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]"
-2021-12-01 08:40:49.359 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]"
-2021-12-01 08:40:49.371 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]"
-2021-12-01 08:40:49.378 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]"
-2021-12-01 08:40:49.388 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]"
-2021-12-01 08:40:49.396 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]"
-2021-12-01 08:40:49.404 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]"
-2021-12-01 08:40:49.424 G Executed DbCommand ("15"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]"
-2021-12-01 08:40:49.432 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]"
-2021-12-01 08:40:49.440 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]"
-2021-12-01 08:40:49.452 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]"
-2021-12-01 08:40:49.460 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]"
-2021-12-01 08:40:49.469 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]"
-2021-12-01 08:40:49.483 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]"
-2021-12-01 08:40:49.491 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]"
-2021-12-01 08:40:49.507 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]"
-2021-12-01 08:40:49.515 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]"
-2021-12-01 08:40:49.532 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]"
-2021-12-01 08:40:49.545 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]"
-2021-12-01 08:40:49.561 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]"
-2021-12-01 08:40:49.580 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]"
-2021-12-01 08:40:49.590 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]"
-2021-12-01 08:40:49.598 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]"
-2021-12-01 08:40:49.606 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]"
-2021-12-01 08:40:49.613 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]"
-2021-12-01 08:40:49.631 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]"
-2021-12-01 08:40:49.652 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]"
-2021-12-01 08:40:49.659 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]"
-2021-12-01 08:40:49.668 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]"
-2021-12-01 08:40:50.069 G Initialized all ABP modules.
-2021-12-01 08:40:50.185 G Now listening on: "http://localhost:44378"
-2021-12-01 08:40:50.187 G Application started. Press Ctrl+C to shut down.
-2021-12-01 08:40:50.188 G Hosting environment: "Development"
-2021-12-01 08:40:50.190 G Content root path: "C:\Users\Administrator\Source\Repos\Win.Sfs.SmartSettlementSystem.PG\src\Modules\SettleAccount\host\SettleAccount.HttpApi.Host"
-2021-12-01 08:40:51.311 G Request starting HTTP/1.1 GET http://localhost:44378/ - -
-2021-12-01 08:40:52.254 G Entity Framework Core "5.0.8" initialized '"SettingManagementDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery "
-2021-12-01 08:40:52.374 G Executed DbCommand ("96"ms) [Parameters=["@__providerName_0='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
-""SELECT [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[Value]
-FROM [AbpSettings] AS [a]
-WHERE ([a].[ProviderName] = @__providerName_0) AND [a].[ProviderKey] IS NULL"
-2021-12-01 08:40:52.532 G Entity Framework Core "5.0.8" initialized '"SettingManagementDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery "
-2021-12-01 08:40:52.550 G Executed DbCommand ("14"ms) [Parameters=["@__providerName_0='?' (Size = 64)"], CommandType='Text', CommandTimeout='30']"
-""SELECT [a].[Id], [a].[Name], [a].[ProviderKey], [a].[ProviderName], [a].[Value]
-FROM [AbpSettings] AS [a]
-WHERE ([a].[ProviderName] = @__providerName_0) AND [a].[ProviderKey] IS NULL"
-2021-12-01 08:40:52.668 G Executing endpoint '"Win.Sfs.SettleAccount.Controllers.HomeController.Index (SettleAccount.HttpApi.Host)"'
-2021-12-01 08:40:52.742 G Route matched with "{action = \"Index\", controller = \"Home\", area = \"\"}". Executing controller action with signature "Microsoft.AspNetCore.Mvc.ActionResult Index()" on controller "Win.Sfs.SettleAccount.Controllers.HomeController" ("SettleAccount.HttpApi.Host").
-2021-12-01 08:40:52.786 G Executing RedirectResult, redirecting to "/swagger".
-2021-12-01 08:40:52.794 G Executed action "Win.Sfs.SettleAccount.Controllers.HomeController.Index (SettleAccount.HttpApi.Host)" in 43.9946ms
-2021-12-01 08:40:52.796 G Executed endpoint '"Win.Sfs.SettleAccount.Controllers.HomeController.Index (SettleAccount.HttpApi.Host)"'
-2021-12-01 08:40:52.816 G Request finished HTTP/1.1 GET http://localhost:44378/ - - - 302 0 - 1508.3720ms
-2021-12-01 08:40:52.832 G Request starting HTTP/1.1 GET http://localhost:44378/swagger/index.html - -
-2021-12-01 08:40:52.900 G Request finished HTTP/1.1 GET http://localhost:44378/swagger/index.html - - - 200 - text/html;charset=utf-8 67.8754ms
-2021-12-01 08:40:53.097 G Request starting HTTP/1.1 GET http://localhost:44378/swagger/v1/swagger.json - -
-2021-12-01 08:40:54.139 G Request finished HTTP/1.1 GET http://localhost:44378/swagger/v1/swagger.json - - - 200 - application/json;charset=utf-8 1042.7423ms
-2021-12-01 08:45:46.322 G 2 servers were removed due to timeout
-2021-12-01 08:53:10.809 G Request starting HTTP/1.1 GET http://localhost:44378/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make?version=202110 - -
-2021-12-01 08:53:10.852 G Executing endpoint '"Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.InvoiceSettledDetailDiffMake (SettleAccount.Application)"'
-2021-12-01 08:53:10.867 G Route matched with "{action = \"InvoiceSettledDetailDiffMake\", controller = \"Report\", area = \"\"}". Executing controller action with signature "System.Threading.Tasks.Task`1[System.String] InvoiceSettledDetailDiffMake(System.String, System.String, System.String, System.String, System.String, System.String, System.String, System.String)" on controller "Win.Sfs.SettleAccount.Reports.ReportServices.ReportService" ("SettleAccount.Application").
-2021-12-01 08:53:12.946 G No type was specified for the decimal property '"ConsignQty"' on entity type '"BTCarKB"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.949 G No type was specified for the decimal property '"ConsignQty"' on entity type '"BTNotConsignReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.950 G No type was specified for the decimal property '"NeedQty"' on entity type '"BTNotConsignReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.954 G No type was specified for the decimal property '"DiffQty"' on entity type '"BTSeqKBDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.955 G No type was specified for the decimal property '"KBQty"' on entity type '"BTSeqKBDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.956 G No type was specified for the decimal property '"SeqQty"' on entity type '"BTSeqKBDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.957 G No type was specified for the decimal property '"Qty"' on entity type '"Bom"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.958 G No type was specified for the decimal property '"ScrapPercent"' on entity type '"Bom"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.959 G No type was specified for the decimal property '"TaxRate"' on entity type '"Customer"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.960 G No type was specified for the decimal property '"Qty"' on entity type '"CustomerBom"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.961 G No type was specified for the decimal property '"Qty"' on entity type '"CarMaterialConfig"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.962 G No type was specified for the decimal property '"Qty"' on entity type '"EstimatedSum"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.963 G No type was specified for the decimal property '"Qty"' on entity type '"FIS_TH"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.964 G No type was specified for the decimal property '"SettledQty"' on entity type '"FIS_TH"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.965 G No type was specified for the decimal property '"Qty"' on entity type '"HQConsign"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.971 G No type was specified for the decimal property '"Qty"' on entity type '"HQSpecConsign"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.973 G No type was specified for the decimal property '"ConsignQty"' on entity type '"HQKB"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.974 G No type was specified for the decimal property '"NeedQty"' on entity type '"HQKB"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.975 G No type was specified for the decimal property '"ConsignQty"' on entity type '"HQSpecKB"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.976 G No type was specified for the decimal property '"NeedQty"' on entity type '"HQSpecKB"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.977 G No type was specified for the decimal property '"Amt"' on entity type '"Invoice"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.978 G No type was specified for the decimal property '"Qty"' on entity type '"Invoice"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.979 G No type was specified for the decimal property '"ExtendedMargin"' on entity type '"ItemInvoicePrice"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.980 G No type was specified for the decimal property '"ExtendedPrice"' on entity type '"ItemInvoicePrice"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.981 G No type was specified for the decimal property '"Price"' on entity type '"ItemInvoicePrice"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.986 G No type was specified for the decimal property '"Qty"' on entity type '"MaterialRelationshipDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.988 G No type was specified for the decimal property '"Price"' on entity type '"PriceList"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.989 G No type was specified for the decimal property '"DiffAmount"' on entity type '"SecMatchBase"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.990 G No type was specified for the decimal property '"DiffPrice"' on entity type '"SecMatchBase"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.991 G No type was specified for the decimal property '"Price"' on entity type '"SecMatchBase"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.992 G No type was specified for the decimal property '"RealSettlementNumber"' on entity type '"SecMatchBase"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.993 G No type was specified for the decimal property '"RealSettlementPrice"' on entity type '"SecMatchBase"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.994 G No type was specified for the decimal property '"SettlementNumber"' on entity type '"SecMatchBase"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.995 G No type was specified for the decimal property '"SettlementPrice"' on entity type '"SecMatchBase"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.996 G No type was specified for the decimal property '"SupplyProportion"' on entity type '"SecMatchBase"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:12.998 G No type was specified for the decimal property '"TheoreticalSettlementNumber"' on entity type '"SecMatchBase"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.002 G No type was specified for the decimal property '"UsedNumber"' on entity type '"SecMatchBase"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.003 G No type was specified for the decimal property '"Amt"' on entity type '"SecondaryAdjustment"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.004 G No type was specified for the decimal property '"Qty"' on entity type '"SecondaryAdjustment"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.005 G No type was specified for the decimal property '"Total"' on entity type '"SecondaryAdjustment"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.006 G No type was specified for the decimal property '"Amt"' on entity type '"SecondaryDiscount"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.007 G No type was specified for the decimal property '"Qty"' on entity type '"SecondaryDiscount"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.008 G No type was specified for the decimal property '"Total"' on entity type '"SecondaryDiscount"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.009 G No type was specified for the decimal property '"CustomItemPrice"' on entity type '"SecondaryPriceRatio"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.010 G No type was specified for the decimal property '"CustomSubItemPrice"' on entity type '"SecondaryPriceRatio"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.011 G No type was specified for the decimal property '"SupplyProportionPrice"' on entity type '"SecondaryPriceRatio"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.012 G No type was specified for the decimal property '"Qty"' on entity type '"SettleAccount"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.016 G No type was specified for the decimal property '"Qty"' on entity type '"UnSettleAccount"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.018 G No type was specified for the decimal property '"PerCarNum"' on entity type '"SettlementPakAndSpareParts"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.019 G No type was specified for the decimal property '"Price"' on entity type '"SettlementPakAndSpareParts"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.020 G No type was specified for the decimal property '"QuantityPrice"' on entity type '"SettlementPakAndSpareParts"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.021 G No type was specified for the decimal property '"Price"' on entity type '"SettlementPart"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.022 G No type was specified for the decimal property '"Qty"' on entity type '"KanBanSettle"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.023 G No type was specified for the decimal property '"Amt"' on entity type '"ScrapClaims"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.024 G No type was specified for the decimal property '"Qty"' on entity type '"ScrapClaims"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.025 G No type was specified for the decimal property '"AmountNoTax"' on entity type '"SparePart"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.026 G No type was specified for the decimal property '"InvoicedQty"' on entity type '"SparePart"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.027 G No type was specified for the decimal property '"PurchasePriceNoTax"' on entity type '"SparePart"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.028 G No type was specified for the decimal property '"ReceiptQty"' on entity type '"SparePart"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.033 G No type was specified for the decimal property '"TaxRate"' on entity type '"SparePart"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.034 G No type was specified for the decimal property '"Qty"' on entity type '"WMSKanBanSettle"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.035 G No type was specified for the decimal property '"WMSDeliveryQty"' on entity type '"WMSKanBanSettle"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.036 G No type was specified for the decimal property '"AmountNoTax"' on entity type '"WMSSparePart"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.037 G No type was specified for the decimal property '"InvoicedQty"' on entity type '"WMSSparePart"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.038 G No type was specified for the decimal property '"PurchasePriceNoTax"' on entity type '"WMSSparePart"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.039 G No type was specified for the decimal property '"ReceiptQty"' on entity type '"WMSSparePart"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.040 G No type was specified for the decimal property '"TaxRate"' on entity type '"WMSSparePart"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.041 G No type was specified for the decimal property '"InvoiceQty"' on entity type '"EstimatedInventoryDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.042 G No type was specified for the decimal property '"ReceiveQty"' on entity type '"EstimatedInventoryDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.043 G No type was specified for the decimal property '"DiffQty"' on entity type '"EstimatedStockDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.044 G No type was specified for the decimal property '"EstimationQty"' on entity type '"EstimatedStockDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.045 G No type was specified for the decimal property '"FgQty"' on entity type '"EstimatedStockDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.050 G No type was specified for the decimal property '"StockQty"' on entity type '"EstimatedStockDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.051 G No type was specified for the decimal property '"UnSettledQty"' on entity type '"EstimatedStockDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.053 G No type was specified for the decimal property '"Qty"' on entity type '"FIS"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.054 G No type was specified for the decimal property '"SettledQty"' on entity type '"FIS"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.055 G No type was specified for the decimal property '"Qty"' on entity type '"FISExtend"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.056 G No type was specified for the decimal property '"SettledQty"' on entity type '"FISExtend"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.057 G No type was specified for the decimal property '"EndingInventoryQty"' on entity type '"InventoryDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.058 G No type was specified for the decimal property '"InputQty"' on entity type '"InventoryDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.059 G No type was specified for the decimal property '"OpeningInventoryQty"' on entity type '"InventoryDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.060 G No type was specified for the decimal property '"OutputQty"' on entity type '"InventoryDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.065 G No type was specified for the decimal property '"Price"' on entity type '"InventoryDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.066 G No type was specified for the decimal property '"ConsignQty"' on entity type '"JFCarKB"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.067 G No type was specified for the decimal property '"ConsignQty"' on entity type '"JFNotConsignReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.068 G No type was specified for the decimal property '"InStockQty"' on entity type '"JFNotConsignReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.069 G No type was specified for the decimal property '"CP7ScrapQty"' on entity type '"InvoiceSettledDiff"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.070 G No type was specified for the decimal property '"ClaimQty"' on entity type '"InvoiceSettledDiff"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.071 G No type was specified for the decimal property '"DiffPrice"' on entity type '"InvoiceSettledDiff"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.072 G No type was specified for the decimal property '"DiffQty"' on entity type '"InvoiceSettledDiff"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.073 G No type was specified for the decimal property '"InvoiceAmt"' on entity type '"InvoiceSettledDiff"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.074 G No type was specified for the decimal property '"InvoicePrice"' on entity type '"InvoiceSettledDiff"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.075 G No type was specified for the decimal property '"InvoiceQty"' on entity type '"InvoiceSettledDiff"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.080 G No type was specified for the decimal property '"SalePrice"' on entity type '"InvoiceSettledDiff"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.081 G No type was specified for the decimal property '"SettleQty"' on entity type '"InvoiceSettledDiff"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.082 G No type was specified for the decimal property '"CustomSubItemPrice"' on entity type '"SecondaryActuralAdjustmentReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.083 G No type was specified for the decimal property '"CustomSubItemSumQty"' on entity type '"SecondaryActuralAdjustmentReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.084 G No type was specified for the decimal property '"ErpSubItemActualQty"' on entity type '"SecondaryActuralAdjustmentReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.086 G No type was specified for the decimal property '"ErpSubItemQty"' on entity type '"SecondaryActuralAdjustmentReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.087 G No type was specified for the decimal property '"OfflineQty"' on entity type '"SecondaryActuralAdjustmentReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.088 G No type was specified for the decimal property '"SumPriceNoTax"' on entity type '"SecondaryActuralAdjustmentReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.089 G No type was specified for the decimal property '"SumPriceWithTax"' on entity type '"SecondaryActuralAdjustmentReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.090 G No type was specified for the decimal property '"ActNoTaxAmount"' on entity type '"SecondaryActuralDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.095 G No type was specified for the decimal property '"ActPaymentPartyQty"' on entity type '"SecondaryActuralDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.097 G No type was specified for the decimal property '"DiffAmount"' on entity type '"SecondaryActuralDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.098 G No type was specified for the decimal property '"DiffQty"' on entity type '"SecondaryActuralDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.099 G No type was specified for the decimal property '"StaPaymentPartyQty"' on entity type '"SecondaryActuralDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.100 G No type was specified for the decimal property '"StdNoTaxAmount"' on entity type '"SecondaryActuralDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.101 G No type was specified for the decimal property '"Qty"' on entity type '"SendUnsettledDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.102 G No type was specified for the decimal property '"SettledQty"' on entity type '"SendUnsettledDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.103 G No type was specified for the decimal property '"DiffQty"' on entity type '"StockFisDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.105 G No type was specified for the decimal property '"FisQty"' on entity type '"StockFisDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.106 G No type was specified for the decimal property '"StockQty"' on entity type '"StockFisDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.107 G No type was specified for the decimal property '"DiffQty"' on entity type '"StockSettledDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.111 G No type was specified for the decimal property '"R3SettledQty"' on entity type '"StockSettledDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.112 G No type was specified for the decimal property '"StockQty"' on entity type '"StockSettledDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.113 G No type was specified for the decimal property '"DiffQty"' on entity type '"StockUnsettledDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.114 G No type was specified for the decimal property '"FisUnSettledQty"' on entity type '"StockUnsettledDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.115 G No type was specified for the decimal property '"StockQty"' on entity type '"StockUnsettledDiffReportDetail"'. This will cause values to be silently truncated if they do not fit in the default precision and scale. Explicitly specify the SQL server column type that can accommodate all the values in 'OnModelCreating' using 'HasColumnType()', specify precision and scale using 'HasPrecision()' or configure a value converter using 'HasConversion()'.
-2021-12-01 08:53:13.165 G Entity Framework Core "5.0.8" initialized '"SettleAccountDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery "
-2021-12-01 08:53:13.372 G Executed DbCommand ("41"ms) [Parameters=["@p0='?' (DbType = Guid), @p1='?' (Size = 50), @p2='?' (DbType = Guid), @p3='?' (Size = 50), @p4='?' (DbType = DateTime2), @p5='?' (Size = 50), @p6='?' (DbType = Guid), @p7='?' (DbType = Guid), @p8='?' (DbType = DateTime2), @p9='?' (Size = 500), @p10='?' (Size = 50), @p11='?' (DbType = Boolean), @p12='?' (Size = 4000), @p13='?' (Size = 4000), @p14='?' (Size = 500), @p15='?' (DbType = DateTime2), @p16='?' (DbType = Guid), @p17='?' (Size = 50), @p18='?' (Size = 500), @p19='?' (Size = 500), @p20='?' (Size = 4000), @p21='?' (Size = 300), @p22='?' (Size = 4000), @p23='?' (Size = 50), @p24='?' (Size = 4000)"], CommandType='Text', CommandTimeout='1800']"
-""SET NOCOUNT ON;
-INSERT INTO [Set_TaskJob] ([Id], [ActionName], [BranchId], [ConcurrencyStamp], [CreationTime], [Creator], [CreatorId], [DeleterId], [DeletionTime], [DownFileName], [Email], [Enabled], [Error], [ExtraProperties], [FileName], [LastModificationTime], [LastModifierId], [Name], [RealDownFileName], [RealFileName], [Remark], [ServiceName], [State], [TaskId], [Type])
-VALUES (@p0, @p1, @p2, @p3, @p4, @p5, @p6, @p7, @p8, @p9, @p10, @p11, @p12, @p13, @p14, @p15, @p16, @p17, @p18, @p19, @p20, @p21, @p22, @p23, @p24);
-SELECT [IsDeleted]
-FROM [Set_TaskJob]
-WHERE @@ROWCOUNT = 1 AND [Id] = @p0;"
-2021-12-01 08:53:13.551 G Executed DbCommand ("7"ms) [Parameters=["@__input_Id_0='?' (DbType = Guid)"], CommandType='Text', CommandTimeout='1800']"
-""SELECT TOP(1) [s].[Id], [s].[ActionName], [s].[BranchId], [s].[ConcurrencyStamp], [s].[CreationTime], [s].[Creator], [s].[CreatorId], [s].[DeleterId], [s].[DeletionTime], [s].[DownFileName], [s].[Email], [s].[Enabled], [s].[Error], [s].[ExtraProperties], [s].[FileName], [s].[IsDeleted], [s].[LastModificationTime], [s].[LastModifierId], [s].[Name], [s].[RealDownFileName], [s].[RealFileName], [s].[Remark], [s].[ServiceName], [s].[State], [s].[TaskId], [s].[Type]
-FROM [Set_TaskJob] AS [s]
-WHERE [s].[Id] = @__input_Id_0"
-2021-12-01 08:53:13.785 G Executed DbCommand ("5"ms) [Parameters=["@__id_0='?' (DbType = Guid)"], CommandType='Text', CommandTimeout='1800']"
-""SELECT TOP(1) [s].[Id], [s].[ActionName], [s].[BranchId], [s].[ConcurrencyStamp], [s].[CreationTime], [s].[Creator], [s].[CreatorId], [s].[DeleterId], [s].[DeletionTime], [s].[DownFileName], [s].[Email], [s].[Enabled], [s].[Error], [s].[ExtraProperties], [s].[FileName], [s].[IsDeleted], [s].[LastModificationTime], [s].[LastModifierId], [s].[Name], [s].[RealDownFileName], [s].[RealFileName], [s].[Remark], [s].[ServiceName], [s].[State], [s].[TaskId], [s].[Type]
-FROM [Set_TaskJob] AS [s]
-WHERE [s].[Id] = @__id_0
-ORDER BY [s].[Id]"
-2021-12-01 08:53:14.119 G Executed DbCommand ("286"ms) [Parameters=[""], CommandType='Text', CommandTimeout='1800']"
-""SELECT TOP 0 T.[Id], T.[ActionName], T.[BranchId], T.[ConcurrencyStamp], T.[CreationTime], T.[Creator], T.[CreatorId], T.[DeleterId], T.[DeletionTime], T.[DownFileName], T.[Email], T.[Enabled], T.[Error], T.[ExtraProperties], T.[FileName], T.[IsDeleted], T.[LastModificationTime], T.[LastModifierId], T.[Name], T.[RealDownFileName], T.[RealFileName], T.[Remark], T.[ServiceName], T.[State], T.[TaskId], T.[Type] INTO [dbo].[Set_TaskJobTemp9f202c49] FROM [dbo].[Set_TaskJob] AS T LEFT JOIN [dbo].[Set_TaskJob] AS Source ON 1 = 0;"
-2021-12-01 08:53:14.234 G Executed DbCommand ("39"ms) [Parameters=[""], CommandType='Text', CommandTimeout='1800']"
-""MERGE [dbo].[Set_TaskJob] WITH (HOLDLOCK) AS T USING (SELECT TOP 1 * FROM [dbo].[Set_TaskJobTemp9f202c49] ORDER BY [Id]) AS S ON T.[Id] = S.[Id] WHEN MATCHED AND EXISTS (SELECT S.[Id], S.[ActionName], S.[BranchId], S.[ConcurrencyStamp], S.[CreationTime], S.[Creator], S.[CreatorId], S.[DeleterId], S.[DeletionTime], S.[DownFileName], S.[Email], S.[Enabled], S.[Error], S.[ExtraProperties], S.[FileName], S.[IsDeleted], S.[LastModificationTime], S.[LastModifierId], S.[Name], S.[RealDownFileName], S.[RealFileName], S.[Remark], S.[ServiceName], S.[State], S.[TaskId], S.[Type] EXCEPT SELECT T.[Id], T.[ActionName], T.[BranchId], T.[ConcurrencyStamp], T.[CreationTime], T.[Creator], T.[CreatorId], T.[DeleterId], T.[DeletionTime], T.[DownFileName], T.[Email], T.[Enabled], T.[Error], T.[ExtraProperties], T.[FileName], T.[IsDeleted], T.[LastModificationTime], T.[LastModifierId], T.[Name], T.[RealDownFileName], T.[RealFileName], T.[Remark], T.[ServiceName], T.[State], T.[TaskId], T.[Type]) THEN UPDATE SET T.[ActionName] = S.[ActionName], T.[BranchId] = S.[BranchId], T.[ConcurrencyStamp] = S.[ConcurrencyStamp], T.[CreationTime] = S.[CreationTime], T.[Creator] = S.[Creator], T.[CreatorId] = S.[CreatorId], T.[DeleterId] = S.[DeleterId], T.[DeletionTime] = S.[DeletionTime], T.[DownFileName] = S.[DownFileName], T.[Email] = S.[Email], T.[Enabled] = S.[Enabled], T.[Error] = S.[Error], T.[ExtraProperties] = S.[ExtraProperties], T.[FileName] = S.[FileName], T.[IsDeleted] = S.[IsDeleted], T.[LastModificationTime] = S.[LastModificationTime], T.[LastModifierId] = S.[LastModifierId], T.[Name] = S.[Name], T.[RealDownFileName] = S.[RealDownFileName], T.[RealFileName] = S.[RealFileName], T.[Remark] = S.[Remark], T.[ServiceName] = S.[ServiceName], T.[State] = S.[State], T.[TaskId] = S.[TaskId], T.[Type] = S.[Type];"
-2021-12-01 08:53:14.278 G Executed DbCommand ("40"ms) [Parameters=[""], CommandType='Text', CommandTimeout='1800']"
-""IF OBJECT_ID ('[dbo].[Set_TaskJobTemp9f202c49]', 'U') IS NOT NULL DROP TABLE [dbo].[Set_TaskJobTemp9f202c49]"
-2021-12-01 08:53:14.299 G Executed DbCommand ("11"ms) [Parameters=["@__id_0='?' (DbType = Guid)"], CommandType='Text', CommandTimeout='1800']"
-""SELECT TOP(1) [s].[Id], [s].[ActionName], [s].[BranchId], [s].[ConcurrencyStamp], [s].[CreationTime], [s].[Creator], [s].[CreatorId], [s].[DeleterId], [s].[DeletionTime], [s].[DownFileName], [s].[Email], [s].[Enabled], [s].[Error], [s].[ExtraProperties], [s].[FileName], [s].[IsDeleted], [s].[LastModificationTime], [s].[LastModifierId], [s].[Name], [s].[RealDownFileName], [s].[RealFileName], [s].[Remark], [s].[ServiceName], [s].[State], [s].[TaskId], [s].[Type]
-FROM [Set_TaskJob] AS [s]
-WHERE [s].[Id] = @__id_0"
-2021-12-01 08:53:14.320 G Executed DbCommand ("3"ms) [Parameters=["@p3='?' (DbType = Guid), @p0='?' (Size = 50), @p4='?' (Size = 50), @p1='?' (DbType = DateTime2), @p2='?' (Size = 50)"], CommandType='Text', CommandTimeout='1800']"
-""SET NOCOUNT ON;
-UPDATE [Set_TaskJob] SET [ConcurrencyStamp] = @p0, [LastModificationTime] = @p1, [TaskId] = @p2
-WHERE [Id] = @p3 AND [ConcurrencyStamp] = @p4;
-SELECT @@ROWCOUNT;"
-2021-12-01 08:53:14.387 G Executing "ObjectResult", writing value of type '"System.String"'.
-2021-12-01 08:53:14.392 G Executed action "Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.InvoiceSettledDetailDiffMake (SettleAccount.Application)" in 3522.68ms
-2021-12-01 08:53:14.393 G Executed endpoint '"Win.Sfs.SettleAccount.Reports.ReportServices.ReportService.InvoiceSettledDetailDiffMake (SettleAccount.Application)"'
-2021-12-01 08:53:14.395 G Request finished HTTP/1.1 GET http://localhost:44378/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make?version=202110 - - - 200 - text/plain;+charset=utf-8 3586.5059ms
-2021-12-01 08:53:18.335 G Entity Framework Core "5.0.8" initialized '"SettleAccountDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery "
-2021-12-01 08:54:19.056 G Entity Framework Core "5.0.8" initialized '"SettleAccountDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery "
-2021-12-01 08:54:21.395 G Entity Framework Core "5.0.8" initialized '"SettleAccountDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery "
-2021-12-01 08:54:21.533 G Entity Framework Core "5.0.8" initialized '"SettleAccountDbContext"' using provider '"Microsoft.EntityFrameworkCore.SqlServer"' with options: "QuerySplittingBehavior=SplitQuery "

src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211110061756_initail.cs

@@ -1,507 +0,0 @@
-using System;
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace Win.Sfs.SettleAccount.Migrations
-{
-    public partial class initail : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.CreateTable(
-                name: "Set_Invoice",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Year = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    Period = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    Version = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    Factory = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    MaterialCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
-                    MaterialDesc = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    Qty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    Amt = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    Extend = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
-                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    Remark = table.Column<string>(type: "nvarchar(1000)", maxLength: 1000, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Set_Invoice", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Set_InvoiceVersion",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Year = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    Period = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    Version = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    CustomerCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
-                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    Remark = table.Column<string>(type: "nvarchar(max)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Set_InvoiceVersion", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Set_KanBanSettle",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Year = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    Period = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    Version = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    Kanban = table.Column<string>(type: "nvarchar(150)", maxLength: 150, nullable: false),
-                    Relation = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
-                    Factory = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    MaterialCode = table.Column<string>(type: "nvarchar(150)", maxLength: 150, nullable: false),
-                    PartType = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    SupplierCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    SettleInputDate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    Batch = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    Flag = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    Qty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    SettleDate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    State = table.Column<int>(type: "int", nullable: false),
-                    Extend = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ParentId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
-                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    Remark = table.Column<string>(type: "nvarchar(max)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Set_KanBanSettle", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Set_KanBanSettle_Version",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    CustomerCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
-                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
-                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    Remark = table.Column<string>(type: "nvarchar(max)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Set_KanBanSettle_Version", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Set_ScrapClaims",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Year = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    Period = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    Version = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    Type = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
-                    MaterialCode = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
-                    MaterialDesc = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    Qty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    Amt = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    Extend = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
-                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    Remark = table.Column<string>(type: "nvarchar(1000)", maxLength: 1000, nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Set_ScrapClaims", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Set_ScrapClaims_Version",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    CustomerCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
-                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
-                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    Remark = table.Column<string>(type: "nvarchar(max)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Set_ScrapClaims_Version", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Set_Settle",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
-                    Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
-                    SettleYear = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    KENNCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    ChassisNumber = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    Model = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    CP5A = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CP7 = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    MaterialCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    Qty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    SettlementID = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    SettlementSupplier = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    ParentId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    state = table.Column<int>(type: "int", nullable: false),
-                    Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
-                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    Remark = table.Column<string>(type: "nvarchar(max)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Set_Settle", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Set_Settle_Version",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    CustomerCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
-                    Factory = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
-                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    Remark = table.Column<string>(type: "nvarchar(max)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Set_Settle_Version", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Set_SparePart",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
-                    Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
-                    Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
-                    LineNumber = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    PurchaseType = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    PurchaseOrderNo = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
-                    PurchaseOrderNoItem = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    PurchaseOrderNoText = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    ReceiptQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    InvoicedQty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    AmountNoTax = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    PurchasePriceNoTax = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    AccountNum = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    MaterialCode = table.Column<string>(type: "nvarchar(150)", maxLength: 150, nullable: false),
-                    MaterialDesc = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    SpareDate = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    DeliveryOrderNo = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: false),
-                    DeliveryLineNum = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    BatchNo = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    Unit = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    TaxRate = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    TaxCode = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    GermanInvoiceNo = table.Column<string>(type: "nvarchar(100)", maxLength: 100, nullable: true),
-                    Factory = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    FactoryName = table.Column<string>(type: "nvarchar(50)", maxLength: 50, nullable: true),
-                    Extend = table.Column<string>(type: "nvarchar(250)", maxLength: 250, nullable: true),
-                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
-                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    Remark = table.Column<string>(type: "nvarchar(max)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Set_SparePart", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Set_SparePart_Version",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    CustomerCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
-                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
-                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    Remark = table.Column<string>(type: "nvarchar(max)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Set_SparePart_Version", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Set_Unsettle",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
-                    Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
-                    SettleYear = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    KENNCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    ChassisNumber = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    Model = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    CP5A = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CP7 = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    MaterialCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    Qty = table.Column<decimal>(type: "decimal(18,2)", nullable: false),
-                    SettlementID = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    SettlementSupplier = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    ParentId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    state = table.Column<int>(type: "int", nullable: false),
-                    UnsettledReason = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
-                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    Remark = table.Column<string>(type: "nvarchar(max)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Set_Unsettle", x => x.Id);
-                });
-
-            migrationBuilder.CreateTable(
-                name: "Set_Unsettle_Version",
-                columns: table => new
-                {
-                    Id = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Year = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    Period = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    Version = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: false),
-                    CustomerCode = table.Column<string>(type: "nvarchar(36)", maxLength: 36, nullable: true),
-                    Factory = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ExtraProperties = table.Column<string>(type: "nvarchar(max)", nullable: true),
-                    ConcurrencyStamp = table.Column<string>(type: "nvarchar(40)", maxLength: 40, nullable: true),
-                    CreationTime = table.Column<DateTime>(type: "datetime2", nullable: false),
-                    CreatorId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    LastModificationTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    LastModifierId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    IsDeleted = table.Column<bool>(type: "bit", nullable: false, defaultValue: false),
-                    DeleterId = table.Column<Guid>(type: "uniqueidentifier", nullable: true),
-                    DeletionTime = table.Column<DateTime>(type: "datetime2", nullable: true),
-                    BranchId = table.Column<Guid>(type: "uniqueidentifier", nullable: false),
-                    Enabled = table.Column<bool>(type: "bit", nullable: false),
-                    Remark = table.Column<string>(type: "nvarchar(max)", nullable: true)
-                },
-                constraints: table =>
-                {
-                    table.PrimaryKey("PK_Set_Unsettle_Version", x => x.Id);
-                });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Set_KanBanSettle_Kanban_MaterialCode",
-                table: "Set_KanBanSettle",
-                columns: new[] { "Kanban", "MaterialCode" },
-                unique: true,
-                filter: "IsDeleted=0");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Set_KanBanSettle_Version_Version",
-                table: "Set_KanBanSettle_Version",
-                column: "Version",
-                unique: true,
-                filter: "IsDeleted=0");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Set_ScrapClaims_Version_Version",
-                table: "Set_ScrapClaims_Version",
-                column: "Version",
-                unique: true,
-                filter: "IsDeleted=0");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Set_Settle_state",
-                table: "Set_Settle",
-                column: "state");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Set_Settle_Version_ChassisNumber_MaterialCode_KENNCode",
-                table: "Set_Settle",
-                columns: new[] { "Version", "ChassisNumber", "MaterialCode", "KENNCode" });
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Set_Settle_Version_Version",
-                table: "Set_Settle_Version",
-                column: "Version",
-                unique: true,
-                filter: "IsDeleted=0");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Set_SparePart_Version_Version",
-                table: "Set_SparePart_Version",
-                column: "Version",
-                unique: true,
-                filter: "IsDeleted=0");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Set_Unsettle_state",
-                table: "Set_Unsettle",
-                column: "state");
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Set_Unsettle_Version_ChassisNumber_MaterialCode",
-                table: "Set_Unsettle",
-                columns: new[] { "Version", "ChassisNumber", "MaterialCode" },
-                unique: true);
-
-            migrationBuilder.CreateIndex(
-                name: "IX_Set_Unsettle_Version_Version",
-                table: "Set_Unsettle_Version",
-                column: "Version",
-                unique: true,
-                filter: "IsDeleted=0");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.DropTable(
-                name: "Set_Invoice");
-
-            migrationBuilder.DropTable(
-                name: "Set_InvoiceVersion");
-
-            migrationBuilder.DropTable(
-                name: "Set_KanBanSettle");
-
-            migrationBuilder.DropTable(
-                name: "Set_KanBanSettle_Version");
-
-            migrationBuilder.DropTable(
-                name: "Set_ScrapClaims");
-
-            migrationBuilder.DropTable(
-                name: "Set_ScrapClaims_Version");
-
-            migrationBuilder.DropTable(
-                name: "Set_Settle");
-
-            migrationBuilder.DropTable(
-                name: "Set_Settle_Version");
-
-            migrationBuilder.DropTable(
-                name: "Set_SparePart");
-
-            migrationBuilder.DropTable(
-                name: "Set_SparePart_Version");
-
-            migrationBuilder.DropTable(
-                name: "Set_Unsettle");
-
-            migrationBuilder.DropTable(
-                name: "Set_Unsettle_Version");
-        }
-    }
-}

src/Modules/SettleAccount/host/SettleAccount.HttpApi.Host/Migrations/20211112093946_data20211112.cs

@@ -1,31 +0,0 @@
-using Microsoft.EntityFrameworkCore.Migrations;
-
-namespace Win.Sfs.SettleAccount.Migrations
-{
-    public partial class data20211112 : Migration
-    {
-        protected override void Up(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<string>(
-                name: "State",
-                table: "Set_KanBanSettle",
-                type: "nvarchar(max)",
-                nullable: true,
-                oldClrType: typeof(int),
-                oldType: "int");
-        }
-
-        protected override void Down(MigrationBuilder migrationBuilder)
-        {
-            migrationBuilder.AlterColumn<int>(
-                name: "State",
-                table: "Set_KanBanSettle",
-                type: "int",
-                nullable: false,
-                defaultValue: 0,
-                oldClrType: typeof(string),
-                oldType: "nvarchar(max)",
-                oldNullable: true);
-        }
-    }
-}

src/Modules/SettleAccount/src/SettleAccount.Application/Reports/ReportServices/ReportMakeService.cs

@@ -120,10 +120,10 @@ namespace Win.Sfs.SettleAccount.Reports.ReportServices
         /// </summary>
         /// <param name="kanBan">看板号</param>
         /// <param name="sapMaterialCode">厂内零件号</param>
-        /// <param name="version"></param>
+        /// <param name="version">版本</param>
         /// <param name="customerCode"></param>
         /// <param name="customerPartCode">客户物料号</param>
-        /// <param name="estimateTypeDesc">t物料组（车型）</param>
+        /// <param name="estimateTypeDesc">物料组（车型）</param>
         /// <param name="state"></param>
         /// <param name="begin"></param>
         /// <param name="end"></param>

vue/src/router/index.js

@@ -168,14 +168,13 @@ export const asyncRoutes = [
   /** when your routing map is too long, you can split it into small modules **/
   managerRouter,//系统首页
   personRouter,//系统管理
-  //basedataRouter,//基础数据维护
+  basedataRouter,//基础数据维护
-  //newjitRouter,//FIS数据管理
+  vwFisDataRouter,//结算与开票数据导入
-  //vwFisDataRouter,//结算与开票数据导入
+  billdataRouter,//销售结算与开票报表
-  //billdataRouter,//销售结算与开票报表
   //businessdataRouter,
-  //wheeldataRouter,//大众看板和备件
+  wheeldataRouter,//大众看板和备件
   pgfis,//派格fis
-  //JobTimeDataRouter,//后台作业监控
+  JobTimeDataRouter,//后台作业监控
  
   // 404 page must be placed at the end !!!
   { path: '*', redirect: '/404', hidden: true }

vue/src/router/modules/vwFisData.js

@@ -2,7 +2,7 @@
 import Layout from '@/layout'
 
 const vwFisDataRouter = {
-  path: '/caip',
+  path: '/cpat',
   component: Layout,
   redirect: 'pg',
   name: '业务数据',
@@ -17,7 +17,7 @@ const vwFisDataRouter = {
   },
   children: [
     {
-      path: 'unSettleAccount',
+      path: 'unsettle-account',
       component: () => import('@/views/ux/vw/dataInput/r3-open'),
       name: 'SettleAccount',//命名路由
       meta: {
@@ -27,7 +27,7 @@ const vwFisDataRouter = {
       }
     },
     {
-      path: 'settleAccount-finish',
+      path: 'settle-account-finish',
       component: () => import('@/views/ux/vw/dataInput/r3'),
       name: 'SettleAccount',//命名路由
       meta: {
@@ -47,7 +47,7 @@ const vwFisDataRouter = {
       }
     },
     {
-      path: 'kanBan',
+      path: 'kan-ban',
       component: () => import('@/views/ux/vw/dataInput/vwKanBan/index'),
       name: 'VWKanBan',//命名路由
       meta: {
@@ -57,7 +57,7 @@ const vwFisDataRouter = {
       }
     },
     {
-      path: 'scrapClaims',
+      path: 'scrap-claims',
       component: () => import('@/views/ux/vw/dataInput/ScrapClaims'),
       name: 'ScrapClaims',
       meta: {
@@ -68,7 +68,7 @@ const vwFisDataRouter = {
     },
     
     {
-      path: 'SparePart',
+      path: 'spare-part',
       component: () => import('@/views/ux/vw/dataInput/SparePart'),
       name: 'SparePart',//命名路由
       meta: {

vue/src/router/modules/vwKBdata.js

@@ -2,7 +2,7 @@
 import Layout from '@/layout'
 
 const billdataRouter = {
-  path: '/vw-car-kb',
+  path: '/cpat-report',
   component: Layout,
   redirect: 'vw-car-kb',
   name: 'basedata',
@@ -17,9 +17,9 @@ const billdataRouter = {
   },
   children: [
     {
-      path: '/IssuedUnsettled',
+      path: 'unsettled-detail',//大众准时化未结明细表（包含漏结，漏结要有标识）
       component: () => import('@/views/ux/billManage/IssuedUnsettled/index'),
-      name: 'IssuedUnsettled',//命名路由
+      name: 'UnsettledDetail',//命名路由
       meta: {
         title: '大众准时化未结明细',
         roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
@@ -27,9 +27,9 @@ const billdataRouter = {
       }
     },
     {
-      path: '/settledPartAndErpPartPriceDiff',
+      path: 'unsettled-diff',
-      component: () => import('@/views/ux/billManage/settledPartAndErpPartPriceDiff/index'),
+      component: () => import('@/views/ux/billManage/UnSettledDiff/index'),
-      name: 'SettledPartAndErpPartPriceDiff',//命名路由
+      name: 'UnSettledDiff',//命名路由
       meta: {
         title: '大众准时化未结比对',
         roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
@@ -37,9 +37,9 @@ const billdataRouter = {
       }
     },
     {
-      path: '/audiAndvw1',
+      path: 'unSettle-diffExport',
-      component: () => import('@/views/ux/billManage/audiAndvw'),
+      component: () => import('@/views/ux/billManage/UnSettleDiffExport'),
-      name: 'audiAndvw',//命名路由
+      name: 'UnSettleDiffExport',//命名路由
       meta: {
         title: '准时化未结差异比对',
         roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
@@ -47,7 +47,7 @@ const billdataRouter = {
       }
     },
     {
-      path: '/InvoiceSettledDiff',
+      path: 'invoice-settled/diff',
       component: () => import('@/views/ux/billManage/InvoiceSettledDiff'),
       name: 'InvoiceSettledDiff',//命名路由
       meta: {
@@ -57,7 +57,17 @@ const billdataRouter = {
       }
     },
     {
-      path: '/FisUnSettledDiff',
+      path: 'invoice-settled/detaildiff',
+      component: () => import('@/views/ux/billManage/InvoiceSettledDetailDiff'),
+      name: 'InvoiceSettledDetailDiff',//命名路由
+      meta: {
+        title: '发票与结算核对明细',
+        roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
+        icon: '结算对比'
+      }
+    },
+    {
+      path: 'FisUnSettledDiff',
       component: () => import('@/views/ux/billManage/FisUnSettledDiff'),
       name: 'FisUnSettledDiff',//命名路由
       meta: {
@@ -67,9 +77,9 @@ const billdataRouter = {
       }
     },
     {
-      path: '/priceQtyDiff',
+      path: 'unInvoice-settled/detailDiff',
-      component: () => import('@/views/ux/billManage/PriceQtyDiff'),
+      component: () => import('@/views/ux/billManage/UnInvoiceSettledDetailDiff'),
-      name: 'PriceQtyDiff',//命名路由
+      name: 'UnInvoiceSettledDetailDiff',//命名路由
       meta: {
         title: '准时化结算数量差异比对',
         roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）
@@ -77,9 +87,9 @@ const billdataRouter = {
       }
     },
     {
-      path: '/audiAndvw',
+      path: 'settle-doorPanel',
-      component: () => import('@/views/ux/billManage/audiAndvw'),
+      component: () => import('@/views/ux/billManage/SettleDoorPanel'),
-      name: 'audiAndvw',//命名路由
+      name: 'SettleDoorPanel',//命名路由
       meta: {
         title: '准时化结算门板价格差异',
         roles: ['SettleAccount.Reports'],//控制页面角色（可以设置多个角色）

vue/src/router/modules/wheeldata.js

@@ -3,7 +3,7 @@
 import Layout from '@/layout'
 
 const wheeldataRouter = {
-  path: '/cpat/report',
+  path: '/cpat/report/',
   component: Layout,
   redirect: 'cpat',//重定向
   name: 'WheelData',

vue/src/views/pg-fis/basedate/m100Online/index.vue

@@ -1021,10 +1021,10 @@ export default {
         {
           if(this.listQuery.productType === 1)//门板
           {
-            if(parseInt(this.form.endHostSN )-parseInt(this.form.beginHostSN) > 11)
+            if(parseInt(this.form.endHostSN )-parseInt(this.form.beginHostSN) <= 0)
             {
               this.$message({
-                message: "最多只能打印12个顺序号，终止顺序号不能大于"+(parseInt(this.form.beginHostSN)+11),
+                message: "起止大众顺序号相减不能为零！",
                 type: "error",
               });
               return;

vue/src/views/pg-fis/basedate/unknownAssembly/index.vue

@@ -320,7 +320,7 @@
             </el-col>
             <el-col :span="7">
               <div style="border:1px;height:570px;width:270px">
-                <el-table :data="tempdetails" ref="leftTable" height="550" stripe border highlight-current-row @row-click="rowClickLeft" @select="selectLeft">
+                <el-table :data="tempdetails" ref="leftTable" height="550" stripe border highlight-current-row @row-click="rowClickLeft" @select="selectLeft" @select-all="selectLeftAll">
                   <el-table-column type="selection" width="40px"></el-table-column>
                   <el-table-column prop="partCode" label="结算件代码" width="150px" align="center"></el-table-column>
                   <el-table-column prop="partNum" label="数量" width="78px" align="center"></el-table-column>
@@ -340,7 +340,7 @@
             </el-col>
             <el-col :span="7">
               <div style="border:1px;height:570px;width:270px">
-                <el-table :data="data2" ref="rightTable" height="550" stripe border highlight-current-row @row-click="rowClickRight" @select="selectRight">
+                <el-table :data="data2" ref="rightTable" height="550" stripe border highlight-current-row @row-click="rowClickRight" @select="selectRight" @select-all="selectRightAll">
                   <el-table-column type="selection" width="40px"></el-table-column>
                   <el-table-column prop="partCode" label="结算件代码" width="150px" align="center"></el-table-column>
                   <el-table-column prop="partNum" label="数量" width="78px" align="center"></el-table-column>
@@ -815,6 +815,13 @@ export default {
         this.formTitle = "添加总成";
         this.isEdit = false;
         this.form = {};
+        this.leftRowTemp = [];
+        this.rightRowTemp = [];
+        this.assly = {};
+        this.tempdetails = [];
+        this.erpAssemblyCfgList =[];
+        this.tempAssCfgList = [];
+        this.asTemp = [];
         this.getUnknownAssemblyList();
         this.getZcCode();
         this.getvehicleModel();
@@ -954,6 +961,7 @@ export default {
         };
         lastSubmit.erpAssemblyCfgList = this.tempAssCfgList;
 
+        //#region 
         // var lastSubmitt = [];
         // console.log("flag")
         // this.tempAssCfgList.forEach(element => {
@@ -990,6 +998,7 @@ export default {
         //   })
         // });
         // console.log("this is lastSubmit:",lastSubmit)
+        //#endregion
 
         this.$axios
           .posts(
@@ -1114,30 +1123,31 @@ export default {
         if(this.rightRowTemp.length === 0){
           alert("请先选择需移动的零件")
         }
-        else if(this.rightRowTemp.length !== 0 && parseInt(this.rightRowTemp[0].partNum) !== 1){
+        else if(this.rightRowTemp.length === 1 && parseInt(this.rightRowTemp[0].partNum) !== 1){
           this.numFormData.num = parseInt(this.rightRowTemp[0].partNum);
           this.dialogNumVisible = true;
           this.numTitle = "输入移动结算件数量"
         }
         else{
           console.log("R->F");
-            this.numFormData.num = 1;
+            this.rightRowTemp.forEach(item => {
-            if(this.numFormData.num <= this.rightRowTemp[0].partNum && this.numFormData.num > 0){
+              this.numFormData.num = item.partNum;
+            //if(this.numFormData.num <= item.partNum && this.numFormData.num > 0){
 
               //数据插入最终缓存
               if(this.tempAssCfgList.length !== 0){
                 console.log("second")
                 var rfMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
                 if(rfMove.length !== 0){
-                  var sameDetail = rfMove[0].details.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
+                  var sameDetail = rfMove[0].details.filter(u=>u.partCode === item.partCode);
                   if(sameDetail.length !== 0){
                     sameDetail[0].partNum =  parseInt(sameDetail[0].partNum) + parseInt(this.numFormData.num);
                   }
                   else{
                     rfMove[0].details.push({
-                      description: this.rightRowTemp[0].description,
+                      description: item.description,
                       isKey: false,
-                      partCode: this.rightRowTemp[0].partCode,
+                      partCode: item.partCode,
                       partNum: this.numFormData.num,//移动框输入的数量
                     })
                   }
@@ -1151,9 +1161,9 @@ export default {
                   previousVersionId: this.asTemp[0].previousVersionId,
                   vehicleModel: this.asTemp[0].carModel,
                   details:[{
-                    description: this.rightRowTemp[0].description,
+                    description: item.description,
                     isKey: false,
-                    partCode: this.rightRowTemp[0].partCode,
+                    partCode: item.partCode,
                     partNum: this.numFormData.num,//移动框输入的数量
                   }]
                 })
@@ -1167,9 +1177,9 @@ export default {
                   isCover: false,
                   previousVersionId: this.asTemp[0].previousVersionId,
                   details:[{
-                    description: this.rightRowTemp[0].description,
+                    description: item.description,
                     isKey: false,
-                    partCode: this.rightRowTemp[0].partCode,
+                    partCode: item.partCode,
                     partNum: this.numFormData.num,//移动框输入的数量
                   }]
                 })
@@ -1177,32 +1187,34 @@ export default {
 
               console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
               //数据插入中间数据源
-              var judge = this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode);
+              var judge = this.tempdetails.filter(u=>u.partCode === item.partCode);
               if(judge.length === 1){
                 var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-                this.tempdetails.filter(u=>u.partCode === this.rightRowTemp[0].partCode)[0].partNum = t;
+                this.tempdetails.filter(u=>u.partCode === item.partCode)[0].partNum = t;
               }
               else{
                 this.tempdetails.push({
-                  description: this.rightRowTemp[0].description,
+                  description: item.description,
                   isKey: false,
-                  partCode: this.rightRowTemp[0].partCode,
+                  partCode: item.partCode,
                   partNum: parseInt(this.numFormData.num),//移动框输入的数量
                 })
               }
               /* 右侧数据移动 */
-              var delid = this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0]
+              var delid = this.data2.filter(u=>u.partCode === item.partCode)[0]
               var n1 = parseInt(this.numFormData.num);
               var n2 = parseInt(delid.partNum);
               if(n1 === n2){
-                this.data2 = this.data2.filter(u=>u.id !== this.rightRowTemp[0].id);
+                this.data2 = this.data2.filter(u=>u.partCode !== item.partCode);
                 this.rightRowTemp = [];
               }
               else{
-                this.data2.filter(u=>u.id === this.rightRowTemp[0].id)[0].partNum =  delid.partNum - this.numFormData.num;
+                this.data2.filter(u=>u.partCode === item.partCode)[0].partNum =  delid.partNum - this.numFormData.num;
-                this.rightRowTemp[0].partNum = n2 - n1;
+                item.partNum = n2 - n1;
-              }
               }
+            });
+            
+            //}
         }
       }
     },
@@ -1214,23 +1226,24 @@ export default {
         if(this.leftRowTemp.length === 0){
         alert("请先选择需移动的零件")
         }
-        else if(this.leftRowTemp.length !== 0 && parseInt(this.leftRowTemp[0].partNum) !== 1){
+        else if(this.leftRowTemp.length === 1 && parseInt(this.leftRowTemp[0].partNum) !== 1){
           this.numFormData.num = parseInt(this.leftRowTempnpm[0].partNum);
           this.dialogNumVisible = true;
           this.numTitle = "输入移动结算件数量"
         }
         else{
           console.log("F->R");
-          this.numFormData.num = 1;
+          this.leftRowTemp.forEach(item => {
-            if(this.numFormData.num <= this.leftRowTemp[0].partNum && this.numFormData.num > 0){
+            this.numFormData.num = item.partNum;
+            //if(this.numFormData.num <= this.leftRowTemp[0].partNum && this.numFormData.num > 0){
               
               //数据插入最终缓存
               console.log("移除或删除")
               var frMove = this.tempAssCfgList.filter(u=>u.erpAssemblyCode === this.asTemp[0].erpAssemblyCode);
-              var samedetail = frMove[0].details.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
+              var samedetail = frMove[0].details.filter(u=>u.partCode === item.partCode);
               if(samedetail.length !== 0){
                 if(parseInt(samedetail[0].partNum) === parseInt(this.numFormData.num)){
-                  frMove[0].details = frMove[0].details.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
+                  frMove[0].details = frMove[0].details.filter(u=>u.partCode !== item.partCode);
                 }
                 else{
                   samedetail[0].partNum =  parseInt(samedetail[0].partNum) - parseInt(this.numFormData.num);
@@ -1243,32 +1256,35 @@ export default {
               console.log("this is tempAssCfgList 最终数据",this.tempAssCfgList)
               
               //数据插入右侧数据源
-              var judge = this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode);
+              var judge = this.data2.filter(u=>u.partCode === item.partCode);
               if(judge.length === 1){
                 var t = parseInt(judge[0].partNum) + parseInt(this.numFormData.num);
-                this.data2.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum = t;
+                this.data2.filter(u=>u.partCode === item.partCode)[0].partNum = t;
               }
               else{
                   this.data2.push({
-                    description: this.leftRowTemp[0].description,
+                    description: item.description,
                     isKey: false,
-                    partCode: this.leftRowTemp[0].partCode,
+                    partCode: item.partCode,
                     partNum: parseInt(this.numFormData.num),//移动框输入的数量
                 })
               }
               /* 中间数据移动 */
-              var delid = this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0]
+              var delid = this.tempdetails.filter(u=>u.partCode === item.partCode)[0];
+              console.log(this.tempdetails);
               var n1 = parseInt(this.numFormData.num);
               var n2 = parseInt(delid.partNum);
               if(n1 === n2){
-                this.tempdetails = this.tempdetails.filter(u=>u.partCode !== this.leftRowTemp[0].partCode);
+                this.tempdetails = this.tempdetails.filter(u=>u.partCode !== item.partCode);
                 this.leftRowTemp = [];
               }
               else{
-                this.tempdetails.filter(u=>u.partCode === this.leftRowTemp[0].partCode)[0].partNum =  parseInt(delid.partNum) - parseInt(this.numFormData.num);
+                this.tempdetails.filter(u=>u.partCode === item.partCode)[0].partNum =  parseInt(delid.partNum) - parseInt(this.numFormData.num);
-                this.leftRowTemp[0].partNum = n2 - n1;
+                item.partNum = n2 - n1;
-              }
               }
+            //}
+          });
+            
         }
       }
     },
@@ -1516,27 +1532,49 @@ export default {
       this.rightRowTemp=[]; //清空已选
       console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
       // 选择项大于1时
-      if (selection.length > 1) {
+      // if (selection.length > 1) {
-      let del_row = selection.shift();
+      // let del_row = selection.shift();
-      // console.log('把数组的第一个元素从其中删除后', selection);
+      // // console.log('把数组的第一个元素从其中删除后', selection);
-      this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+      // this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
-      }
+      // }
-      this.rightRowTemp.push(selection[0])
+      selection.forEach(item => {
+        this.rightRowTemp.push(item);
+      });
       console.log('当用户手动勾选数据行', this.rightRowTemp)
     },
+    /* 右侧复选框全选事件 */
+    selectRightAll(selection) {
+      this.rightRowTemp=[]; //清空已选
+      console.log('当用户手动勾选全选 Checkbox 时触发的事件', selection)
+      selection.forEach(item => {
+        this.rightRowTemp.push(item);
+      });
+      console.log('当用户手动勾选全选', this.rightRowTemp)
+    },
     /* 左侧复选框单选事件 */
     selectLeft(selection, row) {
       this.leftRowTemp=[]; //清空已选
       console.log('当用户手动勾选数据行的 Checkbox 时触发的事件', selection, row)
-      // 选择项大于1时
+      // // 选择项大于1时
-      if (selection.length > 1) {
+      // if (selection.length > 1) {
-      let del_row = selection.shift();
+      // let del_row = selection.shift();
-      // console.log('把数组的第一个元素从其中删除后', selection);
+      // // console.log('把数组的第一个元素从其中删除后', selection);
-      this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
+      // this.$refs.rightTable.toggleRowSelection(del_row, false); // 用于多选表格，切换某一行的选中状态，如果使用了第二个参数，则是设置这一行选中与否（selected 为 true 则选中）
-      }
+      // }
-      this.leftRowTemp.push(selection[0])
+      selection.forEach(item => {
+        this.leftRowTemp.push(item);
+      });
       console.log('当用户手动勾选数据行', this.leftRowTemp)
     },
+    /* 左侧复选框全选事件 */
+    selectLeftAll(selection) {
+      this.leftRowTemp=[]; //清空已选
+      console.log('当用户手动勾选全选 Checkbox 时触发的事件', selection)
+      selection.forEach(item => {
+        this.leftRowTemp.push(item);
+      });
+      console.log('当用户手动勾选全选', this.leftRowTemp)
+    },
     getvehicleModel()
     {
       this.$axios

vue/src/views/ux/billManage/InvoiceSettledDiff/index.vue

@@ -1,11 +1,10 @@
-<!--ERP总成开票报表-->
+<!--发票与结算核对汇总-->
 <template>
   <div class="cr-body-content">
     <!--功能栏-->
     <!-- 搜索 -->
     <div style="float: left">
       <flexbox class="content-header">
-        <!-- 统计 -->
         <el-button
           class="filter-item"
           size="mini"
@@ -14,23 +13,6 @@
           @click="handleCreate"
           >统计
         </el-button>
-
-        <!-- <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照零件号搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button> -->
       </flexbox>
     </div>
     <!-- 刷新 -->
@@ -51,7 +33,7 @@
         </el-tooltip>
 
         <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔30秒进行自动刷新！</span
+          >说明：每间隔15秒进行自动刷新！</span
         >
       </flexbox>
     </div>
@@ -66,7 +48,6 @@
       :data="list"
       :height="tableHeight"
       :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
       size="small"
       stripe
       border
@@ -87,9 +68,7 @@
         :gutter="0"
       >
         <template slot="header" slot-scope="scope">
-          <span>
           {{ scope.column.label }}
-          </span>
         </template>
       </el-table-column>
 
@@ -99,7 +78,6 @@
         label="操作名称(单击箭头过滤)"
         width="165"
         column-key="actionName"
-        align="center"
         :filters="[
           { text: '导出', value: '导出' },
           { text: '消息', value: '消息' },
@@ -124,7 +102,7 @@
       <el-table-column
         prop="stateName"
         label="状态(单击箭头过滤)"
-        width="155"
+        width="165"
         column-key="stateName"
         align="center"
         :filters="[
@@ -148,9 +126,9 @@
         </template>
       </el-table-column>
       <!-- 操作 -->
-      <el-table-column label="操作" align="center" width="180">
+      <el-table-column label="操作" align="center" width="250">
         <template slot-scope="scope">
-          <div align="left">
+          <div align="center">
             <!-- <el-button
               v-if="scope.row.actionName == '导出'"
               size="mini"
@@ -353,9 +331,15 @@
       :close-on-click-modal="false"
       :title="formTitle"
       append-to-body
-      width="550px"
+      width="680px"
+    >
+      <el-form
+        ref="formCount"
+        :inline="true"
+        :rules="rules"
+        :model="formCount"
+        size="mini"
       >
-      <el-form ref="formCount" :inline="true" :model="formCount" size="mini">
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="选择版本" required />
@@ -379,25 +363,17 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row>
+
+        <el-row>
           <el-col :md="4" :xs="24">
-            <el-form-item label="适用功能" required />
+            <el-form-item label="客户零件号" />
           </el-col>
           <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="customerCode">
+            <el-form-item prop="materialCode">
-              <el-select
+              <el-input v-model="formCount.materialCode" style="width: 300px" />
-                v-model="formCount.customerCode"
-                size="medium"
-                clearable
-                style="width: 188px; margin-right: 15px"
-                placeholder="请选择"
-              >
-                <el-option label="结算" value="R0003"></el-option>
-                <el-option label="二配" value="R0001"></el-option>
-              </el-select>
             </el-form-item>
           </el-col>
-        </el-row> -->
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="text" @click="dialogFormVisible = false"
@@ -418,6 +394,12 @@ import permission from "@/directive/permission/index.js";
 import { downloadFile } from "@/utils/crmindex.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import moment from "moment";
+const cityOptions = [
+  { id: 0, name: "未结" },
+  { id: 1, name: "部分结算" },
+  { id: 2, name: "已结" },
+  /* { id: 3, name: "预批量" }, */
+];
 
 export default {
   name: "InvoiceSettledDiff",
@@ -427,24 +409,72 @@ export default {
   data() {
     return {
       crmType: "backJob",
+      rules: {
+        versionValue: [
+          { required: true, message: "必须输入！", trigger: "change" },
+        ],
+      },
+      pickerOptionsCp5: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      pickerOptions0: {
+        disabledDate: (time) => {
+          //if (this.endTime != "") {
+          //return  time.getTime() >= new Date(this.endTime).getTime();
+          return time.getTime() > new Date(this.endTime).getTime();
+          //}
+        },
+      },
+      pickerOptions1: {
+        disabledDate: (time) => {
+          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
+          return time.getTime() <= new Date(this.startTime).getTime();
+        },
+      },
+      startTime: "",
+      endTime: "",
+      pickerOptionsCp7: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      datetime5: [],
+      datetime7: [],
+      checkedCities: [0],
+      cities: cityOptions,
       selectValue: "",
       selectNameValue: "",
-      valueSelect: "R0003",
+      radio: "0", //结算状态：0未结 1部分结算
       versionList: [],
+      materialGroupList: [],
       // 是否显示详细弹出层
       openView: false,
       versionValue: "",
+      materialGroupValue: "",
       formTitle: "",
       timer: null, //定时器名称
       //当前位置
       activeIndex: 1,
       //默认显示基本信息
       activeName: "first",
-      rules: {
-        versionValue: [
-          { required: true, message: "必须输入！", trigger: "change" },
-        ],
-      },
       //步骤条步数
       stepList: [
         {
@@ -463,7 +493,17 @@ export default {
       customerInfos: "",
       searchContent: "", // 输入内容
       form: {},
-      formCount: { name: "结算与开票数据对比", customerCode: "R0003" },
+      formCount: {
+        name: "未结算对比",
+        // datetime5: [],
+        // datetime7: [],
+        settledate: "",
+        materialCode: "",
+        sapMaterialCode: "",
+        chassisNumber: "",
+        kennCode: "",
+        version: "",
+      },
       list: null,
       totalCount: 0,
       listLoading: true,
@@ -477,8 +517,14 @@ export default {
       },
       listExportQuery: {
         version: "",
-        customerCode: "",
+        materialCode: undefined,
-        //apply:"",
+        cp7begin: undefined,
+        cp7end: undefined,
+        kenncode: undefined,
+        chassisNumber: undefined,
+        materialGroup: undefined,
+        begin: undefined,
+        end: undefined,
       },
       listQuery: {
         taskId: "",
@@ -497,7 +543,7 @@ export default {
         { label: "执行完成(任务成功)", value: "Succeeded", cssName: "success" },
         { label: "执行中...", value: "Processing", cssName: "primary" },
         { label: "执行完成(任务失败)", value: "Failed", cssName: "danger" },
-        { label: "等待执行...", value: "Scheduled", cssName: "primary" },
+        { label: "等待执行", value: "Scheduled", cssName: "primary" },
       ],
     };
   },
@@ -511,15 +557,19 @@ export default {
       this.listQuery.taskId = "";
       this.listQuery.stateName = "";
       setTimeout(this.getList, 0);
-    }, 1000 * 30); //30秒刷新一次页面
+    }, 1000 * 15); //15秒刷新一次页面
     // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
     });
+    //this.disabledDateCp5();
   },
   created() {
     this.getAllVersionList();
+    this.getMaterialGroup();
     this.getList();
+    // this.getCurrentMonthFirst();
+    // this.getCurrentMonthLast();
   },
   beforeDestroy() {
     clearInterval(this.timer);
@@ -533,27 +583,22 @@ export default {
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
-        width: 70,
+        width: 85,
       });
-      /* tempsTabs.push({
-        label: "当前版本",
-        prop: "version",
-        width: 140,
-      }); */
       tempsTabs.push({
         label: "模块名称",
         prop: "name",
-        width: 150,
+        width: 170,
       });
       tempsTabs.push({
-        label: "邮箱",
+        label: "创建人",
         prop: "email",
-        width: 105,
+        width: 110,
       });
       tempsTabs.push({
         label: "创建时间",
         prop: "createdAt",
-        width: 140,
+        width: 150,
       });
       // tempsTabs.push({
       //   label: "操作名称",
@@ -569,34 +614,36 @@ export default {
     },
   },
   methods: {
-    /* 导出功能 */
+    getdateValue(val) {
-    handleDownloadExport() {
+      this.startTime = val;
-      if (this.versionValue === "") {
+      this.getbalanceIndexData();
-        this.$message.error("请选择版本");
-        return false;
-      }
-      this.listLoading = true;
-      this.listExportQuery.version = this.versionValue;
-      console.log("导出条件：" + JSON.stringify(this.listExportQuery));
-      this.$axios
-        .posts(
-          "/api/settleaccount/ReportMakeService/SettledPartAndErpPartPriceDiff-Make",
-          this.listExportQuery
-        )
-        .then((res) => {
-          let taskid = res;
-          if (Number.isInteger(taskid)) {
-            this.$notify({
-              title: "成功",
-              message: "任务生成成功！任务号:" + taskid,
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.getList();
-          this.listLoading = false;
-        });
     },
+    getdateVal(val) {
+      this.endTime = val;
+      this.getbalanceIndexData();
+    },
+
+    getCurrentMonthFirst() {
+      var date = new Date();
+      date.setDate(1);
+      var month = parseInt(date.getMonth() + 1);
+      var day = date.getDate();
+      if (month < 10) month = "0" + month;
+      if (day < 10) day = "0" + day;
+      this.startTime = date.getFullYear() + "-" + month + "-" + day;
+    },
+    getCurrentMonthLast() {
+      var date = new Date();
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      month = month < 10 ? "0" + month : month;
+      var day = new Date(year, month, 0);
+      this.endTime = year + "-" + month + "-" + day.getDate();
+    },
+    handleCheckedCitiesChange(value) {
+      alert(value);
+    },
+
     getAllVersionList() {
       this.$axios
         .posts("/api/settleaccount/CentralizedControl/openlist")
@@ -613,18 +660,73 @@ export default {
           this.listLoading = false;
         });
     },
+    //获取物料组车型
+    getMaterialGroup() {
+      this.$axios
+        .posts("/api/settleaccount/CodeSetting/list", {
+          project: "物料组",
+          maxResultCount: 1000,
+          skipCount: 0,
+        })
+        .then((response) => {
+          this.materialGroupList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.description;
+            options.label = element.description;
+            this.materialGroupList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
     /* 重置 */
     resetForm(formName) {
       this.formCount = {};
+      //this.formCount.materialCode = "";
     },
     save() {
       this.$refs.formCount.validate((valid) => {
         if (valid) {
-          console.log("参数:" + JSON.stringify(this.formCount));
           this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue;
+          this.listExportQuery.version = this.formCount.versionValue; //版本
-          this.listExportQuery.customerCode = this.formCount.customerCode;
+          this.listExportQuery.matialCode = this.formCount.materialCode
-          console.log("导出条件：" + JSON.stringify(this.listExportQuery));
+            ? this.formCount.materialCode
+            : undefined;
+          // if (this.formCount.materialCode != "") {
+          //   this.listExportQuery.matialCode = this.formCount.materialCode; //物料号
+          // }
+          // if (this.formCount.kennCode != "") {
+          //   this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
+          // }
+          // var getdate5 = JSON.stringify(this.datetime5);
+          // if (getdate5 != "[]") {
+          //   alert(this.datetime5[0]);
+          //   this.listExportQuery.begin = this.datetime5
+          //     ? this.datetime5[0] || undefined
+          //     : undefined;
+          //   this.listExportQuery.end = this.datetime5
+          //     ? this.datetime5[1] || undefined
+          //     : undefined;
+          // }
+          // if (this.startTime != "") {
+          //   this.listExportQuery.cp7begin = this.startTime; //CP7开始时间
+          // }
+          // if (this.endTime != "") {
+          //   this.listExportQuery.cp7end = this.endTime; //CP5结束日期
+          // }
+          // if (this.formCount.chassisNumber != "") {
+          //   this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
+          // }
+          // if (this.formCount.materialGroupValue != "") {
+          //   this.listExportQuery.materialGroup =
+          //     this.formCount.materialGroupValue; //物料组车型
+          // }
+          console.log(
+            "发票与结算核对汇总-导出条件：" +
+              JSON.stringify(this.listExportQuery)
+          );
           this.$axios
             .gets(
               "/api/settleaccount/ReportMakeService/InvoiceSettledDiff-Make",
@@ -652,9 +754,9 @@ export default {
       });
     },
     handleCreate() {
-      // this.$nextTick(() => {
+      this.$nextTick(() => {
-      //   this.$refs["formCount"].resetFields();
+        this.$refs["formCount"].resetFields();
-      // });
+      });
       this.formTitle = "报表统计";
       this.isEdit = false;
       this.form = {};
@@ -704,6 +806,7 @@ export default {
     },
     /* 导出类型的文件 */
     downloadErrData(param) {
+      this.listLoading = true;
       let fileNameOfProject = param;
       this.$axios
         .BolbGets(
@@ -771,7 +874,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "结算与开票数据对比";
+      this.listQuery.name = "大众发票与结算核对汇总表";
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
         .then((response) => {
@@ -793,7 +896,7 @@ export default {
     //       this.form = response;
     //     });
     // },
-    // resetQuery() {},
+    resetQuery() {},
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
       var item = this.list[rowIndex];
@@ -813,7 +916,7 @@ export default {
       if (column.property === "stateName") {
         return { textAlign: "center" };
       }
-      return { textAlign: "left" };
+      return { textAlign: "center" };
     },
     handleRowClick(row, column, event) {
       this.$refs.multipleTable.clearSelection();
@@ -827,6 +930,11 @@ export default {
 <style lang="scss" scoped>
 @import "../../styles/crmtable.scss";
 @import "../../styles/steps.scss";
-</style>
 
+/deep/ .el-checkbox input:focus {
+  outline: none !important;
+  border-color: gray;
+  border: 0px;
+  box-shadow: none !important;
+}
 </style>

vue/src/views/ux/billManage/IssuedUnsettled/index.vue

@@ -33,7 +33,7 @@
         </el-tooltip>
 
         <span style="margin-left: 10px; color: #ff5640; float: right"
-          >说明：每间隔30秒进行自动刷新！</span
+          >说明：每间隔15秒进行自动刷新！</span
         >
       </flexbox>
     </div>
@@ -331,98 +331,154 @@
       :close-on-click-modal="false"
       :title="formTitle"
       append-to-body
-      width="580px"
+      width="680px"
+    >
+      <el-form
+        ref="formCount"
+        :inline="true"
+        :rules="rules"
+        :model="formCount"
+        size="mini"
       >
-      <el-form ref="formCount" :inline="true" :model="formCount" size="mini">
         <el-row>
           <el-col :md="4" :xs="24">
-            <el-form-item label="选择日期" />
+            <el-form-item label="选择版本" required />
           </el-col>
           <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="datatime5">
+            <el-form-item prop="versionValue">
-              <el-date-picker
+              <el-select
-                v-model="formCount.datetime5"
+                v-model="formCount.versionValue"
-                type="daterange"
+                size="medium"
-                range-separator="至"
+                clearable
-                start-placeholder="开始日期"
+                style="width: 188px; margin-right: 15px"
-                end-placeholder="结束日期"
+                placeholder="请选择"
-                value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd HH:mm:ss"
               >
-              </el-date-picker>
+                <el-option
+                  v-for="item in versionList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="物料组(车型)" />
+          </el-col>
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="materialGroupValue">
+              <el-select
+                v-model="formCount.materialGroupValue"
+                size="medium"
+                filterable
+                clearable
+                style="width: 188px; margin-right: 15px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in materialGroupList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
             </el-form-item>
           </el-col>
         </el-row>
 
-        <!-- <el-row>
+        <el-row>
           <el-col :md="4" :xs="24">
-            <el-form-item label="CP7日期" />
+            <el-form-item label="CP5时间：" />
           </el-col>
           <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="datatime7">
+            <el-form-item>
               <el-date-picker
-                v-model="formCount.datetime7"
+                v-model="datetime5"
-                type="daterange"
+                type="datetimerange"
+                :picker-options="pickerOptionsCp5"
                 range-separator="至"
                 start-placeholder="开始日期"
                 end-placeholder="结束日期"
                 value-format="yyyy-MM-dd HH:mm:ss"
-                format="yyyy-MM-dd HH:mm:ss"
+                :default-time="['00:00:00', '23:59:59']"
               >
               </el-date-picker>
             </el-form-item>
           </el-col>
-        </el-row> -->
+        </el-row>
-
         <el-row>
           <el-col :md="4" :xs="24">
-            <el-form-item label="结算状态" />
+            <el-form-item label="CP7时间：" />
           </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="state">
+            <el-form-item prop="startTime">
-              <!-- <el-radio v-model="formCount.state" label="0">未结</el-radio>
+              <el-date-picker
-              <el-radio v-model="formCount.state" label="1">部分结算</el-radio>
+                v-model="formCount.startTime"
-              <el-radio v-model="formCount.state" label="2">已结</el-radio>
+                type="datetime"
-              <el-radio v-model="formCount.state" label="3">预批量</el-radio> -->
+                size="small"
-              <el-checkbox-group
+                :picker-options="pickerOptions0"
-                v-model="formCount.state"
+                @change="getdateValue"
-                
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="00:00:00"
               >
-               <!-- @change="handleCheckedCitiesChange" -->
+              </el-date-picker>
-                <el-checkbox
+            </el-form-item>
-                  v-for="(city, index) of cities"
+          </el-col>
-                  :key="index"
+          <el-col :md="10" :xs="24" style="margin-left: -40px">
-                  :label="city.id"
+            <el-form-item prop="endTime">
-                  @change="checkedListChange(index)"
+              <el-date-picker
-                  >{{ city.name }}</el-checkbox
+                v-model="formCount.endTime"
+                type="datetime"
+                :picker-options="pickerOptions1"
+                size="small"
+                @change="getdateVal"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="23:59:59"
               >
-              </el-checkbox-group>
+              </el-date-picker>
             </el-form-item>
           </el-col>
         </el-row>
 
-       <!-- <el-row>
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="KEEN号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="kennCode">
+              <el-input v-model="formCount.kennCode" />
+            </el-form-item>
+          </el-col>
           <el-col :md="4" :xs="24">
             <el-form-item label="底盘号" />
           </el-col>
-          <el-col :md="20" :xs="24" style="margin-left: -80px">
+          <el-col :md="10" :xs="24" style="margin-left: -95px">
-            <el-form-item prop="vin">
+            <el-form-item prop="chassisNumber">
-              <el-input v-model="formCount.vin" placeholder="请输入底盘号" />
+              <el-input v-model="formCount.chassisNumber" />
             </el-form-item>
           </el-col>
         </el-row>
 
         <el-row>
           <el-col :md="4" :xs="24">
-            <el-form-item label="结算包" />
+            <el-form-item label="客户零件号" />
           </el-col>
           <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="settleMent">
+            <el-form-item prop="materialCode">
-              <el-input v-model="formCount.settleMent" placeholder="请输入结算包" />
+              <el-input v-model="formCount.materialCode" style="width: 450px" />
             </el-form-item>
           </el-col>
-        </el-row> -->
+          <!-- <el-col :md="4" :xs="24">
-
+            <el-form-item label="厂内零件号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -95px">
+            <el-form-item prop="sapMaterialCode">
+              <el-input v-model="formCount.sapMaterialCode" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="text" @click="dialogFormVisible = false"
@@ -451,22 +507,72 @@ const cityOptions = [
 ];
 
 export default {
-  name: "IssuedUnsettled",
+  name: "UnsettledDetail",
   components: { Pagination, CRMTableHead },
   directives: { permission },
 
   data() {
     return {
       crmType: "backJob",
+      rules: {
+        versionValue: [
+          { required: true, message: "必须输入！", trigger: "change" },
+        ],
+      },
+      pickerOptionsCp5: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      pickerOptions0: {
+        disabledDate: (time) => {
+          //if (this.endTime != "") {
+          //return  time.getTime() >= new Date(this.endTime).getTime();
+          return time.getTime() > new Date(this.endTime).getTime();
+          //}
+        },
+      },
+      pickerOptions1: {
+        disabledDate: (time) => {
+          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
+          return time.getTime() <= new Date(this.startTime).getTime();
+        },
+      },
+      // startTime: "",
+      // endTime: "",
+      pickerOptionsCp7: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      datetime5: [],
       checkedCities: [0],
       cities: cityOptions,
       selectValue: "",
       selectNameValue: "",
       radio: "0", //结算状态：0未结 1部分结算
       versionList: [],
+      materialGroupList: [],
       // 是否显示详细弹出层
       openView: false,
       versionValue: "",
+      materialGroupValue: "",
       formTitle: "",
       timer: null, //定时器名称
       //当前位置
@@ -492,10 +598,15 @@ export default {
       searchContent: "", // 输入内容
       form: {},
       formCount: {
-        name: "未结算对比",
+        startTime: "",
-        datetime5: "",
+        endTime: "",
-        datetime7: "",
+        // name: "未结算对比",
-        state: [0],
+        // settledate: "",
+        // materialCode: "",
+        // sapMaterialCode: "",
+        // chassisNumber: "",
+        // kennCode: "",
+        // version: "",
       },
       list: null,
       totalCount: 0,
@@ -509,11 +620,15 @@ export default {
         },
       },
       listExportQuery: {
-        //version: "",
+        version: "",
-        //customerCode: "TH",
+        materialCode: undefined,
-        state: "",
+        cp7begin: undefined,
-        begin: "",
+        cp7end: undefined,
-        end: "",
+        kenncode: undefined,
+        chassisNumber: undefined,
+        materialGroup: undefined,
+        begin: undefined,
+        end: undefined,
       },
       listQuery: {
         taskId: "",
@@ -546,15 +661,19 @@ export default {
       this.listQuery.taskId = "";
       this.listQuery.stateName = "";
       setTimeout(this.getList, 0);
-    }, 1000 * 30); //30秒刷新一次页面
+    }, 1000 * 15); //15秒刷新一次页面
     // 通过$once来监听定时器，在beforeDestroy钩子可以被清除。
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
     });
+    //this.disabledDateCp5();
   },
   created() {
     this.getAllVersionList();
+    this.getMaterialGroup();
     this.getList();
+    // this.getCurrentMonthFirst();
+    // this.getCurrentMonthLast();
   },
   beforeDestroy() {
     clearInterval(this.timer);
@@ -599,37 +718,36 @@ export default {
     },
   },
   methods: {
+    getdateValue(val) {
+      this.startTime = val;
+      this.getbalanceIndexData();
+    },
+    getdateVal(val) {
+      this.endTime = val;
+      this.getbalanceIndexData();
+    },
+
+    getCurrentMonthFirst() {
+      var date = new Date();
+      date.setDate(1);
+      var month = parseInt(date.getMonth() + 1);
+      var day = date.getDate();
+      if (month < 10) month = "0" + month;
+      if (day < 10) day = "0" + day;
+      this.startTime = date.getFullYear() + "-" + month + "-" + day;
+    },
+    getCurrentMonthLast() {
+      var date = new Date();
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      month = month < 10 ? "0" + month : month;
+      var day = new Date(year, month, 0);
+      this.endTime = year + "-" + month + "-" + day.getDate();
+    },
     handleCheckedCitiesChange(value) {
       alert(value);
     },
-    /* 导出功能 */
+
-    handleDownloadExport() {
-      if (this.versionValue === "") {
-        this.$message.error("请选择版本");
-        return false;
-      }
-      this.listLoading = true;
-      this.listExportQuery.version = this.version;
-      console.log("导出条件：" + JSON.stringify(this.listExportQuery));
-      this.$axios
-        .posts(
-          "/api/settleaccount/ReportMakeService/UnSettledDiff-Make",
-          this.listExportQuery
-        )
-        .then((res) => {
-          let taskid = res;
-          if (Number.isInteger(taskid)) {
-            this.$notify({
-              title: "成功",
-              message: "任务生成成功！任务号:" + taskid,
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.getList();
-          this.listLoading = false;
-        });
-    },
     getAllVersionList() {
       this.$axios
         .posts("/api/settleaccount/CentralizedControl/openlist")
@@ -646,37 +764,80 @@ export default {
           this.listLoading = false;
         });
     },
-    checkedListChange(index)
+    //获取物料组车型
-    {
+    getMaterialGroup() {
-      if(this.formCount.state.length === 0)
+      this.$axios
-      {
+        .posts("/api/settleaccount/CodeSetting/list", {
-        this.formCount.state.push(this.cities[index].id);
+          project: "物料组",
-      }
+          maxResultCount: 1000,
+          skipCount: 0,
+        })
+        .then((response) => {
+          this.materialGroupList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.description;
+            options.label = element.description;
+            this.materialGroupList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
     },
     /* 重置 */
     resetForm(formName) {
-      //this.formCount = {};
+      this.formCount = {};
-      this.formCount.datetime5 = "";
+      this.datetime5 = [];
-      this.formCount.datetime7 = "";
+      this.startTime = "";
-      this.formCount.state = [0];
+      this.endTime = "";
     },
     save() {
       this.$refs.formCount.validate((valid) => {
         if (valid) {
-          console.log("参数:" + JSON.stringify(this.formCount));
           this.formLoading = true;
-          //console.log(this.formCount.datetime);
+          this.listExportQuery.version = this.formCount.versionValue; //版本
-          this.listExportQuery.begin = this.formCount.datetime5[0];
+          if (this.formCount.materialCode != "") {
-          this.listExportQuery.end = this.formCount.datetime5[1];
+            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
-          this.listExportQuery.state = this.formCount.state.join(',');
+          }
-          //console.log(this.formCount.state.join(','))
+          // if (this.formCount.sapMaterialCode != "") {
-          console.log(this.formCount.datetime5[0]);
+          //   this.listExportQuery.sapMaterialCode =
-          console.log(this.formCount.datetime5[1]);
+          //     this.formCount.sapMaterialCode; //厂内物料号
-          console.log(this.formCount.state);
+          // }
-          console.log("导出条件：" + JSON.stringify(this.listExportQuery));
+          if (this.formCount.kennCode != "") {
+            this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
+          }
+          var getdate5 = JSON.stringify(this.datetime5);
+          if (getdate5 != "[]") {
+            this.listExportQuery.begin = this.datetime5
+              ? this.datetime5[0] || undefined
+              : undefined;
+            this.listExportQuery.end = this.datetime5
+              ? this.datetime5[1] || undefined
+              : undefined;
+          } else {
+            this.listExportQuery.begin = undefined;
+            this.listExportQuery.end = undefined;
+          }
+          this.listExportQuery.cp7begin = this.startTime
+            ? this.startTime
+            : undefined;
+          this.listExportQuery.cp7end = this.endTime ? this.endTime : undefined;
+          if (this.formCount.chassisNumber != "") {
+            this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
+          }
+          if (this.formCount.materialGroupValue != "") {
+            this.listExportQuery.materialGroup =
+              this.formCount.materialGroupValue; //物料组车型
+          }
+
+          console.log(
+            "大众准时化未结明细-导出条件：" +
+              JSON.stringify(this.listExportQuery)
+          );
           this.$axios
             .gets(
-              "/api/settleaccount/ReportMakeService/UnSettledDiff-Make",
+              "/api/settleaccount/ReportMakeService/UnsettledDetailReportService-Make",
               this.listExportQuery
             )
             .then((res) => {
@@ -707,8 +868,12 @@ export default {
       this.formTitle = "报表统计";
       this.isEdit = false;
       this.form = {};
+      this.datetime5 = [];
+      this.startTime = "";
+      this.endTime = "";
       this.dialogFormVisible = true;
     },
+
     filterHandler(value, row, column) {
       const property = column["property"];
       return row[property] === value;
@@ -821,7 +986,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "未结算对比";
+      this.listQuery.name = "大众发票与结算核对明细表";
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
         .then((response) => {
@@ -878,11 +1043,10 @@ export default {
 @import "../../styles/crmtable.scss";
 @import "../../styles/steps.scss";
 
-  /deep/ .el-checkbox input:focus{
+/deep/ .el-checkbox input:focus {
-    outline:none !important;
+  outline: none !important;
   border-color: gray;
   border: 0px;
   box-shadow: none !important;
-  }
+}
-  
 </style>

vue/src/views/ux/billManage/PriceQtyDiff/index.vue → vue/src/views/ux/billManage/SettleDoorPanel/index.vue

@@ -1,10 +1,10 @@
-<!--价差量差分析报表-->
+<!--准时化结算门板价格差异-->
 <template>
   <div class="cr-body-content">
     <!--功能栏-->
+    <!-- 搜索 -->
     <div style="float: left">
       <flexbox class="content-header">
-        <!-- 统计 -->
         <el-button
           class="filter-item"
           size="mini"
@@ -13,23 +13,6 @@
           @click="handleCreate"
           >统计
         </el-button>
-
-        <!-- <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照零件号搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button> -->
       </flexbox>
     </div>
     <!-- 刷新 -->
@@ -65,7 +48,6 @@
       :data="list"
       :height="tableHeight"
       :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
       size="small"
       stripe
       border
@@ -96,7 +78,6 @@
         label="操作名称(单击箭头过滤)"
         width="165"
         column-key="actionName"
-        align="center"
         :filters="[
           { text: '导出', value: '导出' },
           { text: '消息', value: '消息' },
@@ -121,7 +102,7 @@
       <el-table-column
         prop="stateName"
         label="状态(单击箭头过滤)"
-        width="155"
+        width="165"
         column-key="stateName"
         align="center"
         :filters="[
@@ -145,7 +126,7 @@
         </template>
       </el-table-column>
       <!-- 操作 -->
-      <el-table-column label="操作" align="center" width="180">
+      <el-table-column label="操作" align="center" width="250">
         <template slot-scope="scope">
           <div align="center">
             <!-- <el-button
@@ -350,9 +331,15 @@
       :close-on-click-modal="false"
       :title="formTitle"
       append-to-body
-      width="550px"
+      width="680px"
+    >
+      <el-form
+        ref="formCount"
+        :inline="true"
+        :rules="rules"
+        :model="formCount"
+        size="mini"
       >
-      <el-form ref="formCount" :inline="true" :model="formCount" size="mini">
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="选择版本" required />
@@ -376,6 +363,122 @@
             </el-form-item>
           </el-col>
         </el-row>
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="物料组(车型)" />
+          </el-col>
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
+            <el-form-item prop="materialGroupValue">
+              <el-select
+                v-model="formCount.materialGroupValue"
+                size="medium"
+                filterable
+                clearable
+                style="width: 188px; margin-right: 15px"
+                placeholder="请选择"
+              >
+                <el-option
+                  v-for="item in materialGroupList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
+              </el-select>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="CP5时间：" />
+          </el-col>
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-date-picker
+                v-model="datetime5"
+                type="datetimerange"
+                :picker-options="pickerOptionsCp5"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :default-time="['00:00:00', '23:59:59']"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="CP7时间：" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-date-picker
+                v-model="startTime"
+                type="datetime"
+                size="small"
+                :picker-options="pickerOptions0"
+                @change="getdateValue"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="00:00:00"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -40px">
+            <el-form-item>
+              <el-date-picker
+                v-model="endTime"
+                type="datetime"
+                :picker-options="pickerOptions1"
+                size="small"
+                @change="getdateVal"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="23:59:59"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="KEEN号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-input v-model="formCount.kennCode" />
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="底盘号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -95px">
+            <el-form-item>
+              <el-input v-model="formCount.chassisNumber" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="客户零件号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-input v-model="formCount.materialCode" />
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="客户零件号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -95px">
+            <el-form-item>
+              <el-input v-model="formCount.sapMaterialCode" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="text" @click="dialogFormVisible = false"
@@ -397,31 +500,80 @@ import { downloadFile } from "@/utils/crmindex.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import moment from "moment";
 
+
 export default {
-  name: "PriceQtyDiff",
+  name: "SettleDoorPanel",
   components: { Pagination, CRMTableHead },
   directives: { permission },
 
   data() {
     return {
       crmType: "backJob",
+      rules: {
+        versionValue: [
+          { required: true, message: "必须输入！", trigger: "change" },
+        ],
+      },
+      pickerOptionsCp5: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      pickerOptions0: {
+        disabledDate: (time) => {
+          //if (this.endTime != "") {
+          //return  time.getTime() >= new Date(this.endTime).getTime();
+          return time.getTime() > new Date(this.endTime).getTime();
+          //}
+        },
+      },
+      pickerOptions1: {
+        disabledDate: (time) => {
+          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
+          return time.getTime() <= new Date(this.startTime).getTime();
+        },
+      },
+      startTime: "",
+      endTime: "",
+      pickerOptionsCp7: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      datetime5: [],
+      datetime7: [],
+      checkedCities: [0],
       selectValue: "",
       selectNameValue: "",
+      radio: "0", //结算状态：0未结 1部分结算
       versionList: [],
+      materialGroupList: [],
       // 是否显示详细弹出层
       openView: false,
       versionValue: "",
+      materialGroupValue: "",
       formTitle: "",
       timer: null, //定时器名称
       //当前位置
       activeIndex: 1,
       //默认显示基本信息
       activeName: "first",
-      rules: {
-        versionValue: [
-          { required: true, message: "必须输入！", trigger: "change" },
-        ],
-      },
       //步骤条步数
       stepList: [
         {
@@ -440,7 +592,17 @@ export default {
       customerInfos: "",
       searchContent: "", // 输入内容
       form: {},
-      formCount: { name: "价差量差分析报表" },
+      formCount: {
+        name: "未结算对比",
+        // datetime5: [],
+        // datetime7: [],
+        settledate: "",
+        materialCode: "",
+        sapMaterialCode: "",
+        chassisNumber: "",
+        kennCode: "",
+        version: "",
+      },
       list: null,
       totalCount: 0,
       listLoading: true,
@@ -454,8 +616,14 @@ export default {
       },
       listExportQuery: {
         version: "",
-        customerCode: "TH",
+        materialCode: undefined,
-        //apply:"",
+        cp7begin: undefined,
+        cp7end: undefined,
+        kenncode: undefined,
+        chassisNumber: undefined,
+        materialGroup: undefined,
+        begin: undefined,
+        end: undefined,
       },
       listQuery: {
         taskId: "",
@@ -493,10 +661,14 @@ export default {
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
     });
+    //this.disabledDateCp5();
   },
   created() {
     this.getAllVersionList();
+    this.getMaterialGroup();
     this.getList();
+    // this.getCurrentMonthFirst();
+    // this.getCurrentMonthLast();
   },
   beforeDestroy() {
     clearInterval(this.timer);
@@ -510,27 +682,22 @@ export default {
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
-        width: 80,
+        width: 85,
       });
-      /* tempsTabs.push({
-        label: "当前版本",
-        prop: "version",
-        width: 140,
-      }); */
       tempsTabs.push({
         label: "模块名称",
         prop: "name",
-        width: 150,
+        width: 170,
       });
       tempsTabs.push({
         label: "创建人",
         prop: "email",
-        width: 105,
+        width: 110,
       });
       tempsTabs.push({
         label: "创建时间",
         prop: "createdAt",
-        width: 140,
+        width: 150,
       });
       // tempsTabs.push({
       //   label: "操作名称",
@@ -546,7 +713,36 @@ export default {
     },
   },
   methods: {
-    //取版本
+    getdateValue(val) {
+      this.startTime = val;
+      this.getbalanceIndexData();
+    },
+    getdateVal(val) {
+      this.endTime = val;
+      this.getbalanceIndexData();
+    },
+
+    getCurrentMonthFirst() {
+      var date = new Date();
+      date.setDate(1);
+      var month = parseInt(date.getMonth() + 1);
+      var day = date.getDate();
+      if (month < 10) month = "0" + month;
+      if (day < 10) day = "0" + day;
+      this.startTime = date.getFullYear() + "-" + month + "-" + day;
+    },
+    getCurrentMonthLast() {
+      var date = new Date();
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      month = month < 10 ? "0" + month : month;
+      var day = new Date(year, month, 0);
+      this.endTime = year + "-" + month + "-" + day.getDate();
+    },
+    handleCheckedCitiesChange(value) {
+      alert(value);
+    },
+
     getAllVersionList() {
       this.$axios
         .posts("/api/settleaccount/CentralizedControl/openlist")
@@ -563,23 +759,79 @@ export default {
           this.listLoading = false;
         });
     },
+    //获取物料组车型
+    getMaterialGroup() {
+      this.$axios
+        .posts("/api/settleaccount/CodeSetting/list", {
+          project: "物料组",
+          maxResultCount: 1000,
+          skipCount: 0,
+        })
+        .then((response) => {
+          this.materialGroupList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.description;
+            options.label = element.description;
+            this.materialGroupList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
     /* 重置 */
     resetForm(formName) {
       this.formCount = {};
+      this.datetime5 = [];
+      this.startTime = "";
+      this.endTime = "";
+      // this.datetime7 = [];
     },
     save() {
       this.$refs.formCount.validate((valid) => {
         if (valid) {
-          console.log("参数:" + JSON.stringify(this.formCount));
           this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue;
+          this.listExportQuery.version = this.formCount.versionValue; //版本
-          //this.listExportQuery.customerCode = this.formCount.customerCode;
+          if (this.formCount.materialCode != "") {
+            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
+          }
+          if (this.formCount.sapMaterialCode != "") {
+            this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //厂内物料号
+          }
+          if (this.formCount.kennCode != "") {
+            this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
+          }
+          var getdate5 = JSON.stringify(this.datetime5);
+          if (getdate5 != "[]") {
+            alert(this.datetime5[0]);
+            this.listExportQuery.begin = this.datetime5
+              ? this.datetime5[0] || undefined
+              : undefined;
+            this.listExportQuery.end = this.datetime5
+              ? this.datetime5[1] || undefined
+              : undefined;
+          }
+          if (this.startTime != "") {
+            this.listExportQuery.cp7begin = this.startTime; //CP7开始时间
+          }
+          if (this.endTime != "") {
+            this.listExportQuery.cp7end = this.endTime; //CP5结束日期
+          }
+          if (this.formCount.chassisNumber != "") {
+            this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
+          }
+          if (this.formCount.materialGroupValue != "") {
+            this.listExportQuery.materialGroup =
+              this.formCount.materialGroupValue; //物料组车型
+          }
           console.log(
-            "价差量差，传入条件：" + JSON.stringify(this.listExportQuery)
+            "大众准时化结算门板价格差异比对报表-导出条件：" +
+              JSON.stringify(this.listExportQuery)
           );
           this.$axios
             .gets(
-              "/api/settleaccount/ReportMakeService/PriceQtyDiff-Make",
+              "/api/settleaccount/ReportMakeService/SettleDoorPanel",
               this.listExportQuery
             )
             .then((res) => {
@@ -604,9 +856,9 @@ export default {
       });
     },
     handleCreate() {
-      // this.$nextTick(() => {
+      this.$nextTick(() => {
-      //   this.$refs["formCount"].resetFields();
+        this.$refs["formCount"].resetFields();
-      // });
+      });
       this.formTitle = "报表统计";
       this.isEdit = false;
       this.form = {};
@@ -655,7 +907,8 @@ export default {
       }
     },
     /* 导出类型的文件 */
-    downloadErrData(param) {alert(param)
+    downloadErrData(param) {
+      this.listLoading = true;
       let fileNameOfProject = param;
       this.$axios
         .BolbGets(
@@ -723,7 +976,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "价差量差分析报表";
+      this.listQuery.name = "大众准时化结算门板价格差异比对报表";
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
         .then((response) => {
@@ -745,7 +998,7 @@ export default {
     //       this.form = response;
     //     });
     // },
-    // resetQuery() {},
+    resetQuery() {},
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
       var item = this.list[rowIndex];
@@ -779,6 +1032,11 @@ export default {
 <style lang="scss" scoped>
 @import "../../styles/crmtable.scss";
 @import "../../styles/steps.scss";
-</style>
 
+/deep/ .el-checkbox input:focus {
+  outline: none !important;
+  border-color: gray;
+  border: 0px;
+  box-shadow: none !important;
+}
 </style>

vue/src/views/ux/billManage/settledPartAndErpPartPriceDiff/index.vue → vue/src/views/ux/billManage/UnSettleDiffExport/index.vue

@@ -1,33 +1,22 @@
-<!--零件匹配关系页-->
+<!--准时化未结差异比对-->
+<!--发出未结算页-->
 <template>
   <div class="cr-body-content">
+    <!--功能栏-->
+    <!-- 搜索 -->
     <div style="float: left">
       <flexbox class="content-header">
         <el-button
+          class="filter-item"
+          size="mini"
           type="primary"
           icon="el-icon-plus"
-          size="mini"
           @click="handleCreate"
-          >统计<!-- 报表(输出Excel文件) -->
+          >统计
         </el-button>
-        <!-- <el-input
-        v-model="searchContent"
-        clearable
-        size="small"
-        placeholder="按照零件号搜索..."
-        style="width: 200px"
-        class="search-container"
-        @keyup.enter.native="handleFilter"
-      />
-      <el-button
-        size="mini"
-        type="success"
-        icon="el-icon-search"
-        @click="handleFilter"
-        >搜索
-      </el-button> -->
       </flexbox>
     </div>
+    <!-- 刷新 -->
     <div style="float: right">
       <flexbox class="content-header">
         <el-tooltip
@@ -43,13 +32,14 @@
             @click="refresh()"
           />
         </el-tooltip>
-        <span style="margin-left: 10px; color: #ff5640"
+
+        <span style="margin-left: 10px; color: #ff5640; float: right"
           >说明：每间隔30秒进行自动刷新！</span
         >
       </flexbox>
     </div>
 
-    <!--表格渲染-->
+    <!--主页面表格渲染-->
     <el-table
       ref="multipleTable"
       v-loading="listLoading"
@@ -59,7 +49,6 @@
       :data="list"
       :height="tableHeight"
       :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
       size="small"
       stripe
       border
@@ -75,20 +64,27 @@
         :label="item.label"
         :min-width="item.width"
         :formatter="fieldFormatter"
+        sortable
         show-overflow-tooltip
         :gutter="0"
-        sortable
       >
         <template slot="header" slot-scope="scope">
           {{ scope.column.label }}
         </template>
       </el-table-column>
+
+      <!-- 操作名称 -->
       <el-table-column
         prop="actionName"
+        label="操作名称(单击箭头过滤)"
         width="165"
         column-key="actionName"
-        label="导出类型"
+        :filters="[
-        sortable
+          { text: '导出', value: '导出' },
+          { text: '消息', value: '消息' },
+        ]"
+        filter-placement="bottom-end"
+        :filter-method="filterHandler"
       >
         <template slot-scope="scope">
           <div align="center">
@@ -103,21 +99,21 @@
           </div>
         </template>
       </el-table-column>
+      <!-- 状态 -->
       <el-table-column
         prop="stateName"
         label="状态(单击箭头过滤)"
-        width="185"
+        width="165"
-        align="center"
         column-key="stateName"
+        align="center"
         :filters="[
           { text: '执行完成(任务成功)', value: 'Succeeded' },
           { text: '执行完成(任务失败)', value: 'Failed' },
           { text: '执行中', value: 'Processing' },
-          { text: '等待执行', value: '等待执行' },
+          { text: '等待执行', value: 'Scheduled' },
         ]"
         filter-placement="bottom-end"
         :filter-method="filterHandler"
-        sortable
       >
         <template slot-scope="scope">
           <el-tag
@@ -130,15 +126,16 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="280" sortable>
+      <!-- 操作 -->
+      <el-table-column label="操作" align="center" width="250">
         <template slot-scope="scope">
+          <div align="center">
             <!-- <el-button
               v-if="scope.row.actionName == '导出'"
               size="mini"
               type="text"
               @click="handleDownload(scope.row)"
               icon="el-icon-edit"
-            style="margin-left: 100px"
               >下载</el-button
             > -->
             <el-button
@@ -165,11 +162,13 @@
               icon="el-icon-edit"
               >检验失败，下载</el-button
             >
+          </div>
         </template>
       </el-table-column>
     </el-table>
-    <div class="table-footer">
+
     <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+    <div class="table-footer">
       <pagination
         v-show="totalCount > 0"
         :total="totalCount"
@@ -326,13 +325,14 @@
         <el-button @click="openView = false">关 闭</el-button>
       </div>
     </el-dialog>
-    <!--表单渲染-->
+
+    <!--统计功能表单渲染-->
     <el-dialog
       :visible.sync="dialogFormVisible"
       :close-on-click-modal="false"
       :title="formTitle"
       append-to-body
-      width="550px"
+      width="680px"
     >
       <el-form
         ref="formCount"
@@ -364,31 +364,128 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :md="4" :xs="24">
-            <el-form-item label="适用功能" required />
+            <el-form-item label="物料组(车型)" />
           </el-col>
           <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="customerCode">
+            <el-form-item prop="materialGroupValue">
               <el-select
-                v-model="formCount.customerCode"
+                v-model="formCount.materialGroupValue"
                 size="medium"
+                filterable
                 clearable
                 style="width: 188px; margin-right: 15px"
                 placeholder="请选择"
               >
-                <el-option label="结算" value="R0003"></el-option>
+                <el-option
-                <el-option label="二配" value="R0001"></el-option>
+                  v-for="item in materialGroupList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row> -->
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="CP5时间：" />
+          </el-col>
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-date-picker
+                v-model="datetime5"
+                type="datetimerange"
+                :picker-options="pickerOptionsCp5"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :default-time="['00:00:00', '23:59:59']"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="CP7时间：" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-date-picker
+                v-model="startTime"
+                type="datetime"
+                size="small"
+                :picker-options="pickerOptions0"
+                @change="getdateValue"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="00:00:00"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -40px">
+            <el-form-item>
+              <el-date-picker
+                v-model="endTime"
+                type="datetime"
+                :picker-options="pickerOptions1"
+                size="small"
+                @change="getdateVal"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="23:59:59"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row> 
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="KEEN号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-input v-model="formCount.kennCode" />
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="底盘号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -95px">
+            <el-form-item>
+              <el-input v-model="formCount.chassisNumber" />
+            </el-form-item>
+          </el-col>
+        </el-row>-->
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="客户零件号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-input v-model="formCount.materialCode" />
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="客户零件号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -95px">
+            <el-form-item>
+              <el-input v-model="formCount.sapMaterialCode" />
+            </el-form-item>
+          </el-col>
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="dialogFormVisible = false"
+        <!-- <el-button type="text" @click="dialogFormVisible = false"
           >取消</el-button
-        >
+        > -->
-        <!-- <el-button @click="resetForm('formCount')">重置</el-button> -->
+        <el-button @click="resetForm('formCount')">重置</el-button>
         <el-button v-loading="formLoading" type="primary" @click="save"
           >确认</el-button
         >
@@ -403,27 +500,81 @@ import permission from "@/directive/permission/index.js";
 import { downloadFile } from "@/utils/crmindex.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import moment from "moment";
+const cityOptions = [
+  { id: 0, name: "未结" },
+  { id: 1, name: "部分结算" },
+  { id: 2, name: "已结" },
+  /* { id: 3, name: "预批量" }, */
+];
 
 export default {
-  name: "SettledPartAndErpPartPriceDiff",
+  name: "UnSettleDiffExport",
   components: { Pagination, CRMTableHead },
   directives: { permission },
 
   data() {
     return {
       crmType: "backJob",
-      //customerCode: "R0003",
       rules: {
         versionValue: [
           { required: true, message: "必须输入！", trigger: "change" },
         ],
       },
+      pickerOptionsCp5: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      pickerOptions0: {
+        disabledDate: (time) => {
+          //if (this.endTime != "") {
+          //return  time.getTime() >= new Date(this.endTime).getTime();
+          return time.getTime() > new Date(this.endTime).getTime();
+          //}
+        },
+      },
+      pickerOptions1: {
+        disabledDate: (time) => {
+          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
+          return time.getTime() <= new Date(this.startTime).getTime();
+        },
+      },
+      startTime: "",
+      endTime: "",
+      pickerOptionsCp7: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      datetime5: [],
+      datetime7: [],
+      checkedCities: [0],
+      cities: cityOptions,
       selectValue: "",
       selectNameValue: "",
+      radio: "0", //结算状态：0未结 1部分结算
       versionList: [],
+      materialGroupList: [],
       // 是否显示详细弹出层
       openView: false,
       versionValue: "",
+      materialGroupValue: "",
       formTitle: "",
       timer: null, //定时器名称
       //当前位置
@@ -448,7 +599,17 @@ export default {
       customerInfos: "",
       searchContent: "", // 输入内容
       form: {},
-      formCount: {},
+      formCount: {
+        name: "未结算对比",
+        // datetime5: [],
+        // datetime7: [],
+        settledate: "",
+        materialCode: "",
+        sapMaterialCode: "",
+        chassisNumber: "",
+        kennCode: "",
+        version: "",
+      },
       list: null,
       totalCount: 0,
       listLoading: true,
@@ -462,18 +623,16 @@ export default {
       },
       listExportQuery: {
         version: "",
-        customerCode: "",
+        materialCode: undefined,
-        //apply:"",
+        cp7begin: undefined,
+        cp7end: undefined,
+        kenncode: undefined,
+        chassisNumber: undefined,
+        materialGroup: undefined,
+        begin: undefined,
+        end: undefined,
       },
       listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
         taskId: "",
         name: "",
       },
@@ -483,7 +642,6 @@ export default {
       tableHeight: document.documentElement.clientHeight - 260,
       isEdit: false,
       menuCateMap: [
-        { label: "导入", value: "导入", cssName: "primary" },
         { label: "导出", value: "导出", cssName: "warning" },
         { label: "消息", value: "消息", cssName: "info" },
       ],
@@ -510,43 +668,38 @@ export default {
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
     });
+    //this.disabledDateCp5();
   },
   created() {
     this.getAllVersionList();
+    this.getMaterialGroup();
     this.getList();
+    // this.getCurrentMonthFirst();
+    // this.getCurrentMonthLast();
   },
   beforeDestroy() {
     clearInterval(this.timer);
     this.timer = null;
   },
   computed: {
+    /* 主表头 */
     getDefaultField() {
       var tempsTabs = [];
 
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
-        width: 120,
+        width: 85,
       });
       tempsTabs.push({
         label: "模块名称",
         prop: "name",
-        width: 200,
+        width: 170,
       });
-      // tempsTabs.push({
-      //   label: "操作名称",
-      //   prop: "actionName",
-      //   width: 120,
-      // });
       tempsTabs.push({
         label: "创建人",
-        prop: "creator",
-        width: 100,
-      });
-      tempsTabs.push({
-        label: "电子邮箱",
         prop: "email",
-        width: 120,
+        width: 110,
       });
       tempsTabs.push({
         label: "创建时间",
@@ -554,6 +707,11 @@ export default {
         width: 150,
       });
       // tempsTabs.push({
+      //   label: "操作名称",
+      //   prop: "actionName",
+      //   width: 120,
+      // });
+      // tempsTabs.push({
       //   label: "状态",
       //   prop: "stateName",
       //   width: 100,
@@ -562,6 +720,36 @@ export default {
     },
   },
   methods: {
+    getdateValue(val) {
+      this.startTime = val;
+      this.getbalanceIndexData();
+    },
+    getdateVal(val) {
+      this.endTime = val;
+      this.getbalanceIndexData();
+    },
+
+    getCurrentMonthFirst() {
+      var date = new Date();
+      date.setDate(1);
+      var month = parseInt(date.getMonth() + 1);
+      var day = date.getDate();
+      if (month < 10) month = "0" + month;
+      if (day < 10) day = "0" + day;
+      this.startTime = date.getFullYear() + "-" + month + "-" + day;
+    },
+    getCurrentMonthLast() {
+      var date = new Date();
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      month = month < 10 ? "0" + month : month;
+      var day = new Date(year, month, 0);
+      this.endTime = year + "-" + month + "-" + day.getDate();
+    },
+    handleCheckedCitiesChange(value) {
+      alert(value);
+    },
+
     getAllVersionList() {
       this.$axios
         .posts("/api/settleaccount/CentralizedControl/openlist")
@@ -578,21 +766,80 @@ export default {
           this.listLoading = false;
         });
     },
+    //获取物料组车型
+    getMaterialGroup() {
+      this.$axios
+        .posts("/api/settleaccount/CodeSetting/list", {
+          project: "物料组",
+          maxResultCount: 1000,
+          skipCount: 0,
+        })
+        .then((response) => {
+          this.materialGroupList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.description;
+            options.label = element.description;
+            this.materialGroupList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    /* 重置 */
     resetForm(formName) {
       this.formCount = {};
+      this.datetime5 = [];
+      this.startTime = "";
+      this.endTime = "";
+      // this.datetime7 = [];
     },
-
     save() {
       this.$refs.formCount.validate((valid) => {
         if (valid) {
-          console.log("参数:" + JSON.stringify(this.formCount));
           this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue;
+          this.listExportQuery.version = this.formCount.versionValue; //版本
-          this.listExportQuery.customerCode = this.formCount.customerCode;
+          if (this.formCount.materialCode != "") {
-          console.log("导出条件：" + JSON.stringify(this.listExportQuery));
+            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
+          }
+          if (this.formCount.sapMaterialCode != "") {
+            this.listExportQuery.sapMaterialCode =
+              this.formCount.sapMaterialCode; //厂内物料号
+          }
+          if (this.formCount.kennCode != "") {
+            this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
+          }
+          var getdate5 = JSON.stringify(this.datetime5);
+          if (getdate5 != "[]") {
+            alert(this.datetime5[0]);
+            this.listExportQuery.begin = this.datetime5
+              ? this.datetime5[0] || undefined
+              : undefined;
+            this.listExportQuery.end = this.datetime5
+              ? this.datetime5[1] || undefined
+              : undefined;
+          }
+          // if (this.startTime != "") {
+          //   this.listExportQuery.cp7begin = this.startTime; //CP7开始时间
+          // }
+          // if (this.endTime != "") {
+          //   this.listExportQuery.cp7end = this.endTime; //CP7结束日期
+          // }
+          if (this.formCount.chassisNumber != "") {
+            this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
+          }
+          // if (this.formCount.materialGroupValue != "") {
+          //   this.listExportQuery.materialGroup =
+          //     this.formCount.materialGroupValue; //物料组车型
+          // }
+          console.log(
+            "准时化未结差异比对-导出条件：" +
+              JSON.stringify(this.listExportQuery)
+          );
           this.$axios
             .gets(
-              "/api/settleaccount/ReportMakeService/SettledPartAndErpPartPriceDiff-Make",
+              "/api/settleaccount/ReportMakeService/UnSettleDiffExport-Make",
               this.listExportQuery
             )
             .then((res) => {
@@ -616,29 +863,10 @@ export default {
         }
       });
     },
-
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "materialCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-
     handleCreate() {
-      // this.$nextTick(() => {
+      this.$nextTick(() => {
-      //   this.$refs["formCount"].resetFields();
+        this.$refs["formCount"].resetFields();
-      // });
+      });
       this.formTitle = "报表统计";
       this.isEdit = false;
       this.form = {};
@@ -648,7 +876,7 @@ export default {
       const property = column["property"];
       return row[property] === value;
     },
-    /** 任务详细信息 */
+    /* 任务详细信息 */
     handleView(row) {
       this.listQuery.taskId = row.taskId;
       this.$axios
@@ -670,9 +898,7 @@ export default {
           this.openView = true;
         });
     },
-    /**
+    /*  刷新  */
-     * 刷新
-     */
     refresh() {
       this.list = [];
       this.listQuery.taskId = "";
@@ -688,10 +914,9 @@ export default {
         console.log("点击重置");
       }
     },
-    /**
+    /* 导出类型的文件 */
-     * 导出类型的文件
-     */
     downloadErrData(param) {
+      this.listLoading = true;
       let fileNameOfProject = param;
       this.$axios
         .BolbGets(
@@ -724,14 +949,13 @@ export default {
           this.listLoading = false;
         });
     },
-
+    /* 刷新列表 */
-    /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {
         this.getList();
       }
     },
-    /** 格式化字段 */
+    /* 格式化字段 */
     fieldFormatter(row, column) {
       if (column.property === "stateName") {
         return {
@@ -760,7 +984,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "结算总成和ERP总成价格对比";
+      this.listQuery.name = "大众发票与结算核对明细表";
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
         .then((response) => {
@@ -774,14 +998,14 @@ export default {
           this.listLoading = false;
         });
     },
-    fetchData(id) {
+    // fetchData(id) {
-      //循环动态，取客户名称
+    //   //循环动态，取客户名称
-      this.$axios
+    //   this.$axios
-        .gets("/api/settleaccount/MaterialRelationship/" + id)
+    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-        .then((response) => {
+    //     .then((response) => {
-          this.form = response;
+    //       this.form = response;
-        });
+    //     });
-    },
+    // },
     resetQuery() {},
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
@@ -799,6 +1023,9 @@ export default {
       //}
     },
     headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "stateName") {
+        return { textAlign: "center" };
+      }
       return { textAlign: "center" };
     },
     handleRowClick(row, column, event) {
@@ -813,6 +1040,11 @@ export default {
 <style lang="scss" scoped>
 @import "../../styles/crmtable.scss";
 @import "../../styles/steps.scss";
-</style>
 
+/deep/ .el-checkbox input:focus {
+  outline: none !important;
+  border-color: gray;
+  border: 0px;
+  box-shadow: none !important;
+}
 </style>

vue/src/views/ux/billManage/audiAndvw/index.vue → vue/src/views/ux/billManage/UnSettledDiff/index.vue

@@ -1,18 +1,21 @@
-<!--二配报表-->
+<!--大众准时化未结比对-->
 <template>
   <div class="cr-body-content">
+    <!--功能栏-->
+    <!-- 搜索 -->
     <div style="float: left">
       <flexbox class="content-header">
         <el-button
+          class="filter-item"
+          size="mini"
           type="primary"
           icon="el-icon-plus"
-          size="mini"
           @click="handleCreate"
-          >统计<!-- 报表(输出Excel文件) -->
+          >统计
         </el-button>
-
       </flexbox>
     </div>
+    <!-- 刷新 -->
     <div style="float: right">
       <flexbox class="content-header">
         <el-tooltip
@@ -28,13 +31,14 @@
             @click="refresh()"
           />
         </el-tooltip>
-        <span style="margin-left: 10px; color: #ff5640"
+
+        <span style="margin-left: 10px; color: #ff5640; float: right"
           >说明：每间隔30秒进行自动刷新！</span
         >
       </flexbox>
     </div>
 
-    <!--表格渲染-->
+    <!--主页面表格渲染-->
     <el-table
       ref="multipleTable"
       v-loading="listLoading"
@@ -44,7 +48,6 @@
       :data="list"
       :height="tableHeight"
       :cell-style="cellStyle"
-      :header-cell-style="headerRowStyle"
       size="small"
       stripe
       border
@@ -60,20 +63,27 @@
         :label="item.label"
         :min-width="item.width"
         :formatter="fieldFormatter"
+        sortable
         show-overflow-tooltip
         :gutter="0"
-        sortable
       >
         <template slot="header" slot-scope="scope">
           {{ scope.column.label }}
         </template>
       </el-table-column>
+
+      <!-- 操作名称 -->
       <el-table-column
         prop="actionName"
+        label="操作名称(单击箭头过滤)"
         width="165"
         column-key="actionName"
-        label="导出类型"
+        :filters="[
-        sortable
+          { text: '导出', value: '导出' },
+          { text: '消息', value: '消息' },
+        ]"
+        filter-placement="bottom-end"
+        :filter-method="filterHandler"
       >
         <template slot-scope="scope">
           <div align="center">
@@ -88,21 +98,21 @@
           </div>
         </template>
       </el-table-column>
+      <!-- 状态 -->
       <el-table-column
         prop="stateName"
         label="状态(单击箭头过滤)"
-        width="185"
+        width="165"
-        align="center"
         column-key="stateName"
+        align="center"
         :filters="[
           { text: '执行完成(任务成功)', value: 'Succeeded' },
           { text: '执行完成(任务失败)', value: 'Failed' },
           { text: '执行中', value: 'Processing' },
-          { text: '等待执行', value: '等待执行' },
+          { text: '等待执行', value: 'Scheduled' },
         ]"
         filter-placement="bottom-end"
         :filter-method="filterHandler"
-        sortable
       >
         <template slot-scope="scope">
           <el-tag
@@ -115,15 +125,16 @@
           </el-tag>
         </template>
       </el-table-column>
-      <el-table-column label="操作" align="center" width="280" sortable>
+      <!-- 操作 -->
+      <el-table-column label="操作" align="center" width="250">
         <template slot-scope="scope">
+          <div align="center">
             <!-- <el-button
               v-if="scope.row.actionName == '导出'"
               size="mini"
               type="text"
               @click="handleDownload(scope.row)"
               icon="el-icon-edit"
-            style="margin-left: 100px"
               >下载</el-button
             > -->
             <el-button
@@ -150,11 +161,13 @@
               icon="el-icon-edit"
               >检验失败，下载</el-button
             >
+          </div>
         </template>
       </el-table-column>
     </el-table>
-    <div class="table-footer">
+
     <!-- 分页控件 style="margin-top: -25px;margin-bottom:-25px;float:right;"-->
+    <div class="table-footer">
       <pagination
         v-show="totalCount > 0"
         :total="totalCount"
@@ -311,13 +324,14 @@
         <el-button @click="openView = false">关 闭</el-button>
       </div>
     </el-dialog>
-    <!--表单渲染-->
+
+    <!--统计功能表单渲染-->
     <el-dialog
       :visible.sync="dialogFormVisible"
       :close-on-click-modal="false"
       :title="formTitle"
       append-to-body
-      width="550px"
+      width="680px"
     >
       <el-form
         ref="formCount"
@@ -349,31 +363,128 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <el-row>
+        <!-- <el-row>
           <el-col :md="4" :xs="24">
-            <el-form-item label="选择工厂" required />
+            <el-form-item label="物料组(车型)" />
           </el-col>
           <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="customerCode">
+            <el-form-item prop="materialGroupValue">
               <el-select
-                v-model="formCount.customerCode"
+                v-model="formCount.materialGroupValue"
                 size="medium"
+                filterable
                 clearable
                 style="width: 188px; margin-right: 15px"
                 placeholder="请选择"
               >
-                <el-option label="奥迪" value="audi"></el-option>
+                <el-option
-                <el-option label="宝来" value="boro"></el-option>
+                  v-for="item in materialGroupList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
+        </el-row> -->
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="CP5时间：" />
+          </el-col>
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-date-picker
+                v-model="datetime5"
+                type="datetimerange"
+                :picker-options="pickerOptionsCp5"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :default-time="['00:00:00', '23:59:59']"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <!-- <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="CP7时间：" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-date-picker
+                v-model="startTime"
+                type="datetime"
+                size="small"
+                :picker-options="pickerOptions0"
+                @change="getdateValue"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="00:00:00"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -40px">
+            <el-form-item>
+              <el-date-picker
+                v-model="endTime"
+                type="datetime"
+                :picker-options="pickerOptions1"
+                size="small"
+                @change="getdateVal"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="23:59:59"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="KEEN号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-input v-model="formCount.kennCode" />
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="底盘号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -95px">
+            <el-form-item>
+              <el-input v-model="formCount.chassisNumber" />
+            </el-form-item>
+          </el-col>
+        </el-row> -->
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="客户零件号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-input v-model="formCount.materialCode" />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :md="4" :xs="24">
+            <el-form-item label="厂内零件号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -95px">
+            <el-form-item>
+              <el-input v-model="formCount.sapMaterialCode" />
+            </el-form-item>
+          </el-col> -->
         </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
-        <el-button type="text" @click="dialogFormVisible = false"
+        <!-- <el-button type="text" @click="dialogFormVisible = false"
           >取消</el-button
-        >
+        > -->
-        <!-- <el-button @click="resetForm('formCount')">重置</el-button> -->
+        <el-button @click="resetForm('formCount')">重置</el-button>
         <el-button v-loading="formLoading" type="primary" @click="save"
           >确认</el-button
         >
@@ -389,26 +500,74 @@ import { downloadFile } from "@/utils/crmindex.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import moment from "moment";
 
+
 export default {
-  name: "SettledPartAndErpPartPriceDiff",
+  name: "InvoiceSettledDetailDiff",
   components: { Pagination, CRMTableHead },
   directives: { permission },
 
   data() {
     return {
       crmType: "backJob",
-      //customerCode: "R0003",
       rules: {
         versionValue: [
           { required: true, message: "必须输入！", trigger: "change" },
         ],
       },
+      pickerOptionsCp5: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      pickerOptions0: {
+        disabledDate: (time) => {
+          //if (this.endTime != "") {
+          //return  time.getTime() >= new Date(this.endTime).getTime();
+          return time.getTime() > new Date(this.endTime).getTime();
+          //}
+        },
+      },
+      pickerOptions1: {
+        disabledDate: (time) => {
+          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
+          return time.getTime() <= new Date(this.startTime).getTime();
+        },
+      },
+      startTime: "",
+      endTime: "",
+      pickerOptionsCp7: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      datetime5: [],
+      datetime7: [],
+      checkedCities: [0],
       selectValue: "",
       selectNameValue: "",
+      radio: "0", //结算状态：0未结 1部分结算
       versionList: [],
+      materialGroupList: [],
       // 是否显示详细弹出层
       openView: false,
       versionValue: "",
+      materialGroupValue: "",
       formTitle: "",
       timer: null, //定时器名称
       //当前位置
@@ -433,7 +592,17 @@ export default {
       customerInfos: "",
       searchContent: "", // 输入内容
       form: {},
-      formCount: {},
+      formCount: {
+        name: "未结算对比",
+        // datetime5: [],
+        // datetime7: [],
+        settledate: "",
+        materialCode: "",
+        sapMaterialCode: "",
+        chassisNumber: "",
+        kennCode: "",
+        version: "",
+      },
       list: null,
       totalCount: 0,
       listLoading: true,
@@ -447,18 +616,16 @@ export default {
       },
       listExportQuery: {
         version: "",
-        customerCode: "",
+        materialCode: undefined,
-        //apply:"",
+        cp7begin: undefined,
+        cp7end: undefined,
+        kenncode: undefined,
+        chassisNumber: undefined,
+        materialGroup: undefined,
+        begin: undefined,
+        end: undefined,
       },
       listQuery: {
-        Filters: [
-          {
-            logic: 0,
-            column: "Enabled",
-            action: 0,
-            value: "true",
-          }, //默认查询可用的
-        ],
         taskId: "",
         name: "",
       },
@@ -468,7 +635,6 @@ export default {
       tableHeight: document.documentElement.clientHeight - 260,
       isEdit: false,
       menuCateMap: [
-        { label: "导入", value: "导入", cssName: "primary" },
         { label: "导出", value: "导出", cssName: "warning" },
         { label: "消息", value: "消息", cssName: "info" },
       ],
@@ -495,43 +661,38 @@ export default {
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
     });
+    //this.disabledDateCp5();
   },
   created() {
     this.getAllVersionList();
+    this.getMaterialGroup();
     this.getList();
+    // this.getCurrentMonthFirst();
+    // this.getCurrentMonthLast();
   },
   beforeDestroy() {
     clearInterval(this.timer);
     this.timer = null;
   },
   computed: {
+    /* 主表头 */
     getDefaultField() {
       var tempsTabs = [];
 
       tempsTabs.push({
         label: "单据流水号",
         prop: "taskId",
-        width: 120,
+        width: 85,
       });
       tempsTabs.push({
         label: "模块名称",
         prop: "name",
-        width: 200,
+        width: 170,
       });
-      // tempsTabs.push({
-      //   label: "操作名称",
-      //   prop: "actionName",
-      //   width: 120,
-      // });
       tempsTabs.push({
         label: "创建人",
-        prop: "creator",
-        width: 100,
-      });
-      tempsTabs.push({
-        label: "电子邮箱",
         prop: "email",
-        width: 120,
+        width: 110,
       });
       tempsTabs.push({
         label: "创建时间",
@@ -539,6 +700,11 @@ export default {
         width: 150,
       });
       // tempsTabs.push({
+      //   label: "操作名称",
+      //   prop: "actionName",
+      //   width: 120,
+      // });
+      // tempsTabs.push({
       //   label: "状态",
       //   prop: "stateName",
       //   width: 100,
@@ -547,6 +713,36 @@ export default {
     },
   },
   methods: {
+    getdateValue(val) {
+      this.startTime = val;
+      this.getbalanceIndexData();
+    },
+    getdateVal(val) {
+      this.endTime = val;
+      this.getbalanceIndexData();
+    },
+
+    getCurrentMonthFirst() {
+      var date = new Date();
+      date.setDate(1);
+      var month = parseInt(date.getMonth() + 1);
+      var day = date.getDate();
+      if (month < 10) month = "0" + month;
+      if (day < 10) day = "0" + day;
+      this.startTime = date.getFullYear() + "-" + month + "-" + day;
+    },
+    getCurrentMonthLast() {
+      var date = new Date();
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      month = month < 10 ? "0" + month : month;
+      var day = new Date(year, month, 0);
+      this.endTime = year + "-" + month + "-" + day.getDate();
+    },
+    handleCheckedCitiesChange(value) {
+      alert(value);
+    },
+
     getAllVersionList() {
       this.$axios
         .posts("/api/settleaccount/CentralizedControl/openlist")
@@ -563,21 +759,79 @@ export default {
           this.listLoading = false;
         });
     },
+    //获取物料组车型
+    getMaterialGroup() {
+      this.$axios
+        .posts("/api/settleaccount/CodeSetting/list", {
+          project: "物料组",
+          maxResultCount: 1000,
+          skipCount: 0,
+        })
+        .then((response) => {
+          this.materialGroupList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.description;
+            options.label = element.description;
+            this.materialGroupList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
+    },
+    /* 重置 */
     resetForm(formName) {
       this.formCount = {};
+      this.datetime5 = [];
+      this.startTime = "";
+      this.endTime = "";
+      // this.datetime7 = [];
     },
-
     save() {
       this.$refs.formCount.validate((valid) => {
         if (valid) {
-          console.log("参数:" + JSON.stringify(this.formCount));
           this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue;
+          this.listExportQuery.version = this.formCount.versionValue; //版本
-          this.listExportQuery.customerCode = this.formCount.customerCode;
+          if (this.formCount.materialCode != "") {
-          console.log("导出条件：" + JSON.stringify(this.listExportQuery));
+            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
+          }
+          if (this.formCount.sapMaterialCode != "") {
+            this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //厂内物料号
+          }
+          if (this.formCount.kennCode != "") {
+            this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
+          }
+          var getdate5 = JSON.stringify(this.datetime5);
+          if (getdate5 != "[]") {
+            alert(this.datetime5[0]);
+            this.listExportQuery.begin = this.datetime5
+              ? this.datetime5[0] || undefined
+              : undefined;
+            this.listExportQuery.end = this.datetime5
+              ? this.datetime5[1] || undefined
+              : undefined;
+          }
+          if (this.startTime != "") {
+            this.listExportQuery.cp7begin = this.startTime; //CP7开始时间
+          }
+          if (this.endTime != "") {
+            this.listExportQuery.cp7end = this.endTime; //CP5结束日期
+          }
+          if (this.formCount.chassisNumber != "") {
+            this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
+          }
+          if (this.formCount.materialGroupValue != "") {
+            this.listExportQuery.materialGroup =
+              this.formCount.materialGroupValue; //物料组车型
+          }
+          console.log(
+            "大众发票与结算核对明细表-导出条件：" +
+              JSON.stringify(this.listExportQuery)
+          );
           this.$axios
             .gets(
-              "/api/settleaccount/ReportMakeService/SettledPartAndErpPartPriceDiff-Make",
+              "/api/settleaccount/ReportMakeService/InvoiceSettledDetailDiff-Make",
               this.listExportQuery
             )
             .then((res) => {
@@ -601,29 +855,10 @@ export default {
         }
       });
     },
-
-    /** 筛选操作 */
-    handleFilter() {
-      this.page = 1;
-      this.getList();
-      this.listQuery.Filters = [];
-      if (this.searchContent != "") {
-        var column = "materialCode";
-        let filter = {
-          logic: 0,
-          column: column,
-          action: 0,
-          value: this.searchContent,
-        };
-        this.listQuery.Filters.push(filter);
-      }
-      this.getList();
-    },
-
     handleCreate() {
-      // this.$nextTick(() => {
+      this.$nextTick(() => {
-      //   this.$refs["formCount"].resetFields();
+        this.$refs["formCount"].resetFields();
-      // });
+      });
       this.formTitle = "报表统计";
       this.isEdit = false;
       this.form = {};
@@ -633,7 +868,7 @@ export default {
       const property = column["property"];
       return row[property] === value;
     },
-    /** 任务详细信息 */
+    /* 任务详细信息 */
     handleView(row) {
       this.listQuery.taskId = row.taskId;
       this.$axios
@@ -655,9 +890,7 @@ export default {
           this.openView = true;
         });
     },
-    /**
+    /*  刷新  */
-     * 刷新
-     */
     refresh() {
       this.list = [];
       this.listQuery.taskId = "";
@@ -673,10 +906,9 @@ export default {
         console.log("点击重置");
       }
     },
-    /**
+    /* 导出类型的文件 */
-     * 导出类型的文件
-     */
     downloadErrData(param) {
+      this.listLoading = true;
       let fileNameOfProject = param;
       this.$axios
         .BolbGets(
@@ -709,14 +941,13 @@ export default {
           this.listLoading = false;
         });
     },
-
+    /* 刷新列表 */
-    /** 刷新列表 */
     handleHandle(data) {
       if (data.type !== "edit") {
         this.getList();
       }
     },
-    /** 格式化字段 */
+    /* 格式化字段 */
     fieldFormatter(row, column) {
       if (column.property === "stateName") {
         return {
@@ -745,7 +976,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "结算总成和ERP总成价格对比";
+      this.listQuery.name = "大众准时化未结明细表";
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
         .then((response) => {
@@ -759,14 +990,14 @@ export default {
           this.listLoading = false;
         });
     },
-    fetchData(id) {
+    // fetchData(id) {
-      //循环动态，取客户名称
+    //   //循环动态，取客户名称
-      this.$axios
+    //   this.$axios
-        .gets("/api/settleaccount/MaterialRelationship/" + id)
+    //     .gets("/api/settleaccount/MaterialRelationship/" + id)
-        .then((response) => {
+    //     .then((response) => {
-          this.form = response;
+    //       this.form = response;
-        });
+    //     });
-    },
+    // },
     resetQuery() {},
     /** 通过回调控制style */
     cellStyle({ row, column, rowIndex, columnIndex }) {
@@ -784,6 +1015,9 @@ export default {
       //}
     },
     headerRowStyle({ row, column, rowIndex, columnIndex }) {
+      if (column.property === "stateName") {
+        return { textAlign: "center" };
+      }
       return { textAlign: "center" };
     },
     handleRowClick(row, column, event) {
@@ -798,6 +1032,11 @@ export default {
 <style lang="scss" scoped>
 @import "../../styles/crmtable.scss";
 @import "../../styles/steps.scss";
-</style>
 
+/deep/ .el-checkbox input:focus {
+  outline: none !important;
+  border-color: gray;
+  border: 0px;
+  box-shadow: none !important;
+}
 </style>

vue/src/views/ux/billManage/kanBanWithCode/index.vue

@@ -1,4 +1,4 @@
-<!--大众看板结算明细比对带条码-->
+<!--大众看板结算与交货核对-->
 <template>
   <div class="cr-body-content">
     <!--功能栏-->
@@ -331,9 +331,15 @@
       :close-on-click-modal="false"
       :title="formTitle"
       append-to-body
-      width="550px"
+      width="680px"
+    >
+      <el-form
+        ref="formCount"
+        :inline="true"
+        :rules="rules"
+        :model="formCount"
+        size="mini"
       >
-      <el-form ref="formCount" :inline="true" :model="formCount" size="mini">
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="选择版本" required />
@@ -357,25 +363,58 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row>
+        <el-row>
           <el-col :md="4" :xs="24">
-            <el-form-item label="适用功能" required />
+            <el-form-item label="物料组(车型)" />
           </el-col>
           <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="customerCode">
+            <el-form-item prop="materialGroupValue">
               <el-select
-                v-model="formCount.customerCode"
+                v-model="formCount.materialGroupValue"
                 size="medium"
+                filterable
                 clearable
                 style="width: 188px; margin-right: 15px"
                 placeholder="请选择"
               >
-                <el-option label="结算" value="R0003"></el-option>
+                <el-option
-                <el-option label="二配" value="R0001"></el-option>
+                  v-for="item in materialGroupList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row> -->
+        </el-row>
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="看板号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-input v-model="formCount.kanBan" style="width: 300px" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="客户零件号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-input v-model="formCount.materialCode" />
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="厂内零件号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -95px">
+            <el-form-item>
+              <el-input v-model="formCount.sapMaterialCode" />
+            </el-form-item>
+          </el-col>
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="text" @click="dialogFormVisible = false"
@@ -396,30 +435,74 @@ import permission from "@/directive/permission/index.js";
 import { downloadFile } from "@/utils/crmindex.js";
 import CRMTableHead from "../../components/CRMTableHead";
 import moment from "moment";
-const cityOptions = [
-  { id: 0, name: "未结" },
-  { id: 1, name: "部分结算" },
-  { id: 2, name: "已结" },
-  /* { id: 3, name: "预批量" }, */
-];
 
 export default {
-  name: "IssuedUnsettled",
+  name: "KanBanWithCode",
   components: { Pagination, CRMTableHead },
   directives: { permission },
 
   data() {
     return {
       crmType: "backJob",
+      rules: {
+        versionValue: [
+          { required: true, message: "必须输入！", trigger: "change" },
+        ],
+      },
+      pickerOptionsCp5: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      pickerOptions0: {
+        disabledDate: (time) => {
+          //if (this.endTime != "") {
+          //return  time.getTime() >= new Date(this.endTime).getTime();
+          return time.getTime() > new Date(this.endTime).getTime();
+          //}
+        },
+      },
+      pickerOptions1: {
+        disabledDate: (time) => {
+          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
+          return time.getTime() <= new Date(this.startTime).getTime();
+        },
+      },
+      startTime: "",
+      endTime: "",
+      pickerOptionsCp7: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      datetime5: [],
+      datetime7: [],
       checkedCities: [0],
-      cities: cityOptions,
       selectValue: "",
       selectNameValue: "",
       radio: "0", //结算状态：0未结 1部分结算
       versionList: [],
+      materialGroupList: [],
       // 是否显示详细弹出层
       openView: false,
       versionValue: "",
+      materialGroupValue: "",
       formTitle: "",
       timer: null, //定时器名称
       //当前位置
@@ -446,9 +529,15 @@ export default {
       form: {},
       formCount: {
         name: "未结算对比",
-        datetime5: "",
+        // datetime5: [],
-        datetime7: "",
+        // datetime7: [],
-        state: [0],
+        kanBan: "", //看板
+        settledate: "",
+        materialCode: "", //客户物料号
+        sapMaterialCode: "", //厂内物料号
+        chassisNumber: "",
+        kennCode: "",
+        version: "",
       },
       list: null,
       totalCount: 0,
@@ -462,11 +551,17 @@ export default {
         },
       },
       listExportQuery: {
-        //version: "",
+        version: "",
-        //customerCode: "TH",
+        kanBan: "", //看板
-        state: "",
+        customerPartCode: undefined, //客户物料号
-        begin: "",
+        sapMaterialCode: undefined, //厂内物料号
-        end: "",
+        cp7begin: undefined,
+        cp7end: undefined,
+        kenncode: undefined,
+        chassisNumber: undefined,
+        estimateTypeDesc: undefined, //物料组车型
+        begin: undefined,
+        end: undefined,
       },
       listQuery: {
         taskId: "",
@@ -504,10 +599,14 @@ export default {
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
     });
+    //this.disabledDateCp5();
   },
   created() {
     this.getAllVersionList();
+    this.getMaterialGroup();
     this.getList();
+    // this.getCurrentMonthFirst();
+    // this.getCurrentMonthLast();
   },
   beforeDestroy() {
     clearInterval(this.timer);
@@ -552,37 +651,36 @@ export default {
     },
   },
   methods: {
+    getdateValue(val) {
+      this.startTime = val;
+      this.getbalanceIndexData();
+    },
+    getdateVal(val) {
+      this.endTime = val;
+      this.getbalanceIndexData();
+    },
+
+    getCurrentMonthFirst() {
+      var date = new Date();
+      date.setDate(1);
+      var month = parseInt(date.getMonth() + 1);
+      var day = date.getDate();
+      if (month < 10) month = "0" + month;
+      if (day < 10) day = "0" + day;
+      this.startTime = date.getFullYear() + "-" + month + "-" + day;
+    },
+    getCurrentMonthLast() {
+      var date = new Date();
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      month = month < 10 ? "0" + month : month;
+      var day = new Date(year, month, 0);
+      this.endTime = year + "-" + month + "-" + day.getDate();
+    },
     handleCheckedCitiesChange(value) {
       alert(value);
     },
-    /* 导出功能 */
+
-    handleDownloadExport() {
-      if (this.versionValue === "") {
-        this.$message.error("请选择版本");
-        return false;
-      }
-      this.listLoading = true;
-      this.listExportQuery.version = this.version;
-      console.log("导出条件：" + JSON.stringify(this.listExportQuery));
-      this.$axios
-        .posts(
-          "/api/settleaccount/ReportMakeService/SettleKanBan-WithCode",
-          this.listExportQuery
-        )
-        .then((res) => {
-          let taskid = res;
-          if (Number.isInteger(taskid)) {
-            this.$notify({
-              title: "成功",
-              message: "任务生成成功！任务号:" + taskid,
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.getList();
-          this.listLoading = false;
-        });
-    },
     getAllVersionList() {
       this.$axios
         .posts("/api/settleaccount/CentralizedControl/openlist")
@@ -599,30 +697,58 @@ export default {
           this.listLoading = false;
         });
     },
-    checkedListChange(index)
+    //获取物料组车型
-    {
+    getMaterialGroup() {
-      if(this.formCount.state.length === 0)
+      this.$axios
-      {
+        .posts("/api/settleaccount/CodeSetting/list", {
-        this.formCount.state.push(this.cities[index].id);
+          project: "物料组",
-      }
+          maxResultCount: 1000,
+          skipCount: 0,
+        })
+        .then((response) => {
+          this.materialGroupList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.description;
+            options.label = element.description;
+            this.materialGroupList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
     },
     /* 重置 */
     resetForm(formName) {
-      //this.formCount = {};
+      this.formCount = {};
-      this.formCount.datetime5 = "";
+      this.datetime5 = [];
-      this.formCount.datetime7 = "";
+      this.startTime = "";
-      this.formCount.state = [0];
+      this.endTime = "";
+      // this.datetime7 = [];
     },
     save() {
       this.$refs.formCount.validate((valid) => {
         if (valid) {
-          console.log("参数:" + JSON.stringify(this.formCount));
           this.formLoading = true;
-           this.listExportQuery.version = this.formCount.versionValue;
+          this.listExportQuery.version = this.formCount.versionValue; //版本
-          // this.listExportQuery.begin = this.formCount.datetime5[0];
+          if (this.formCount.kanBan != "") {
-          // this.listExportQuery.end = this.formCount.datetime5[1];
+            this.listExportQuery.kanBan = this.formCount.kanBan; //看板
-          // this.listExportQuery.state = this.formCount.state.join(',');
+          }
-          console.log("导出条件：" + JSON.stringify(this.listExportQuery));
+          if (this.formCount.materialCode != "") {
+            this.listExportQuery.customerPartCode = this.formCount.materialCode; //物料号
+          }
+          if (this.formCount.sapMaterialCode != "") {
+            this.listExportQuery.sapMaterialCode =
+              this.formCount.sapMaterialCode; //厂内物料号
+          }
+          if (this.formCount.materialGroupValue != "") {
+            this.listExportQuery.estimateTypeDesc =
+              this.formCount.materialGroupValue; //物料组车型
+          }
+          console.log(
+            "大众看板结算与交货核对明细表-导出条件：" +
+              JSON.stringify(this.listExportQuery)
+          );
           this.$axios
             .gets(
               "/api/settleaccount/ReportMakeService/SettleKanBan-WithCode",
@@ -770,7 +896,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "未结算对比";
+      this.listQuery.name = "大众看板结算与交货核对明细表";
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
         .then((response) => {
@@ -827,11 +953,10 @@ export default {
 @import "../../styles/crmtable.scss";
 @import "../../styles/steps.scss";
 
-  /deep/ .el-checkbox input:focus{
+/deep/ .el-checkbox input:focus {
-    outline:none !important;
+  outline: none !important;
   border-color: gray;
   border: 0px;
   box-shadow: none !important;
-  }
+}
-  
 </style>

vue/src/views/ux/billManage/sparePart/index.vue

@@ -1,4 +1,4 @@
-<!--大众备件结算明细-->
+<!--大众备件结算核对-->
 <template>
   <div class="cr-body-content">
     <!--功能栏-->
@@ -331,9 +331,15 @@
       :close-on-click-modal="false"
       :title="formTitle"
       append-to-body
-      width="550px"
+      width="680px"
+    >
+      <el-form
+        ref="formCount"
+        :inline="true"
+        :rules="rules"
+        :model="formCount"
+        size="mini"
       >
-      <el-form ref="formCount" :inline="true" :model="formCount" size="mini">
         <el-row>
           <el-col :md="4" :xs="24">
             <el-form-item label="选择版本" required />
@@ -357,25 +363,122 @@
             </el-form-item>
           </el-col>
         </el-row>
-        <!-- <el-row>
+        <el-row>
           <el-col :md="4" :xs="24">
-            <el-form-item label="适用功能" required />
+            <el-form-item label="物料组(车型)" />
           </el-col>
           <el-col :md="20" :xs="24" style="margin-left: -80px">
-            <el-form-item prop="customerCode">
+            <el-form-item prop="materialGroupValue">
               <el-select
-                v-model="formCount.customerCode"
+                v-model="formCount.materialGroupValue"
                 size="medium"
+                filterable
                 clearable
                 style="width: 188px; margin-right: 15px"
                 placeholder="请选择"
               >
-                <el-option label="结算" value="R0003"></el-option>
+                <el-option
-                <el-option label="二配" value="R0001"></el-option>
+                  v-for="item in materialGroupList"
+                  :key="item.value"
+                  :label="item.label"
+                  :value="item.value"
+                ></el-option>
               </el-select>
             </el-form-item>
           </el-col>
-        </el-row> -->
+        </el-row>
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="CP5时间：" />
+          </el-col>
+          <el-col :md="20" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-date-picker
+                v-model="datetime5"
+                type="datetimerange"
+                :picker-options="pickerOptionsCp5"
+                range-separator="至"
+                start-placeholder="开始日期"
+                end-placeholder="结束日期"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                :default-time="['00:00:00', '23:59:59']"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="CP7时间：" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-date-picker
+                v-model="startTime"
+                type="datetime"
+                size="small"
+                :picker-options="pickerOptions0"
+                @change="getdateValue"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="00:00:00"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -40px">
+            <el-form-item>
+              <el-date-picker
+                v-model="endTime"
+                type="datetime"
+                :picker-options="pickerOptions1"
+                size="small"
+                @change="getdateVal"
+                value-format="yyyy-MM-dd HH:mm:ss"
+                default-time="23:59:59"
+              >
+              </el-date-picker>
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="KEEN号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-input v-model="formCount.kennCode" />
+            </el-form-item>
+          </el-col>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="底盘号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -95px">
+            <el-form-item>
+              <el-input v-model="formCount.chassisNumber" />
+            </el-form-item>
+          </el-col>
+        </el-row>
+
+        <el-row>
+          <el-col :md="4" :xs="24">
+            <el-form-item label="客户零件号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -80px">
+            <el-form-item>
+              <el-input v-model="formCount.materialCode" />
+            </el-form-item>
+          </el-col>
+          <!-- <el-col :md="4" :xs="24">
+            <el-form-item label="客户零件号" />
+          </el-col>
+          <el-col :md="10" :xs="24" style="margin-left: -95px">
+            <el-form-item>
+              <el-input v-model="formCount.sapMaterialCode" />
+            </el-form-item>
+          </el-col> -->
+        </el-row>
       </el-form>
       <div slot="footer" class="dialog-footer">
         <!-- <el-button type="text" @click="dialogFormVisible = false"
@@ -404,22 +507,73 @@ const cityOptions = [
 ];
 
 export default {
-  name: "IssuedUnsettled",
+  name: "SparePartReport",
   components: { Pagination, CRMTableHead },
   directives: { permission },
 
   data() {
     return {
       crmType: "backJob",
+      rules: {
+        versionValue: [
+          { required: true, message: "必须输入！", trigger: "change" },
+        ],
+      },
+      pickerOptionsCp5: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      pickerOptions0: {
+        disabledDate: (time) => {
+          //if (this.endTime != "") {
+          //return  time.getTime() >= new Date(this.endTime).getTime();
+          return time.getTime() > new Date(this.endTime).getTime();
+          //}
+        },
+      },
+      pickerOptions1: {
+        disabledDate: (time) => {
+          //return time.getTime() <= new Date(this.startTime).getTime() || time.getTime() > Date.now();
+          return time.getTime() <= new Date(this.startTime).getTime();
+        },
+      },
+      startTime: "",
+      endTime: "",
+      pickerOptionsCp7: {
+        disabledDate: (time) => {
+          let now = new Date();
+          let monthEndDate = new Date(now.getFullYear(), now.getMonth() + 1, 0);
+          let timeEnd = Date.parse(monthEndDate);
+          if (timeEnd) {
+            return (
+              time.getTime() > time.getTime() > timeEnd - 8.64e7 ||
+              time.getTime() > timeEnd + 60 * 60 * 24 * 1000
+            ); //能选上最后一天
+          }
+        },
+      },
+      datetime5: [],
+      datetime7: [],
       checkedCities: [0],
       cities: cityOptions,
       selectValue: "",
       selectNameValue: "",
       radio: "0", //结算状态：0未结 1部分结算
       versionList: [],
+      materialGroupList: [],
       // 是否显示详细弹出层
       openView: false,
       versionValue: "",
+      materialGroupValue: "",
       formTitle: "",
       timer: null, //定时器名称
       //当前位置
@@ -446,9 +600,14 @@ export default {
       form: {},
       formCount: {
         name: "未结算对比",
-        datetime5: "",
+        // datetime5: [],
-        datetime7: "",
+        // datetime7: [],
-        state: [0],
+        settledate: "",
+        materialCode: "",
+        sapMaterialCode: "",
+        chassisNumber: "",
+        kennCode: "",
+        version: "",
       },
       list: null,
       totalCount: 0,
@@ -462,11 +621,15 @@ export default {
         },
       },
       listExportQuery: {
-        //version: "",
+        version: "",
-        //customerCode: "TH",
+        materialCode: undefined,
-        state: "",
+        cp7begin: undefined,
-        begin: "",
+        cp7end: undefined,
-        end: "",
+        kenncode: undefined,
+        chassisNumber: undefined,
+        materialGroup: undefined,
+        begin: undefined,
+        end: undefined,
       },
       listQuery: {
         taskId: "",
@@ -504,10 +667,14 @@ export default {
     this.$once("hook:beforeDestroy", () => {
       clearInterval(timer);
     });
+    //this.disabledDateCp5();
   },
   created() {
     this.getAllVersionList();
+    this.getMaterialGroup();
     this.getList();
+    // this.getCurrentMonthFirst();
+    // this.getCurrentMonthLast();
   },
   beforeDestroy() {
     clearInterval(this.timer);
@@ -552,37 +719,36 @@ export default {
     },
   },
   methods: {
+    getdateValue(val) {
+      this.startTime = val;
+      this.getbalanceIndexData();
+    },
+    getdateVal(val) {
+      this.endTime = val;
+      this.getbalanceIndexData();
+    },
+
+    getCurrentMonthFirst() {
+      var date = new Date();
+      date.setDate(1);
+      var month = parseInt(date.getMonth() + 1);
+      var day = date.getDate();
+      if (month < 10) month = "0" + month;
+      if (day < 10) day = "0" + day;
+      this.startTime = date.getFullYear() + "-" + month + "-" + day;
+    },
+    getCurrentMonthLast() {
+      var date = new Date();
+      var year = date.getFullYear();
+      var month = date.getMonth() + 1;
+      month = month < 10 ? "0" + month : month;
+      var day = new Date(year, month, 0);
+      this.endTime = year + "-" + month + "-" + day.getDate();
+    },
     handleCheckedCitiesChange(value) {
       alert(value);
     },
-    /* 导出功能 */
+
-    handleDownloadExport() {
-      if (this.versionValue === "") {
-        this.$message.error("请选择版本");
-        return false;
-      }
-      this.listLoading = true;
-      this.listExportQuery.version = this.version;
-      console.log("导出条件：" + JSON.stringify(this.listExportQuery));
-      this.$axios
-        .posts(
-          "/api/settleaccount/ReportMakeService/SettlSparePartExport",
-          this.listExportQuery
-        )
-        .then((res) => {
-          let taskid = res;
-          if (Number.isInteger(taskid)) {
-            this.$notify({
-              title: "成功",
-              message: "任务生成成功！任务号:" + taskid,
-              type: "success",
-              duration: 2000,
-            });
-          }
-          this.getList();
-          this.listLoading = false;
-        });
-    },
     getAllVersionList() {
       this.$axios
         .posts("/api/settleaccount/CentralizedControl/openlist")
@@ -599,32 +765,79 @@ export default {
           this.listLoading = false;
         });
     },
-    checkedListChange(index) {
+    //获取物料组车型
-      if (this.formCount.state.length === 0) {
+    getMaterialGroup() {
-        this.formCount.state.push(this.cities[index].id);
+      this.$axios
-      }
+        .posts("/api/settleaccount/CodeSetting/list", {
+          project: "物料组",
+          maxResultCount: 1000,
+          skipCount: 0,
+        })
+        .then((response) => {
+          this.materialGroupList = [];
+          response.items.forEach((element) => {
+            let options = {};
+            options.value = element.description;
+            options.label = element.description;
+            this.materialGroupList.push(options);
+          });
+        })
+        .catch(() => {
+          this.listLoading = false;
+        });
     },
     /* 重置 */
     resetForm(formName) {
-      //this.formCount = {};
+      this.formCount = {};
-      this.formCount.datetime5 = "";
+      this.datetime5 = [];
-      this.formCount.datetime7 = "";
+      this.startTime = "";
-      this.formCount.state = [0];
+      this.endTime = "";
+      // this.datetime7 = [];
     },
     save() {
       this.$refs.formCount.validate((valid) => {
         if (valid) {
-          console.log("参数:" + JSON.stringify(this.formCount));
           this.formLoading = true;
-          this.listExportQuery.version = this.formCount.versionValue;
+          this.listExportQuery.version = this.formCount.versionValue; //版本
-          // this.listExportQuery.begin = this.formCount.datetime5[0];
+          if (this.formCount.materialCode != "") {
-          // this.listExportQuery.end = this.formCount.datetime5[1];
+            this.listExportQuery.materialCode = this.formCount.materialCode; //物料号
-          // this.listExportQuery.state = this.formCount.state.join(',');
+          }
-
+          // if (this.formCount.sapMaterialCode != "") {
-          console.log("导出条件：" + JSON.stringify(this.listExportQuery));
+          //   this.listExportQuery.sapMaterialCode = this.formCount.sapMaterialCode; //厂内物料号
+          // }
+          if (this.formCount.kennCode != "") {
+            this.listExportQuery.kenncode = this.formCount.kennCode; //KEEN号
+          }
+          var getdate5 = JSON.stringify(this.datetime5);
+          if (getdate5 != "[]") {
+            alert(this.datetime5[0]);
+            this.listExportQuery.begin = this.datetime5
+              ? this.datetime5[0] || undefined
+              : undefined;
+            this.listExportQuery.end = this.datetime5
+              ? this.datetime5[1] || undefined
+              : undefined;
+          }
+          if (this.startTime != "") {
+            this.listExportQuery.cp7begin = this.startTime; //CP7开始时间
+          }
+          if (this.endTime != "") {
+            this.listExportQuery.cp7end = this.endTime; //CP5结束日期
+          }
+          if (this.formCount.chassisNumber != "") {
+            this.listExportQuery.chassisNumber = this.formCount.chassisNumber; //底盘号
+          }
+          if (this.formCount.materialGroupValue != "") {
+            this.listExportQuery.materialGroup =
+              this.formCount.materialGroupValue; //物料组车型
+          }
+          console.log(
+            "大众备件结算核对-导出条件：" +
+              JSON.stringify(this.listExportQuery)
+          );
           this.$axios
             .gets(
-              "/api/settleaccount/ReportMakeService/SettlSparePartExport",
+              "/api/settleaccount/ReportMakeService/SettleDoorPanel",
               this.listExportQuery
             )
             .then((res) => {
@@ -769,7 +982,7 @@ export default {
     getList() {
       this.listLoading = true;
       //导入界面中超链接过来的参数
-      this.listQuery.name = "未结算对比";
+      this.listQuery.name = "大众准时化结算门板价格差异比对报表";
       this.$axios
         .posts("/api/settleaccount/Job/list", this.listQuery)
         .then((response) => {

vue/src/views/ux/vw/dataInput/SparePart/index.vue

@@ -193,7 +193,7 @@ export default {
       list: null,
       totalCount: 0,
       listLoading: true,
-      formLoading: false,
+      formLoading: true,
       // 高级搜索
       filterObj: {
         type: Object,
@@ -318,7 +318,7 @@ export default {
         width: 150,
       });
       tempsTabs.push({ label: "工厂", prop: "factory", width: 150 });
-      tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 150 });
+      tempsTabs.push({ label: "工厂名称", prop: "factoryName", width: 220 });
       return tempsTabs;
     },
   },

vue/static/config.js

@@ -2,23 +2,9 @@ let configJSON
 if (process.env.NODE_ENV === 'development') {
   configJSON = {
     base: {
-			// ip: 'http://localhost',
-			// auth_port: '44344',
-			// public_port: '44344',
-			// backend_port: '44344',
-			
-      // ip: 'http://localhost',
-      // auth_port: '10100',
-      // public_port: '10130',
-      // backend_port: '10130'
-      
-			 /* ip: 'http://localhost',
-			 auth_port: '44378',
-			 public_port: '44378',
-			 backend_port: '44378', */
 			
       ip: 'http://192.168.0.140',
-      // ip: 'http://149.223.116.5',
+      //ip: 'http://149.223.116.5',
       auth_port: '8066',
       public_port: '8092',
       backend_port: '8092'